From: Jonghyun Park <parjong@gmail.com>
Date: Mon, 26 Sep 2016 10:58:35 +0000 (+0900)
Subject: Check PAL first, and then Windows Phone (#7354)
X-Git-Tag: accepted/tizen/base/20180629.140029~3495
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=712cdd405e9aac7fc6806814a2fddd976e84d9df;p=platform%2Fupstream%2Fcoreclr.git

Check PAL first, and then Windows Phone (#7354)
---

diff --git a/src/zap/zapimage.cpp b/src/zap/zapimage.cpp
index f7737ba..8f2bc78 100644
--- a/src/zap/zapimage.cpp
+++ b/src/zap/zapimage.cpp
@@ -1705,16 +1705,16 @@ void ZapImage::OutputTables()
         SetSizeOfStackCommit(m_ModuleDecoder.GetSizeOfStackCommit());
     }
 
-#if defined(_TARGET_ARM_) && defined(FEATURE_CORECLR) && defined(FEATURE_CORESYSTEM)
+#if defined(FEATURE_PAL)
+    // PAL library requires native image sections to align to page bounaries.
+    SetFileAlignment(0x1000);
+#elif defined(_TARGET_ARM_) && defined(FEATURE_CORECLR) && defined(FEATURE_CORESYSTEM)
     if (!IsReadyToRunCompilation())
     {
         // On ARM CoreSys builds, crossgen will use 4k file alignment, as requested by Phone perf team
         // to improve perf on phones with compressed system partitions.
         SetFileAlignment(0x1000);
     }
-#elif defined(FEATURE_PAL)
-    // PAL library requires native image sections to align to page bounaries.
-    SetFileAlignment(0x1000);
 #endif
 }