SWitch over to using dwarf2_generate_asm_lineno

2 files changed, 9 insertions, 15 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 904db39954..a841ee4195 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-02  Nick Clifton  <nickc@redhat.com>
+
+	* config/tc-mn10300.c (debug_line): Remove this static
+	varaible.
+	(md_assemble): Call dwarf2_generate_asm_lineno instead of
+	dwarf2_where and dwarf2_gen_line_info.
+
+
 2000-11-02  Theo Honohan  <th@futuretv.com>
 
 	* config/tc-arm.c (do_msr): Improve error message. 
diff --git a/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c
index 5137bf41b8..c865b8561d 100644
--- a/gas/config/tc-mn10300.c
+++ b/gas/config/tc-mn10300.c
@@ -32,8 +32,6 @@ struct reg_name
   int value;
 };
 
-struct dwarf2_line_info debug_line;
-
 /* Generic assembler global variables which must be defined by all
    targets.  */
 
@@ -1792,19 +1790,7 @@ keep_going:
     }
 
   if (debug_type == DEBUG_DWARF2)
-    {
-      bfd_vma addr;
-
-      /* First update the notion of the current source line.  */
-      dwarf2_where (&debug_line);
-
-      /* We want the offset of the start of this instruction within the
-         the current frag.  */
-      addr = frag_now->fr_address + frag_now_fix () - real_size;
-
-      /* And record the information.  */
-      dwarf2_gen_line_info (addr, &debug_line);
-    }
+    dwarf2_generate_asm_lineno (real_size);
 }
 
 /* If while processing a fixup, a reloc really needs to be created