diff options
| author | Jonghyun Park <parjong@gmail.com> | 2017-02-24 11:01:10 +0900 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-02-23 18:01:10 -0800 |
| commit | 70b21c84b90aa2c37bb7366ea175f59a03512ae4 (patch) | |
| tree | 67aad4824322fe75173dffefd3807768c81844c0 | |
| parent | f9749b431bf74c00b7e346a1f2e80e2032fd2b21 (diff) | |
| download | coreclr-70b21c84b90aa2c37bb7366ea175f59a03512ae4.tar.gz coreclr-70b21c84b90aa2c37bb7366ea175f59a03512ae4.tar.bz2 coreclr-70b21c84b90aa2c37bb7366ea175f59a03512ae4.zip | |
[x86/Linux] Enable FEATURE_ARRAYSTUB_AS_IL (#9752)
* [x86/Linux] Enable FEATURE_ARRAYSTUB_AS_IL
* Move FeatureStubsAsIL into Windows-specific block
| -rw-r--r-- | clr.coreclr.props | 5 | ||||
| -rw-r--r-- | clrdefinitions.cmake | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props index 9211976c39..a9b51917a6 100644 --- 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 index 38d1b7d353..4845b8f06f 100644 --- 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) |