diff --git a/gas/ChangeLog b/gas/ChangeLog
index 835b56f3fa..cbdaa3d6ba 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-19  Bob Wilson  <bob.wilson@acm.org>
+	
+	* dwarf2dbg.c (dwarf2_emit_label): Use dwarf2_consume_line_info.
+	
 2007-11-19  Bob Wilson  <bob.wilson@acm.org>
 	
 	* dwarf2dbg.c (dwarf2_consume_line_info): New.
diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
index 97a60c7883..96da797e60 100644
--- a/gas/dwarf2dbg.c
+++ b/gas/dwarf2dbg.c
@@ -419,17 +419,11 @@ dwarf2_emit_label (symbolS *label)
   if (debug_type == DEBUG_DWARF2)
     dwarf2_where (&loc);
   else
-    {
-      loc = current;
-      loc_directive_seen = FALSE;
-    }
+    loc = current;
 
   loc.flags |= DWARF2_FLAG_BASIC_BLOCK;
 
-  current.flags &= ~(DWARF2_FLAG_BASIC_BLOCK
-		     | DWARF2_FLAG_PROLOGUE_END
-		     | DWARF2_FLAG_EPILOGUE_BEGIN);
-
+  dwarf2_consume_line_info ();
   dwarf2_gen_line_info_1 (label, &loc);
 }