summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
diff options
context:
space:
mode:
authorYaron Keren <yaron.keren@gmail.com>2015-07-14 05:51:05 +0000
committerYaron Keren <yaron.keren@gmail.com>2015-07-14 05:51:05 +0000
commitd1ba2d9d8bc6d6bd596eb990376d7f0933018aca (patch)
tree5b577529a3b8ed7da3a07ac4f98f03bc169076d0 /llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
parentea671fbdffda6976607997eb2e5d796211cf5003 (diff)
downloadbcm5719-llvm-d1ba2d9d8bc6d6bd596eb990376d7f0933018aca.tar.gz
bcm5719-llvm-d1ba2d9d8bc6d6bd596eb990376d7f0933018aca.zip
Generate correct asm info for mingw and cygwin ARM targets.
http://reviews.llvm.org/D11075 Patch by Martell Malone Reviewed by Reid Kleckner llvm-svn: 242123
Diffstat (limited to 'llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp')
-rw-r--r--llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
index dd26e4b9bfe..21c9fc1e58b 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
@@ -277,10 +277,10 @@ static MCAsmInfo *createARMMCAsmInfo(const MCRegisterInfo &MRI,
MCAsmInfo *MAI;
if (TheTriple.isOSDarwin() || TheTriple.isOSBinFormatMachO())
MAI = new ARMMCAsmInfoDarwin(TheTriple);
- else if (TheTriple.isWindowsItaniumEnvironment())
- MAI = new ARMCOFFMCAsmInfoGNU();
else if (TheTriple.isWindowsMSVCEnvironment())
MAI = new ARMCOFFMCAsmInfoMicrosoft();
+ else if (TheTriple.isOSWindows())
+ MAI = new ARMCOFFMCAsmInfoGNU();
else
MAI = new ARMELFMCAsmInfo(TheTriple);
OpenPOWER on IntegriCloud