binutils/

	* dwarf.c (process_debug_info): Display abbrev offset in hex.
	(display_debug_abbrev): Show offset of abbrev.

binutils/testsuite/
	* binutils-all/objdump.W: Update.
	* binutils-all/readelf.wa: Update.
	* binutils-all/i386/compressed-1a.d: Update.
	* binutils-all/x86-64/compressed-1a.d: Update.

gas/testsuite/
	* gas/elf/dwarf2-1.d: Update.
	* gas/elf/dwarf2-2.d: Update.
	* gas/i386/dw2-compress-1.d: Update.

11 files changed, 37 insertions, 16 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 1469e219ea..17c194c0a4 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,10 @@
 2012-05-17  Alan Modra  <amodra@gmail.com>
 
+	* dwarf.c (process_debug_info): Display abbrev offset in hex.
+	(display_debug_abbrev): Show offset of abbrev.
+
+2012-05-17  Alan Modra  <amodra@gmail.com>
+
 	* dwarf.c (display_debug_ranges): Don't report more than one use
 	of the same range set as an overlap.
 
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 54c94bcb1a..072a1a7506 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -2061,8 +2061,8 @@ process_debug_info (struct dwarf_section *section,
 		  dwarf_vmatoa ("x", compunit.cu_length),
 		  offset_size == 8 ? "64-bit" : "32-bit");
 	  printf (_("   Version:       %d\n"), compunit.cu_version);
