Remove ExtractCodeAndPrelink and switch Portable to MCLinker
Change-Id: Ia2459c7da6b79e0a1c0f1148c6e28ad9cbbe27a2
diff --git a/src/runtime.cc b/src/runtime.cc
index c74757f..414bef4 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -57,10 +57,6 @@
#include "verifier/method_verifier.h"
#include "well_known_classes.h"
-#if defined(ART_USE_PORTABLE_COMPILER)
-#include "compiler/llvm/procedure_linkage_table.h"
-#endif
-
#include "JniConstants.h" // Last to avoid LOG redefinition in ics-mr1-plus-art.
namespace art {
@@ -99,27 +95,13 @@
instrumentation_(NULL),
use_compile_time_class_path_(false),
main_thread_group_(NULL),
- system_thread_group_(NULL)
-#if defined(ART_USE_PORTABLE_COMPILER)
-#if defined(__arm__)
- , plt_(kArm)
-#elif defined(__mips__)
- , plt_(kMips)
-#elif defined(__i386__)
- , plt_(kX86)
-#endif
-#endif
- {
+ system_thread_group_(NULL) {
for (int i = 0; i < Runtime::kLastTrampolineMethodType; i++) {
resolution_stub_array_[i] = NULL;
}
for (int i = 0; i < Runtime::kLastCalleeSaveType; i++) {
callee_save_methods_[i] = NULL;
}
-
-#if defined(ART_USE_PORTABLE_COMPILER)
- CHECK(plt_.AllocateTable()) << "Failed to allocate PLT";
-#endif
}
Runtime::~Runtime() {