Get rid of some GLOBAL_ISEL ifdefs that should be harmless for code size.
More to come, but those were easy.
llvm-svn: 260723
diff --git a/llvm/lib/CodeGen/LLVMTargetMachine.cpp b/llvm/lib/CodeGen/LLVMTargetMachine.cpp
index 0e61716..583d168 100644
--- a/llvm/lib/CodeGen/LLVMTargetMachine.cpp
+++ b/llvm/lib/CodeGen/LLVMTargetMachine.cpp
@@ -42,11 +42,9 @@
EnableFastISelOption("fast-isel", cl::Hidden,
cl::desc("Enable the \"fast\" instruction selector"));
-#ifdef LLVM_BUILD_GLOBAL_ISEL
static cl::opt<bool>
EnableGlobalISel("global-isel", cl::Hidden, cl::init(false),
cl::desc("Enable the \"global\" instruction selector"));
-#endif
void LLVMTargetMachine::initAsmInfo() {
MRI = TheTarget.createMCRegInfo(getTargetTriple().str());
@@ -141,14 +139,11 @@
TM->getO0WantsFastISel()))
TM->setFastISel(true);
-#ifdef LLVM_BUILD_GLOBAL_ISEL
- if (EnableGlobalISel) {
+ // Ask the target for an isel.
+ if (LLVM_UNLIKELY(EnableGlobalISel)) {
if (PassConfig->addIRTranslator())
return nullptr;
- } else
-#endif
- // Ask the target for an isel.
- if (PassConfig->addInstSelector())
+ } else if (PassConfig->addInstSelector())
return nullptr;
PassConfig->addMachinePasses();