* dwarf2read.c (dwarf_decode_lines): Recognize and ignore

	DW_LNE_set_discriminator.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dbe9a55b57874d57d25ef2355eb75b808e612ef4..537fea8bdc66f402e6052e94d8562475b9c47e6d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-10  Cary Coutant  <ccoutant@google.com>
+
+       * dwarf2read.c (dwarf_decode_lines): Recognize and ignore
+       DW_LNE_set_discriminator.
+
 2009-06-10  Pierre Muller  <muller@ics.u-strasbg.fr>
 
        * breakpoint.c: ARI fixes.

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 9267148ff7a97a8919073c5e192a6a2adbea665e..6da8f4ed9efac9ca4cf889c6ab3abfc9fe6b20ac 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -7357,6 +7357,11 @@ dwarf_decode_lines (struct line_header *lh, char *comp_dir, bfd *abfd,
                     add_file_name (lh, cur_file, dir_index, mod_time, length);
                   }
                  break;
+               case DW_LNE_set_discriminator:
+                 /* The discriminator is not interesting to the debugger;
+                    just ignore it.  */
+                 line_ptr = extended_end;
+                 break;
                default:
                  complaint (&symfile_complaints,
                             _("mangled .debug_line section"));