From 6ed21c52f25243b7cc1c64b19a47bbd4beb69314 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Mon, 5 Dec 2016 16:19:41 +0900 Subject: [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. --- src/vm/frames.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/vm/frames.h') 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_) -- cgit v1.2.3