Fix Linux x86 build error related to dotnet#35552 (dotnet#35892)

erlimar · May 6, 2020 · 87f7afa · 87f7afa
1 parent ef2a7a3
commit 87f7afa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/src/coreclr/src/vm/i386/asmconstants.h b/src/coreclr/src/vm/i386/asmconstants.h
@@ -143,8 +143,10 @@ ASMCONSTANTS_C_ASSERT(LazyMachState_captureEip == offsetof(LazyMachState, captur
 #define VASigCookie__StubOffset 4
 ASMCONSTANTS_C_ASSERT(VASigCookie__StubOffset == offsetof(VASigCookie, pNDirectILStub))
 
+#ifndef UNIX_X86_ABI
 #define SIZEOF_TailCallFrame 32
 ASMCONSTANTS_C_ASSERT(SIZEOF_TailCallFrame == sizeof(TailCallFrame))
+#endif // !UNIX_X86_ABI
 
 #define SIZEOF_GSCookie 4
 

diff --git a/src/coreclr/src/vm/i386/cgenx86.cpp b/src/coreclr/src/vm/i386/cgenx86.cpp
@@ -838,6 +838,7 @@ void PInvokeCalliFrame::UpdateRegDisplay(const PREGDISPLAY pRD)
     RETURN;
 }
 
+#ifndef UNIX_X86_ABI
 void TailCallFrame::UpdateRegDisplay(const PREGDISPLAY pRD)
 {
     CONTRACT_VOID
@@ -883,6 +884,7 @@ void TailCallFrame::UpdateRegDisplay(const PREGDISPLAY pRD)
 
     RETURN;
 }
+#endif // !UNIX_X86_ABI
 
 #ifdef FEATURE_READYTORUN
 void DynamicHelperFrame::UpdateRegDisplay(const PREGDISPLAY pRD)

diff --git a/src/coreclr/src/vm/i386/jitinterfacex86.cpp b/src/coreclr/src/vm/i386/jitinterfacex86.cpp
@@ -135,8 +135,10 @@ HCIMPL1(Object*, AllocObjectWrapper, MethodTable *pMT)
 HCIMPLEND
 
 /*********************************************************************/
+#ifndef UNIX_X86_ABI
 extern "C" void* g_TailCallFrameVptr;
 void* g_TailCallFrameVptr;
+#endif // !UNI_X86_ABI
 
 #ifdef FEATURE_HIJACK
 extern "C" void STDCALL JIT_TailCallHelper(Thread * pThread);
@@ -1085,8 +1087,10 @@ void InitJITHelpers1()
 
     // Leave the patched region writable for StompWriteBarrierEphemeral(), StompWriteBarrierResize()
 
+#ifndef UNIX_X86_ABI
     // Initialize g_TailCallFrameVptr for JIT_TailCall helper
     g_TailCallFrameVptr = (void*)TailCallFrame::GetMethodFrameVPtr();
+#endif // !UNIX_X86_ABI
 }
 #pragma warning (default : 4731)
 

diff --git a/src/coreclr/src/vm/i386/virtualcallstubcpu.hpp b/src/coreclr/src/vm/i386/virtualcallstubcpu.hpp
@@ -696,11 +696,16 @@ extern "C" void STDCALL JIT_TailCallReturnFromVSD();
 PCODE StubCallSite::GetCallerAddress()
 {
     LIMITED_METHOD_CONTRACT;
+
+#ifdef UNIX_X86_ABI
+    return m_returnAddr;
+#else // UNIX_X86_ABI
     if (m_returnAddr != (PCODE)JIT_TailCallReturnFromVSD)
         return m_returnAddr;
 
     // Find the tailcallframe in the frame chain and get the actual caller from the first TailCallFrame
     return TailCallFrame::FindTailCallFrame(GetThread()->GetFrame())->GetCallerAddress();
+#endif // UNIX_X86_ABI
 }
 
 #ifdef STUB_LOGGING