diff --git a/llvm/lib/Target/TargetMachine.cpp b/llvm/lib/Target/TargetMachine.cpp
index 3f58e8439014..daac9243ddb3 100644
--- a/llvm/lib/Target/TargetMachine.cpp
+++ b/llvm/lib/Target/TargetMachine.cpp
@@ -198,7 +198,7 @@ TargetMachine::TargetMachine(const Target &T,
     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)
diff --git a/llvm/test/CodeGen/X86/dbg-file-name.ll b/llvm/test/CodeGen/X86/dbg-file-name.ll
index 138ee264bfc2..70e0a5d1c47a 100644
--- a/llvm/test/CodeGen/X86/dbg-file-name.ll
+++ b/llvm/test/CodeGen/X86/dbg-file-name.ll
@@ -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"
diff --git a/llvm/tools/llc/llc.cpp b/llvm/tools/llc/llc.cpp
index 4cb3cf1cb96b..be6afec20a02 100644
--- a/llvm/tools/llc/llc.cpp
+++ b/llvm/tools/llc/llc.cpp
@@ -133,8 +133,8 @@ cl::opt<bool> DisableDotLoc("disable-dot-loc", cl::Hidden,
 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 @@ int main(int argc, char **argv) {
   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() &&