diff options
| author | 2015-08-21 23:26:39 +0000 | |
|---|---|---|
| committer | 2015-08-21 23:26:39 +0000 | |
| commit | 2ee4589ef330e341f7682833c896fb6ea4f18dea (patch) | |
| tree | 56e819c0eb9482a8498376491977165482209234 /test/115-native-bridge/nativebridge.cc | |
| parent | 300432d27ba9dd6961458fb1e1c845766f25c50a (diff) | |
| parent | 3835acca9101bd7afa181d8df8eba5a496d480e6 (diff) | |
Merge "Correct for signal, native bridge test hard-coded signal handling values"
Diffstat (limited to 'test/115-native-bridge/nativebridge.cc')
| -rw-r--r-- | test/115-native-bridge/nativebridge.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/115-native-bridge/nativebridge.cc b/test/115-native-bridge/nativebridge.cc index 04326b3028..702e779bb1 100644 --- a/test/115-native-bridge/nativebridge.cc +++ b/test/115-native-bridge/nativebridge.cc @@ -206,8 +206,9 @@ static jint trampoline_Java_Main_testSignal(JNIEnv*, jclass) { #if defined(__arm__) || defined(__i386__) || defined(__aarch64__) *go_away_compiler = 'a'; #elif defined(__x86_64__) - // Cause a SEGV using an instruction known to be 3 bytes long - asm volatile("movl $0, %%eax;" "movb $1, (%%eax);" : : : "%eax"); + // Cause a SEGV using an instruction known to be 3 bytes long to account for hardcoded jump + // in the signal handler + asm volatile("movl $0, %%eax;" "movb $1, (%%al);" : : : "%eax"); #else // On other architectures we simulate SEGV. kill(getpid(), SIGSEGV); |