diff options
| author | Jonghyun Park <parjong@gmail.com> | 2016-12-06 10:58:32 +0900 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-12-05 17:58:32 -0800 |
| commit | 7b92136d5ee99e10b2a7fa843a1fbf5cc76be6ee (patch) | |
| tree | ebed611e6c23385f13eb59ab7a9d3095783b907c | |
| parent | 910209a77d3311f845c535023d49b409d90e63ef (diff) | |
| download | coreclr-7b92136d5ee99e10b2a7fa843a1fbf5cc76be6ee.tar.gz coreclr-7b92136d5ee99e10b2a7fa843a1fbf5cc76be6ee.tar.bz2 coreclr-7b92136d5ee99e10b2a7fa843a1fbf5cc76be6ee.zip | |
[x86/Linux] Fix exception handling routine (#8433)
* [x86/Linux] Fix exception handling routine
DispatchManagedException requires WIN64EXCEPTIONS to be defined, but it
is not defined for x86/Linux.
| -rw-r--r-- | src/vm/exceptmacros.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vm/exceptmacros.h b/src/vm/exceptmacros.h index efed993a2d..9b6c5549f7 100644 --- a/src/vm/exceptmacros.h +++ b/src/vm/exceptmacros.h @@ -296,7 +296,7 @@ VOID DECLSPEC_NORETURN RaiseTheExceptionInternalOnly(OBJECTREF throwable, BOOL r void UnwindAndContinueRethrowHelperInsideCatch(Frame* pEntryFrame, Exception* pException); VOID DECLSPEC_NORETURN UnwindAndContinueRethrowHelperAfterCatch(Frame* pEntryFrame, Exception* pException); -#ifdef FEATURE_PAL +#if defined(FEATURE_PAL) && defined(WIN64EXCEPTIONS) VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHardwareException); #define INSTALL_MANAGED_EXCEPTION_DISPATCHER \ @@ -334,14 +334,14 @@ VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHar UNREACHABLE(); \ } -#else +#else // FEATURE_PAL && WIN64EXCEPTIONS #define INSTALL_MANAGED_EXCEPTION_DISPATCHER #define UNINSTALL_MANAGED_EXCEPTION_DISPATCHER #define INSTALL_UNHANDLED_MANAGED_EXCEPTION_TRAP #define UNINSTALL_UNHANDLED_MANAGED_EXCEPTION_TRAP -#endif // FEATURE_PAL +#endif // FEATURE_PAL && WIN64EXCEPTIONS #define INSTALL_UNWIND_AND_CONTINUE_HANDLER_NO_PROBE \ { \ |