Merge pull request #23937 from hoyosjs/juhoyosa/pal-link-fix

Add PAL exports to DAC and remove linkage of PAL from static utility library
dotnet · Apr 12, 2019 · d833cac · d833cac
2 parents 5ecae61 + 88c12b2
commit d833cac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/dlls/mscordac/mscordac_unixexports.src b/src/dlls/mscordac/mscordac_unixexports.src
@@ -112,16 +112,20 @@ nativeStringResourceTable_mscorrc_debug
 #GetCurrentDirectoryW
 #GetCurrentProcess
 #GetCurrentProcessId
+#GetCurrentProcessorNumberEx
 #GetCurrentThreadId
 #GetEnvironmentVariableA
 #GetEnvironmentVariableW
 #GetFileAttributesExW
 #GetFileAttributesW
 #GetFileSize
 #GetFullPathNameW
+#GetLogicalProcessorInformationEx
 #GetLastError
 #GetLongPathNameW
 #GetModuleFileNameW
+#GetNumaHighestNodeNumber
+#GetNumaProcessorNodeEx
 #GetProcAddress
 #GetProcessAffinityMask
 #GetProcessHeap
@@ -133,6 +137,7 @@ nativeStringResourceTable_mscorrc_debug
 #GetTempFileNameW
 #GetTempPathA
 #GetTempPathW
+#GetThreadGroupAffinity
 #HeapAlloc
 #HeapFree
 #HeapSetInformation
@@ -168,6 +173,7 @@ nativeStringResourceTable_mscorrc_debug
 #SetFilePointer
 #SetLastError
 #SetErrorMode
+#SetThreadGroupAffinity
 #Sleep
 #SleepEx
 #SwitchToThread
@@ -179,6 +185,7 @@ nativeStringResourceTable_mscorrc_debug
 #TlsGetValue
 #TlsSetValue
 #VirtualAlloc
+#VirtualAllocExNuma
 #VirtualFree
 #VirtualProtect
 #VirtualQuery

diff --git a/src/utilcode/staticnohost/CMakeLists.txt b/src/utilcode/staticnohost/CMakeLists.txt
@@ -9,7 +9,4 @@ add_library_clr(utilcodestaticnohost STATIC ${UTILCODE_STATICNOHOST_SOURCES})
 
 if(CLR_CMAKE_PLATFORM_UNIX)
   target_link_libraries(utilcodestaticnohost  nativeresourcestring)
-  if(CLR_CMAKE_PLATFORM_DARWIN)
-    target_link_libraries(utilcodestaticnohost  coreclrpal)
-  endif(CLR_CMAKE_PLATFORM_DARWIN)
 endif(CLR_CMAKE_PLATFORM_UNIX)