include/elf/

	 * dwarf2.h (DW_LNE_set_discriminator): New enum value.

binutils/

	* dwarf.c (process_extended_line_op): Add DW_LNE_set_discriminator.
	Add missing newlines to HP extensions.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 73c05c8..0e2d554 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-24  Cary Coutant  <ccoutant@google.com>
+
+       * dwarf.c (process_extended_line_op): Add DW_LNE_set_discriminator.
+       Add missing newlines to HP extensions.
+
 2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
 
        * objcopy.c (set_pe_subsystem): Replace efi-rom with sal-rtd.

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 72efe3e..c8b10f0 100644 (file)
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -328,36 +328,41 @@ process_extended_line_op (unsigned char *data, int is_stmt)
       printf (_("%s\n\n"), name);
       break;
 
+    case DW_LNE_set_discriminator:
+      printf (_("set Discriminator to %lu\n"),
+              read_leb128 (data, & bytes_read, 0));
+      break;
+
     /* HP extensions.  */
     case DW_LNE_HP_negate_is_UV_update:
-      printf ("DW_LNE_HP_negate_is_UV_update");
+      printf ("DW_LNE_HP_negate_is_UV_update\n");
       break;
     case DW_LNE_HP_push_context:
-      printf ("DW_LNE_HP_push_context");
+      printf ("DW_LNE_HP_push_context\n");
       break;
     case DW_LNE_HP_pop_context:
-      printf ("DW_LNE_HP_pop_context");
+      printf ("DW_LNE_HP_pop_context\n");
       break;
     case DW_LNE_HP_set_file_line_column:
-      printf ("DW_LNE_HP_set_file_line_column");
+      printf ("DW_LNE_HP_set_file_line_column\n");
       break;
     case DW_LNE_HP_set_routine_name:
-      printf ("DW_LNE_HP_set_routine_name");
+      printf ("DW_LNE_HP_set_routine_name\n");
       break;
     case DW_LNE_HP_set_sequence:
-      printf ("DW_LNE_HP_set_sequence");
+      printf ("DW_LNE_HP_set_sequence\n");
       break;
     case DW_LNE_HP_negate_post_semantics:
-      printf ("DW_LNE_HP_negate_post_semantics");
+      printf ("DW_LNE_HP_negate_post_semantics\n");
       break;
     case DW_LNE_HP_negate_function_exit:
-      printf ("DW_LNE_HP_negate_function_exit");
+      printf ("DW_LNE_HP_negate_function_exit\n");
       break;
     case DW_LNE_HP_negate_front_end_logical:
-      printf ("DW_LNE_HP_negate_front_end_logical");
+      printf ("DW_LNE_HP_negate_front_end_logical\n");
       break;
     case DW_LNE_HP_define_proc:
-      printf ("DW_LNE_HP_define_proc");
+      printf ("DW_LNE_HP_define_proc\n");
       break;
 
     default:

diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index c7dc5e3..eeaa880 100644 (file)
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-24  Cary Coutant  <ccoutant@google.com>
+
+        * dwarf2.h (DW_LNE_set_discriminator): New enum value.
+
 2009-04-15  Anthony Green  <green@moxielogic.com>
 
        * common.h (EM_MOXIE): Define.

diff --git a/include/elf/dwarf2.h b/include/elf/dwarf2.h
index f8d010b..a7448dc 100644 (file)
--- a/include/elf/dwarf2.h
+++ b/include/elf/dwarf2.h
@@ -709,6 +709,7 @@ enum dwarf_line_number_x_ops
     DW_LNE_end_sequence = 1,
     DW_LNE_set_address = 2,
     DW_LNE_define_file = 3,
+    DW_LNE_set_discriminator = 4,
     /* HP extensions.  */
     DW_LNE_HP_negate_is_UV_update      = 0x11,
     DW_LNE_HP_push_context             = 0x12,