diff options
| -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, 15 insertions, 5 deletions
diff --git a/src/ToolBox/SOS/Strike/sos.def b/src/ToolBox/SOS/Strike/sos.def index e18216ca48..c8d08e7319 100644 --- a/src/ToolBox/SOS/Strike/sos.def +++ b/src/ToolBox/SOS/Strike/sos.def @@ -209,6 +209,7 @@ EXPORTS #endif // !FEATURE_PAL +#ifdef FEATURE_CORESYSTEM // Only documented for Apollo internal usage Watch watch=Watch @@ -227,4 +228,4 @@ EXPORTS getCodeTypeFlags=GetCodeTypeFlags TraceToCode tracetocode=TraceToCode - +#endif diff --git a/src/debug/ee/rcthread.cpp b/src/debug/ee/rcthread.cpp index c5e6ff77ea..2244766c32 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 +#endif // _DEBUG || !FEATURE_CORESYSTEM // 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 50e430fe0a..6c4dfe8331 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 // !CROSSGEN_COMPILE +#endif // FEATURE_CORESYSTEM #endif // __WIN_WRAP_H__ diff --git a/src/vm/assembly.hpp b/src/vm/assembly.hpp index e411d2e31b..7dde928125 100644 --- a/src/vm/assembly.hpp +++ b/src/vm/assembly.hpp @@ -291,7 +291,9 @@ public: BOOL GetModuleZapFile(LPCWSTR name, SString &path); +#if defined(FEATURE_CORESYSTEM) BOOL AllowUntrustedCaller(); +#endif // defined(FEATURE_CORESYSTEM) #ifdef LOGGING LPCWSTR GetDebugName() diff --git a/src/vm/dllimport.cpp b/src/vm/dllimport.cpp index 38266add18..98e58c60c7 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 // !PLATFORM_UNIX +#endif // FEATURE_CORESYSTEM && !FEATURE_PAL if (hmod == NULL) { diff --git a/src/vm/methodtable.inl b/src/vm/methodtable.inl index 3399a8b29d..cf79ffe2e0 100644 --- a/src/vm/methodtable.inl +++ b/src/vm/methodtable.inl @@ -380,7 +380,11 @@ 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 a31ef3f66b..59525d783a 100644 --- a/src/vm/securitymeta.inl +++ b/src/vm/securitymeta.inl @@ -1076,12 +1076,15 @@ 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_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 760688f0e0..90be10a99b 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), GetCurrentProcessCpuCount() + * 3. !defined(FEATURE_PAL) but defined(FEATURE_CORESYSTEM), 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; |