enable GCWhere on PAL and fixed a bug in 859307b where it's missing a function in...

Commit migrated from https://github.com/dotnet/coreclr/commit/550b9c5d355918c6e6ce88366bdf0da99d31579f

diff --git a/src/coreclr/src/ToolBox/SOS/Strike/CMakeLists.txt b/src/coreclr/src/ToolBox/SOS/Strike/CMakeLists.txt
index c474574..e4448e7 100644 (file)
--- a/src/coreclr/src/ToolBox/SOS/Strike/CMakeLists.txt
+++ b/src/coreclr/src/ToolBox/SOS/Strike/CMakeLists.txt
@@ -124,13 +124,8 @@ else(WIN32)
     strike.cpp
     sos.cpp
     util.cpp
+    ../../../coreclr/hosts/unixcoreruncommon/coreruncommon.cpp
   )
-  if(CLR_CMAKE_PLATFORM_DARWIN)
-    set(SOS_SOURCES
-      ${SOS_SOURCES}
-      ../../../coreclr/hosts/unixcoreruncommon/coreruncommon.cpp
-    )
-  endif(CLR_CMAKE_PLATFORM_DARWIN)
 
   set(SOS_LIBRARY
     corguids

diff --git a/src/coreclr/src/ToolBox/SOS/Strike/sos_unixexports.src b/src/coreclr/src/ToolBox/SOS/Strike/sos_unixexports.src
index 4ce1a4b..ed811b6 100644 (file)
--- a/src/coreclr/src/ToolBox/SOS/Strike/sos_unixexports.src
+++ b/src/coreclr/src/ToolBox/SOS/Strike/sos_unixexports.src
@@ -23,6 +23,7 @@ DumpStack
 DumpStackObjects
 DumpVC
 EEHeap
+GCWhere
 EEStack
 EHInfo
 FindAppDomain

diff --git a/src/coreclr/src/ToolBox/SOS/Strike/strike.cpp b/src/coreclr/src/ToolBox/SOS/Strike/strike.cpp
index 4a67aa1..ca06b8e 100644 (file)
--- a/src/coreclr/src/ToolBox/SOS/Strike/strike.cpp
+++ b/src/coreclr/src/ToolBox/SOS/Strike/strike.cpp
@@ -9609,8 +9609,6 @@ DECLARE_API(GCRoot)
     return Status;
 }
 
-#ifndef FEATURE_PAL
-
 DECLARE_API(GCWhere)
 {
     INIT_API();
@@ -9730,6 +9728,8 @@ DECLARE_API(GCWhere)
     return Status;
 }
 
+#ifndef FEATURE_PAL
+
 DECLARE_API(FindRoots)
 {
 #ifndef FEATURE_PAL