1 files changed, 16 insertions, 0 deletions
diff --git a/test/115-native-bridge/nativebridge.cc b/test/115-native-bridge/nativebridge.cc
index a049b97adc..3b352096df 100644
--- a/test/115-native-bridge/nativebridge.cc
+++ b/test/115-native-bridge/nativebridge.cc
@@ -224,6 +224,22 @@ static jint trampoline_Java_Main_testSignal(JNIEnv*, jclass) {
   sigaction(SIGILL, &tmp, nullptr);
   kill(getpid(), SIGILL);
 
+#if defined(__BIONIC__)
+  // Do the same again, but with sigaction64.
+  struct sigaction64 tmp2;
+  sigemptyset64(&tmp2.sa_mask);
+  tmp2.sa_sigaction = test_sigaction_handler;
+  tmp2.sa_restorer = nullptr;
+
+  sigaction64(SIGSEGV, &tmp2, nullptr);
+  sigaction64(SIGILL, &tmp2, nullptr);
+#endif
+
+  // Reraise SIGSEGV/SIGILL even on non-bionic, so that the expected output is
+  // the same.
+  raise_sigsegv();
+  kill(getpid(), SIGILL);
+
   return 1234;
 }