Merge "Revert "JIT root tables.""
am: 20c56a8cde
Change-Id: I94678ba4ca22e9dc051ee83a40964c5b0d97f607
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index ca65c2b..a9f4042 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1449,11 +1449,6 @@
}
void Runtime::DumpForSigQuit(std::ostream& os) {
- // Dumping for SIGQIT may cause deadlocks if the the debugger is active. b/26118154
- if (Dbg::IsDebuggerActive()) {
- LOG(INFO) << "Skipping DumpForSigQuit due to active debugger";
- return;
- }
GetClassLinker()->DumpForSigQuit(os);
GetInternTable()->DumpForSigQuit(os);
GetJavaVM()->DumpForSigQuit(os);
diff --git a/runtime/utils.cc b/runtime/utils.cc
index 6ed54f7..66739a9 100644
--- a/runtime/utils.cc
+++ b/runtime/utils.cc
@@ -37,6 +37,7 @@
#if defined(__APPLE__)
#include "AvailabilityMacros.h" // For MAC_OS_X_VERSION_MAX_ALLOWED
#include <sys/syscall.h>
+#include <crt_externs.h>
#endif
#if defined(__linux__)