Make build-memcheck-for-chromium.sh build the binaries from valgrind-variant...

binaries/linux_x64/lib/valgrind/default.supp

Index: binaries/linux_x64/lib/valgrind/default.supp
===================================================================
--- binaries/linux_x64/lib/valgrind/default.supp	(revision 64717)
+++ binaries/linux_x64/lib/valgrind/default.supp	(working copy)
@@ -1,5 +1,5 @@
 # This is a generated file, composed of the following suppression rules:
-#  exp-ptrcheck.supp xfree-3.supp xfree-4.supp glibc-2.X-drd.supp glibc-2.34567-NPTL-helgrind.supp glibc-2.X.supp
+#  exp-ptrcheck.supp xfree-3.supp xfree-4.supp glibc-X.X.supp glibc-2.X-drd.supp glibc-2.34567-NPTL-helgrind.supp glibc-2.X.supp
 {
    lib-X11-used-old-pointer-after-realloc-1
    exp-ptrcheck:Heap
@@ -58,6 +58,36 @@
 }
 
 
+# Invalid read of size 16
+#    at 0x5643A5C: ??? (strcpy.S:94)
+#    by 0x50C6A99: XtResolvePathname (in /usr/lib/libXt.so.6.0.0)
+#    by 0x50C3856: XtScreenDatabase (in /usr/lib/libXt.so.6.0.0)
+#    by 0x50C4386: _XtDisplayInitialize (in /usr/lib/libXt.so.6.0.0)
+{
+   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept
+   exp-ptrcheck:Heap
+   obj:/*lib*/libc-2.*so*
+   obj:/*lib*/libX*so*
+}
+{
+   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept - 2
+   exp-ptrcheck:Heap
+   obj:/*lib*/libc-2.*so*
+   obj:/*lib*/libICE*so*
+}
+{
+   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept - 3
+   exp-ptrcheck:Heap
+   obj:/*lib*/libc-2.*so*
+   obj:/*lib*/libglib*so*
+}
+{
+   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept - 4
+   exp-ptrcheck:Heap
+   obj:/*lib*/libc-2.*so*
+   obj:/*lib*/libfontconfig*so*
+}
+
 ##----------------------------------------------------------------------##
 
 # Errors to suppress by default with XFree86 3.3.6)
@@ -612,7 +642,245 @@
    fun:_IO_default_xsputn
    obj:/lib*/libc-2.*so*
 }
+
+##----------------------------------------------------------------------##
+
+# Errors to suppress by default with glibc 2.x
+
+# IMPORTANT: DO NOT EDIT glibc-2.X.supp, as it is as a generated
+# file.  Instead edit glibc-2.X.supp.in.
+
+# Format of this file is:
+# {
+#     name_of_suppression
+#     tool_name:supp_kind
+#     (optional extra info for some suppression types)
+#     caller0 name, or /name/of/so/file.so
+#     caller1 name, or ditto
+#     (optionally: caller2 name)
+#     (optionally: caller3 name)
+#  }
 #
