From: Rhys Kidd Date: Wed, 19 Aug 2015 12:18:31 +0000 (+0000) Subject: Follow-up fix for r15565: sa_restorer should not be used. n-i-bz. X-Git-Tag: svn/VALGRIND_3_11_0~88 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9389efb876869c9a17485d3d723759342fc9586;p=thirdparty%2Fvalgrind.git Follow-up fix for r15565: sa_restorer should not be used. n-i-bz. It is obsolete and not specified by POSIX. See man sigaction on Linux. No regressions reported. The following error may be seen on platforms that don't implement this extension: depbase=`echo tc12_rwl_trivial.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\ gcc -DHAVE_CONFIG_H -I. -I../.. -I../.. -I../../include -I../../coregrind -I../../include -I../../VEX/pub -I../../VEX/pub -DVGA_amd64=1 -DVGO_darwin=1 -DVGP_amd64_darwin=1 -DVGPV_amd64_darwin_vanilla=1 -DVGA_SEC_x86=1 -DVGP_SEC_amd64_darwin=1 -Winline -Wall -Wshadow -Wno-long-long -g -fno-stack-protector -Wno-format-extra-args -Wno-literal-range -Wno-tautological-constant-out-of-range-compare -Wno-self-assign -Wno-string-plus-int -Wno-uninitialized -Wno-unused-value -arch x86_64 -MT tc12_rwl_trivial.o -MD -MP -MF $depbase.Tpo -c -o tc12_rwl_trivial.o tc12_rwl_trivial.c &&\ mv -f $depbase.Tpo $depbase.Po In file included from tc12_rwl_trivial.c:8: ./safe-pthread.h:37:7: error: no member named 'sa_restorer' in 'struct sigaction' sa.sa_restorer = NULL; ~~ ^ 1 error generated. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15569 --- diff --git a/drd/tests/tc12_rwl_trivial.stderr.exp b/drd/tests/tc12_rwl_trivial.stderr.exp index ae7aa0ac58..3f4973f1a1 100644 --- 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:42) + by 0x........: safe_pthread_rwlock_unlock (safe-pthread.h:41) 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 0e4b244c91..4c35bd6e00 100644 --- a/helgrind/tests/safe-pthread.h +++ b/helgrind/tests/safe-pthread.h @@ -34,7 +34,6 @@ static int safe_pthread_rwlock_unlock( pthread_rwlock_t *rwlock ) { sa.sa_sigaction = sigill_handler; sigemptyset( &sa.sa_mask ); sa.sa_flags = SA_SIGINFO; - sa.sa_restorer = NULL; sigaction( SIGILL, &sa, &oldsa );