diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3272fd776020296b39a4d85e238d8dc0154a8a5c..3e7642d16dcfdd0a1858cd35a86af4d4ee4e8d73 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-22  Bob Wilson  <bob.wilson@acm.org>
+
+	* dwarf2dbg.c (dwarf2_finish): Don't write a .debug_line section
+	without a corresponding .debug_info section.
+
 2004-11-22  Hans-Peter Nilsson  <hp@axis.com>
 
 	* read.c (potable): Add "error" and "warning".
diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
index e1b7a8166fb7bb91167183077851ecb59e0f7075..d3b5e852835d1f00ac7989e4591694cce47878ed 100644
--- a/gas/dwarf2dbg.c
+++ b/gas/dwarf2dbg.c
@@ -1356,13 +1356,12 @@ dwarf2_finish (void)
   struct line_seg *s;
 
   /* We don't need to do anything unless:
-     - Some debug information was recorded via .file/.loc
-     - or, we are generating DWARF2 information ourself (--gdwarf2)
+     - Some debug information was recorded via .file/.loc or
+       generated by GAS (--gdwarf2)
      - or, there is a user-provided .debug_info section which could
        reference the file table in the .debug_line section we generate
        below.  */
   if (all_segs == NULL
-      && debug_type != DEBUG_DWARF2
       && (bfd_get_section_by_name (stdoutput, ".debug_info") == NULL
 	  || files_in_use == 0))
     return;