Merge from trunk, r12254 (Use normal setjmp/longjmp, not the __builtin

ones)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_7_BRANCH@12256

diff --git a/memcheck/tests/badjump2.c b/memcheck/tests/badjump2.c
index 47a6829861021a9238d11c97603514de054374fb..ad7329f63b90f6fd9fbd51dd79a6c9c0dfa365e0 100644 (file)
--- a/memcheck/tests/badjump2.c
+++ b/memcheck/tests/badjump2.c
@@ -13,7 +13,7 @@ static jmp_buf myjmpbuf;
 static
 void SIGSEGV_handler(int signum)
 {
-   __builtin_longjmp(myjmpbuf, 1);
+   longjmp(myjmpbuf, 1);
 }
 
 int main(void)
@@ -33,7 +33,7 @@ int main(void)
    res = sigaction( SIGSEGV, &sigsegv_new, &sigsegv_saved );
    assert(res == 0);
 
-   if (__builtin_setjmp(myjmpbuf) == 0) {
+   if (setjmp(myjmpbuf) == 0) {
       // Jump to zero; will cause seg fault
 #if defined(__powerpc64__)
       unsigned long int fn[3];