summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDouglas Leung <douglas.leung@imgtec.com>2015-05-29 19:50:02 -0700
committerAndreas Gampe <agampe@google.com>2015-05-31 16:59:36 -0700
commit0bcf9fdad1cb286f4149e249513326c2acbb6c38 (patch)
treedaa8a13f4516812f8f243a010564e7dcae8773d6 /test
parent8ee2145d65ed14b267ae4c6396f2333115611a97 (diff)
downloadart-0bcf9fdad1cb286f4149e249513326c2acbb6c38.zip
art-0bcf9fdad1cb286f4149e249513326c2acbb6c38.tar.gz
art-0bcf9fdad1cb286f4149e249513326c2acbb6c38.tar.bz2
Fix test 115-native-bridge for Mips.
(cherry picked from commit d0af5479d61013362e43ae15cb69c9f8da915e08) Change-Id: I3eee8df39e774d233f11c43a5578f407bfdebca1
Diffstat (limited to 'test')
-rw-r--r--test/115-native-bridge/nativebridge.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/115-native-bridge/nativebridge.cc b/test/115-native-bridge/nativebridge.cc
index fd94b23..c8141a7 100644
--- a/test/115-native-bridge/nativebridge.cc
+++ b/test/115-native-bridge/nativebridge.cc
@@ -197,7 +197,9 @@ static jint trampoline_Java_Main_testSignal(JNIEnv*, jclass) {
struct sigaction tmp;
sigemptyset(&tmp.sa_mask);
tmp.sa_sigaction = test_sigaction_handler;
+#if !defined(__APPLE__) && !defined(__mips__)
tmp.sa_restorer = nullptr;
+#endif
sigaction(SIGSEGV, &tmp, nullptr);
#if defined(__arm__) || defined(__i386__) || defined(__x86_64__) || defined(__aarch64__)