From: Sylvestre Ledru Date: Tue, 27 Aug 2013 06:49:46 +0000 (+0000) Subject: Fix the build issue under ia64. Close bug #5715 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=47c7eee5338f6d8c05f86838b6a2fe41c7c771de;p=oota-llvm.git Fix the build issue under ia64. Close bug #5715 Thanks to Luca Falavigna for the help and most of the patch. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@189324 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/ExecutionEngine/JIT/JIT.cpp b/lib/ExecutionEngine/JIT/JIT.cpp index 53ea0a26008..e0504d1c84e 100644 --- a/lib/ExecutionEngine/JIT/JIT.cpp +++ b/lib/ExecutionEngine/JIT/JIT.cpp @@ -68,7 +68,7 @@ extern "C" void LLVMLinkInJIT() { } // Determine whether we can register EH tables. -#if (defined(__GNUC__) && !defined(__ARM_EABI__) && \ +#if (defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__ia64__) && \ !defined(__USING_SJLJ_EXCEPTIONS__)) #define HAVE_EHTABLE_SUPPORT 1 #else diff --git a/lib/ExecutionEngine/RTDyldMemoryManager.cpp b/lib/ExecutionEngine/RTDyldMemoryManager.cpp index 4e7645722a4..c5500dfdbc1 100644 --- a/lib/ExecutionEngine/RTDyldMemoryManager.cpp +++ b/lib/ExecutionEngine/RTDyldMemoryManager.cpp @@ -33,7 +33,7 @@ namespace llvm { RTDyldMemoryManager::~RTDyldMemoryManager() {} // Determine whether we can register EH tables. -#if (defined(__GNUC__) && !defined(__ARM_EABI__) && \ +#if (defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__ia64__) && \ !defined(__USING_SJLJ_EXCEPTIONS__)) #define HAVE_EHTABLE_SUPPORT 1 #else