[llvm] r205772 - X86MCAsmInfoGNUCOFF: Set PointerSize as 8 for targeting x64. It caused DW_LNE_set_address was misemitted on x64.

[NAKAMURA Takumi]

Author: chapuni
Date: Tue Apr  8 10:28:50 2014
New Revision: 205772

URL: http://llvm.org/viewvc/llvm-project?rev=205772&view=rev
Log:
X86MCAsmInfoGNUCOFF: Set PointerSize as 8 for targeting x64. It caused DW_LNE_set_address was misemitted on x64.

FIXME: I haven't investigate whether CalleeSaveStackSlotSize should be 8.

Modified:
    llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
    llvm/trunk/test/DebugInfo/unconditional-branch.ll
    llvm/trunk/test/MC/ELF/comp-dir.s

Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp?rev=205772&r1=205771&r2=205772&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp Tue Apr  8 10:28:50 2014
@@ -157,8 +157,10 @@ X86MCAsmInfoMicrosoft::X86MCAsmInfoMicro
 void X86MCAsmInfoGNUCOFF::anchor() { }
 
 X86MCAsmInfoGNUCOFF::X86MCAsmInfoGNUCOFF(const Triple &Triple) {
-  if (Triple.getArch() == Triple::x86_64)
+  if (Triple.getArch() == Triple::x86_64) {
     PrivateGlobalPrefix = ".L";
+    PointerSize = 8;
+  }
 
   AssemblerDialect = AsmWriterFlavor;
 

Modified: llvm/trunk/test/DebugInfo/unconditional-branch.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/unconditional-branch.ll?rev=205772&r1=205771&r2=205772&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/unconditional-branch.ll (original)
+++ llvm/trunk/test/DebugInfo/unconditional-branch.ll Tue Apr  8 10:28:50 2014
@@ -4,11 +4,6 @@
 ; RUN: %llc_dwarf -fast-isel=false -O0 -filetype=obj %s -o %t
 ; RUN: llvm-dwarfdump %t | FileCheck %s
 
-; FIXME: Investigating.
-; XFAIL: *
-; RUN: llc -mtriple=x86_64-mingw32 -fast-isel=false -O0 -filetype=obj %s -o %t
-; RUN: llvm-dwarfdump %t | FileCheck %s
-
 ; CHECK: {{0x[0-9a-f]+}}      1      0      1   0             0  is_stmt
 ; CHECK: {{0x[0-9a-f]+}}      2      0      1   0             0  is_stmt
 ; CHECK: {{0x[0-9a-f]+}}      4      0      1   0             0  is_stmt

Modified: llvm/trunk/test/MC/ELF/comp-dir.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/comp-dir.s?rev=205772&r1=205771&r2=205772&view=diff
==============================================================================
--- llvm/trunk/test/MC/ELF/comp-dir.s (original)
+++ llvm/trunk/test/MC/ELF/comp-dir.s Tue Apr  8 10:28:50 2014
@@ -1,5 +1,4 @@
 // REQUIRES: shell
-// XFAIL: mingw
 // RUN: llvm-mc -triple=x86_64-linux-unknown -g -fdebug-compilation-dir=/test/comp/dir %s -filetype=obj -o %t.o
 // RUN: llvm-dwarfdump -debug-dump=info %t.o | FileCheck %s