From 1baa12e56db2622a53ef3fe70e8de79765fc436c Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Sun, 22 Aug 2010 12:13:35 +0000 Subject: [PATCH] Merge from branches/THUMB: supps and mandatory redirs on Ubuntu 10.04 (ARM) git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11281 --- coregrind/m_redir.c | 4 ++-- glibc-2.X.supp.in | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c index f649b2ad59..9172cc2698 100644 --- 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 ef85328b44..935bd747f6 100644 --- 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 +} -- 2.47.2