diff options
| author | Jonghyun Park <parjong@gmail.com> | 2016-12-05 16:19:41 +0900 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-12-04 23:19:41 -0800 |
| commit | 6ed21c52f25243b7cc1c64b19a47bbd4beb69314 (patch) | |
| tree | 1a7b44cb2ddd4a5e9613c3e7604431a59b8c5a18 /src/vm/dllimportcallback.h | |
| parent | 7f533e516a5b0f8fd83bc616cd9241e294d24aaf (diff) | |
| download | coreclr-6ed21c52f25243b7cc1c64b19a47bbd4beb69314.tar.gz coreclr-6ed21c52f25243b7cc1c64b19a47bbd4beb69314.tar.bz2 coreclr-6ed21c52f25243b7cc1c64b19a47bbd4beb69314.zip | |
[x86/Linux] Revert UMThkCallFrame-related changes (#8434)
* [x86/Linux] Revert UMThkCallFrame-related code
* [x86/Linux] Fix dangling 'TheUMEntryPrestub' reference
This commit re-enables GenerateUMThunkPrestub and its related code in
order to remove TheUMEntryPrestub reference.
* [x86/Linux] Re-enable several methods in StubLinkerCPU
This commit re-enables the following methods for x86/Linux:
- StubLinkerCPU::EmitSetup
- StubLinkerCPU::EmitComMethodStubProlog
- StubLinkerCPU::EmitComMethodStubEpilog
In addtion, EmitComMethodStubEpilog is marked as NYI.
Diffstat (limited to 'src/vm/dllimportcallback.h')
| -rw-r--r-- | src/vm/dllimportcallback.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vm/dllimportcallback.h b/src/vm/dllimportcallback.h index 059906e9e2..936916872c 100644 --- a/src/vm/dllimportcallback.h +++ b/src/vm/dllimportcallback.h @@ -569,12 +569,12 @@ private: AppDomain *m_pDomain; }; -#if defined(_TARGET_X86_) && !defined(FEATURE_PAL) +#ifdef _TARGET_X86_ //------------------------------------------------------------------------- // One-time creation of special prestub to initialize UMEntryThunks. //------------------------------------------------------------------------- Stub *GenerateUMThunkPrestub(); -#endif +#endif // _TARGET_X86_ //------------------------------------------------------------------------- // NExport stub |