[x86/Linux] Enable FEATURE_ARRAYSTUB_AS_IL (#9752)

* [x86/Linux] Enable FEATURE_ARRAYSTUB_AS_IL * Move FeatureStubsAsIL into Windows-specific block
dotnet · 70b21c84b90aa2c37bb7366ea175f59a03512ae4 · parjong committed with jkotas Feb 24, 2017 · Feb 24, 2017 · 70b21c8
1 parent f9749b4
commit 70b21c84b90aa2c37bb7366ea175f59a03512ae4
Unified Split

Showing with 9 additions and 6 deletions.

+3 −2 clr.coreclr.props

+6 −4 clrdefinitions.cmake
diff --git a/clr.coreclr.props b/clr.coreclr.props
@@ -5,8 +5,6 @@
     <DebuggingSupportedBuild>true</DebuggingSupportedBuild>
     <EnCSupported Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</EnCSupported>
     <EnableDownlevelForNls Condition="'$(CrossTargetArchitecture)' != ''">true</EnableDownlevelForNls>
-    <FeatureArrayStubAsIL Condition="('$(TargetArch)' == 'arm') or ('$(TargetArch)' == 'amd64') or ('$(TargetArch)' == 'arm64')">true</FeatureArrayStubAsIL>
-    <FeatureStubsAsIL Condition="'$(TargetArch)' == 'arm64'">true</FeatureStubsAsIL>
     <FeatureCominteropApartmentSupport>true</FeatureCominteropApartmentSupport>
     <FeatureDbiDebugging>true</FeatureDbiDebugging>
     <FeatureDbiOopDebugging_HostLocal>false</FeatureDbiOopDebugging_HostLocal>
@@ -67,6 +65,7 @@
     <FeaturePal>true</FeaturePal>
     <FeatureXplatEventSource>true</FeatureXplatEventSource>
 
+    <FeatureArrayStubAsIL>true</FeatureArrayStubAsIL>
     <FeatureStubsAsIL>true</FeatureStubsAsIL>
 
     <!-- Windows specific features -->
@@ -83,6 +82,8 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetsUnix)' != 'true'">
+    <FeatureArrayStubAsIL Condition="('$(TargetArch)' == 'arm') or ('$(TargetArch)' == 'amd64') or ('$(TargetArch)' == 'arm64')">true</FeatureArrayStubAsIL>
+    <FeatureStubsAsIL Condition="'$(TargetArch)' == 'arm64'">true</FeatureStubsAsIL>
     <FeatureUseLcid>true</FeatureUseLcid>
     <FeatureImplicitLongPath>true</FeatureImplicitLongPath>
   </PropertyGroup>
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake
@@ -91,11 +91,13 @@ endif(WIN32)
 
 add_definitions(-DFEATURE_APPDOMAIN_RESOURCE_MONITORING)
 if(WIN32)
-    add_definitions(-DFEATURE_APPX)
-endif(WIN32)
-if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_ARM64)
+  add_definitions(-DFEATURE_APPX)
+  if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_ARM64)
     add_definitions(-DFEATURE_ARRAYSTUB_AS_IL)
-endif()
+  endif()
+else(WIN32)
+  add_definitions(-DFEATURE_ARRAYSTUB_AS_IL)
+endif(WIN32)
 
 add_definitions(-DFEATURE_COLLECTIBLE_TYPES)