diff options
| -rw-r--r-- | compiler/dex/mir_graph.cc | 4 | ||||
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 38 | ||||
| -rw-r--r-- | compiler/driver/compiler_driver.h | 6 |
3 files changed, 2 insertions, 46 deletions
diff --git a/compiler/dex/mir_graph.cc b/compiler/dex/mir_graph.cc index 58f12c9..4d34038 100644 --- a/compiler/dex/mir_graph.cc +++ b/compiler/dex/mir_graph.cc @@ -1609,8 +1609,8 @@ void MIRGraph::ReplaceSpecialChars(std::string& str) { } std::string MIRGraph::GetSSAName(int ssa_reg) { - // TODO: This value is needed for LLVM and debugging. Currently, we compute this and then copy to - // the arena. We should be smarter and just place straight into the arena, or compute the + // TODO: This value is needed for debugging. Currently, we compute this and then copy to the + // arena. We should be smarter and just place straight into the arena, or compute the // value more lazily. int vreg = SRegToVReg(ssa_reg); if (vreg >= static_cast<int>(GetFirstTempVR())) { diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index f6b217a..c2b8375 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -2370,44 +2370,6 @@ bool CompilerDriver::WriteElf(const std::string& android_root, SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { return compiler_->WriteElf(file, oat_writer, dex_files, android_root, is_host); } -void CompilerDriver::InstructionSetToLLVMTarget(InstructionSet instruction_set, - std::string* target_triple, - std::string* target_cpu, - std::string* target_attr) { - switch (instruction_set) { - case kThumb2: - *target_triple = "thumb-none-linux-gnueabi"; - *target_cpu = "cortex-a9"; - *target_attr = "+thumb2,+neon,+neonfp,+vfp3,+db"; - break; - - case kArm: - *target_triple = "armv7-none-linux-gnueabi"; - // TODO: Fix for Nexus S. - *target_cpu = "cortex-a9"; - // TODO: Fix for Xoom. - *target_attr = "+v7,+neon,+neonfp,+vfp3,+db"; - break; - - case kX86: - *target_triple = "i386-pc-linux-gnu"; - *target_attr = ""; - break; - - case kX86_64: - *target_triple = "x86_64-pc-linux-gnu"; - *target_attr = ""; - break; - - case kMips: - *target_triple = "mipsel-unknown-linux"; - *target_attr = "mips32r2"; - break; - - default: - LOG(FATAL) << "Unknown instruction set: " << instruction_set; - } - } bool CompilerDriver::SkipCompilation(const std::string& method_name) { if (!profile_present_) { diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index edd1bd2..a6ed559 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -385,12 +385,6 @@ class CompilerDriver { OatWriter* oat_writer, File* file); - // TODO: move to a common home for llvm helpers once quick/portable are merged. - static void InstructionSetToLLVMTarget(InstructionSet instruction_set, - std::string* target_triple, - std::string* target_cpu, - std::string* target_attr); - void SetCompilerContext(void* compiler_context) { compiler_context_ = compiler_context; } |