From 83c950cc6e963ad9ef0a75b8147e9eb3149f0592 Mon Sep 17 00:00:00 2001
From: Julian Seward <jseward@acm.org>
Date: Tue, 1 Nov 2011 07:16:31 +0000
Subject: [PATCH] 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
---
 memcheck/tests/badjump2.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/memcheck/tests/badjump2.c b/memcheck/tests/badjump2.c
index 47a6829861..ad7329f63b 100644
--- 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];
-- 
2.47.2