+# For Memcheck, the supp_kinds are:
+#
+#     Param Value1 Value2 Value4 Value8 Value16 Jump
+#     Free Addr1 Addr2 Addr4 Addr8 Addr16
+#     Cond (previously known as Value0)
+#
+# and the optional extra info is:
+#     if Param: name of system call param
+
+##----------------------------------------------------------------------##
+##--- generic suppressions                                           ---##
+##----------------------------------------------------------------------##
+
+{
+   dl-hack3-cond-0
+   Memcheck:Cond
+   fun:_dl_start
+   fun:_start
+}
+{
+   dl-hack3-cond-1
+   Memcheck:Cond
+   obj:/lib*/ld-2*.so*
+   obj:/lib*/ld-2*.so*
+   obj:/lib*/ld-2*.so*
+}
+{
+   dl-hack3-cond-2
+   Memcheck:Cond
+   obj:/lib*/ld-2*.so*
+   obj:/lib*/ld-2*.so*
+   obj:/lib*/libc-2*.so*
+}
+{
+   dl-hack3-cond-3
+   Memcheck:Cond
+   obj:/lib*/ld-2*.so*
+   obj:/lib*/libc-2*.so*
+   obj:/lib*/libc-2*.so*
+}
+{
+   dl-hack3-cond-4
+   Memcheck:Cond
+   obj:/lib*/ld-2*.so*
+   obj:/lib*/ld-2*.so*
+   obj:/lib*/libdl-2*.so*
+}
+
+{
+   dl-hack4-64bit-addr-1
+   Memcheck:Addr8
+   obj:/lib*/ld-2*.so*
+   obj:/lib*/ld-2*.so*
+   obj:/lib*/ld-2*.so*
+}
+{
+   dl-hack4-64bit-addr-2
+   Memcheck:Addr8
+   obj:/lib*/ld-2*.so*
+   obj:/lib*/ld-2*.so*
+   obj:/lib*/libc-2*.so*
+}
+{
+   dl-hack4-64bit-addr-3
+   Memcheck:Addr8
+   obj:/lib*/ld-2*.so*
+   obj:/lib*/ld-2*.so*
+   obj:/lib*/libdl-2*.so*
+}
+
+{
+   dl-hack5-32bit-addr-1
+   Memcheck:Addr4
+   obj:/lib*/ld-2*.so
+   obj:/lib*/ld-2*.so
+   obj:/lib*/ld-2*.so
+}
+{
+   dl-hack5-32bit-addr-3
+   Memcheck:Addr4
+   obj:/lib*/ld-2*.so
+   obj:/lib*/ld-2*.so
+   obj:/lib*/libdl-2*.so*
+}
+{
+   dl-hack5-32bit-addr-4
+   Memcheck:Addr4
+   obj:/lib*/ld-2*.so
+   obj:/lib*/libdl-2*.so*
+   obj:/lib*/ld-2*.so
+}
+
+
+##----------------------------------------------------------------------##
+##--- Misc ad-hoc hacks                                              ---##
+##----------------------------------------------------------------------##
+{
+   glibc-2.5.x-on-SUSE-10.2-(PPC)-1
+   Memcheck:Cond
+   fun:_dl_start_final
+   fun:_dl_start
+   fun:_start
+}
+{
+   glibc-2.5.x-on-SUSE-10.2-(PPC)-2a
+   Memcheck:Cond
+   fun:index
+   obj:*ld-2.*.so
+}
+{
+   glibc-2.5.x-on-SuSE-10.2-(PPC)-2b
+   Memcheck:Addr4
+   fun:index
+   fun:expand_dynamic_string_token
+}
+{
+   glibc-2.5.5-on-SuSE-10.2-(PPC)-2c
+   Memcheck:Addr4
+   fun:index
+   obj:*ld-2.*.so
+}
+{
+   glibc-2.3.5-on-SuSE-10.1-(PPC)-3
+   Memcheck:Addr4
+   fun:*wordcopy_fwd_dest_aligned*
+   fun:mem*cpy
+   obj:*lib*2.*.so
+}
+
+{
+   glibc-2-on-SUSE-10.3-(x86)
+   Memcheck:Addr4
+   obj:/lib/ld-2*.so
+   obj:/lib/ld-2*.so
+   obj:/lib/ld-2*.so
+}
+
+{
+   glibc24-64bit-padding-1a
+   Memcheck:Param
+   socketcall.sendto(msg)
+   fun:send
+   fun:get_mapping
+   fun:__nscd_get_map_ref
+   fun:nscd*
+}
+{
+   glibc24-64bit-padding-1b
+   Memcheck:Param
+   socketcall.sendto(msg)
+   fun:__sendto_nocancel
+   obj:/*libc-2.so
+   obj:/*libc-2.so
+   obj:/*libc-2.so
+}
+{
+   glibc24-64bit-padding-1c
+   Memcheck:Param
+   socketcall.send(msg)
+   fun:send
+   fun:__nscd_get_map_ref
+   fun:nscd_get*_r
+   fun:*nscd*
+   obj:/*libc-2.so
+}
+
+
+{
+   X11-64bit-padding-3a
+   Memcheck:Param
+   write(buf)
+   obj:/*libpthread-2.4.so*
+   obj:/usr/lib*/libX11.so*
+   obj:/usr/lib*/libX11.so*
+   obj:/usr/lib*/libX11.so*
+}
+
+{
+   X11-64bit-padding-4a
+   Memcheck:Param
+   socketcall.sendto(msg)
+   fun:send
+   obj:/*libc-2.so
+   obj:/*libc-2.so
+   obj:/*libc-2.so
+}
+{
+   X11-64bit-padding-4b
+   Memcheck:Param
+   socketcall.send(msg)
+   fun:send
+   obj:/*libc-2.so
+   obj:/*libc-2.so
+   obj:/*libc-2.so
+}
+
+##----------------------------------------------------------------------##
+# MontaVista Linux 4.0.1 on ppc32
+{
+    MVL-401-linuxthreads-pthread_create
+    Memcheck:Param
+    write(buf)
+    fun:pthread_create
+}
+{
+   MVL-401-linuxthreads-pthread_create
+   Memcheck:Param
+   write(buf)
+   obj:/lib/libpthread-0.10.so
+   fun:pthread_create
+}
+
+##----------------------------------------------------------------------##
+# Ubuntu 10.04 on ARM (Thumb).  Not sure why this is necessary.
+{
+   U1004-ARM-_dl_relocate_object
+   Memcheck:Cond
+   fun:_dl_relocate_object
+}
+#
 # Suppression patterns for ld, the dynamic loader.
 #
 
@@ -655,6 +923,14 @@
 #    fun:_ZNSsC1ERKSs
 # }
 
+{
+   drd-libstdc++-cxa_guard_release
+   drd:CondErr
+   fun:pthread_cond_broadcast@*
+   fun:__cxa_guard_release
+}
+
+
 #
 # Suppression patterns for libpthread.
 #
@@ -678,30 +954,60 @@
    fun:__deallocate_stack
 }
 {
+   drd-libpthread-__free_stacks
+   drd:ConflictingAccess
+   fun:__free_stacks
+}
+{
    drd-libpthread-__free_tcb
    drd:ConflictingAccess
    ...
    fun:__free_tcb
 }
 {
+   drd-libpthread-__nptl_deallocate_tsd
+   drd:ConflictingAccess
+   fun:__nptl_deallocate_tsd
+}
+{
    drd-libpthread-pthread_detach
    drd:ConflictingAccess
    fun:pthread_detach
    fun:pthread_detach
 }
 {
+   drd-libpthread-pthread_once
+   drd:ConflictingAccess
+   fun:pthread_once
+}
+{
+   drd-libpthread-pthread_cancel_init
+   drd:ConflictingAccess
+   fun:pthread_cancel_init
+}
+{
    drd-libpthread-_Unwind_ForcedUnwind
    drd:ConflictingAccess
    ...
    fun:_Unwind_ForcedUnwind
 }
 {
+   drd-libpthread-_Unwind_GetCFA
+   drd:ConflictingAccess
+   fun:_Unwind_GetCFA
+}
+{
    drd-libpthread-_Unwind_Resume
    drd:ConflictingAccess
    ...
    fun:_Unwind_Resume
 }
 {
+   drd-libpthread-?
+   drd:ConflictingAccess
+   obj:/lib/libgcc_s.so.1
+}
+{
    drd-libpthread-nanosleep
    drd:ConflictingAccess
    fun:nanosleep
@@ -760,6 +1066,7 @@
 {
    drd-libglib-access-g_threads_got_initialized
    drd:ConflictingAccess
+   ...
    fun:_ZN27QEventDispatcherGlibPrivateC1EP13_GMainContext
    fun:_ZN20QEventDispatcherGlibC1EP7QObject
    obj:/usr/lib*/libQtCore.so.4.*
@@ -801,7 +1108,6 @@
    drd-libQtCore-deref-that-calls-QThreadData-destructor
    drd:ConflictingAccess
    fun:_ZN11QThreadDataD1Ev
-   fun:_ZN11QThreadData5derefEv
    obj:/usr/lib*/libQtCore.so.4.*
 }
 {
@@ -834,14 +1140,20 @@
    drd:ConflictingAccess
    fun:_ZN10QMutexPool3getEPKv
 }
+{
+   drd-libQtCore-qt_gettime_is_monotonic()
+   drd:ConflictingAccess
+   fun:_Z23qt_gettime_is_monotonicv
+}
 
 #
 # Suppression patterns for libboost.
 #
 
 # Suppress the races on boost::once_flag::epoch and on
-# boost::detail::once_global_epoch. See also the source file
-# boost/thread/pthread/once.hpp in the Boost source tree.
+# boost::detail::this_thread_epoch. See also the source file
+# boost/thread/pthread/once.hpp in the Boost source tree
+# (https://svn.boost.org/trac/boost/browser/trunk/boost/thread/pthread/once.hpp).
 {
    drd-libboost-boost::call_once<void (*)()>(boost::once_flag&, void (*)())
    drd:ConflictingAccess
@@ -853,12 +1165,21 @@
    drd:ConflictingAccess
    fun:_ZN5boost6detail25get_once_per_thread_epochEv
 }
+# Suppress the race reports on boost::detail::current_thread_tls_key. See also
+# https://svn.boost.org/trac/boost/ticket/3526 for more information about why
+# the access pattern of current_thread_tls_key is safe.
 {
    drd-libboost-boost::detail::get_current_thread_data()
    drd:ConflictingAccess
    ...
    fun:_ZN5boost6detail23get_current_thread_dataEv
 }
