* dwarf2dbg.c (process_entries): Don't optimize redundant line notes.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index d75371ef84d36e05d337486144b5b1184b127409..901e73e92807b21d0894a81117edac3b7f004cbd 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-12  Jason Merrill  <jason_merrill@redhat.com>
+
+       * dwarf2dbg.c (process_entries): Don't optimize redundant line notes.
+
 2001-04-12  Alexandre Oliva  <aoliva@redhat.com>
 
        * expr.c (operand): Pass &c to md_parse_name().

diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
index f902b153962696c2790f0bb9c01a88ee4676a0bc..8607e214c0a1e05a6fa2813c16342c691d33231d 100644 (file)
--- a/gas/dwarf2dbg.c
+++ b/gas/dwarf2dbg.c
@@ -873,7 +873,11 @@ process_entries (seg, e)
          changed = 1;
        }
 
-      if (line != e->loc.line || changed)
+      /* Don't try to optimize away redundant entries; gdb wants two
+        entries for a function where the code starts on the same line as
+        the {, and there's no way to identify that case here.  Trust gcc
+        to optimize appropriately.  */
+      if (1 /* line != e->loc.line || changed */)
        {
          int line_delta = e->loc.line - line;
          if (frag == NULL)