-	  printf (_("   Abbrev Offset: %s\n"),
-		  dwarf_vmatoa ("d", compunit.cu_abbrev_offset));
+	  printf (_("   Abbrev Offset: 0x%s\n"),
+		  dwarf_vmatoa ("x", compunit.cu_abbrev_offset));
 	  printf (_("   Pointer Size:  %d\n"), compunit.cu_pointer_size);
 	  if (do_types)
 	    {
@@ -3681,14 +3681,17 @@ display_debug_abbrev (struct dwarf_section *section,
 
   do
     {
+      unsigned char *last;
+
       free_abbrevs ();
 
+      last = start;
       start = process_abbrev_section (start, end);
 
       if (first_abbrev == NULL)
 	continue;
 
-      printf (_("  Number TAG\n"));
+      printf (_("  Number TAG (0x%lx)\n"), (long) (last - section->start));
 
       for (entry = first_abbrev; entry; entry = entry->next)
 	{
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 67c353e540..879425e461 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-17  Alan Modra  <amodra@gmail.com>
+
+	* binutils-all/objdump.W: Update.
+	* binutils-all/readelf.wa: Update.
+	* binutils-all/i386/compressed-1a.d: Update.
+	* binutils-all/x86-64/compressed-1a.d: Update.
+
 2012-05-16  Meador Inge  <meadori@codesourcery.com>
 
 	* binutils-all/arm/objdump.exp:
diff --git a/binutils/testsuite/binutils-all/i386/compressed-1a.d b/binutils/testsuite/binutils-all/i386/compressed-1a.d
index 3a626b471d..aa0284ad68 100644
--- a/binutils/testsuite/binutils-all/i386/compressed-1a.d
+++ b/binutils/testsuite/binutils-all/i386/compressed-1a.d
@@ -7,7 +7,7 @@
 
 Contents of the .[z]?debug_abbrev section:
 
-  Number TAG
+  Number TAG \(0x0\)
    1      DW_TAG_compile_unit    \[has children\]
     DW_AT_producer     DW_FORM_strp
     DW_AT_language     DW_FORM_data1
@@ -30,7 +30,7 @@ Contents of the .[z]?debug_info section:
   Compilation Unit @ offset 0x0:
    Length:        0x46 \(32-bit\)
    Version:       3
-   Abbrev Offset: 0
+   Abbrev Offset: 0x0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
     <c>   DW_AT_producer    : \(indirect string, offset: 0x0\): GNU C 4.4.4	
diff --git a/binutils/testsuite/binutils-all/objdump.W b/binutils/testsuite/binutils-all/objdump.W
index 5b58fb4f7a..449372eaed 100644
--- a/binutils/testsuite/binutils-all/objdump.W
+++ b/binutils/testsuite/binutils-all/objdump.W
@@ -6,7 +6,7 @@ Contents of the .debug_info section:
   Compilation Unit @ offset 0x0:
    Length:        0x4e \(32-bit\)
    Version:       2
-   Abbrev Offset: 0
+   Abbrev Offset: 0x0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
     <c>   DW_AT_stmt_list   : 0x0	
@@ -75,7 +75,7 @@ Raw dump of debug contents of section .debug_line:
 
 Contents of the .debug_abbrev section:
 
-  Number TAG
+  Number TAG \(0x0\)
    1      DW_TAG_compile_unit    \[has children\]
     DW_AT_stmt_list    DW_FORM_data4
     DW_AT_high_pc      DW_FORM_addr
diff --git a/binutils/testsuite/binutils-all/readelf.wa b/binutils/testsuite/binutils-all/readelf.wa
index 63892a4dcf..e1e158ccbe 100644
--- a/binutils/testsuite/binutils-all/readelf.wa
+++ b/binutils/testsuite/binutils-all/readelf.wa
@@ -1,6 +1,6 @@
 Contents of the .zdebug_abbrev section:
 
-  Number TAG
+  Number TAG (0x0)
    1      DW_TAG_compile_unit    [has children]
     DW_AT_stmt_list    DW_FORM_data4
     DW_AT_high_pc      DW_FORM_addr
diff --git a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
index 4176f6dd0d..98115aff89 100644
--- a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
+++ b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
@@ -7,7 +7,7 @@
 
 Contents of the .[z]?debug_abbrev section:
 
-  Number TAG
+  Number TAG \(0x0\)
    1      DW_TAG_compile_unit    \[has children\]
     DW_AT_producer     DW_FORM_strp
     DW_AT_language     DW_FORM_data1
@@ -30,7 +30,7 @@ Contents of the .[z]?debug_info section:
   Compilation Unit @ offset 0x0:
    Length:        0x5e \(32-bit\)
    Version:       3
-   Abbrev Offset: 0
+   Abbrev Offset: 0x0
    Pointer Size:  8
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
     <c>   DW_AT_producer    : \(indirect string, offset: 0x0\): GNU C 4.4.4	
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 15b6cd0d3a..9c5e32807d 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2012-05-17  Alan Modra  <amodra@gmail.com>
 
+	* gas/elf/dwarf2-1.d: Update.
+	* gas/elf/dwarf2-2.d: Update.
+	* gas/i386/dw2-compress-1.d: Update.
+
+2012-05-17  Alan Modra  <amodra@gmail.com>
+
 	* gas/ppc/vle.d: Pass -a32 to assembler.
 	* gas/ppc/vle-reloc.d: Likewise.
 	* gas/ppc/vle-simple-1.d: Likewise, also match wider addresses.
diff --git a/gas/testsuite/gas/elf/dwarf2-1.d b/gas/testsuite/gas/elf/dwarf2-1.d
index b691bfd7e8..ff0ff74c31 100644
--- a/gas/testsuite/gas/elf/dwarf2-1.d
+++ b/gas/testsuite/gas/elf/dwarf2-1.d
@@ -8,7 +8,7 @@ Contents of the .[z]?debug_info section:
   Compilation Unit @ offset 0x0:
    Length:        0x4e \(32-bit\)
    Version:       2
-   Abbrev Offset: 0
+   Abbrev Offset: 0x0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
     <c>   DW_AT_stmt_list   : 0x0	
@@ -77,7 +77,7 @@ Raw dump of debug contents of section .[z]?debug_line:
 
 Contents of the .[z]?debug_abbrev section:
 
-  Number TAG
+  Number TAG \(0x0\)
    1      DW_TAG_compile_unit    \[has children\]
     DW_AT_stmt_list    DW_FORM_data4
     DW_AT_high_pc      DW_FORM_addr
diff --git a/gas/testsuite/gas/elf/dwarf2-2.d b/gas/testsuite/gas/elf/dwarf2-2.d
index 3b3a341d8e..2feafa691e 100644
--- a/gas/testsuite/gas/elf/dwarf2-2.d
+++ b/gas/testsuite/gas/elf/dwarf2-2.d
@@ -8,7 +8,7 @@ Contents of the .[z]?debug_info section:
   Compilation Unit @ offset 0x0:
    Length:        0x4e \(32-bit\)
    Version:       2
-   Abbrev Offset: 0
+   Abbrev Offset: 0x0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
     <c>   DW_AT_stmt_list   : 0x0	
@@ -77,7 +77,7 @@ Raw dump of debug contents of section .[z]?debug_line:
 
 Contents of the .[z]?debug_abbrev section:
 
-  Number TAG
+  Number TAG \(0x0\)
    1      DW_TAG_compile_unit    \[has children\]
     DW_AT_stmt_list    DW_FORM_data4
     DW_AT_high_pc      DW_FORM_addr
diff --git a/gas/testsuite/gas/i386/dw2-compress-1.d b/gas/testsuite/gas/i386/dw2-compress-1.d
index f47e58ccff..06057cac7e 100644
--- a/gas/testsuite/gas/i386/dw2-compress-1.d
+++ b/gas/testsuite/gas/i386/dw2-compress-1.d
@@ -7,7 +7,7 @@ Contents of the .zdebug_info section:
   Compilation Unit @ offset 0x0:
    Length:        0x4e \(32-bit\)
    Version:       2
-   Abbrev Offset: 0
+   Abbrev Offset: 0x0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
     <c>   DW_AT_stmt_list   : 0x0	
@@ -32,7 +32,7 @@ Contents of the .zdebug_info section:
 
 Contents of the .zdebug_abbrev section:
 
-  Number TAG
+  Number TAG \(0x0\)
    1      DW_TAG_compile_unit    \[has children\]
     DW_AT_stmt_list    DW_FORM_data4
     DW_AT_high_pc      DW_FORM_addr