diff options
| author | Jonghyun Park <parjong@gmail.com> | 2016-12-14 19:29:32 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2016-12-14 11:29:32 +0100 |
| commit | 676216ab65a6b0ef83782298f414c87e24a1256f (patch) | |
| tree | 92ffa8131948bc585b869805f7b4f34733916020 /src/vm/exceptmacros.h | |
| parent | 3019808a3d38e934dc21d5c31c75f7d056bdfa9c (diff) | |
| download | coreclr-676216ab65a6b0ef83782298f414c87e24a1256f.tar.gz coreclr-676216ab65a6b0ef83782298f414c87e24a1256f.tar.bz2 coreclr-676216ab65a6b0ef83782298f414c87e24a1256f.zip | |
[x86/Linux] Adds Dummy Exception Handler (#8613)
This commit adds a dummy exeption handler to enable x86/Linux build.
This commit also reverts 7b92136d5ee to make it easy to enable
WIN64EXCEPTIONS in x86/Linux.
Diffstat (limited to 'src/vm/exceptmacros.h')
| -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 9b6c5549f7..2af064c96d 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); -#if defined(FEATURE_PAL) && defined(WIN64EXCEPTIONS) +#ifdef FEATURE_PAL 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 // FEATURE_PAL && WIN64EXCEPTIONS +#else // FEATURE_PAL #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 && WIN64EXCEPTIONS +#endif // FEATURE_PAL #define INSTALL_UNWIND_AND_CONTINUE_HANDLER_NO_PROBE \ { \ |