diff options
| -rw-r--r-- | include/llvm/Target/TargetOptions.h | 4 | ||||
| -rw-r--r-- | lib/Target/ARM/ARMISelLowering.cpp | 3 | ||||
| -rw-r--r-- | lib/Target/ARM/ARMSubtarget.h | 2 | ||||
| -rw-r--r-- | lib/Target/TargetMachine.cpp | 5 | ||||
| -rw-r--r-- | test/CodeGen/ARM/divmod.ll | 2 |
5 files changed, 5 insertions, 11 deletions
diff --git a/include/llvm/Target/TargetOptions.h b/include/llvm/Target/TargetOptions.h index cea8d5d8a2..62190c166e 100644 --- a/include/llvm/Target/TargetOptions.h +++ b/include/llvm/Target/TargetOptions.h @@ -157,10 +157,6 @@ namespace llvm { /// wth earlier copy coalescing. extern bool StrongPHIElim; - /// HasDivModLibcall - This flag indicates whether the target compiler - /// runtime library has integer divmod libcalls. - extern bool HasDivModLibcall; - /// getTrapFunctionName - If this returns a non-empty string, this means isel /// should lower Intrinsic::trap to a call to the specified function name /// instead of an ISD::TRAP node. diff --git a/lib/Target/ARM/ARMISelLowering.cpp b/lib/Target/ARM/ARMISelLowering.cpp index 50dd409107..2d555cd782 100644 --- a/lib/Target/ARM/ARMISelLowering.cpp +++ b/lib/Target/ARM/ARMISelLowering.cpp @@ -398,7 +398,8 @@ ARMTargetLowering::ARMTargetLowering(TargetMachine &TM) setLibcallCallingConv(RTLIB::UDIV_I32, CallingConv::ARM_AAPCS); } - if (HasDivModLibcall) { + // Use divmod iOS compiler-rt calls. + if (Subtarget->getTargetTriple().getOS() == Triple::IOS) { setLibcallName(RTLIB::SDIVREM_I32, "__divmodsi4"); setLibcallName(RTLIB::UDIVREM_I32, "__udivmodsi4"); } diff --git a/lib/Target/ARM/ARMSubtarget.h b/lib/Target/ARM/ARMSubtarget.h index f880bc958f..0271c873f1 100644 --- a/lib/Target/ARM/ARMSubtarget.h +++ b/lib/Target/ARM/ARMSubtarget.h @@ -201,6 +201,8 @@ protected: bool hasFP16() const { return HasFP16; } bool hasD16() const { return HasD16; } + const Triple &getTargetTriple() const { return TargetTriple; } + bool isTargetDarwin() const { return TargetTriple.isOSDarwin(); } bool isTargetELF() const { return !isTargetDarwin(); } diff --git a/lib/Target/TargetMachine.cpp b/lib/Target/TargetMachine.cpp index 93eae250df..4a1ac94826 100644 --- a/lib/Target/TargetMachine.cpp +++ b/lib/Target/TargetMachine.cpp @@ -206,11 +206,6 @@ EnableStrongPHIElim(cl::Hidden, "strong-phi-elim", cl::desc("Use strong PHI elimination."), cl::location(StrongPHIElim), cl::init(false)); -static cl::opt<bool, true> -UseDivMod("use-divmod-libcall", - cl::desc("Use __{u}divmod libcalls for div / rem pairs"), - cl::location(HasDivModLibcall), - cl::init(false)); static cl::opt<std::string> TrapFuncName("trap-func", cl::Hidden, cl::desc("Emit a call to trap function rather than a trap instruction"), diff --git a/test/CodeGen/ARM/divmod.ll b/test/CodeGen/ARM/divmod.ll index 9c90a8296b..34313aa89a 100644 --- a/test/CodeGen/ARM/divmod.ll +++ b/test/CodeGen/ARM/divmod.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -mtriple=arm-apple-darwin -use-divmod-libcall | FileCheck %s +; RUN: llc < %s -mtriple=arm-apple-ios | FileCheck %s define void @foo(i32 %x, i32 %y, i32* nocapture %P) nounwind ssp { entry: |