summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2013-12-24 06:50:45 +0000
committerBill Wendling <isanbard@gmail.com>2013-12-24 06:50:45 +0000
commitdbb832b83351cec97b025b61c26536ef50c3181c (patch)
tree3614e1b7c27944343fd199c2c3fdfe6492e8124d /lib
parentf42dee19138bcebe60b1699ca8e298a8128a9eb8 (diff)
downloadllvm-dbb832b83351cec97b025b61c26536ef50c3181c.tar.gz
llvm-dbb832b83351cec97b025b61c26536ef50c3181c.tar.bz2
llvm-dbb832b83351cec97b025b61c26536ef50c3181c.tar.xz
Merging r197483:
------------------------------------------------------------------------ r197483 | yrnkrn | 2013-12-17 00:40:11 -0800 (Tue, 17 Dec 2013) | 8 lines There are no __register_frame and __deregister_frame functions when using structured exception handling (SEH) on Windows 64. http://llvm-reviews.chandlerc.com/D2378 Patch by Jonathan Liu! ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@197944 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/ExecutionEngine/RTDyldMemoryManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ExecutionEngine/RTDyldMemoryManager.cpp b/lib/ExecutionEngine/RTDyldMemoryManager.cpp
index 58a64609b9..26e1fddd76 100644
--- a/lib/ExecutionEngine/RTDyldMemoryManager.cpp
+++ b/lib/ExecutionEngine/RTDyldMemoryManager.cpp
@@ -34,7 +34,7 @@ RTDyldMemoryManager::~RTDyldMemoryManager() {}
// Determine whether we can register EH tables.
#if (defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__ia64__) && \
- !defined(__USING_SJLJ_EXCEPTIONS__))
+ !defined(__SEH__) && !defined(__USING_SJLJ_EXCEPTIONS__))
#define HAVE_EHTABLE_SUPPORT 1
#else
#define HAVE_EHTABLE_SUPPORT 0