gas: Make dwarf2dbg.c versions specific and add DW_AT_high_pc case for DWARF 4+.

    * dwarf2dbg.c (DWARF2_ARANGES_VERSION): New define to 2.
    (DWARF2_LINE_VERSION): Likewise.
    (out_debug_line): Use DWARF2_LINE_VERSION not DWARF2_VERSION.
    (out_debug_aranges): Use DWARF2_ARANGES_VERSION not DWARF2_VERSION.
    (out_debug_abbrev): Use DW_FORM_data for DW_AT_high_pc when
    DWARF2_VERSION >= 4.
    (out_debug_info): Use difference between start and end as data
    value for DW_AT_high_pc when DWARF2_VERSION >= 4.
    * config/tc-ia64.h (DWARF2_LINE_VERSION): Override it.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5eee5d3923c58b13cc81489288f0dc5f7b709f9a..7e642335cd543c8bbf872bc076cbc1a9f0f37c60 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,15 @@
+2012-04-26  Mark Wielaard  <mjw@redhat.com>
+
+       * dwarf2dbg.c (DWARF2_ARANGES_VERSION): New define to 2.
+       (DWARF2_LINE_VERSION): Likewise.
+       (out_debug_line): Use DWARF2_LINE_VERSION not DWARF2_VERSION.
+       (out_debug_aranges): Use DWARF2_ARANGES_VERSION not DWARF2_VERSION.
+       (out_debug_abbrev): Use DW_FORM_data for DW_AT_high_pc when
+       DWARF2_VERSION >= 4.
+       (out_debug_info): Use difference between start and end as data
+       value for DW_AT_high_pc when DWARF2_VERSION >= 4.
+       * config/tc-ia64.h (DWARF2_LINE_VERSION): Override it.
+
 2012-04-27  David S. Miller  <davem@davemloft.net>
 
        * doc/c-sparc.text: Document %l34 and %h34.

diff --git a/gas/config/tc-ia64.h b/gas/config/tc-ia64.h
index 96618e9ab757146a865ca3d2775a0fca96fe1788..7cade49621f967f1021717e74a98c85c41d5eb62 100644 (file)
--- a/gas/config/tc-ia64.h
+++ b/gas/config/tc-ia64.h
@@ -327,4 +327,5 @@ typedef struct unwind_record
 /* VMS backtraces expect dwarf version 3.  */
 #ifdef TE_VMS
 #define DWARF2_VERSION 3
+#define DWARF2_LINE_VERSION 3
 #endif

diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
index 76f5e84f53fa903547e08504fab5682a8fa3450c..f428f0d12230ee3c17957ce857b64ff991c3228a 100644 (file)
--- a/gas/dwarf2dbg.c
+++ b/gas/dwarf2dbg.c
@@ -93,6 +93,16 @@
 #define DWARF2_VERSION 2
 #endif
 
+/* The .debug_aranges version has been 2 in DWARF version 2, 3 and 4. */
+#ifndef DWARF2_ARANGES_VERSION
+#define DWARF2_ARANGES_VERSION 2
+#endif
+
+/* This implementation output version 2 .debug_line information. */
+#ifndef DWARF2_LINE_VERSION
+#define DWARF2_LINE_VERSION 2
+#endif
+
 #include "subsegs.h"
 
 #include "dwarf2.h"
@@ -1457,7 +1467,7 @@ out_debug_line (segT line_seg)
   line_end = exp.X_add_symbol;
 
   /* Version.  */
-  out_two (DWARF2_VERSION);
+  out_two (DWARF2_LINE_VERSION);
 
   /* Length of the prologue following this length.  */
   prologue_end = symbol_temp_make ();
@@ -1565,7 +1575,7 @@ out_debug_aranges (segT aranges_seg, segT info_seg)
   aranges_end = exp.X_add_symbol;
 
   /* Version.  */
-  out_two (DWARF2_VERSION);
+  out_two (DWARF2_ARANGES_VERSION);
 
   /* Offset to .debug_info.  */
   TC_DWARF2_EMIT_OFFSET (section_symbol (info_seg), sizeof_offset);
@@ -1631,7 +1641,11 @@ out_debug_abbrev (segT abbrev_seg,
   if (all_segs->next == NULL)
     {
       out_abbrev (DW_AT_low_pc, DW_FORM_addr);
-      out_abbrev (DW_AT_high_pc, DW_FORM_addr);
+      if (DWARF2_VERSION < 4)
+       out_abbrev (DW_AT_high_pc, DW_FORM_addr);
+      else
+       out_abbrev (DW_AT_high_pc, (sizeof_address == 4
+                                   ? DW_FORM_data4 : DW_FORM_data8));
     }
   else
     {
@@ -1694,7 +1708,13 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT ranges_seg)
       emit_expr (&exp, sizeof_address);
 
       /* DW_AT_high_pc */
-      exp.X_op = O_symbol;
+      if (DWARF2_VERSION < 4)
+       exp.X_op = O_symbol;
+      else
+       {
+         exp.X_op = O_subtract;
+         exp.X_op_symbol = all_segs->text_start;
+       }
       exp.X_add_symbol = all_segs->text_end;
       exp.X_add_number = 0;
       emit_expr (&exp, sizeof_address);