From 5501b7e8057c7f54d3cf49e51421264ff646b269 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Mon, 11 Oct 2010 20:05:22 +0000 Subject: [PATCH] Change flag from Enable to Disable since we're enabled by default. Also don't use fast-isel on non-darwin since it's untested. llvm-svn: 116217 --- llvm/lib/Target/ARM/ARMFastISel.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/llvm/lib/Target/ARM/ARMFastISel.cpp b/llvm/lib/Target/ARM/ARMFastISel.cpp index a7ca18e8c5e1..f290bacf9158 100644 --- a/llvm/lib/Target/ARM/ARMFastISel.cpp +++ b/llvm/lib/Target/ARM/ARMFastISel.cpp @@ -46,9 +46,9 @@ using namespace llvm; static cl::opt -EnableARMFastISel("arm-fast-isel", - cl::desc("Turn on experimental ARM fast-isel support"), - cl::init(true), cl::Hidden); +DisableARMFastISel("disable-arm-fast-isel", + cl::desc("Turn on experimental ARM fast-isel support"), + cl::init(false), cl::Hidden); namespace { @@ -1555,7 +1555,11 @@ bool ARMFastISel::TargetSelectInstruction(const Instruction *I) { namespace llvm { llvm::FastISel *ARM::createFastISel(FunctionLoweringInfo &funcInfo) { - if (EnableARMFastISel) return new ARMFastISel(funcInfo); + // Completely untested on non-darwin. + const TargetMachine &TM = funcInfo.MF->getTarget(); + const ARMSubtarget *Subtarget = &TM.getSubtarget(); + if (Subtarget->isTargetDarwin() && !DisableARMFastISel) + return new ARMFastISel(funcInfo); return 0; } }