Merge from branches/THUMB: supps and mandatory redirs on Ubuntu 10.04 (ARM)

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11281

diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
index f649b2ad594d9dcb8dc5abfe466df2f944f3cbf3..9172cc26985b2dfcca3c3a051d8f3783dcb788e4 100644 (file)
--- a/coregrind/m_redir.c
+++ b/coregrind/m_redir.c
@@ -1009,7 +1009,7 @@ void VG_(redir_initialise) ( void )
       add_hardwired_spec(
          "ld-linux.so.3", "strlen",
          (Addr)&VG_(arm_linux_REDIR_FOR_strlen),
-         NULL 
+         complain_about_stripped_glibc_ldso
       );
       //add_hardwired_spec(
       //   "ld-linux.so.3", "index",
@@ -1019,7 +1019,7 @@ void VG_(redir_initialise) ( void )
       add_hardwired_spec(
          "ld-linux.so.3", "memcpy",
          (Addr)&VG_(arm_linux_REDIR_FOR_memcpy),
-         NULL 
+         complain_about_stripped_glibc_ldso
       );
    }
    /* nothing so far */

diff --git a/glibc-2.X.supp.in b/glibc-2.X.supp.in
index ef85328b44d5f16c69bcae85f6a6bf016ba8c3c8..935bd747f6034442be10d23df107f0edad3cef8f 100644 (file)
--- a/glibc-2.X.supp.in
+++ b/glibc-2.X.supp.in
@@ -228,3 +228,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
+}