[llvm-branch-commits] [llvm-branch] r98309 - in /llvm/branches/release_27: ./ lib/Target/X86/X86MCAsmInfo.cpp

[Tanya Lattner]

Author: tbrethou
Date: Thu Mar 11 18:03:18 2010
New Revision: 98309

URL: http://llvm.org/viewvc/llvm-project?rev=98309&view=rev
Log:
Merge 98205 from mainline.
Work around a bug in the openbsd assembler on i386,
which doesn't support .quad correctly because it is
"really really old".  PR6528.

Yet another reason the mc assembler should take over ;-)

Modified:
    llvm/branches/release_27/   (props changed)
    llvm/branches/release_27/lib/Target/X86/X86MCAsmInfo.cpp

Propchange: llvm/branches/release_27/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 11 18:03:18 2010
@@ -1 +1 @@
-/llvm/trunk:98171,98193,98203,98212
+/llvm/trunk:98171,98193,98203,98205,98212

Modified: llvm/branches/release_27/lib/Target/X86/X86MCAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_27/lib/Target/X86/X86MCAsmInfo.cpp?rev=98309&r1=98308&r2=98309&view=diff
==============================================================================
--- llvm/branches/release_27/lib/Target/X86/X86MCAsmInfo.cpp (original)
+++ llvm/branches/release_27/lib/Target/X86/X86MCAsmInfo.cpp Thu Mar 11 18:03:18 2010
@@ -71,7 +71,7 @@
   AbsoluteEHSectionOffsets = false;
 }
 
-X86ELFMCAsmInfo::X86ELFMCAsmInfo(const Triple &Triple) {
+X86ELFMCAsmInfo::X86ELFMCAsmInfo(const Triple &T) {
   AsmTransCBE = x86_asm_table;
   AssemblerDialect = AsmWriterFlavor;
 
@@ -91,6 +91,11 @@
   // Exceptions handling
   ExceptionsType = ExceptionHandling::Dwarf;
   AbsoluteEHSectionOffsets = false;
+  
+  // OpenBSD has buggy support for .quad in 32-bit mode, just split into two
+  // .words.
+  if (T.getOS() == Triple::OpenBSD && T.getArch() == Triple::x86)
+    Data64bitsDirective = 0;
 }
 
 MCSection *X86ELFMCAsmInfo::getNonexecutableStackSection(MCContext &Ctx) const {