1 files changed, 14 insertions, 0 deletions
diff --git a/src/pal/src/init/pal.cpp b/src/pal/src/init/pal.cpp
index fa94922325..2fdafe4f8c 100644
--- a/src/pal/src/init/pal.cpp
+++ b/src/pal/src/init/pal.cpp
@@ -42,6 +42,7 @@ SET_DEFAULT_DEBUG_CHANNEL(PAL); // some headers have code with asserts, so do th
 #include "pal/debug.h"
 #include "pal/locale.h"
 #include "pal/init.h"
+#include "pal/numa.h"
 #include "pal/stackstring.hpp"
 
 #if HAVE_MACH_EXCEPTIONS
@@ -523,6 +524,12 @@ Initialize(
             goto CLEANUP15;
         }
 
+        if (FALSE == NUMASupportInitialize())
+        {
+            ERROR("Unable to initialize NUMA support\n");
+            goto CLEANUP15;
+        }
+
         TRACE("First-time PAL initialization complete.\n");
         init_count++;        
 
@@ -548,6 +555,7 @@ Initialize(
     }
     goto done;
 
+    NUMASupportCleanup();
     /* No cleanup required for CRTInitStdStreams */ 
 CLEANUP15:
     FILECleanupStdHandles();
@@ -650,6 +658,12 @@ PAL_InitializeCoreCLR(const char *szExePath)
         return ERROR_DLL_INIT_FAILED;
     }
 
+    if (!PROCAbortInitialize())
+    {
+        printf("PROCAbortInitialize FAILED %d (%s)\n", errno, strerror(errno));
+        return ERROR_GEN_FAILURE;
+    }
+
     if (!InitializeFlushProcessWriteBuffers())
     {
         return ERROR_GEN_FAILURE;