diff options
| author | Bill Wendling <isanbard@gmail.com> | 2013-12-24 06:50:45 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2013-12-24 06:50:45 +0000 |
| commit | 1255f5f451a1b6b110f8c6f34fb813102d6e1f2d (patch) | |
| tree | a179f341e8380bbd36d1b2de8f11b84839c987a6 | |
| parent | 271b135a1adec35b02d8e7a993a581ed8f3aa10d (diff) | |
Merging r197483:llvmorg-3.4.0
------------------------------------------------------------------------
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!
------------------------------------------------------------------------
llvm-svn: 197944
| -rw-r--r-- | llvm/lib/ExecutionEngine/RTDyldMemoryManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/ExecutionEngine/RTDyldMemoryManager.cpp b/llvm/lib/ExecutionEngine/RTDyldMemoryManager.cpp index 58a64609b9bc..26e1fddd7695 100644 --- a/llvm/lib/ExecutionEngine/RTDyldMemoryManager.cpp +++ b/llvm/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 |