summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2014-05-17 04:28:08 +0000
committerSaleem Abdulrasool <compnerd@compnerd.org>2014-05-17 04:28:08 +0000
commit46fed305db66aaeecfb9dd5accb2cb01111ce6df (patch)
treebe378af0de824737107083fb23b8b8f0b10d570c /llvm/lib
parentc85473143c006690cb766a008736554ad8493ff5 (diff)
downloadbcm5719-llvm-46fed305db66aaeecfb9dd5accb2cb01111ce6df.tar.gz
bcm5719-llvm-46fed305db66aaeecfb9dd5accb2cb01111ce6df.zip
ARM: use the proper target object format for WoA
WoA uses COFF, not ELF. ARMISelLowering::createTLOF would previously return ELF for any non-MachO platform. This was a missed site when the original change for target format support for Windows on ARM was done. llvm-svn: 209057
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Target/ARM/ARMISelLowering.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp
index c2d9b7a1248..d0d1018f34e 100644
--- a/llvm/lib/Target/ARM/ARMISelLowering.cpp
+++ b/llvm/lib/Target/ARM/ARMISelLowering.cpp
@@ -158,7 +158,8 @@ void ARMTargetLowering::addQRTypeForNEON(MVT VT) {
static TargetLoweringObjectFile *createTLOF(TargetMachine &TM) {
if (TM.getSubtarget<ARMSubtarget>().isTargetMachO())
return new TargetLoweringObjectFileMachO();
-
+ if (TM.getSubtarget<ARMSubtarget>().isTargetWindows())
+ return new TargetLoweringObjectFileCOFF();
return new ARMElfTargetObjectFile();
}
OpenPOWER on IntegriCloud