+{
+   drd-libboost-boost::detail::set_current_thread_data(boost::detail::thread_data_base*)
+   drd:ConflictingAccess
+   ...
+   fun:_ZN5boost6detail23set_current_thread_dataEPNS0_16thread_data_baseE
+}
 
 # FIXME 22 Jan 09: helgrind-glibc2X-005 overlaps with a lot of
 # other stuff.  They should be removed.
@@ -996,12 +1317,6 @@
    fun:__lll_*lock_*
 }
 {
-   helgrind-glibc2X-112
-   Helgrind:Race
-   fun:pthread_create_WRK
-   fun:pthread_create@*
-}
-{
    helgrind-glibc2X-113
    Helgrind:Race
    fun:pthread_barrier_wait*
@@ -1135,7 +1450,7 @@
 
 ##----------------------------------------------------------------------##
 
-# Errors to suppress by default with glibc 2.7.x
+# Errors to suppress by default with glibc 2.11.x
 
 # IMPORTANT: DO NOT EDIT glibc-2.X.supp, as it is as a generated
 # file.  Instead edit glibc-2.X.supp.in.
@@ -1173,74 +1488,74 @@
 {
    dl-hack3-cond-1
    Memcheck:Cond
-   obj:/lib*/ld-2.7*.so*
-   obj:/lib*/ld-2.7*.so*
-   obj:/lib*/ld-2.7*.so*
+   obj:/lib*/ld-2.11*.so*
+   obj:/lib*/ld-2.11*.so*
+   obj:/lib*/ld-2.11*.so*
 }
 {
    dl-hack3-cond-2
    Memcheck:Cond
-   obj:/lib*/ld-2.7*.so*
-   obj:/lib*/ld-2.7*.so*
-   obj:/lib*/libc-2.7*.so*
+   obj:/lib*/ld-2.11*.so*
+   obj:/lib*/ld-2.11*.so*
+   obj:/lib*/libc-2.11*.so*
 }
 {
    dl-hack3-cond-3
    Memcheck:Cond
-   obj:/lib*/ld-2.7*.so*
-   obj:/lib*/libc-2.7*.so*
-   obj:/lib*/libc-2.7*.so*
+   obj:/lib*/ld-2.11*.so*
+   obj:/lib*/libc-2.11*.so*
+   obj:/lib*/libc-2.11*.so*
 }
 {
    dl-hack3-cond-4
    Memcheck:Cond
-   obj:/lib*/ld-2.7*.so*
-   obj:/lib*/ld-2.7*.so*
-   obj:/lib*/libdl-2.7*.so*
+   obj:/lib*/ld-2.11*.so*
+   obj:/lib*/ld-2.11*.so*
+   obj:/lib*/libdl-2.11*.so*
 }
 
 {
    dl-hack4-64bit-addr-1
    Memcheck:Addr8
-   obj:/lib*/ld-2.7*.so*
-   obj:/lib*/ld-2.7*.so*
-   obj:/lib*/ld-2.7*.so*
+   obj:/lib*/ld-2.11*.so*
+   obj:/lib*/ld-2.11*.so*
+   obj:/lib*/ld-2.11*.so*
 }
 {
    dl-hack4-64bit-addr-2
    Memcheck:Addr8
-   obj:/lib*/ld-2.7*.so*
-   obj:/lib*/ld-2.7*.so*
-   obj:/lib*/libc-2.7*.so*
+   obj:/lib*/ld-2.11*.so*
+   obj:/lib*/ld-2.11*.so*
+   obj:/lib*/libc-2.11*.so*
 }
 {
    dl-hack4-64bit-addr-3
    Memcheck:Addr8
-   obj:/lib*/ld-2.7*.so*
-   obj:/lib*/ld-2.7*.so*
-   obj:/lib*/libdl-2.7*.so*
+   obj:/lib*/ld-2.11*.so*
+   obj:/lib*/ld-2.11*.so*
+   obj:/lib*/libdl-2.11*.so*
 }
 
 {
    dl-hack5-32bit-addr-1
    Memcheck:Addr4
-   obj:/lib*/ld-2.7*.so
-   obj:/lib*/ld-2.7*.so
-   obj:/lib*/ld-2.7*.so
+   obj:/lib*/ld-2.11*.so
+   obj:/lib*/ld-2.11*.so
+   obj:/lib*/ld-2.11*.so
 }
 {
    dl-hack5-32bit-addr-3
    Memcheck:Addr4
-   obj:/lib*/ld-2.7*.so
-   obj:/lib*/ld-2.7*.so
-   obj:/lib*/libdl-2.7*.so*
+   obj:/lib*/ld-2.11*.so
+   obj:/lib*/ld-2.11*.so
+   obj:/lib*/libdl-2.11*.so*
 }
 {
    dl-hack5-32bit-addr-4
    Memcheck:Addr4
-   obj:/lib*/ld-2.7*.so
-   obj:/lib*/libdl-2.7*.so*
-   obj:/lib*/ld-2.7*.so
+   obj:/lib*/ld-2.11*.so
+   obj:/lib*/libdl-2.11*.so*
+   obj:/lib*/ld-2.11*.so
 }
 
 
@@ -1258,7 +1573,7 @@
    glibc-2.5.x-on-SUSE-10.2-(PPC)-2a
    Memcheck:Cond
    fun:index
-   obj:*ld-2.7.*.so
+   obj:*ld-2.11.*.so
 }
 {
    glibc-2.5.x-on-SuSE-10.2-(PPC)-2b
@@ -1270,22 +1585,22 @@
    glibc-2.5.5-on-SuSE-10.2-(PPC)-2c
    Memcheck:Addr4
    fun:index
-   obj:*ld-2.7.*.so
+   obj:*ld-2.11.*.so
 }
 {
    glibc-2.3.5-on-SuSE-10.1-(PPC)-3
    Memcheck:Addr4
    fun:*wordcopy_fwd_dest_aligned*
    fun:mem*cpy
-   obj:*lib*2.7.*.so
+   obj:*lib*2.11.*.so
 }
 
 {
-   glibc-2.7-on-SUSE-10.3-(x86)
+   glibc-2.11-on-SUSE-10.3-(x86)
    Memcheck:Addr4
-   obj:/lib/ld-2.7*.so
-   obj:/lib/ld-2.7*.so
-   obj:/lib/ld-2.7*.so
+   obj:/lib/ld-2.11*.so
+   obj:/lib/ld-2.11*.so
+   obj:/lib/ld-2.11*.so
 }
 
 {
@@ -1302,9 +1617,9 @@
    Memcheck:Param
    socketcall.sendto(msg)
    fun:__sendto_nocancel
-   obj:/*libc-2.7.so
-   obj:/*libc-2.7.so
-   obj:/*libc-2.7.so
+   obj:/*libc-2.11.so
+   obj:/*libc-2.11.so
+   obj:/*libc-2.11.so
 }
 {
    glibc24-64bit-padding-1c
@@ -1314,7 +1629,7 @@
    fun:__nscd_get_map_ref
    fun:nscd_get*_r
    fun:*nscd*
-   obj:/*libc-2.7.so
+   obj:/*libc-2.11.so
 }
 
 
@@ -1333,18 +1648,18 @@
    Memcheck:Param
    socketcall.sendto(msg)
    fun:send
-   obj:/*libc-2.7.so
-   obj:/*libc-2.7.so
-   obj:/*libc-2.7.so
+   obj:/*libc-2.11.so
+   obj:/*libc-2.11.so
+   obj:/*libc-2.11.so
 }
 {
    X11-64bit-padding-4b
    Memcheck:Param
    socketcall.send(msg)
    fun:send
-   obj:/*libc-2.7.so
-   obj:/*libc-2.7.so
-   obj:/*libc-2.7.so
+   obj:/*libc-2.11.so
+   obj:/*libc-2.11.so
+   obj:/*libc-2.11.so
 }
 
 ##----------------------------------------------------------------------##
@@ -1362,3 +1677,11 @@
    obj:/lib/libpthread-0.10.so
    fun:pthread_create
 }
+
+##----------------------------------------------------------------------##
+# Ubuntu 10.04 on ARM (Thumb).  Not sure why this is necessary.
+{
+   U1004-ARM-_dl_relocate_object
+   Memcheck:Cond
+   fun:_dl_relocate_object
+}