Install the SIGILL handler everywhere so we get consistent

stacks and don't have to worry about __GLIBC_PREREQ not being
defined on all platforms.

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

diff --git a/drd/tests/tc12_rwl_trivial.stderr.exp b/drd/tests/tc12_rwl_trivial.stderr.exp
index 1a67b3d60399bc4256dc79f3efb52c1bc63867a8..ae7aa0ac5893c67eb5d0300babc4e25711e80785 100644 (file)
--- a/drd/tests/tc12_rwl_trivial.stderr.exp
+++ b/drd/tests/tc12_rwl_trivial.stderr.exp
@@ -1,7 +1,7 @@
 
 Reader-writer lock not locked by calling thread: rwlock 0x.........
    at 0x........: pthread_rwlock_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: safe_pthread_rwlock_unlock (safe-pthread.h:43)
+   by 0x........: safe_pthread_rwlock_unlock (safe-pthread.h:42)
    by 0x........: main (tc12_rwl_trivial.c:29)
 rwlock 0x........ was first observed at:
    at 0x........: pthread_rwlock_init (drd_pthread_intercepts.c:?)

diff --git a/helgrind/tests/safe-pthread.h b/helgrind/tests/safe-pthread.h
index 1210f3a851e32224b8103a20e1820b20266be47c..0e4b244c91cc750c298815f01fb708de2111c81c 100644 (file)
--- a/helgrind/tests/safe-pthread.h
+++ b/helgrind/tests/safe-pthread.h
@@ -26,7 +26,6 @@ static void sigill_handler( int signum, siginfo_t *siginfo, void *sigcontext ) {
  * glibc normally does - error reporting is optional.
  */
 static int safe_pthread_rwlock_unlock( pthread_rwlock_t *rwlock ) {
-#if __GLIBC_PREREQ(2,20) && ( defined(__i386__) || defined(__x86_64__) )
    struct sigaction sa;
    struct sigaction oldsa;
    int r;
@@ -48,9 +47,6 @@ static int safe_pthread_rwlock_unlock( pthread_rwlock_t *rwlock ) {
    sigaction( SIGILL, &oldsa, NULL );
 
    return r;
-#else
-   return pthread_rwlock_unlock( rwlock );
-#endif
 }
 
 #define pthread_rwlock_unlock safe_pthread_rwlock_unlock