Merge branch 'master' into v2.1

2 files changed, 16 insertions, 0 deletions

diff --git a/dynasm/dasm_x86.lua b/dynasm/dasm_x86.lua
index a8e25ed3..1fa80b55 100644
--- a/dynasm/dasm_x86.lua
+++ b/dynasm/dasm_x86.lua
@@ -1116,6 +1116,7 @@ local map_op = {
   shrd_3 =      "mriqdw:0FACRmU|mrC/qq:0FADRm|mrC/dd:|mrC/ww:",
 
   rdtsc_0 =     "0F31", -- P1+
+  rdpmc_0 =     "0F33", -- P6+
   cpuid_0 =     "0FA2", -- P1+
 
   -- floating point ops
diff --git a/src/lj.supp b/src/lj.supp
index 411f2617..acb9e789 100644
--- a/src/lj.supp
+++ b/src/lj.supp
@@ -24,3 +24,18 @@
    Memcheck:Cond
    fun:lj_str_new
 }
+{
+   Optimized string compare
+   Memcheck:Addr4
+   fun:lj_str_fastcmp
+}
+{
+   Optimized string compare
+   Memcheck:Addr1
+   fun:lj_str_fastcmp
+}
+{
+   Optimized string compare
+   Memcheck:Cond
+   fun:lj_str_fastcmp
+}