From 52009b8919ba55690f21cdc8f04e012a53eb8ef4 Mon Sep 17 00:00:00 2001
From: danmosemsft <danmose@microsoft.com>
Date: Fri, 10 Feb 2017 21:43:40 -0800
Subject: [PATCH] Remove more always defined FEATURE_CORESYSTEM

---
 src/ToolBox/SOS/Strike/sos.def | 3 +--
 src/debug/ee/rcthread.cpp      | 2 +-
 src/inc/winwrap.h              | 2 +-
 src/vm/assembly.hpp            | 2 --
 src/vm/dllimport.cpp           | 2 +-
 src/vm/methodtable.inl         | 4 ----
 src/vm/securitymeta.inl        | 3 ---
 src/vm/win32threadpool.cpp     | 2 +-
 8 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/ToolBox/SOS/Strike/sos.def b/src/ToolBox/SOS/Strike/sos.def
index c8d08e7..e18216c 100644
--- a/src/ToolBox/SOS/Strike/sos.def
+++ b/src/ToolBox/SOS/Strike/sos.def
@@ -209,7 +209,6 @@ EXPORTS
 #endif // !FEATURE_PAL
 
 
-#ifdef FEATURE_CORESYSTEM
 // Only documented for Apollo internal usage
     Watch
     watch=Watch
@@ -228,4 +227,4 @@ EXPORTS
     getCodeTypeFlags=GetCodeTypeFlags
     TraceToCode
     tracetocode=TraceToCode
-#endif
+    
diff --git a/src/debug/ee/rcthread.cpp b/src/debug/ee/rcthread.cpp
index 2244766..c5e6ff7 100644
--- a/src/debug/ee/rcthread.cpp
+++ b/src/debug/ee/rcthread.cpp
@@ -797,7 +797,7 @@ static LONG _debugFilter(LPEXCEPTION_POINTERS ep, PVOID pv)
     DWORD tid = GetCurrentThreadId();
 
     DebuggerIPCEventType type = (DebuggerIPCEventType) (event->type & DB_IPCE_TYPE_MASK);
-#endif // _DEBUG || !FEATURE_CORESYSTEM
+#endif // _DEBUG 
 
     // We should never AV here. In a debug build, throw up an assert w/ lots of useful (private) info.
 #ifdef _DEBUG
diff --git a/src/inc/winwrap.h b/src/inc/winwrap.h
index 6c4dfe8..50e430f 100644
--- a/src/inc/winwrap.h
+++ b/src/inc/winwrap.h
@@ -1014,6 +1014,6 @@ inline int LateboundMessageBoxA(HWND hWnd,
 #define MessageBoxW LateboundMessageBoxW
 #define MessageBoxA LateboundMessageBoxA
 
-#endif // FEATURE_CORESYSTEM
+#endif // !CROSSGEN_COMPILE
 
 #endif  // __WIN_WRAP_H__
diff --git a/src/vm/assembly.hpp b/src/vm/assembly.hpp
index 6974fdd..e411d2e 100644
--- a/src/vm/assembly.hpp
+++ b/src/vm/assembly.hpp
@@ -291,9 +291,7 @@ public:
 
     BOOL GetModuleZapFile(LPCWSTR name, SString &path);
 
-#if defined(FEATURE_CORESYSTEM)
     BOOL AllowUntrustedCaller();
-#endif // defined(FEATURE_APTCA) || defined(FEATURE_CORESYSTEM)
     
 #ifdef LOGGING
     LPCWSTR GetDebugName()
diff --git a/src/vm/dllimport.cpp b/src/vm/dllimport.cpp
index 98e58c6..38266ad 100644
--- a/src/vm/dllimport.cpp
+++ b/src/vm/dllimport.cpp
@@ -6416,7 +6416,7 @@ HINSTANCE NDirect::LoadLibraryModule(NDirectMethodDesc * pMD, LoadLibErrorTracke
             hmod = LocalLoadLibraryHelper(wszLibName, LOAD_LIBRARY_SEARCH_SYSTEM32, pErrorTracker);
         }
     }
-#endif // FEATURE_CORESYSTEM && !FEATURE_PAL
+#endif // !PLATFORM_UNIX
 
     if (hmod == NULL)
     {
diff --git a/src/vm/methodtable.inl b/src/vm/methodtable.inl
index cf79ffe..3399a8b 100644
--- a/src/vm/methodtable.inl
+++ b/src/vm/methodtable.inl
@@ -380,11 +380,7 @@ inline BOOL MethodTable::SupportsAutoNGen()
 inline BOOL MethodTable::RunCCTorAsIfNGenImageExists()
 {
     LIMITED_METHOD_CONTRACT;
-#ifdef FEATURE_CORESYSTEM
     return TRUE; // On our coresystem builds we will always be using triton in the customer scenario.
-#else
-    return FALSE;
-#endif
 }
 
 //==========================================================================================
diff --git a/src/vm/securitymeta.inl b/src/vm/securitymeta.inl
index 11da444..a31ef3f 100644
--- a/src/vm/securitymeta.inl
+++ b/src/vm/securitymeta.inl
@@ -1076,15 +1076,12 @@ inline BOOL ModuleSecurityDescriptor::IsMixedTransparency()
     return !IsAllCritical() && !IsAllTransparent();
 }
 
-
-#if defined(FEATURE_CORESYSTEM)
 inline BOOL ModuleSecurityDescriptor::IsAPTCA()
 {
     WRAPPER_NO_CONTRACT;
     VerifyDataComputed();
     return !!(m_flags & ModuleSecurityDescriptorFlags_IsAPTCA);
 }
-#endif // defined(FEATURE_APTCA) || defined(FEATURE_CORESYSTEM)
 
 // Get the set of security rules that the assembly is using
 inline SecurityRuleSet ModuleSecurityDescriptor::GetSecurityRuleSet()
diff --git a/src/vm/win32threadpool.cpp b/src/vm/win32threadpool.cpp
index 90be10a..760688f 100644
--- a/src/vm/win32threadpool.cpp
+++ b/src/vm/win32threadpool.cpp
@@ -4550,7 +4550,7 @@ DWORD __stdcall ThreadpoolMgr::GateThreadStart(LPVOID lpArgs)
      * 2. GCCpuGroups=1, CLR creates GC threads for all processors in all CPU groups
      *    thus, the threadpool thread would use a whole CPU group (if Thread_UseAllCpuGroups is not set).
      *    ==> use g_SystemInfo.dwNumberOfProcessors.
-     * 3. !defined(FEATURE_PAL) but defined(FEATURE_CORESYSTEM), GetCurrentProcessCpuCount()
+     * 3. !defined(FEATURE_PAL), GetCurrentProcessCpuCount()
      *    returns g_SystemInfo.dwNumberOfProcessors ==> use g_SystemInfo.dwNumberOfProcessors;
      * Other cases:
      * 1. Normal case: the mask is all or a subset of all processors in a CPU group;
-- 
2.7.4