diff options
author | danmosemsft <danmose@microsoft.com> | 2017-01-22 20:36:11 -0800 |
---|---|---|
committer | danmosemsft <danmose@microsoft.com> | 2017-01-22 20:36:11 -0800 |
commit | c1853ffc86372e239e77c5847b3079e005fda583 (patch) | |
tree | 02554735292f616c7584879849c6d12f813deea5 | |
parent | 3a92622ac3ece3594495301c59173e9679677938 (diff) | |
download | coreclr-c1853ffc86372e239e77c5847b3079e005fda583.tar.gz coreclr-c1853ffc86372e239e77c5847b3079e005fda583.tar.bz2 coreclr-c1853ffc86372e239e77c5847b3079e005fda583.zip |
Remove FEATURE_LOADER_OPTIMIZATION
-rw-r--r-- | clr.coreclr.props | 1 | ||||
-rw-r--r-- | clr.defines.targets | 2 | ||||
-rw-r--r-- | clr.desktop.props | 1 | ||||
-rw-r--r-- | clr.props | 1 | ||||
-rw-r--r-- | src/mscorlib/src/System/AppDomain.cs | 8 |
5 files changed, 0 insertions, 13 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props index 47ba910b5e..421b1b57e1 100644 --- a/clr.coreclr.props +++ b/clr.coreclr.props @@ -21,7 +21,6 @@ <FeatureIsymReader>true</FeatureIsymReader> <!-- This is here for testing purposes only, and only on checked builds for x86/ARM --> <FeatureLazyCOWPages Condition="'$(_BuildType)'!='ret' and (('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'arm'))">true</FeatureLazyCOWPages> - <FeatureLoaderOptimization>true</FeatureLoaderOptimization> <FeatureMainClrModuleUsesCoreName>true</FeatureMainClrModuleUsesCoreName> <FeatureMergeCultureSupportAndEngine>true</FeatureMergeCultureSupportAndEngine> <FeatureMergeJitAndEngine>true</FeatureMergeJitAndEngine> diff --git a/clr.defines.targets b/clr.defines.targets index 2d39da9d66..885249051d 100644 --- a/clr.defines.targets +++ b/clr.defines.targets @@ -47,7 +47,6 @@ <CDefines Condition="'$(FeatureLazyCOWPages)' == 'true'">$(CDefines);FEATURE_LAZY_COW_PAGES</CDefines> <CDefines Condition="'$(FeatureLeakCultureInfo)' == 'true'">$(CDefines);FEATURE_LEAK_CULTURE_INFO</CDefines> <CDefines Condition="'$(FeatureLegacyNetCFDbgHostControl)' == 'true'">$(CDefines);FEATURE_LEGACYNETCF_DBG_HOST_CONTROL</CDefines> - <CDefines Condition="'$(FeatureLoaderOptimization)' == 'true'">$(CDefines);FEATURE_LOADER_OPTIMIZATION</CDefines> <CDefines Condition="'$(FeatureMacl)' == 'true'">$(CDefines);FEATURE_MACL</CDefines> <CDefines Condition="'$(FeatureManagedEtw)' == 'true'">$(CDefines);FEATURE_MANAGED_ETW</CDefines> <CDefines Condition="'$(FeatureManagedEtwChannels)' == 'true'">$(CDefines);FEATURE_MANAGED_ETW_CHANNELS</CDefines> @@ -150,7 +149,6 @@ <DefineConstants Condition="'$(FeatureIsostore)' == 'true'">$(DefineConstants);FEATURE_ISOSTORE</DefineConstants> <DefineConstants Condition="'$(FeatureIsostoreLight)' == 'true'">$(DefineConstants);FEATURE_ISOSTORE_LIGHT</DefineConstants> <DefineConstants Condition="'$(FeatureLeakCultureInfo)' == 'true'">$(DefineConstants);FEATURE_LEAK_CULTURE_INFO</DefineConstants> - <DefineConstants Condition="'$(FeatureLoaderOptimization)' == 'true'">$(DefineConstants);FEATURE_LOADER_OPTIMIZATION</DefineConstants> <DefineConstants Condition="'$(FeatureMacl)' == 'true'">$(DefineConstants);FEATURE_MACL</DefineConstants> <DefineConstants Condition="'$(FeatureManagedEtw)' == 'true'">$(DefineConstants);FEATURE_MANAGED_ETW</DefineConstants> <DefineConstants Condition="'$(FeatureManagedEtwChannels)' == 'true'">$(DefineConstants);FEATURE_MANAGED_ETW_CHANNELS</DefineConstants> diff --git a/clr.desktop.props b/clr.desktop.props index fef8910daf..feb04dc993 100644 --- a/clr.desktop.props +++ b/clr.desktop.props @@ -47,7 +47,6 @@ <!-- This is here for testing purposes only, and only on checked builds for x86/ARM --> <FeatureLazyCOWPages Condition="'$(_BuildType)'!='ret' and (('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'arm'))">true</FeatureLazyCOWPages> <FeatureLeakCultureInfo>true</FeatureLeakCultureInfo> - <FeatureLoaderOptimization>true</FeatureLoaderOptimization> <FeatureMacl>true</FeatureMacl> <FeatureManagedEtw>true</FeatureManagedEtw> <FeatureManagedEtwChannels>true</FeatureManagedEtwChannels> @@ -133,7 +133,6 @@ <FeatureEventTrace>false</FeatureEventTrace> <FeatureFusion>false</FeatureFusion> <FeatureIncludeAllInterfaces>false</FeatureIncludeAllInterfaces> - <FeatureLoaderOptimization>false</FeatureLoaderOptimization> <FeatureMdaSupported>false</FeatureMdaSupported> <FeatureMergeJitAndEngine>true</FeatureMergeJitAndEngine> <FeatureMulticoreJIT>false</FeatureMulticoreJIT> diff --git a/src/mscorlib/src/System/AppDomain.cs b/src/mscorlib/src/System/AppDomain.cs index c75353a4d6..18aee26854 100644 --- a/src/mscorlib/src/System/AppDomain.cs +++ b/src/mscorlib/src/System/AppDomain.cs @@ -941,11 +941,9 @@ namespace System int key = AppDomainSetup.Locate(name); if(key == -1) { -#if FEATURE_LOADER_OPTIMIZATION if(name.Equals(AppDomainSetup.LoaderOptimizationKey)) return FusionStore.LoaderOptimization; else -#endif // FEATURE_LOADER_OPTIMIZATION { object[] data; lock (((ICollection)LocalStore).SyncRoot) { @@ -1215,10 +1213,8 @@ namespace System nCreateContext(); #endif // FEATURE_VERSIONING -#if FEATURE_LOADER_OPTIMIZATION if (info.LoaderOptimization != LoaderOptimization.NotSpecified || (oldInfo != null && info.LoaderOptimization != oldInfo.LoaderOptimization)) UpdateLoaderOptimization(info.LoaderOptimization); -#endif // This must be the last action taken _FusionStore = info; } @@ -1353,7 +1349,6 @@ namespace System newSetup.ApplicationBase = NormalizePath(propertyValues[i], fullCheck: true); } -#if FEATURE_LOADER_OPTIMIZATION else if(propertyNames[i]=="LOADER_OPTIMIZATION") { if(propertyValues[i]==null) @@ -1368,7 +1363,6 @@ namespace System default: throw new ArgumentException(Environment.GetResourceString("Argument_UnrecognizedLoaderOptimization"), "LOADER_OPTIMIZATION"); } } -#endif // FEATURE_LOADER_OPTIMIZATION else if(propertyNames[i]=="TRUSTED_PLATFORM_ASSEMBLIES" || propertyNames[i]=="PLATFORM_RESOURCE_ROOTS" || propertyNames[i]=="APP_PATHS" || @@ -1520,10 +1514,8 @@ namespace System private extern void nSetDisableInterfaceCache(); #endif // FEATURE_COMINTEROP -#if FEATURE_LOADER_OPTIMIZATION [MethodImplAttribute(MethodImplOptions.InternalCall)] internal extern void UpdateLoaderOptimization(LoaderOptimization optimization); -#endif public AppDomainSetup SetupInformation { |