From 2d5424d76add9714d95239f183f7f88263f44360 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Sun, 1 Feb 2009 06:42:27 +0000 Subject: [PATCH] Fix PR3423: Link llvm on ARM EABI machines. Patch by Robert Schuster. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@63489 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ExecutionEngine/JIT/JIT.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ExecutionEngine/JIT/JIT.cpp b/lib/ExecutionEngine/JIT/JIT.cpp index 7fc7b2fdceb..9595099c3c0 100644 --- a/lib/ExecutionEngine/JIT/JIT.cpp +++ b/lib/ExecutionEngine/JIT/JIT.cpp @@ -65,7 +65,7 @@ namespace llvm { } -#if defined (__GNUC__) +#if defined(__GNUC__) && !defined(__ARM__EABI__) // libgcc defines the __register_frame function to dynamically register new // dwarf frames for exception handling. This functionality is not portable @@ -86,7 +86,7 @@ namespace llvm { extern "C" void __register_frame(void*); -#if defined (__APPLE__) +#if defined(__APPLE__) namespace { @@ -225,7 +225,7 @@ JIT::JIT(ModuleProvider *MP, TargetMachine &tm, TargetJITInfo &tji, } // Register routine for informing unwinding runtime about new EH frames -#if defined(__GNUC__) +#if defined(__GNUC__) && !defined(__ARM_EABI__) #if defined(__APPLE__) struct LibgccObjectInfo* LOI = (struct LibgccObjectInfo*) _keymgr_get_and_lock_processwide_ptr(KEYMGR_GCC3_DW2_OBJ_LIST);