diff options
| author | SaeHie Park <saehie.park@gmail.com> | 2016-11-23 19:14:59 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2016-11-23 11:14:59 +0100 |
| commit | 61e80e47c8fbb3e852ed12962e1ed736f1acf03d (patch) | |
| tree | 5a44e3c6d2c3ccff9f39f52b18a744bac0d76be8 /src | |
| parent | 4d10630a7de0a7b3d02a910d37834e3534ce5605 (diff) | |
| download | coreclr-61e80e47c8fbb3e852ed12962e1ed736f1acf03d.tar.gz coreclr-61e80e47c8fbb3e852ed12962e1ed736f1acf03d.tar.bz2 coreclr-61e80e47c8fbb3e852ed12962e1ed736f1acf03d.zip | |
[x86/Linux] Fix compile error with exception handling (#8269)
Fix compile error for x86/Linux
- fix unknown type name 'EHWatsonBucketTracker'
- fix field has incomplete type 'EXCEPTION_REGISTRATION_RECORD'
- fix for FaultingExceptionFrame class
Diffstat (limited to 'src')
| -rw-r--r-- | src/inc/corcompile.h | 4 | ||||
| -rw-r--r-- | src/inc/switches.h | 2 | ||||
| -rw-r--r-- | src/vm/excep.h | 4 | ||||
| -rw-r--r-- | src/vm/frames.h | 4 | ||||
| -rw-r--r-- | src/zap/common.h | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/inc/corcompile.h b/src/inc/corcompile.h index 1201a55839..a44f5564c9 100644 --- a/src/inc/corcompile.h +++ b/src/inc/corcompile.h @@ -22,11 +22,11 @@ #error FEATURE_PREJIT is required for this file #endif // FEATURE_PREJIT -#if !defined(_TARGET_X86_) +#if !defined(_TARGET_X86_) || defined(FEATURE_PAL) #ifndef WIN64EXCEPTIONS #define WIN64EXCEPTIONS #endif -#endif // !_TARGET_X86_ +#endif // !_TARGET_X86_ || FEATURE_PAL #include <cor.h> #include <corhdr.h> diff --git a/src/inc/switches.h b/src/inc/switches.h index f52f24bc67..bb3ca28e12 100644 --- a/src/inc/switches.h +++ b/src/inc/switches.h @@ -37,7 +37,7 @@ #define LOGGING #endif -#if !defined(_TARGET_X86_) +#if !defined(_TARGET_X86_) || defined(FEATURE_PAL) #define WIN64EXCEPTIONS #endif diff --git a/src/vm/excep.h b/src/vm/excep.h index 527e3a1ed7..0a32d0261b 100644 --- a/src/vm/excep.h +++ b/src/vm/excep.h @@ -425,7 +425,7 @@ VOID DECLSPEC_NORETURN RealCOMPlusThrowInvalidCastException(OBJECTREF *pObj, Typ #include "eexcp.h" #include "exinfo.h" -#ifdef _TARGET_X86_ +#if defined(_TARGET_X86_) && !defined(FEATURE_PAL) struct FrameHandlerExRecord { EXCEPTION_REGISTRATION_RECORD m_ExReg; @@ -460,7 +460,7 @@ struct NestedHandlerExRecord : public FrameHandlerExRecord } }; -#endif // _TARGET_X86_ +#endif // _TARGET_X86_ && !FEATURE_PAL #if defined(ENABLE_CONTRACTS_IMPL) diff --git a/src/vm/frames.h b/src/vm/frames.h index 0926f29cea..40359db375 100644 --- a/src/vm/frames.h +++ b/src/vm/frames.h @@ -1112,7 +1112,7 @@ class FaultingExceptionFrame : public Frame { friend class CheckAsmOffsets; -#if defined(_TARGET_X86_) +#if defined(_TARGET_X86_) && !defined(FEATURE_PAL) DWORD m_Esp; CalleeSavedRegisters m_regs; TADDR m_ReturnAddress; @@ -1154,7 +1154,7 @@ public: return FRAME_ATTR_EXCEPTION | FRAME_ATTR_FAULTED; } -#if defined(_TARGET_X86_) +#if defined(_TARGET_X86_) && !defined(FEATURE_PAL) CalleeSavedRegisters *GetCalleeSavedRegisters() { LIMITED_METHOD_DAC_CONTRACT; diff --git a/src/zap/common.h b/src/zap/common.h index 95655fd9b8..b3db657f87 100644 --- a/src/zap/common.h +++ b/src/zap/common.h @@ -21,11 +21,11 @@ #include <float.h> #include <limits.h> -#if !defined(_TARGET_X86_) +#if !defined(_TARGET_X86_) || defined(FEATURE_PAL) #ifndef WIN64EXCEPTIONS #define WIN64EXCEPTIONS #endif -#endif // !_TARGET_X86_ +#endif // !_TARGET_X86_ || FEATURE_PAL #include "utilcode.h" #include "corjit.h" |