From: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
Date: Fri, 19 Apr 2019 13:59:52 +0000 (+0200)
Subject: Look for IBC data outside Windows (#24062)
X-Git-Tag: accepted/tizen/unified/20190813.215958~46^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4049a3e9bb28eb4ed7963adf691e2a58a982eb32;p=platform%2Fupstream%2Fcoreclr.git

Look for IBC data outside Windows (#24062)

#23363 added a crossplat implementation of `GetWin32Resource`, but forgot to enable places that call it.
---

diff --git a/src/zap/zapheaders.cpp b/src/zap/zapheaders.cpp
index 8ca00d7..c931d3b 100644
--- a/src/zap/zapheaders.cpp
+++ b/src/zap/zapheaders.cpp
@@ -223,7 +223,6 @@ void ZapVersionResource::Save(ZapWriter * pZapWriter)
 
 void ZapImage::CopyWin32VersionResource()
 {
-#ifndef FEATURE_PAL
     // Copy the version resource over so it is easy to see in the dumps where the ngened module came from
     COUNT_T cbResourceData;
     PVOID pResourceData = m_ModuleDecoder.GetWin32Resource(MAKEINTRESOURCE(1), RT_VERSION, &cbResourceData);
@@ -239,7 +238,6 @@ void ZapImage::CopyWin32VersionResource()
     m_pWin32ResourceSection->Place(pVersionData);
 
     SetDirectoryEntry(IMAGE_DIRECTORY_ENTRY_RESOURCE, m_pWin32ResourceSection);
-#endif
 }
 #undef MAKEINTRESOURCE
 
diff --git a/src/zap/zapimage.cpp b/src/zap/zapimage.cpp
index da7ea50..aa661f5 100644
--- a/src/zap/zapimage.cpp
+++ b/src/zap/zapimage.cpp
@@ -2448,7 +2448,6 @@ HRESULT ZapImage::LocateProfileData()
         return S_FALSE;
     }
 
-#if !defined(FEATURE_PAL)
     //
     // See if there's profile data in the resource section of the PE
     //
@@ -2463,7 +2462,6 @@ HRESULT ZapImage::LocateProfileData()
     static ConfigDWORD g_UseIBCFile;
     if (g_UseIBCFile.val(CLRConfig::EXTERNAL_UseIBCFile) != 1)
         return S_OK;
-#endif
 
     //
     // Couldn't find profile resource--let's see if there's an ibc file to use instead