From fb992ab38502e9c2ba1847c671a0a4d610eab6d6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 27 Aug 2013 06:49:46 +0000 Subject: [PATCH] Fix the build issue under ia64. Close bug #5715 Thanks to Luca Falavigna for the help and most of the patch. llvm-svn: 189324 --- llvm/lib/ExecutionEngine/JIT/JIT.cpp | 2 +- llvm/lib/ExecutionEngine/RTDyldMemoryManager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/lib/ExecutionEngine/JIT/JIT.cpp b/llvm/lib/ExecutionEngine/JIT/JIT.cpp index 53ea0a260087..e0504d1c84e0 100644 --- a/llvm/lib/ExecutionEngine/JIT/JIT.cpp +++ b/llvm/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/llvm/lib/ExecutionEngine/RTDyldMemoryManager.cpp b/llvm/lib/ExecutionEngine/RTDyldMemoryManager.cpp index 4e7645722a4c..c5500dfdbc18 100644 --- a/llvm/lib/ExecutionEngine/RTDyldMemoryManager.cpp +++ b/llvm/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