statically link gc_pal on windows

src/coreclr/dlls/mscoree/coreclr/CMakeLists.txt

@@ -82,7 +82,6 @@ set_property(TARGET coreclr APPEND_STRING PROPERTY LINK_DEPENDS ${EXPORTS_FILE})
 
 if (CLR_CMAKE_HOST_UNIX)
     set(LIB_UNWINDER unwinder_wks)
-    set(GC_PAL gc_unix)
 endif (CLR_CMAKE_HOST_UNIX)
 
 # IMPORTANT! Please do not rearrange the order of the libraries. The linker on Linux is
@@ -109,7 +108,7 @@ set(CORECLR_LIBRARIES
     System.Globalization.Native-Static
     interop
     coreclrminipal
-    ${GC_PAL}
+    gc_pal
 )
 
 if(CLR_CMAKE_TARGET_WIN32)

src/coreclr/gc/CMakeLists.txt

@@ -29,12 +29,10 @@ set(GC_SOURCES
 if(CLR_CMAKE_HOST_UNIX)
   add_subdirectory(unix)
   include(unix/configure.cmake)
-  set (GC_SOURCES
-    ${GC_SOURCES})
 else()
+  add_subdirectory(windows)
   set (GC_SOURCES
     ${GC_SOURCES}
-    windows/gcenv.windows.cpp
     windows/Native.rc)
 endif(CLR_CMAKE_HOST_UNIX)
 
@@ -98,9 +96,9 @@ if(CLR_CMAKE_HOST_WIN32)
     ${STATIC_MT_VCRT_LIB}
     kernel32.lib
     advapi32.lib)
-else()
-  set (GC_LINK_LIBRARIES gc_unix)
-endif(CLR_CMAKE_HOST_WIN32)
+endif(CLR_CMAKE_HOST_WIN32)  
+
+set (GC_LINK_LIBRARIES ${GC_LINK_LIBRARIES} gc_pal)
 
 list(APPEND GC_SOURCES ${GC_HEADERS})
 

src/coreclr/gc/unix/CMakeLists.txt

@@ -8,4 +8,4 @@ set(GC_PAL_SOURCES
     events.cpp
     cgroup.cpp)
 
-add_library(gc_unix STATIC ${GC_PAL_SOURCES} ${VERSION_FILE_PATH})
+add_library(gc_pal STATIC ${GC_PAL_SOURCES} ${VERSION_FILE_PATH})

src/coreclr/gc/windows/CMakeLists.txt

@@ -0,0 +1,9 @@
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+include_directories("../env")
+include_directories("..")
+
+set(GC_PAL_SOURCES
+    gcenv.windows.cpp
+)
+
+add_library(gc_pal STATIC ${GC_PAL_SOURCES})

src/coreclr/gc/windows/gcenv.windows.cpp

@@ -7,12 +7,12 @@
 #include <memory>
 #include "windows.h"
 #include "psapi.h"
-#include "env/gcenv.structs.h"
-#include "env/gcenv.base.h"
-#include "env/gcenv.os.h"
-#include "env/gcenv.ee.h"
-#include "env/gcenv.windows.inl"
-#include "env/volatile.h"
+#include "gcenv.structs.h"
+#include "gcenv.base.h"
+#include "gcenv.os.h"
+#include "gcenv.ee.h"
+#include "gcenv.windows.inl"
+#include "volatile.h"
 #include "gcconfig.h"
 
 GCSystemInfo g_SystemInfo;

src/coreclr/inc/clrconfigvalues.h

