3 files changed, 8 insertions, 6 deletions
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index e5620a2..1f9fbe3 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -696,7 +696,7 @@
    bug_46715
    Heapcheck:Leak
    fun:WebCore::makeExternalString
-   fun:WebCore::v8ExternalStringSlow
+   fun:WebCore::*v8ExternalStringSlow
 }
 {
    bug_46886
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 9c7af25..04e7943 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -622,7 +622,7 @@
    bug_76386a
    Memcheck:Leak
    fun:_Znw*
-   fun:_ZNSs4_Rep9_S_createEjjRKSaIcE
+   fun:_ZNSs4_Rep9_S_createE*RKSaIcE
    ...
    fun:_ZNSsC1EPKcRKSaIcE
 }
@@ -630,8 +630,8 @@
    bug_76386b
    Memcheck:Leak
    fun:_Znw*
-   fun:_ZNSs4_Rep9_S_createEjjRKSaIcE
-   fun:_ZNSs4_Rep8_M_cloneERKSaIcEj
+   fun:_ZNSs4_Rep9_S_createE*RKSaIcE
+   fun:_ZNSs4_Rep8_M_cloneERKSaIcE*
 }
 
 #-----------------------------------------------------------------------
@@ -4668,9 +4668,9 @@
 {
    bug_86755
    Memcheck:Leak
-   fun:_Znaj
+   fun:_Zna*
    fun:_ZN12_GLOBAL__N_112SignHmacSha1ERKSsS1_PSs
-   fun:_ZN18OAuthRequestSigner4SignERK4GURLRKSt3mapISsSsSt4lessISsESaISt4pairIKSsSsEEENS_15SignatureMethodENS_10HttpMethodERS7_SF_SF_SF_PSs
+   fun:_ZN18OAuthRequestSigner4Sign*
 }
 
 #-----------------------------------------------------------------------
diff --git a/tools/valgrind/memcheck_analyze.py b/tools/valgrind/memcheck_analyze.py
index 8263621..f4a1322 100755
--- a/tools/valgrind/memcheck_analyze.py
+++ b/tools/valgrind/memcheck_analyze.py
@@ -260,6 +260,8 @@ class ValgrindError:
     supp = self._suppression;
     supp = supp.replace("fun:_Znwj", "fun:_Znw*")
     supp = supp.replace("fun:_Znwm", "fun:_Znw*")
+    supp = supp.replace("fun:_Znaj", "fun:_Zna*")
+    supp = supp.replace("fun:_Znam", "fun:_Zna*")
     # Split into lines so we can enforce length limits
     supplines = supp.split("\n")