Merge branch 'fix_aot_cross_target' into stark

Author: xoofx

src/coreclr/src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp

@@ -3988,7 +3988,12 @@ void MethodContext::repGetEEInfo(CORINFO_EE_INFO* pEEInfoOut)
         pEEInfoOut->osPageSize                                 = (size_t)0x1000;
         pEEInfoOut->maxUncheckedOffsetForNullObject            = (size_t)((32 * 1024) - 1);
         pEEInfoOut->targetAbi                                  = CORINFO_DESKTOP_ABI;
-        pEEInfoOut->osType                                     = (CORINFO_OS)0;
+#ifdef FEATURE_PAL
+        pEEInfoOut->osType                                     = CORINFO_UNIX;
+#else
+        pEEInfoOut->osType                                     = CORINFO_WINNT;
+#endif
+
         pEEInfoOut->osMajor                                    = (unsigned)0;
         pEEInfoOut->osMinor                                    = (unsigned)0;
         pEEInfoOut->osBuild                                    = (unsigned)0;

src/coreclr/src/inc/corinfo.h

@@ -1781,7 +1781,7 @@ struct CORINFO_EH_CLAUSE
 enum CORINFO_OS
 {
     CORINFO_WINNT,
-    CORINFO_PAL,
+    CORINFO_UNIX,
 };
 
 struct CORINFO_CPU

src/coreclr/src/jit/compiler.cpp

@@ -4894,14 +4894,19 @@ int Compiler::compCompile(CORINFO_METHOD_HANDLE methodHnd,
 
     virtualStubParamInfo = new (this, CMK_Unknown) VirtualStubParamInfo(IsTargetAbi(CORINFO_CORERT_ABI));
 
+    // compMatchedVM is set to true if both CPU/ABI and OS are matching the execution engine requirements
+    //
     // Do we have a matched VM? Or are we "abusing" the VM to help us do JIT work (such as using an x86 native VM
     // with an ARM-targeting "altjit").
+    // Match CPU/ABI for compMatchedVM
     info.compMatchedVM = IMAGE_FILE_MACHINE_TARGET == info.compCompHnd->getExpectedTargetArchitecture();
 
-#if (defined(_TARGET_UNIX_) && !defined(_HOST_UNIX_)) || (!defined(_TARGET_UNIX_) && defined(_HOST_UNIX_))
-    // The host and target platforms don't match. This info isn't handled by the existing
-    // getExpectedTargetArchitecture() JIT-EE interface method.
-    info.compMatchedVM = false;
+    // Match OS for compMatchedVM
+    CORINFO_EE_INFO* eeInfo = eeGetEEInfo();
+#ifdef _TARGET_UNIX_
+    info.compMatchedVM = info.compMatchedVM && (eeInfo->osType == CORINFO_UNIX);
+#else
+    info.compMatchedVM = info.compMatchedVM && (eeInfo->osType == CORINFO_WINNT);
 #endif
 
     // If we are not compiling for a matched VM, then we are getting JIT flags that don't match our target

src/coreclr/src/tools/Common/JitInterface/CorInfoImpl.cs

@@ -2423,6 +2423,7 @@ private void getEEInfo(ref CORINFO_EE_INFO pEEInfoOut)
                 new UIntPtr(32 * 1024 - 1) : new UIntPtr((uint)pEEInfoOut.osPageSize / 2 - 1);
 
             pEEInfoOut.targetAbi = TargetABI;
+            pEEInfoOut.osType = _compilation.NodeFactory.Target.IsWindows ? CORINFO_OS.CORINFO_WINNT : CORINFO_OS.CORINFO_UNIX;
         }
 
         private string getJitTimeLogFilename()

src/coreclr/src/tools/Common/JitInterface/CorInfoTypes.cs

@@ -853,7 +853,7 @@ public struct CORINFO_HELPER_DESC
     public enum CORINFO_OS
     {
         CORINFO_WINNT,
-        CORINFO_PAL,
+        CORINFO_UNIX,
     }
 
     public enum CORINFO_RUNTIME_ABI

src/coreclr/src/vm/jitinterface.cpp

@@ -10324,7 +10324,11 @@ void CEEInfo::getEEInfo(CORINFO_EE_INFO *pEEInfoOut)
     pEEInfoOut->maxUncheckedOffsetForNullObject = MAX_UNCHECKED_OFFSET_FOR_NULL_OBJECT;
     pEEInfoOut->targetAbi = CORINFO_CORECLR_ABI;
 
+#ifdef FEATURE_PAL
+    pEEInfoOut->osType = CORINFO_UNIX;
+#else
     pEEInfoOut->osType = CORINFO_WINNT;
+#endif
 
     // hardcode OS version to 0.0.0. These fields can be removed from JITEE interface
     pEEInfoOut->osMajor = 0;