From dadca8b3d1861da5fc4ee4defb34d3db45d7d7b7 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 13 May 2008 09:32:29 +0000 Subject: [PATCH] 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 --- exp-drd/tests/filter_stderr | 2 +- exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.8 | 2 +- exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exp-drd/tests/filter_stderr b/exp-drd/tests/filter_stderr index 57c869f104..983f5e2b6e 100755 --- 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 f06cfff290..47d53ba239 100644 --- 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 696f2ba523..cd8e41fb72 100644 --- 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........ -- 2.47.3