ARM: correct assertion for long-calls on WoA

COFF/PE, so the relocation model is never static.  Loosen the assertion
accordingly.  The relocation can still be emitted properly, as it will be
converted to an IMAGE_REL_ARM_ADDR32 which will be resolved by the loader
taking the base relocation into account.  This is necessary to permit the
emission of long calls which can be controlled via the -mlong-calls option in
the driver.

llvm-svn: 210399
This commit is contained in:
Saleem Abdulrasool 2014-06-07 20:29:27 +00:00
parent aea65e9b13
commit 90386ad60a
2 changed files with 21 additions and 2 deletions

View File

@ -1598,8 +1598,9 @@ ARMTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
ARMFunctionInfo *AFI = MF.getInfo<ARMFunctionInfo>(); ARMFunctionInfo *AFI = MF.getInfo<ARMFunctionInfo>();
if (EnableARMLongCalls) { if (EnableARMLongCalls) {
assert (getTargetMachine().getRelocationModel() == Reloc::Static assert((Subtarget->isTargetWindows() ||
&& "long-calls with non-static relocation model!"); getTargetMachine().getRelocationModel() == Reloc::Static) &&
"long-calls with non-static relocation model!");
// Handle a global address or an external symbol. If it's not one of // Handle a global address or an external symbol. If it's not one of
// those, the target's already in a register, so we don't need to do // those, the target's already in a register, so we don't need to do
// anything extra. // anything extra.

View File

@ -0,0 +1,18 @@
; RUN: llc -mtriple=thumbv7-windows -mcpu=cortex-a9 -arm-long-calls -o - %s \
; RUN: | FileCheck %s
declare arm_aapcs_vfpcc void @callee()
define arm_aapcs_vfpcc void @caller() nounwind {
entry:
tail call void @callee()
ret void
}
; CHECK-LABEL: caller
; CHECK: ldr [[REG:r[0-9]+]], [[CPI:.LCPI[_0-9]+]]
; CHECK: bx [[REG]]
; CHECK: .align 2
; CHECK: [[CPI]]:
; CHECK: .long callee