Remove always defined FEATURE_CORECLR

1 files changed, 3 insertions, 26 deletions

diff --git a/src/inc/switches.h b/src/inc/switches.h
index 9faf620dc7..daf1751502 100644
--- a/src/inc/switches.h
+++ b/src/inc/switches.h
@@ -10,9 +10,6 @@
 #define STRESS_HEAP
 #endif
 
-#if !defined(CROSSGEN_COMPILE) && !defined(FEATURE_CORECLR)
-#define STRESS_THREAD
-#endif
 
 #define VERIFY_HEAP
 
@@ -67,9 +64,6 @@
 #define GC_STATS
 #endif
 
-#if !defined(FEATURE_CORECLR)
-#define EMIT_FIXUPS
-#endif
 
 #if defined(_DEBUG) && !defined(DACCESS_COMPILE) && (defined(_TARGET_X86_) || defined(_TARGET_AMD64_))
 // On x86/x64 Windows debug builds, respect the COMPlus_EnforceEEThreadNotRequiredContracts
@@ -110,16 +104,12 @@
 // ALLOW_SXS_JIT_NGEN enables AltJit support for NGEN, via COMPlus_AltJitNgen / COMPlus_AltJitName.
 // Note that if ALLOW_SXS_JIT_NGEN is defined, then ALLOW_SXS_JIT must be defined.
 #define ALLOW_SXS_JIT
-#if defined(ALLOW_SXS_JIT)
 #define ALLOW_SXS_JIT_NGEN
-#endif // ALLOW_SXS_JIT
 
-#if defined(FEATURE_CORECLR)
 //master switch for gc suspension not based on hijacking
 #define FEATURE_ENABLE_GCPOLL
-#endif //FEATURE_CORECLR
 
-#if defined(FEATURE_ENABLE_GCPOLL) && defined(_TARGET_X86_)
+#if defined(_TARGET_X86_)
 //this enables a fast version of the GC Poll helper instead of the default portable one.
 #define ENABLE_FAST_GCPOLL_HELPER
 #endif // defined(FEATURE_ENABLE_GCPOLL) && defined(_TARGET_X86_)
@@ -132,18 +122,13 @@
 #define PLATFORM_SUPPORTS_SAFE_THREADSUSPEND
 #endif // !FEATURE_PAL
 
-#if !defined(PLATFORM_SUPPORTS_SAFE_THREADSUSPEND) && !defined(FEATURE_ENABLE_GCPOLL)
-#error "Platform must support either safe thread suspension or GC polling"
-#endif
 
 #if defined(STRESS_HEAP) && defined(_DEBUG) && defined(FEATURE_HIJACK)
 #define HAVE_GCCOVER
 #endif
 
-#ifdef FEATURE_CORECLR
 //Turns on a startup delay to allow simulation of slower and faster startup times.
 #define ENABLE_STARTUP_DELAY
-#endif
 
 
 #ifndef ALLOW_LOCAL_WORKER
@@ -184,15 +169,9 @@
 
 // Windows desktop supports the profiling API attach / detach feature.
 // This will eventually be supported on coreclr as well. 
-#if defined(PROFILING_SUPPORTED) && !defined(FEATURE_CORECLR)
-#define FEATURE_PROFAPI_ATTACH_DETACH
-#endif
 
 // Windows desktop DAC builds need to see some of the data used in the profiling API
 // attach / detach feature, particularly Thread::m_dwProfilerEvacuationCounter 
-#if defined(PROFILING_SUPPORTED_DATA) && !defined(FEATURE_CORECLR)
-#define DATA_PROFAPI_ATTACH_DETACH
-#endif
 
 // MUST NEVER CHECK IN WITH THIS ENABLED.
 // This is just for convenience in doing performance investigations in a checked-out enlistment.
@@ -219,9 +198,7 @@
 // are treated as potential pinned interior pointers. When enabled, the runtime flag COMPLUS_GCCONSERVATIVE 
 // determines dynamically whether GC is conservative. Note that appdomain unload, LCG and unloadable assemblies
 // do not work reliably with conservative GC.
-#ifdef FEATURE_CORECLR
 #define FEATURE_CONSERVATIVE_GC 1
-#endif
 
 #if (defined(_TARGET_ARM_) && !defined(ARM_SOFTFP)) || defined(_TARGET_ARM64_)
 #define FEATURE_HFA
@@ -242,7 +219,7 @@
 
 #define FEATURE_MINIMETADATA_IN_TRIAGEDUMPS
 
-#if defined(FEATURE_PREJIT) && defined(FEATURE_CORECLR)
+#if defined(FEATURE_PREJIT)
 // Desktop CLR allows profilers and debuggers to opt out of loading NGENd images, and to
 // JIT everything instead. "FEATURE_TREAT_NI_AS_MSIL_DURING_DIAGNOSTICS" is roughly the
 // equivalent for Apollo, where MSIL images may not be available at all.
@@ -256,7 +233,7 @@
 // If defined, support interpretation.
 #if !defined(CROSSGEN_COMPILE)
 
-#if defined(ALLOW_SXS_JIT) && !defined(FEATURE_PAL)
+#if !defined(FEATURE_PAL)
 #define FEATURE_STACK_SAMPLING
 #endif // defined (ALLOW_SXS_JIT)