Skip to content

Instantly share code, notes, and snippets.

@kangaroo
Created September 2, 2015 16:58
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save kangaroo/5de7302b2362802df02d to your computer and use it in GitHub Desktop.
Save kangaroo/5de7302b2362802df02d to your computer and use it in GitHub Desktop.
diff --git a/src/ToolBox/SOS/Strike/CMakeLists.txt b/src/ToolBox/SOS/Strike/CMakeLists.txt
index 78ada33..18fd0b1 100644
--- a/src/ToolBox/SOS/Strike/CMakeLists.txt
+++ b/src/ToolBox/SOS/Strike/CMakeLists.txt
@@ -76,10 +76,6 @@ if(WIN32)
ntdll.lib
)
else(WIN32)
- if(NOT CLR_CMAKE_PLATFORM_ARCH_AMD64)
- clr_unknown_arch()
- endif()
-
add_definitions(-DPAL_STDCPP_COMPAT=1)
add_compile_options(-Wno-null-arithmetic)
add_compile_options(-Wno-format)
diff --git a/src/vm/interpreter.cpp b/src/vm/interpreter.cpp
index 5ee4c7a..f4374ad 100644
--- a/src/vm/interpreter.cpp
+++ b/src/vm/interpreter.cpp
@@ -1579,7 +1579,12 @@ CorJitResult Interpreter::GenerateInterpreterStub(CEEInfo* comp,
#else
#error unsupported platform
#endif
- stub = sl.Link();
+ void *heap = NULL;
+#ifdef FEATURE_PAL
+ heap = SystemDomain::GetGlobalLoaderAllocator()->GetExecutableHeap();
+#endif
+
+ stub = sl.Link(heap);
*nativeSizeOfCode = static_cast<ULONG>(stub->GetNumCodeBytes());
// TODO: manage reference count of interpreter stubs. Look for examples...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment