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/frames.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/frames.h')
-rw-r--r-- | src/vm/frames.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vm/frames.h b/src/vm/frames.h index 236ddfd799..91ab3c3e5f 100644 --- a/src/vm/frames.h +++ b/src/vm/frames.h @@ -113,7 +113,7 @@ // | +-ComPrestubMethodFrame - prestub frame for calls from COM to CLR // | #endif //FEATURE_COMINTEROP -#if defined(_TARGET_X86_) +#ifdef _TARGET_X86_ // | +-UMThkCallFrame - this frame represents an unmanaged->managed // | transition through N/Direct #endif @@ -268,7 +268,7 @@ FRAME_TYPE_NAME(DebuggerClassInitMarkFrame) FRAME_TYPE_NAME(DebuggerSecurityCodeMarkFrame) FRAME_TYPE_NAME(DebuggerExitFrame) FRAME_TYPE_NAME(DebuggerU2MCatchHandlerFrame) -#if defined(_TARGET_X86_) +#ifdef _TARGET_X86_ FRAME_TYPE_NAME(UMThkCallFrame) #endif #if defined(FEATURE_INCLUDE_ALL_INTERFACES) && defined(_TARGET_X86_) |