From: Carl Love <cel@us.ibm.com>
Date: Wed, 6 May 2015 19:44:14 +0000 (+0000)
Subject: Patch 2 in a series of cleanup patches from Will Schmidt
X-Git-Tag: svn/VALGRIND_3_11_0~426
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b55e14b952463fb183b15e27895c0007f96b639;p=thirdparty%2Fvalgrind.git

Patch 2 in a series of cleanup patches from Will Schmidt

Adjust the badjump2 test for ppc64le/ABIV2. Under the ABIV2 there
is no function descriptor, so the fn[] setup does not apply.
This fixes the badjump2 test failure as seen on ppc64le.

This patch fixes Vagrind bugzilla 347322.


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

diff --git a/memcheck/tests/badjump2.c b/memcheck/tests/badjump2.c
index ad7329f63b..7e09af52e1 100644
--- a/memcheck/tests/badjump2.c
+++ b/memcheck/tests/badjump2.c
@@ -35,7 +35,7 @@ int main(void)
 
    if (setjmp(myjmpbuf) == 0) {
       // Jump to zero; will cause seg fault
-#if defined(__powerpc64__)
+#if defined(__powerpc64__) && (_CALL_ELF != 2)
       unsigned long int fn[3];
       fn[0] = 0;
       fn[1] = 0;