diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-07-17 16:27:40 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-07-17 16:27:40 +0000 |
| commit | 862e60c75c5c41410d828f05f0f14bc53fcd7dff (patch) | |
| tree | 5ce1911f2ca840e90b67a6efaad79cf46f191f7a | |
| parent | 19f8bc65f6c4733c41aef5d36a87e733c2e69841 (diff) | |
| download | bcm5719-llvm-862e60c75c5c41410d828f05f0f14bc53fcd7dff.tar.gz bcm5719-llvm-862e60c75c5c41410d828f05f0f14bc53fcd7dff.zip | |
MC: fix MCAsmInfo usage for windows-itanium
Windows itanium uses the GNUCOFF assmebly format, not ELF.
llvm-svn: 213274
| -rw-r--r-- | llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp | 3 | ||||
| -rw-r--r-- | llvm/test/MC/X86/x86-itanium.ll | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp index 5e29e5c359a..3bfad6c71b9 100644 --- a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp +++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp @@ -272,7 +272,8 @@ static MCAsmInfo *createX86MCAsmInfo(const MCRegisterInfo &MRI, StringRef TT) { 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. diff --git a/llvm/test/MC/X86/x86-itanium.ll b/llvm/test/MC/X86/x86-itanium.ll new file mode 100644 index 00000000000..1d8308dca75 --- /dev/null +++ b/llvm/test/MC/X86/x86-itanium.ll @@ -0,0 +1,6 @@ +; RUN: llc -mtriple i686-windows-itanium -filetype asm -o - %s | FileCheck %s + +@var = common global i32 0, align 4 + +; CHECK-NOT: .type _var,@object + |
