[llvm] r213274 - MC: fix MCAsmInfo usage for windows-itanium

Saleem Abdulrasool compnerd at compnerd.org
Thu Jul 17 09:27:40 PDT 2014


Author: compnerd
Date: Thu Jul 17 11:27:40 2014
New Revision: 213274

URL: http://llvm.org/viewvc/llvm-project?rev=213274&view=rev
Log:
MC: fix MCAsmInfo usage for windows-itanium

Windows itanium uses the GNUCOFF assmebly format, not ELF.

Added:
    llvm/trunk/test/MC/X86/x86-itanium.ll
Modified:
    llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp

Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp?rev=213274&r1=213273&r2=213274&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp (original)
+++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp Thu Jul 17 11:27:40 2014
@@ -272,7 +272,8 @@ static MCAsmInfo *createX86MCAsmInfo(con
     MAI = new X86ELFMCAsmInfo(TheTriple);
   } else if (TheTriple.isWindowsMSVCEnvironment()) {
     MAI = new X86MCAsmInfoMicrosoft(TheTriple);
-  } else if (TheTriple.isOSCygMing()) {
+  } else if (TheTriple.isOSCygMing() ||
+             TheTriple.isWindowsItaniumEnvironment()) {
     MAI = new X86MCAsmInfoGNUCOFF(TheTriple);
   } else {
     // The default is ELF.

Added: llvm/trunk/test/MC/X86/x86-itanium.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/X86/x86-itanium.ll?rev=213274&view=auto
==============================================================================
--- llvm/trunk/test/MC/X86/x86-itanium.ll (added)
+++ llvm/trunk/test/MC/X86/x86-itanium.ll Thu Jul 17 11:27:40 2014
@@ -0,0 +1,6 @@
+; RUN: llc -mtriple i686-windows-itanium -filetype asm -o - %s | FileCheck %s
+
+ at var = common global i32 0, align 4
+
+; CHECK-NOT: .type  _var, at object
+





More information about the llvm-commits mailing list