diff --git a/include/llvm/Target/TargetAsmInfo.h b/include/llvm/Target/TargetAsmInfo.h
index 5a661a95fda..b4bb8ecbfe0 100644
--- a/include/llvm/Target/TargetAsmInfo.h
+++ b/include/llvm/Target/TargetAsmInfo.h
@@ -286,14 +286,11 @@ namespace llvm {
     ///
     bool HasLEB128; // Defaults to false.
     
-    /// hasDotLoc - True if target asm supports .loc directives.
+    /// hasDotLocAndDotFile - True if target asm supports .loc and .file
+    /// directives for emitting debugging information.
     ///
-    bool HasDotLoc; // Defaults to false.
+    bool HasDotLocAndDotFile; // Defaults to false.
     
-    /// HasDotFile - True if target asm supports .file directives.
-    ///
-    bool HasDotFile; // Defaults to false.
-
     /// SupportsDebugInformation - True if target supports emission of debugging
     /// information.
     bool SupportsDebugInformation;
@@ -568,11 +565,8 @@ namespace llvm {
     bool hasLEB128() const {
       return HasLEB128;
     }
-    bool hasDotLoc() const {
-      return HasDotLoc;
-    }
-    bool hasDotFile() const {
-      return HasDotFile;
+    bool hasDotLocAndDotFile() const {
+      return HasDotLocAndDotFile;
     }
     bool doesSupportDebugInformation() const {
       return SupportsDebugInformation;
diff --git a/lib/Target/TargetAsmInfo.cpp b/lib/Target/TargetAsmInfo.cpp
index 1a3daf0eaa9..e2683441462 100644
--- a/lib/Target/TargetAsmInfo.cpp
+++ b/lib/Target/TargetAsmInfo.cpp
@@ -81,8 +81,7 @@ TargetAsmInfo::TargetAsmInfo() :
   AbsoluteDebugSectionOffsets(false),
   AbsoluteEHSectionOffsets(false),
   HasLEB128(false),
-  HasDotLoc(false),
-  HasDotFile(false),
+  HasDotLocAndDotFile(false),
   SupportsDebugInformation(false),
   SupportsExceptionHandling(false),
   DwarfRequiresFrameSection(true),