From 6180d762a4feb699c816623a810cd95613183413 Mon Sep 17 00:00:00 2001 From: Maoni0 Date: Wed, 22 Jun 2016 12:23:11 -0700 Subject: [PATCH] enable GCWhere on PAL and fixed a bug in 859307b where it's missing a function in Linux Commit migrated from https://github.com/dotnet/coreclr/commit/550b9c5d355918c6e6ce88366bdf0da99d31579f --- src/coreclr/src/ToolBox/SOS/Strike/CMakeLists.txt | 7 +------ src/coreclr/src/ToolBox/SOS/Strike/sos_unixexports.src | 1 + src/coreclr/src/ToolBox/SOS/Strike/strike.cpp | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/coreclr/src/ToolBox/SOS/Strike/CMakeLists.txt b/src/coreclr/src/ToolBox/SOS/Strike/CMakeLists.txt index c474574..e4448e7 100644 --- 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 --- 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 --- 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 -- 2.7.4