diff options
| author | Maoni0 <maonis@microsoft.com> | 2016-06-22 12:23:11 -0700 |
|---|---|---|
| committer | Maoni0 <maonis@microsoft.com> | 2016-06-22 17:15:58 -0700 |
| commit | 550b9c5d355918c6e6ce88366bdf0da99d31579f (patch) | |
| tree | 54d7b1356e2cbd5b3ca573918843422df84feeb3 /src/ToolBox/SOS | |
| parent | 8ae408fde25abe91219003dd02c70a6f78cc6fc2 (diff) | |
| download | coreclr-550b9c5d355918c6e6ce88366bdf0da99d31579f.tar.gz coreclr-550b9c5d355918c6e6ce88366bdf0da99d31579f.tar.bz2 coreclr-550b9c5d355918c6e6ce88366bdf0da99d31579f.zip | |
enable GCWhere on PAL and fixed a bug in 859307b where it's missing a function in Linux
Diffstat (limited to 'src/ToolBox/SOS')
| -rw-r--r-- | src/ToolBox/SOS/Strike/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/ToolBox/SOS/Strike/sos_unixexports.src | 1 | ||||
| -rw-r--r-- | src/ToolBox/SOS/Strike/strike.cpp | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/ToolBox/SOS/Strike/CMakeLists.txt b/src/ToolBox/SOS/Strike/CMakeLists.txt index c474574a08..e4448e7742 100644 --- a/src/ToolBox/SOS/Strike/CMakeLists.txt +++ b/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/ToolBox/SOS/Strike/sos_unixexports.src b/src/ToolBox/SOS/Strike/sos_unixexports.src index 4ce1a4bf8a..ed811b6572 100644 --- a/src/ToolBox/SOS/Strike/sos_unixexports.src +++ b/src/ToolBox/SOS/Strike/sos_unixexports.src @@ -23,6 +23,7 @@ DumpStack DumpStackObjects DumpVC EEHeap +GCWhere EEStack EHInfo FindAppDomain diff --git a/src/ToolBox/SOS/Strike/strike.cpp b/src/ToolBox/SOS/Strike/strike.cpp index 4a67aa19fa..ca06b8e501 100644 --- a/src/ToolBox/SOS/Strike/strike.cpp +++ b/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 |