@@ -272,7 +272,6 @@ RETAIL_CONFIG_DWORD_INFO(EXTERNAL_gcAllowVeryLargeObjects, W("gcAllowVeryLargeOb
 RETAIL_CONFIG_DWORD_INFO(EXTERNAL_GCStress, W("GCStress"), 0, "Trigger GCs at regular intervals")
 CONFIG_DWORD_INFO(INTERNAL_GcStressOnDirectCalls, W("GcStressOnDirectCalls"), 0, "Whether to trigger a GC on direct calls")
 RETAIL_CONFIG_DWORD_INFO(UNSUPPORTED_HeapVerify, W("HeapVerify"), 0, "When set verifies the integrity of the managed heap on entry and exit of each GC")
-RETAIL_CONFIG_DWORD_INFO(UNSUPPORTED_GCNumaAware, W("GCNumaAware"), 1, "Specifies if to enable GC NUMA aware")
 RETAIL_CONFIG_DWORD_INFO(EXTERNAL_GCCpuGroup, W("GCCpuGroup"), 0, "Specifies if to enable GC to support CPU groups")
 RETAIL_CONFIG_STRING_INFO(EXTERNAL_GCName, W("GCName"), "")
 /**

src/coreclr/inc/utilcode.h

@@ -950,31 +950,6 @@ BYTE * ClrVirtualAllocWithinRange(const BYTE *pMinAddr,
 //
 LPVOID ClrVirtualAllocAligned(LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect, SIZE_T alignment);
 
-class NumaNodeInfo
-{
-private:
-    static BOOL m_enableGCNumaAware;
-    static uint16_t m_nNodes;
-    static BOOL InitNumaNodeInfoAPI();
-
-public:
-    static BOOL CanEnableGCNumaAware();
-    static void InitNumaNodeInfo();
-
-#if !defined(FEATURE_NATIVEAOT)
-public: 	// functions
-
-    static LPVOID VirtualAllocExNuma(HANDLE hProc, LPVOID lpAddr, SIZE_T size,
-                                     DWORD allocType, DWORD prot, DWORD node);
-#ifdef HOST_WINDOWS
-    static BOOL GetNumaProcessorNodeEx(PPROCESSOR_NUMBER proc_no, PUSHORT node_no);
-    static bool GetNumaInfo(PUSHORT total_nodes, DWORD* max_procs_per_node);
-#else // HOST_WINDOWS
-    static BOOL GetNumaProcessorNodeEx(USHORT proc_no, PUSHORT node_no);
-#endif // HOST_WINDOWS
-#endif
-};
-
 #ifdef HOST_WINDOWS
 
 struct CPU_Group_Info

src/coreclr/pal/inc/pal.h

@@ -3914,34 +3914,6 @@ PALAPI
 GetSystemInfo(
           OUT LPSYSTEM_INFO lpSystemInfo);
 
-//
-// NUMA related APIs
-//
-
-PALIMPORT
-BOOL
-PALAPI
-GetNumaHighestNodeNumber(
-  OUT PULONG HighestNodeNumber
-);
-
-PALIMPORT
-BOOL
-PALAPI
-PAL_GetNumaProcessorNode(WORD procNo, WORD* node);
-
-PALIMPORT
-LPVOID
-PALAPI
-VirtualAllocExNuma(
-  IN HANDLE hProcess,
-  IN OPTIONAL LPVOID lpAddress,
-  IN SIZE_T dwSize,
-  IN DWORD flAllocationType,
-  IN DWORD flProtect,
-  IN DWORD nndPreferred
-);
-
 PALIMPORT
 BOOL
 PALAPI

src/coreclr/utilcode/util.cpp

@@ -514,94 +514,6 @@ BYTE * ClrVirtualAllocWithinRange(const BYTE *pMinAddr,
 }
 
 #ifdef HOST_WINDOWS
-
-//******************************************************************************
-// NumaNodeInfo
-//******************************************************************************
-#if !defined(FEATURE_NATIVEAOT)
-
-/*static*/ LPVOID NumaNodeInfo::VirtualAllocExNuma(HANDLE hProc, LPVOID lpAddr, SIZE_T dwSize,
-                         DWORD allocType, DWORD prot, DWORD node)
-{
-    return ::VirtualAllocExNuma(hProc, lpAddr, dwSize, allocType, prot, node);
-}
-
-/*static*/ BOOL NumaNodeInfo::GetNumaProcessorNodeEx(PPROCESSOR_NUMBER proc_no, PUSHORT node_no)
-{
-    return ::GetNumaProcessorNodeEx(proc_no, node_no);
-}
-/*static*/ bool NumaNodeInfo::GetNumaInfo(PUSHORT total_nodes, DWORD* max_procs_per_node)
-{
-    if (m_enableGCNumaAware)
-    {
-        DWORD currentProcsOnNode = 0;
-        for (uint16_t i = 0; i < m_nNodes; i++)
-        {
-            GROUP_AFFINITY processorMask;
-            if (GetNumaNodeProcessorMaskEx(i, &processorMask))
-            {
-                DWORD procsOnNode = 0;
-                uintptr_t mask = (uintptr_t)processorMask.Mask;
-                while (mask)
-                {
-                    procsOnNode++;
-                    mask &= mask - 1;
-                }
-
-                currentProcsOnNode = max(currentProcsOnNode, procsOnNode);
-            }
-        }
-
-        *max_procs_per_node = currentProcsOnNode;
-        *total_nodes = m_nNodes;
-        return true;
-    }
-
-    return false;
-}
-#else // HOST_WINDOWS
-/*static*/ BOOL NumaNodeInfo::GetNumaProcessorNodeEx(USHORT proc_no, PUSHORT node_no)
-{
-    return PAL_GetNumaProcessorNode(proc_no, node_no);
-}
-#endif // HOST_WINDOWS
-#endif
-
-#ifdef HOST_WINDOWS
-/*static*/ BOOL NumaNodeInfo::m_enableGCNumaAware = FALSE;
-/*static*/ uint16_t NumaNodeInfo::m_nNodes = 0;
-/*static*/ BOOL NumaNodeInfo::InitNumaNodeInfoAPI()
-{
-#if !defined(FEATURE_NATIVEAOT)
-    //check for numa support if multiple heaps are used
-    ULONG highest = 0;
-
-    if (CLRConfig::GetConfigValue(CLRConfig::UNSUPPORTED_GCNumaAware) == 0)
-        return FALSE;
-
-    // fail to get the highest numa node number
-    if (!::GetNumaHighestNodeNumber(&highest) || (highest == 0))
-        return FALSE;
-
-    m_nNodes = (USHORT)(highest + 1);
-
-    return TRUE;
-#else
-    return FALSE;
-#endif
-}
-
-/*static*/ BOOL NumaNodeInfo::CanEnableGCNumaAware()
-{
-    return m_enableGCNumaAware;
-}
-
-/*static*/ void NumaNodeInfo::InitNumaNodeInfo()
-{
-    m_enableGCNumaAware = InitNumaNodeInfoAPI();
-}
-
-
 //******************************************************************************
 // CPUGroupInfo
 //******************************************************************************

src/coreclr/vm/CMakeLists.txt

@@ -503,13 +503,6 @@ if (CLR_CMAKE_TARGET_ARCH_AMD64 AND CLR_CMAKE_TARGET_WIN32)
 )
 endif (CLR_CMAKE_TARGET_ARCH_AMD64 AND CLR_CMAKE_TARGET_WIN32)
 
-if (CLR_CMAKE_TARGET_WIN32)
-  set ( GC_SOURCES_WKS
-    ${GC_SOURCES_WKS}
-    gcenv.os.cpp 
-    )
-endif (CLR_CMAKE_TARGET_WIN32)
-
 set(GC_HEADERS_WKS
     ${GC_HEADERS_DAC_AND_WKS_COMMON}
     ../gc/gceventstatus.h

src/coreclr/vm/ceemain.cpp

@@ -625,11 +625,6 @@ void EEStartupHelper()
 #ifdef HOST_WINDOWS
         InitializeCrashDump();
 
-
-        // Initialize Numa and CPU group information
-        // Need to do this as early as possible. Used by creating object handle
-        // table inside Ref_Initialization() before GC is initialized.
-        NumaNodeInfo::InitNumaNodeInfo();
 #endif // HOST_WINDOWS
 #ifndef TARGET_UNIX
         CPUGroupInfo::EnsureInitialized();