diff options
| -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/mscorlib.shared.sources.props | 2 | ||||
| -rw-r--r-- | src/mscorlib/src/System/Runtime/Loader/AssemblyLoadContext.cs | 6 | ||||
| -rw-r--r-- | src/mscorlib/src/System/Runtime/ProfileOptimization.cs | 2 |
7 files changed, 1 insertions, 14 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props index aaa9c7e502..092ab82295 100644 --- a/clr.coreclr.props +++ b/clr.coreclr.props @@ -23,7 +23,6 @@ <FeatureLazyCOWPages Condition="'$(_BuildType)'!='ret' and (('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'arm'))">true</FeatureLazyCOWPages> <FeatureMergeCultureSupportAndEngine>true</FeatureMergeCultureSupportAndEngine> <FeatureMergeJitAndEngine>true</FeatureMergeJitAndEngine> - <FeatureMulticoreJIT>true</FeatureMulticoreJIT> <FeaturePrejit>true</FeaturePrejit> <FeatureSpanOfT Condition="'$(UseLegacyCompiler)'!='true'">true</FeatureSpanOfT> <FeatureStandaloneSn>true</FeatureStandaloneSn> diff --git a/clr.defines.targets b/clr.defines.targets index 57493f5261..0ada349f88 100644 --- a/clr.defines.targets +++ b/clr.defines.targets @@ -106,7 +106,6 @@ <CDefines Condition="'$(ProfilingSupportedBuild)' == 'true'">$(CDefines);PROFILING_SUPPORTED</CDefines> <CDefines Condition="'$(UefChainingSupported)' == 'true'">$(CDefines);UEF_CHAINING_SUPPORTED</CDefines> <CDefines Condition="'$(UseStl)' == 'true'">$(CDefines);USE_STL</CDefines> - <CDefines Condition="'$(FeatureMulticoreJIT)' == 'true'">$(CDefines);FEATURE_MULTICOREJIT</CDefines> <CDefines Condition="'$(FeatureUseAsmGCWriteBarriers)' == 'true'">$(CDefines);FEATURE_USE_ASM_GC_WRITE_BARRIERS</CDefines> <CDefines Condition="'$(BinderDebugLog)' == 'true'">$(CDefines);BINDER_DEBUG_LOG</CDefines> <CDefines Condition="'$(FeatureSymDiff)' == 'true'">$(CDefines);FEATURE_SYMDIFF</CDefines> @@ -178,7 +177,6 @@ <DefineConstants Condition="'$(FeatureX509)' == 'true'">$(DefineConstants);FEATURE_X509</DefineConstants> <DefineConstants Condition="'$(FeatureX509Securestrings)' == 'true'">$(DefineConstants);FEATURE_X509_SECURESTRINGS</DefineConstants> <DefineConstants Condition="'$(ProfilingSupportedBuild)' == 'true'">$(DefineConstants);PROFILING_SUPPORTED</DefineConstants> - <DefineConstants Condition="'$(FeatureMulticoreJIT)' == 'true'">$(DefineConstants);FEATURE_MULTICOREJIT</DefineConstants> <DefineConstants Condition="'$(FeatureReJIT)' == 'true'">$(DefineConstants);FEATURE_REJIT</DefineConstants> <DefineConstants Condition="'$(FeatureUseAsmGCWriteBarriers)' == 'true'">$(DefineConstants);FEATURE_USE_ASM_GC_WRITE_BARRIERS</DefineConstants> <DefineConstants Condition="'$(BinderDebugLog)' == 'true'">$(DefineConstants);BINDER_DEBUG_LOG</DefineConstants> diff --git a/clr.desktop.props b/clr.desktop.props index 92a18108bb..c2956320ab 100644 --- a/clr.desktop.props +++ b/clr.desktop.props @@ -52,7 +52,6 @@ <FeatureMdaSupported>true</FeatureMdaSupported> <FeatureMethodRental>true</FeatureMethodRental> <FeatureMixedMode>true</FeatureMixedMode> - <FeatureMulticoreJIT>true</FeatureMulticoreJIT> <FeatureMultiModuleAssemblies>true</FeatureMultiModuleAssemblies> <FeatureNativeImageGeneration>true</FeatureNativeImageGeneration> <FeatureNongenericCollections>true</FeatureNongenericCollections> @@ -135,7 +135,6 @@ <FeatureIncludeAllInterfaces>false</FeatureIncludeAllInterfaces> <FeatureMdaSupported>false</FeatureMdaSupported> <FeatureMergeJitAndEngine>true</FeatureMergeJitAndEngine> - <FeatureMulticoreJIT>false</FeatureMulticoreJIT> <FeatureRandomizedStringHashing>false</FeatureRandomizedStringHashing> <FeatureReflectionOnlyLoad>false</FeatureReflectionOnlyLoad> <FeatureStackProbe>false</FeatureStackProbe> diff --git a/src/mscorlib/mscorlib.shared.sources.props b/src/mscorlib/mscorlib.shared.sources.props index ef7f4b8008..eb7e8c744e 100644 --- a/src/mscorlib/mscorlib.shared.sources.props +++ b/src/mscorlib/mscorlib.shared.sources.props @@ -56,7 +56,7 @@ <ItemGroup> <RuntimeSources Include="$(BclSourcesRoot)\System\Runtime\MemoryFailPoint.cs" /> <RuntimeSources Include="$(BclSourcesRoot)\System\Runtime\GcSettings.cs" /> - <RuntimeSources Condition="'$(FeatureMulticoreJIT)' == 'true'" Include="$(BclSourcesRoot)\System\Runtime\ProfileOptimization.cs" /> + <RuntimeSources Include="$(BclSourcesRoot)\System\Runtime\ProfileOptimization.cs" /> </ItemGroup> <ItemGroup> <CollectionsSources Include="$(BclSourcesRoot)\System\Collections\CollectionBase.cs" /> diff --git a/src/mscorlib/src/System/Runtime/Loader/AssemblyLoadContext.cs b/src/mscorlib/src/System/Runtime/Loader/AssemblyLoadContext.cs index 9c130b5268..94af350029 100644 --- a/src/mscorlib/src/System/Runtime/Loader/AssemblyLoadContext.cs +++ b/src/mscorlib/src/System/Runtime/Loader/AssemblyLoadContext.cs @@ -38,7 +38,6 @@ namespace System.Runtime.Loader [SuppressUnmanagedCodeSecurity] private static extern IntPtr LoadFromStream(IntPtr ptrNativeAssemblyLoadContext, IntPtr ptrAssemblyArray, int iAssemblyArrayLen, IntPtr ptrSymbols, int iSymbolArrayLen, ObjectHandleOnStack retAssembly); -#if FEATURE_MULTICOREJIT [DllImport(JitHelpers.QCall, CharSet = CharSet.Unicode)] [SuppressUnmanagedCodeSecurity] internal static extern void InternalSetProfileRoot(string directoryPath); @@ -46,7 +45,6 @@ namespace System.Runtime.Loader [DllImport(JitHelpers.QCall, CharSet = CharSet.Unicode)] [SuppressUnmanagedCodeSecurity] internal static extern void InternalStartProfile(string profile, IntPtr ptrNativeAssemblyLoadContext); -#endif // FEATURE_MULTICOREJIT protected AssemblyLoadContext() { @@ -432,17 +430,13 @@ namespace System.Runtime.Loader // Set the root directory path for profile optimization. public void SetProfileOptimizationRoot(string directoryPath) { -#if FEATURE_MULTICOREJIT InternalSetProfileRoot(directoryPath); -#endif // FEATURE_MULTICOREJIT } // Start profile optimization for the specified profile name. public void StartProfileOptimization(string profile) { -#if FEATURE_MULTICOREJIT InternalStartProfile(profile, m_pNativeAssemblyLoadContext); -#endif // FEATURE_MULTICOREJI } private void OnAppContextUnloading(object sender, EventArgs e) diff --git a/src/mscorlib/src/System/Runtime/ProfileOptimization.cs b/src/mscorlib/src/System/Runtime/ProfileOptimization.cs index 1e42308ecc..ca4227c011 100644 --- a/src/mscorlib/src/System/Runtime/ProfileOptimization.cs +++ b/src/mscorlib/src/System/Runtime/ProfileOptimization.cs @@ -22,7 +22,6 @@ namespace System.Runtime { using System.Runtime.Versioning; using System.Runtime.CompilerServices; -#if FEATURE_MULTICOREJIT public static class ProfileOptimization { @@ -45,6 +44,5 @@ namespace System.Runtime { } } -#endif } |