Mercurial > hg > truffle
comparison src/os_cpu/linux_x86/vm/os_linux_x86.cpp @ 2211:0cd39a385a72
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@gmail.com> |
---|---|
date | Mon, 21 Feb 2011 19:17:33 +0100 |
parents | 06f017f7daa7 d70fe6ab4436 |
children | 0654ee04b214 |
comparison
equal
deleted
inserted
replaced
2184:5d801e6b9a80 | 2211:0cd39a385a72 |
---|---|
214 #ifdef AMD64 | 214 #ifdef AMD64 |
215 extern "C" void FetchNPFI () ; | 215 extern "C" void FetchNPFI () ; |
216 extern "C" void FetchNResume () ; | 216 extern "C" void FetchNResume () ; |
217 #endif // AMD64 | 217 #endif // AMD64 |
218 | 218 |
219 extern "C" int | 219 extern "C" JNIEXPORT int |
220 JVM_handle_linux_signal(int sig, | 220 JVM_handle_linux_signal(int sig, |
221 siginfo_t* info, | 221 siginfo_t* info, |
222 void* ucVoid, | 222 void* ucVoid, |
223 int abort_if_unrecognized) { | 223 int abort_if_unrecognized) { |
224 ucontext_t* uc = (ucontext_t*) ucVoid; | 224 ucontext_t* uc = (ucontext_t*) ucVoid; |