Some tweaks to make more tests pass, or get closer to passing, on
--enable-only32bit builds on my Ubuntu box:

- For all tests, replace all operator new/new[]/delete/delete[] variants
  with a common form, eg. "...operator new...".  This makes
  exp-ptrcheck/tests/ccc and memcheck/tests/mismatches pass.

- For Helgrind tests, replace all libpthread paths with "/...libpthread...",
  as is done for libc paths.  This avoids problems when /lib32/libpthread.so
  is the path.  No extra tests pass, but many of them get a lot closer to
  passing.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9333 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/tests/filter_libc b/tests/filter_libc
index 83e92d7..377cdc6 100755
--- a/tests/filter_libc
+++ b/tests/filter_libc
@@ -24,6 +24,19 @@
 
     s/($libc_symbols) \(.+\.[cS]:\d+\)$/$1 (in \/...libc...)/;
 
+    # Merge the different C++ operator variations.
+    s/(at.*)__builtin_new/$1...operator new.../;
+    s/(at.*)operator new\(unsigned(| int| long)\)/$1...operator new.../;
+
+    s/(at.*)__builtin_vec_new/$1...operator new.../;
+    s/(at.*)operator new\[\]\(unsigned(| int| long)\)/$1...operator new[].../;
+
+    s/(at.*)__builtin_delete/$1...operator delete.../;
+    s/(at.*)operator delete\(void\*\)/$1...operator delete.../;
+
+    s/(at.*)__builtin_vec_delete/$1...operator delete[].../;
+    s/(at.*)operator delete\[\]\(void\*\)/$1...operator delete[].../;
+
     print;
 }