Make the regression tests pass again on Linux.

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

diff --git a/drd/drd_pthread_intercepts.c b/drd/drd_pthread_intercepts.c
index 154ee66d4ecfcb4b8093326c6074b85db9e32498..4be2e7e5bf762484c4f09721ffa26dcd24fb34fa 100644 (file)
--- a/drd/drd_pthread_intercepts.c
+++ b/drd/drd_pthread_intercepts.c
@@ -633,7 +633,7 @@ PTH_FUNC(int, pthreadZucondZusignal, // pthread_cond_signal
    return ret;
 }
 
-PTH_FUNC(int, pthreadZucondZusignalZu_2Za, // pthread_cond_signal_2*
+PTH_FUNC(int, pthreadZucondZusignalZAZa, // pthread_cond_signal@*
          pthread_cond_t* cond)
 {
    int   ret;

diff --git a/drd/tests/pth_cond_race.stderr.exp b/drd/tests/pth_cond_race.stderr.exp
index 815f508cc00f57569ba8f703e22e31cc809aefca..f07dddaef758d886889e0c7c61ce888dc886568f 100644 (file)
--- a/drd/tests/pth_cond_race.stderr.exp
+++ b/drd/tests/pth_cond_race.stderr.exp
@@ -1,7 +1,7 @@
 
 Thread 2:
 Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
-   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
+   at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
    by 0x........: thread_func (pth_cond_race.c:?)
    by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
 cond 0x........ was first observed at:

diff --git a/drd/tests/pth_inconsistent_cond_wait.stderr.exp1 b/drd/tests/pth_inconsistent_cond_wait.stderr.exp1
index 092585eef6da22d35c6ec4b5ef5b670de92e87c1..595dc3ea1cd671d13cf70d4c7c0044004df5173d 100644 (file)
--- a/drd/tests/pth_inconsistent_cond_wait.stderr.exp1
+++ b/drd/tests/pth_inconsistent_cond_wait.stderr.exp1
@@ -16,7 +16,7 @@ mutex 0x........ was first observed at:
 
 Thread 1:
 Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
-   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
+   at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
    by 0x........: main (pth_inconsistent_cond_wait.c:?)
 cond 0x........ was first observed at:
    at 0x........: pthread_cond_init* (drd_pthread_intercepts.c:?)
@@ -26,7 +26,7 @@ mutex 0x........ was first observed at:
    by 0x........: main (pth_inconsistent_cond_wait.c:?)
 
 Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
-   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
+   at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
    by 0x........: main (pth_inconsistent_cond_wait.c:?)
 cond 0x........ was first observed at:
    at 0x........: pthread_cond_init* (drd_pthread_intercepts.c:?)

diff --git a/drd/tests/pth_inconsistent_cond_wait.stderr.exp2 b/drd/tests/pth_inconsistent_cond_wait.stderr.exp2
index 98e4c4e649e70a38de74ecfeb59d96cdc3070ce9..7391bdc48ab75381f82ff2d304bea6f42973d0f5 100644 (file)
--- a/drd/tests/pth_inconsistent_cond_wait.stderr.exp2
+++ b/drd/tests/pth_inconsistent_cond_wait.stderr.exp2
@@ -16,7 +16,7 @@ mutex 0x........ was first observed at:
 
 Thread 1:
 Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
-   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
+   at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
    by 0x........: main (pth_inconsistent_cond_wait.c:?)
 cond 0x........ was first observed at:
    at 0x........: pthread_cond_init* (drd_pthread_intercepts.c:?)
@@ -26,7 +26,7 @@ mutex 0x........ was first observed at:
    by 0x........: main (pth_inconsistent_cond_wait.c:?)
 
 Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
-   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
+   at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
    by 0x........: main (pth_inconsistent_cond_wait.c:?)
 cond 0x........ was first observed at:
    at 0x........: pthread_cond_init* (drd_pthread_intercepts.c:?)

diff --git a/drd/tests/tc23_bogus_condwait.stderr.exp-linux b/drd/tests/tc23_bogus_condwait.stderr.exp-linux
index 7a1962670cf022311f9ef8238a11cbd96d3b0c39..2efe5485a90d2fbf2ac8983e7b688fac4952446d 100644 (file)
--- a/drd/tests/tc23_bogus_condwait.stderr.exp-linux
+++ b/drd/tests/tc23_bogus_condwait.stderr.exp-linux
@@ -9,7 +9,7 @@ The object at address 0x........ is not a mutex.
 
 Thread 3:
 Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
-   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
+   at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:26)
    by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
 cond 0x........ was first observed at:
@@ -26,7 +26,7 @@ mutex 0x........ was first observed at:
 
 Thread 3:
 Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
-   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
+   at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:30)
    by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
 cond 0x........ was first observed at:
@@ -53,7 +53,7 @@ rwlock 0x........ was first observed at:
 
 Thread 3:
 Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
-   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
+   at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:34)
    by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
 cond 0x........ was first observed at:
@@ -73,7 +73,7 @@ mutex 0x........ was first observed at:
 
 Thread 3:
 Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
-   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
+   at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:38)
    by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
 cond 0x........ was first observed at: