diff options
author | danmosemsft <danmose@microsoft.com> | 2017-02-10 21:43:40 -0800 |
---|---|---|
committer | danmosemsft <danmose@microsoft.com> | 2017-02-10 21:53:53 -0800 |
commit | 52009b8919ba55690f21cdc8f04e012a53eb8ef4 (patch) | |
tree | a78f4bbfcdc69129736cf84d779f6c8bda864524 | |
parent | cbbfc7a109a41c5506d28d9b4e91202cf5a9143c (diff) | |
download | coreclr-52009b8919ba55690f21cdc8f04e012a53eb8ef4.tar.gz coreclr-52009b8919ba55690f21cdc8f04e012a53eb8ef4.tar.bz2 coreclr-52009b8919ba55690f21cdc8f04e012a53eb8ef4.zip |
Remove more always defined FEATURE_CORESYSTEM
-rw-r--r-- | src/ToolBox/SOS/Strike/sos.def | 3 | ||||
-rw-r--r-- | src/debug/ee/rcthread.cpp | 2 | ||||
-rw-r--r-- | src/inc/winwrap.h | 2 | ||||
-rw-r--r-- | src/vm/assembly.hpp | 2 | ||||
-rw-r--r-- | src/vm/dllimport.cpp | 2 | ||||
-rw-r--r-- | src/vm/methodtable.inl | 4 | ||||
-rw-r--r-- | src/vm/securitymeta.inl | 3 | ||||
-rw-r--r-- | 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 c8d08e7319..e18216ca48 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 2244766c32..c5e6ff77ea 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 6c4dfe8331..50e430fe0a 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 6974fdd62f..e411d2e31b 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 98e58c60c7..38266add18 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 cf79ffe2e0..3399a8b29d 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 11da444841..a31ef3f66b 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 90be10a99b..760688f0e0 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; |