Make sure that the same name is used in ld stack frames on 32- and 64-bit systems.

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

diff --git a/exp-drd/tests/filter_stderr b/exp-drd/tests/filter_stderr
index 57c869f104351dbbeb9e6bdbd31aa7a0ad44d442..983f5e2b6e51df4d491383ea44504777c62d3060 100755 (executable)
--- a/exp-drd/tests/filter_stderr
+++ b/exp-drd/tests/filter_stderr
@@ -18,7 +18,7 @@ sed \
 -e "/^Copyright (C) 2006-200., and GNU GPL'd, by Bart Van Assche.$/d" \
 -e "s/\(pthread_create.c:[0-9]*\)/in libpthread-?.?.so/" \
 -e "s:[A-Za-z_]* (in [^ ]*libpthread-[0-9.]*\.so):(within libpthread-?.?.so):" \
--e "s:(within /lib/ld-[0-9.]*\.so):(within ld-?.?.so):" \
+-e "s:(within /lib[0-9]*/ld-[0-9.]*\.so):(within ld-?.?.so):" \
 -e "s/ (\([a-zA-Z_]*\.c\):[0-9]*)/ (\1:?)/" \
 -e "s/ (\([a-zA-Z_]*\.cpp\):[0-9]*)/ (\1:?)/" |
 

diff --git a/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.8 b/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
index f06cfff290e693c7cf409b5ab6fc563e42b34e9e..47d53ba239d1349c586fef9885d60334e4f5cc0c 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
+++ b/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
@@ -99,7 +99,7 @@ FIXME: can't figure out how to verify wrap of sem_post
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
    at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: (within /lib64/ld-2.8.so)
+   by 0x........: (within ld-?.?.so)
    by 0x........: exit (in /...libc...)
    by 0x........: (below main) (in /...libc...)
 

diff --git a/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 b/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
index 696f2ba5234e8b892175bf77a1ad03be312ffa91..cd8e41fb72caec221e801fd46c0bcfa79954840c 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
+++ b/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
@@ -132,7 +132,7 @@ FIXME: can't figure out how to verify wrap of sem_post
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
    at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: (within /lib64/ld-2.8.so)
+   by 0x........: (within ld-?.?.so)
    by 0x........: exit (in /...libc...)
    by 0x........: (below main) (in /...libc...)
 [1/1] mutex_destroy   invalid mutex 0x........