[llvm-commits] [llvm] r143326 - in /llvm/trunk: lib/Target/TargetMachine.cpp test/CodeGen/X86/dbg-file-name.ll tools/llc/llc.cpp

[Nick Lewycky]

Author: nicholas
Date: Sun Oct 30 20:06:02 2011
New Revision: 143326

URL: http://llvm.org/viewvc/llvm-project?rev=143326&view=rev
Log:
Switch new .file directive emission off by default, change llc's flag for it to
-enable-dwarf-directory.

Modified:
    llvm/trunk/lib/Target/TargetMachine.cpp
    llvm/trunk/test/CodeGen/X86/dbg-file-name.ll
    llvm/trunk/tools/llc/llc.cpp

Modified: llvm/trunk/lib/Target/TargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetMachine.cpp?rev=143326&r1=143325&r2=143326&view=diff
==============================================================================
--- llvm/trunk/lib/Target/TargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/TargetMachine.cpp Sun Oct 30 20:06:02 2011
@@ -198,7 +198,7 @@
     MCSaveTempLabels(false),
     MCUseLoc(true),
     MCUseCFI(true),
-    MCUseDwarfDirectory(true) {
+    MCUseDwarfDirectory(false) {
   // Typically it will be subtargets that will adjust FloatABIType from Default
   // to Soft or Hard.
   if (UseSoftFloat)

Modified: llvm/trunk/test/CodeGen/X86/dbg-file-name.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/dbg-file-name.ll?rev=143326&r1=143325&r2=143326&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/dbg-file-name.ll (original)
+++ llvm/trunk/test/CodeGen/X86/dbg-file-name.ll Sun Oct 30 20:06:02 2011
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple x86_64-apple-darwin10.0.0  < %s | FileCheck %s
+; RUN: llc -enable-dwarf-directory -mtriple x86_64-apple-darwin10.0.0  < %s | FileCheck %s
 
 ; Radar 8884898
 ; CHECK: file	1 "/Users/manav/one/two" "simple.c"

Modified: llvm/trunk/tools/llc/llc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llc/llc.cpp?rev=143326&r1=143325&r2=143326&view=diff
==============================================================================
--- llvm/trunk/tools/llc/llc.cpp (original)
+++ llvm/trunk/tools/llc/llc.cpp Sun Oct 30 20:06:02 2011
@@ -133,8 +133,8 @@
 cl::opt<bool> DisableCFI("disable-cfi", cl::Hidden,
                          cl::desc("Do not use .cfi_* directives"));
 
-cl::opt<bool> DisableDwarfDirectory("disable-dwarf-directory", cl::Hidden,
-    cl::desc("Do not use file directives with an explicit directory."));
+cl::opt<bool> EnableDwarfDirectory("enable-dwarf-directory", cl::Hidden,
+    cl::desc("Use .file directives with an explicit directory."));
 
 static cl::opt<bool>
 DisableRedZone("disable-red-zone",
@@ -319,8 +319,8 @@
   if (DisableCFI)
     Target.setMCUseCFI(false);
 
-  if (DisableDwarfDirectory)
-    Target.setMCUseDwarfDirectory(false);
+  if (EnableDwarfDirectory)
+    Target.setMCUseDwarfDirectory(true);
 
   // Disable .loc support for older OS X versions.
   if (TheTriple.isMacOSX() &&