merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index d0d196b470288596729a5c7d2e515a3dd51d3f19..aad44435fe2fa3c50c55d6278a2be97a81f38e16 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-18  Doug Evans  <dje@google.com>
+
+       * dwarf2.def (DW_OP): Add DW_OP_GNU_const_index.
+
 2012-06-12  Rafael Ávila de Espíndola <respindola@mozilla.com>
 
        * plugin-api.h (ld_plugin_output_file_type): Add LDPO_PIE.

diff --git a/include/dwarf2.def b/include/dwarf2.def
index e9a8bcac0858f73d15c20e9a9f3a15f81aa5d152..3c3dfccf35e30acd6f2e5e1840386d95c543af3c 100644 (file)
--- a/include/dwarf2.def
+++ b/include/dwarf2.def
@@ -588,6 +588,7 @@ DW_OP (DW_OP_GNU_reinterpret, 0xf9)
 DW_OP (DW_OP_GNU_parameter_ref, 0xfa)
 /* Extension for Fission.  See http://gcc.gnu.org/wiki/DebugFission.  */
 DW_OP (DW_OP_GNU_addr_index, 0xfb)
+DW_OP (DW_OP_GNU_const_index, 0xfc)
 /* HP extensions.  */
 DW_OP_DUP (DW_OP_HP_unknown, 0xe0) /* Ouch, the same as GNU_push_tls_address.  */
 DW_OP (DW_OP_HP_is_value, 0xe1)