merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 1d5ac5740cc77c3f03326bd1cbbbb55314dc9138..48c40083460e44b6057bf101d07883c31dcfa106 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-09  Jakub Jelinek  <jakub@redhat.com>
+
+       * dwarf2.h (enum dwarf_location_atom): Add DW_OP_implicit_value
+       and DW_OP_stack_value.
+
 2009-07-09  Tom Tromey  <tromey@redhat.com>
 
        * elf/dwarf2.h: Remove, renaming to...

diff --git a/include/dwarf2.h b/include/dwarf2.h
index f0dbfd28f72760bdab1de26a6981b1a401d0eb10..702110406fde825c44c25bba88e86aa6969e1184 100644 (file)
--- a/include/dwarf2.h
+++ b/include/dwarf2.h
@@ -548,6 +548,10 @@ enum dwarf_location_atom
     DW_OP_call_frame_cfa = 0x9c,
     DW_OP_bit_piece = 0x9d,
 
+    /* DWARF 4 extensions.  */
+    DW_OP_implicit_value = 0x9e,
+    DW_OP_stack_value = 0x9f,
+
     DW_OP_lo_user = 0xe0,      /* Implementation-defined range start.  */
     DW_OP_hi_user = 0xff,      /* Implementation-defined range end.  */