commit d1ba2d9d8bc6d6bd596eb990376d7f0933018aca
author Yaron Keren <yaron.keren@gmail.com> Tue Jul 14 05:51:05 2015 +0000
committer Yaron Keren <yaron.keren@gmail.com> Tue Jul 14 05:51:05 2015 +0000
tree 5b577529a3b8ed7da3a07ac4f98f03bc169076d0
parent ea671fbdffda6976607997eb2e5d796211cf5003

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

llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp

diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
index dd26e4b..21c9fc1 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
@@ -277,10 +277,10 @@
   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);