From 37ff8b4178b0b638e2722bc9832bc6cdcd2b8432 Mon Sep 17 00:00:00 2001 From: danmosemsft Date: Sun, 12 Feb 2017 10:58:11 -0800 Subject: [PATCH] Remove always defined FEATURE_MAIN_CLR_MODULE_USES_CORE_NAME Commit migrated from https://github.com/dotnet/coreclr/commit/9e65011e958ea1668333f63bbd029da67e2db4c9 --- src/coreclr/clrdefinitions.cmake | 1 - src/coreclr/src/debug/di/shimprocess.cpp | 4 ---- src/coreclr/src/inc/cor.h | 10 ---------- src/coreclr/src/inc/daccess.h | 5 ----- 4 files changed, 20 deletions(-) diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake index 6b4332b..4226866 100644 --- a/src/coreclr/clrdefinitions.cmake +++ b/src/coreclr/clrdefinitions.cmake @@ -141,7 +141,6 @@ if (NOT CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_MANAGED_ETW) endif(NOT CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_MANAGED_ETW_CHANNELS) -add_definitions(-DFEATURE_MAIN_CLR_MODULE_USES_CORE_NAME) add_definitions(-DFEATURE_MERGE_CULTURE_SUPPORT_AND_ENGINE) if(FEATURE_MERGE_JIT_AND_ENGINE) diff --git a/src/coreclr/src/debug/di/shimprocess.cpp b/src/coreclr/src/debug/di/shimprocess.cpp index a6fc154..46c35fd 100644 --- a/src/coreclr/src/debug/di/shimprocess.cpp +++ b/src/coreclr/src/debug/di/shimprocess.cpp @@ -1850,11 +1850,7 @@ HMODULE ShimProcess::GetDacModule() // mscordaccore.dll <-- coreclr // mscordacwks.dll <-- desktop PCWSTR eeFlavor = -#if defined(FEATURE_MAIN_CLR_MODULE_USES_CORE_NAME) W("mscordaccore.dll"); -#else - W("mscordacwks.dll"); -#endif #endif // FEATURE_PAL wszAccessDllPath.Append(eeFlavor); diff --git a/src/coreclr/src/inc/cor.h b/src/coreclr/src/inc/cor.h index 4245009..a050eb4 100644 --- a/src/coreclr/src/inc/cor.h +++ b/src/coreclr/src/inc/cor.h @@ -171,7 +171,6 @@ DEPRECATED_CLR_STDAPI_(void) CoUninitializeEE(BOOL fFlags); DEPRECATED_CLR_STDAPI_(void) CoEEShutDownCOM(void); -#ifdef FEATURE_MAIN_CLR_MODULE_USES_CORE_NAME #define MAIN_CLR_MODULE_NAME_W W("coreclr") #define MAIN_CLR_MODULE_NAME_A "coreclr" @@ -179,15 +178,6 @@ DEPRECATED_CLR_STDAPI_(void) CoEEShutDownCOM(void); #define MAIN_CLR_DLL_NAME_W MAKEDLLNAME_W(MAIN_CLR_MODULE_NAME_W) #define MAIN_CLR_DLL_NAME_A MAKEDLLNAME_A(MAIN_CLR_MODULE_NAME_A) -#else //FEATURE_MAIN_CLR_MODULE_USES_CORE_NAME - -#define MAIN_CLR_MODULE_NAME_W L"clr" -#define MAIN_CLR_MODULE_NAME_A "clr" - -#define MAIN_CLR_DLL_NAME_W MAKEDLLNAME_W(MAIN_CLR_MODULE_NAME_W) -#define MAIN_CLR_DLL_NAME_A MAKEDLLNAME_A(MAIN_CLR_MODULE_NAME_A) - -#endif //FEATURE_MAIN_CLR_MODULE_USES_CORE_NAME #define MSCOREE_SHIM_W MAIN_CLR_DLL_NAME_W diff --git a/src/coreclr/src/inc/daccess.h b/src/coreclr/src/inc/daccess.h index 3e3a62c..8ca9587 100644 --- a/src/coreclr/src/inc/daccess.h +++ b/src/coreclr/src/inc/daccess.h @@ -2445,13 +2445,8 @@ typedef DPTR(PTR_PCODE) PTR_PTR_PCODE; #endif // Macros like MAIN_CLR_MODULE_NAME* for the DAC module -#ifdef FEATURE_MAIN_CLR_MODULE_USES_CORE_NAME #define MAIN_DAC_MODULE_NAME_W W("mscordaccore") #define MAIN_DAC_MODULE_DLL_NAME_W W("mscordaccore.dll") -#else -#define MAIN_DAC_MODULE_NAME_W W("mscordacwks") -#define MAIN_DAC_MODULE_DLL_NAME_W W("mscordacwks.dll") -#endif // TARGET_CONSISTENCY_CHECK represents a condition that should not fail unless the DAC target is corrupt. // This is in contrast to ASSERTs in DAC infrastructure code which shouldn't fail regardless of the memory -- 2.7.4