diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2010-07-26 21:58:00 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2010-07-26 21:58:00 +0000 |
| commit | e4373b0da6eb194e49ddd8c8d32e5fa1183e89b6 (patch) | |
| tree | 521c16ff6ea7b30e6ca49abc1e12af928db69ae5 /lib/ExecutionEngine | |
| parent | dee81010eb4f932b76dd3f64eacba13b55d2d105 (diff) | |
| download | llvm-e4373b0da6eb194e49ddd8c8d32e5fa1183e89b6.tar.gz llvm-e4373b0da6eb194e49ddd8c8d32e5fa1183e89b6.tar.bz2 llvm-e4373b0da6eb194e49ddd8c8d32e5fa1183e89b6.tar.xz | |
Don't call __register_frame from the JIT on systems that use setjmp/longjmp
exception handling. Also fix an extra underscore typo in one instance of
"__ARM_EABI__". Radar 8236264.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@109451 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine')
| -rw-r--r-- | lib/ExecutionEngine/JIT/JIT.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ExecutionEngine/JIT/JIT.cpp b/lib/ExecutionEngine/JIT/JIT.cpp index 67bd3ed10a..0eb87e4037 100644 --- a/lib/ExecutionEngine/JIT/JIT.cpp +++ b/lib/ExecutionEngine/JIT/JIT.cpp @@ -67,7 +67,7 @@ extern "C" void LLVMLinkInJIT() { } -#if defined(__GNUC__) && !defined(__ARM__EABI__) +#if defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__USING_SJLJ_EXCEPTIONS__) // libgcc defines the __register_frame function to dynamically register new // dwarf frames for exception handling. This functionality is not portable @@ -308,7 +308,7 @@ JIT::JIT(Module *M, TargetMachine &tm, TargetJITInfo &tji, } // Register routine for informing unwinding runtime about new EH frames -#if defined(__GNUC__) && !defined(__ARM_EABI__) +#if defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__USING_SJLJ_EXCEPTIONS__) #if USE_KEYMGR struct LibgccObjectInfo* LOI = (struct LibgccObjectInfo*) _keymgr_get_and_lock_processwide_ptr(KEYMGR_GCC3_DW2_OBJ_LIST); |