diff options
| author | SaeHie Park <saehie.park@gmail.com> | 2016-11-23 11:04:39 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2016-11-23 03:04:39 +0100 |
| commit | 20f48eb1128261332a99503a22b86c3891fdb9cc (patch) | |
| tree | 5211e8201260994eca53ff1943fd251b23b469ae /src/inc | |
| parent | e8989c1a75588dede93fcd5e0db173044a850b74 (diff) | |
| download | coreclr-20f48eb1128261332a99503a22b86c3891fdb9cc.tar.gz coreclr-20f48eb1128261332a99503a22b86c3891fdb9cc.tar.bz2 coreclr-20f48eb1128261332a99503a22b86c3891fdb9cc.zip | |
[x86/Linux] Fix compile error redifinition RUNTIME_FUNCTION (#8249)
Add !FEATURE_PAL directive for x86 as RUNTIME_FUNCTION is defined in pal
Diffstat (limited to 'src/inc')
| -rw-r--r-- | src/inc/corcompile.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/inc/corcompile.h b/src/inc/corcompile.h index 967a7713aa..1201a55839 100644 --- a/src/inc/corcompile.h +++ b/src/inc/corcompile.h @@ -71,7 +71,7 @@ typedef DPTR(struct CORCOMPILE_VIRTUAL_SECTION_INFO) typedef DPTR(struct CORCOMPILE_IMPORT_SECTION) PTR_CORCOMPILE_IMPORT_SECTION; -#ifdef _TARGET_X86_ +#if defined(_TARGET_X86_) && !defined(FEATURE_PAL) // // x86 ABI does not define RUNTIME_FUNCTION. Define our own to allow unification between x86 and other platforms. // @@ -87,7 +87,7 @@ typedef DPTR(RUNTIME_FUNCTION) PTR_RUNTIME_FUNCTION; // Chained unwind info. Used for cold methods. #define RUNTIME_FUNCTION_INDIRECT 0x80000000 -#endif +#endif // _TARGET_X86_ && !FEATURE_PAL // The stride is choosen as maximum value that still gives good page locality of RUNTIME_FUNCTION table touches (only one page of // RUNTIME_FUNCTION table is going to be touched during most IP2MD lookups). |