maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

ARM: fix `-mlong-calls` for WoA 

Not all code-paths set the relocation model to static for Windows.  This
currently breaks on Windows ARM with `-mlong-calls` when built with clang.
Loosen the assertion to what it was previously.  We would ideally ensure that
all the configuration sets Windows to static relocation model.

llvm-svn: 274570
This commit is contained in:
Saleem Abdulrasool 2016-07-05 18:30:52 +00:00
parent 2d79389508
commit 4d950ef892
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/Target/ARM/ARMISelLowering.cpp
View File

@ -1814,7 +1814,7 @@ ARMTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
auto PtrVt = getPointerTy(DAG.getDataLayout()); auto PtrVt = getPointerTy(DAG.getDataLayout());
if (Subtarget->genLongCalls()) { if (Subtarget->genLongCalls()) {
assert(!isPositionIndependent() && assert((!isPositionIndependent() || Subtarget->isTargetWindows()) &&
"long-calls codegen is not position independent!"); "long-calls codegen is not position independent!");
// 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

2
llvm/test/CodeGen/ARM/Windows/long-calls.ll
View File

@ -1,4 +1,4 @@
; RUN: llc -mtriple=thumbv7-windows -mcpu=cortex-a9 -mattr=+long-calls -o - %s \ ; RUN: llc -mtriple=thumbv7-windows -mcpu=cortex-a9 -relocation-model pic -mattr=+long-calls -o - %s \
; RUN: | FileCheck %s ; RUN: | FileCheck %s
declare arm_aapcs_vfpcc void @callee() declare arm_aapcs_vfpcc void @callee()