readelf: print 0x0 as 0, and remove trailing spaces

This changes readelf output a little, removing the 0x prefix on hex
output when the value is 0, except in cases where a fixed field
width is shown.  %#010x is not a good replacement for 0x%08x.

21 files changed, 197 insertions, 197 deletions

diff --git a/binutils/testsuite/binutils-all/dw2-1.W b/binutils/testsuite/binutils-all/dw2-1.W
index dba0483..b11596f 100644
--- a/binutils/testsuite/binutils-all/dw2-1.W
+++ b/binutils/testsuite/binutils-all/dw2-1.W
@@ -3,13 +3,13 @@
 
 Contents of the .z?debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x4e \(32-bit\)
    Version:       2
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
-    <c>   DW_AT_stmt_list   : 0x0
+    <c>   DW_AT_stmt_list   : (0x)?0
     <10>   DW_AT_high_pc     : 0x.
     <14>   DW_AT_low_pc      : 0x.
     <18>   DW_AT_name        : file1.txt
@@ -32,7 +32,7 @@ Contents of the .z?debug_info section:
 
 Raw dump of debug contents of section .z?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      62
   DWARF Version:               2
   Prologue Length:             35
@@ -76,7 +76,7 @@ Raw dump of debug contents of section .z?debug_line:
 
 Contents of the .debug_abbrev section:
 
-  Number TAG \(0x0\)
+  Number TAG \((0x)?0\)
    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/dw2-3.W b/binutils/testsuite/binutils-all/dw2-3.W
index 37fd418..bfff6d4 100644
--- a/binutils/testsuite/binutils-all/dw2-3.W
+++ b/binutils/testsuite/binutils-all/dw2-3.W
@@ -3,15 +3,15 @@
 
 Contents of the .z?debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x5e \(32-bit\)
    Version:       2
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
-    <c>   DW_AT_stmt_list   : 0x0
+    <c>   DW_AT_stmt_list   : (0x)?0
     <10>   DW_AT_high_pc     : 0x4
-    <14>   DW_AT_low_pc      : 0x0
+    <14>   DW_AT_low_pc      : (0x)?0
     <18>   DW_AT_name        : file1.txt
     <22>   DW_AT_producer    : GNU C 3.3.3
     <2e>   DW_AT_language    : 1	\(ANSI C\)
@@ -21,7 +21,7 @@ Contents of the .z?debug_info section:
     <32>   DW_AT_decl_line   : 2
     <33>   DW_AT_name        : func_cu1
     <3c>   DW_AT_type        : <0x85>
-    <40>   DW_AT_low_pc      : 0x0
+    <40>   DW_AT_low_pc      : (0x)?0
     <44>   DW_AT_high_pc     : 0x4
     <48>   DW_AT_frame_base  : 1 byte block: 55 	\(DW_OP_reg5 \([^()]*\)\)
  <1><4a>: Abbrev Number: 3 \(DW_TAG_base_type\)
@@ -58,7 +58,7 @@ Contents of the .z?debug_info section:
 
 Contents of the .z?debug_abbrev section:
 
-  Number TAG \(0x0\)
+  Number TAG \((0x)?0\)
    1      DW_TAG_compile_unit    \[has children\]
     DW_AT_stmt_list    DW_FORM_data4
     DW_AT_high_pc      DW_FORM_addr
@@ -112,7 +112,7 @@ Contents of the .z?debug_abbrev section:
 
 Raw dump of debug contents of section .z?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      62
   DWARF Version:               2
   Prologue Length:             35
@@ -146,7 +146,7 @@ Raw dump of debug contents of section .z?debug_line:
   1	0	0	0	file1.txt
 
  Line Number Statements:
-  \[0x0000002d\]  Extended opcode 2: set Address to 0x0
+  \[0x0000002d\]  Extended opcode 2: set Address to (0x)?0
   \[0x00000034\]  Advance Line by 3 to 4
   \[0x00000036\]  Copy
   \[0x00000037\]  Copy \(view 1\)
diff --git a/binutils/testsuite/binutils-all/dw2-3gabi.W b/binutils/testsuite/binutils-all/dw2-3gabi.W
index 5663517..a53fab6 100644
--- a/binutils/testsuite/binutils-all/dw2-3gabi.W
+++ b/binutils/testsuite/binutils-all/dw2-3gabi.W
@@ -3,15 +3,15 @@
 
 Contents of the .debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x5e \(32-bit\)
    Version:       2
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
-    <c>   DW_AT_stmt_list   : 0x0
+    <c>   DW_AT_stmt_list   : (0x)?0
     <10>   DW_AT_high_pc     : 0x4
-    <14>   DW_AT_low_pc      : 0x0
+    <14>   DW_AT_low_pc      : (0x)?0
     <18>   DW_AT_name        : file1.txt
     <22>   DW_AT_producer    : GNU C 3.3.3
     <2e>   DW_AT_language    : 1	\(ANSI C\)
@@ -21,7 +21,7 @@ Contents of the .debug_info section:
     <32>   DW_AT_decl_line   : 2
     <33>   DW_AT_name        : func_cu1
     <3c>   DW_AT_type        : <0x85>
-    <40>   DW_AT_low_pc      : 0x0
+    <40>   DW_AT_low_pc      : (0x)?0
     <44>   DW_AT_high_pc     : 0x4
     <48>   DW_AT_frame_base  : 1 byte block: 55 	\(DW_OP_reg5 \([^()]*\)\)
  <1><4a>: Abbrev Number: 3 \(DW_TAG_base_type\)
@@ -58,7 +58,7 @@ Contents of the .debug_info section:
 
 Contents of the .debug_abbrev section:
 
-  Number TAG \(0x0\)
+  Number TAG \((0x)?0\)
    1      DW_TAG_compile_unit    \[has children\]
     DW_AT_stmt_list    DW_FORM_data4
     DW_AT_high_pc      DW_FORM_addr
@@ -112,7 +112,7 @@ Contents of the .debug_abbrev section:
 
 Raw dump of debug contents of section .debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      62
   DWARF Version:               2
   Prologue Length:             35
@@ -146,7 +146,7 @@ Raw dump of debug contents of section .debug_line:
   1	0	0	0	file1.txt
 
  Line Number Statements:
-  \[0x0000002d\]  Extended opcode 2: set Address to 0x0
+  \[0x0000002d\]  Extended opcode 2: set Address to (0x)?0
   \[0x00000034\]  Advance Line by 3 to 4
   \[0x00000036\]  Copy
   \[0x00000037\]  Copy \(view 1\)
diff --git a/binutils/testsuite/binutils-all/dw2-ranges.W b/binutils/testsuite/binutils-all/dw2-ranges.W
index 4dfd248..bdf08f6 100644
--- a/binutils/testsuite/binutils-all/dw2-ranges.W
+++ b/binutils/testsuite/binutils-all/dw2-ranges.W
@@ -5,7 +5,7 @@ Contents of the \.debug_ranges section:
 
     Offset   Begin    End
     00000000 ffffffff 00000004 \(base address\)
-    00000000 00000004 00000008 
+    00000000 00000004 00000008 ?
     00000000 ffffffff 00000008 \(base address\)
-    00000000 00000008 0000000c 
+    00000000 00000008 0000000c ?
     00000000 <End of list>
diff --git a/binutils/testsuite/binutils-all/dw5-op.W b/binutils/testsuite/binutils-all/dw5-op.W
index 544a071..f1406c1 100644
--- a/binutils/testsuite/binutils-all/dw5-op.W
+++ b/binutils/testsuite/binutils-all/dw5-op.W
@@ -1,23 +1,23 @@
 Contents of the .debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x4e \(32-bit\)
    Version:       5
    Unit Type:     DW_UT_compile \(1\)
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  8
  <0><c>: Abbrev Number: 3 \(DW_TAG_compile_unit\)
     <d>   DW_AT_producer    : \(indirect string, offset: 0xa\): GNU C11 7.0.1 20170218 \(experimental\) -mtune=generic -march=x86-64 -gdwarf-5 -O2
     <11>   DW_AT_language    : 29	\(C11\)
     <12>   DW_AT_name        : \(indirect line string, offset: 0x2\): main.c
-    <16>   DW_AT_comp_dir    : \(indirect line string, offset: 0x0\): 
-    <1a>   DW_AT_ranges      : 0x0
-    <1e>   DW_AT_low_pc      : 0x0
-    <26>   DW_AT_stmt_list   : 0x0
+    <16>   DW_AT_comp_dir    : \(indirect line string, offset: (0x)?0\): 
+    <1a>   DW_AT_ranges      : (0x)?0
+    <1e>   DW_AT_low_pc      : (0x)?0
+    <26>   DW_AT_stmt_list   : (0x)?0
  <1><2a>: Abbrev Number: 1 \(DW_TAG_base_type\)
     <2b>   DW_AT_byte_size   : 4
     <2c>   DW_AT_encoding    : 5	\(signed\)
-    <2d>   DW_AT_name        : \(indirect string, offset: 0x0\): main
+    <2d>   DW_AT_name        : \(indirect string, offset: (0x)?0\): main
  <1><31>: Abbrev Number: 2 \(DW_TAG_variable\)
     <32>   DW_AT_name        : \(indirect string, offset: 0x5\): xvar
     <36>   DW_AT_decl_file   : 1
@@ -31,5 +31,5 @@ Contents of the .debug_info section:
     <4a>   DW_AT_decl_line   : 3
     <4b>   DW_AT_type        : <0x2a>
     <4f>   DW_AT_external    : 1
-    <4f>   DW_AT_location    :	\(DW_OP_addrx <0x0>\)
+    <4f>   DW_AT_location    :	\(DW_OP_addrx <(0x)?0>\)
 
diff --git a/binutils/testsuite/binutils-all/dw5.W b/binutils/testsuite/binutils-all/dw5.W
index bfcdac1..ff54134 100644
--- a/binutils/testsuite/binutils-all/dw5.W
+++ b/binutils/testsuite/binutils-all/dw5.W
@@ -1,19 +1,19 @@
 Contents of the .debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x160 \(32-bit\)
    Version:       5
    Unit Type:     DW_UT_compile \(1\)
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  8
  <0><c>: Abbrev Number: 6 \(DW_TAG_compile_unit\)
     <d>   DW_AT_producer    : \(indirect string, offset: 0x43\): GNU C11 7.0.1 20170218 \(experimental\) -mtune=generic -march=x86-64 -gdwarf-5 -O2
     <11>   DW_AT_language    : 29	\(C11\)
     <12>   DW_AT_name        : \(indirect line string, offset: 0x14\): main.c
-    <16>   DW_AT_comp_dir    : \(indirect line string, offset: 0x0\): 
+    <16>   DW_AT_comp_dir    : \(indirect line string, offset: (0x)?0\): 
     <1a>   DW_AT_ranges      : 0xc
-    <1e>   DW_AT_low_pc      : 0x0
-    <26>   DW_AT_stmt_list   : 0x0
+    <1e>   DW_AT_low_pc      : (0x)?0
+    <26>   DW_AT_stmt_list   : (0x)?0
  <1><2a>: Abbrev Number: 1 \(DW_TAG_base_type\)
     <2b>   DW_AT_byte_size   : 1
     <2c>   DW_AT_encoding    : 8	\(unsigned char\)
@@ -25,7 +25,7 @@ Contents of the .debug_info section:
  <1><38>: Abbrev Number: 1 \(DW_TAG_base_type\)
     <39>   DW_AT_byte_size   : 4
     <3a>   DW_AT_encoding    : 7	\(unsigned\)
-    <3b>   DW_AT_name        : \(indirect string, offset: 0x0\): unsigned int
+    <3b>   DW_AT_name        : \(indirect string, offset: (0x)?0\): unsigned int
  <1><3f>: Abbrev Number: 1 \(DW_TAG_base_type\)
     <40>   DW_AT_byte_size   : 8
     <41>   DW_AT_encoding    : 7	\(unsigned\)
@@ -172,7 +172,7 @@ Contents of the .debug_info section:
 
 Contents of the .debug_abbrev section:
 
-  Number TAG \(0x0\)
+  Number TAG \((0x)?0\)
    1      DW_TAG_base_type    \[no children\]
     DW_AT_byte_size    DW_FORM_data1
     DW_AT_encoding     DW_FORM_data1
@@ -289,7 +289,7 @@ Contents of the .debug_rnglists section:
 
 Raw dump of debug contents of section .debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      144
   DWARF Version:               5
   Address size \(bytes\):        8
@@ -318,7 +318,7 @@ Raw dump of debug contents of section .debug_line:
 
  The Directory Table \(offset 0x22, lines 3, columns 1\):
   Entry	Name
-  0	\(indirect line string, offset: 0x0\): 
+  0	\(indirect line string, offset: (0x)?0\): 
   1	\(indirect line string, offset: 0x1\): 
   2	\(indirect line string, offset: 0x22\): /usr/include
 
diff --git a/binutils/testsuite/binutils-all/dwarf-attributes.W b/binutils/testsuite/binutils-all/dwarf-attributes.W
index 4e8386a..cfc734c 100644
--- a/binutils/testsuite/binutils-all/dwarf-attributes.W
+++ b/binutils/testsuite/binutils-all/dwarf-attributes.W
@@ -1,10 +1,10 @@
 Contents of the .debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x40 \(32-bit\)
    Version:       5
    Unit Type:     DW_UT_compile \(1\)
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  4
  <0><c>: Abbrev Number: 1 \(User TAG value: 0x5555\)
     <d>   DW_AT_ordering    : 1	\(column major\)
diff --git a/binutils/testsuite/binutils-all/i386/compressed-1a.d b/binutils/testsuite/binutils-all/i386/compressed-1a.d
index bf04974..d8aabd6 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 \(0x0\)
+  Number TAG \((0x)?0\)
    1      DW_TAG_compile_unit    \[has children\]
     DW_AT_producer     DW_FORM_strp
     DW_AT_language     DW_FORM_data1
@@ -29,25 +29,25 @@ Contents of the .[z]?debug_abbrev section:
 
 Contents of the .[z]?debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x46 \(32-bit\)
    Version:       3
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    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
+    <c>   DW_AT_producer    : \(indirect string, offset: (0x)?0\): GNU C 4.4.4
     <10>   DW_AT_language    : 1	\(ANSI C\)
     <11>   DW_AT_name        : \(indirect string, offset: 0x18\): compressed-1.c
     <15>   DW_AT_comp_dir    : \(indirect string, offset: 0x16\): .
-    <19>   DW_AT_low_pc      : 0x0
+    <19>   DW_AT_low_pc      : (0x)?0
     <1d>   DW_AT_high_pc     : 0x1b
-    <21>   DW_AT_stmt_list   : 0x0
+    <21>   DW_AT_stmt_list   : (0x)?0
  <1><25>: Abbrev Number: 2 \(DW_TAG_subprogram\)
     <26>   DW_AT_external    : 1
     <27>   DW_AT_name        : \(indirect string, offset: 0xc\): foo2
     <2b>   DW_AT_decl_file   : 1
     <2c>   DW_AT_decl_line   : 10
-    <2d>   DW_AT_low_pc      : 0x0
+    <2d>   DW_AT_low_pc      : (0x)?0
     <31>   DW_AT_high_pc     : 0x2
     <35>   DW_AT_frame_base  : 1 byte block: 9c 	\(DW_OP_call_frame_cfa\)
  <1><37>: Abbrev Number: 2 \(DW_TAG_subprogram\)
@@ -62,7 +62,7 @@ Contents of the .[z]?debug_info section:
 
 Raw dump of debug contents of section .[z]?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      64
   DWARF Version:               .
   Prologue Length:             37
@@ -93,10 +93,10 @@ Raw dump of debug contents of section .[z]?debug_line:
   1	0	0	0	compressed-1.c
 
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
   \[0x.*\]  Advance Line by 10 to 11
   \[0x.*\]  Copy
-  \[0x.*\]  Special opcode 6: advance Address by 0 to 0x0 and Line by 1 to 12 \(view 1\)
+  \[0x.*\]  Special opcode 6: advance Address by 0 to (0x)?0 and Line by 1 to 12 \(view 1\)
   \[0x.*\]  Advance Line by -7 to 5
   \[0x.*\]  Special opcode 229: advance Address by 16 to 0x10 and Line by 0 to 5
   \[0x.*\]  Special opcode 49: advance Address by 3 to 0x13 and Line by 2 to 7
@@ -109,7 +109,7 @@ Contents of the .[z]?debug_pubnames section:
 
   Length:                              32
   Version:                             2
-  Offset into .[z]?debug_info section:     0x0
+  Offset into .[z]?debug_info section:     (0x)?0
   Size of area in .[z]?debug_info section: 74
 
     Offset	Name
@@ -120,13 +120,13 @@ Contents of the .[z]?debug_aranges section:
 
   Length:                   28
   Version:                  2
-  Offset into .[z]?debug_info:  0x0
+  Offset into .[z]?debug_info:  (0x)?0
   Pointer Size:             4
   Segment Size:             0
 
     Address    Length
-    00000000 0000001b 
-    00000000 00000000 
+    00000000 0000001b ?
+    00000000 00000000 ?
 
 Contents of the .[z]?debug_str section:
 
diff --git a/binutils/testsuite/binutils-all/libdw2-compressedgabi.out b/binutils/testsuite/binutils-all/libdw2-compressedgabi.out
index 7bc4629..70fe78f 100644
--- a/binutils/testsuite/binutils-all/libdw2-compressedgabi.out
+++ b/binutils/testsuite/binutils-all/libdw2-compressedgabi.out
@@ -4,13 +4,13 @@ dw2-1-compressedgabi.o: +file format .*
 
 Contents of the .debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x4e \(32-bit\)
    Version:       2
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
-    <c>   DW_AT_stmt_list   : 0x0
+    <c>   DW_AT_stmt_list   : (0x)?0
     <10>   DW_AT_high_pc     : 0x.
     <14>   DW_AT_low_pc      : 0x.
     <18>   DW_AT_name        : file1.txt
@@ -33,7 +33,7 @@ Contents of the .debug_info section:
 
 Raw dump of debug contents of section .debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      62
   DWARF Version:               2
   Prologue Length:             35
@@ -77,7 +77,7 @@ Raw dump of debug contents of section .debug_line:
 
 Contents of the .debug_abbrev section:
 
-  Number TAG \(0x0\)
+  Number TAG \((0x)?0\)
    1      DW_TAG_compile_unit    \[has children\]
     DW_AT_stmt_list    DW_FORM_data4
     DW_AT_high_pc      DW_FORM_addr
@@ -106,15 +106,15 @@ dw2-2-compressedgabi.o: +file format .*
 
 Contents of the .debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x4e \(32-bit\)
    Version:       2
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
-    <c>   DW_AT_stmt_list   : 0x0
+    <c>   DW_AT_stmt_list   : (0x)?0
     <10>   DW_AT_high_pc     : 0x4
-    <14>   DW_AT_low_pc      : 0x0
+    <14>   DW_AT_low_pc      : (0x)?0
     <18>   DW_AT_name        : file1.txt
     <22>   DW_AT_producer    : GNU C 3.3.3
     <2e>   DW_AT_language    : 1	\(ANSI C\)
@@ -124,7 +124,7 @@ Contents of the .debug_info section:
     <32>   DW_AT_decl_line   : 2
     <33>   DW_AT_name        : func_cu2
     <3c>   DW_AT_type        : <0x4a>
-    <40>   DW_AT_low_pc      : 0x0
+    <40>   DW_AT_low_pc      : (0x)?0
     <44>   DW_AT_high_pc     : 0x4
     <48>   DW_AT_frame_base  : 1 byte block: 55 	\(DW_OP_reg5 \(.*\)\)
  <1><4a>: Abbrev Number: 3 \(DW_TAG_base_type\)
@@ -135,7 +135,7 @@ Contents of the .debug_info section:
 
 Raw dump of debug contents of section .debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      62
   DWARF Version:               2
   Prologue Length:             35
@@ -169,7 +169,7 @@ Raw dump of debug contents of section .debug_line:
   1	0	0	0	file1.txt
 
  Line Number Statements:
-  \[0x0000002d\]  Extended opcode 2: set Address to 0x0
+  \[0x0000002d\]  Extended opcode 2: set Address to (0x)?0
   \[0x00000034\]  Advance Line by 3 to 4
   \[0x00000036\]  Copy
   \[0x00000037\]  Copy \(view 1\)
@@ -179,7 +179,7 @@ Raw dump of debug contents of section .debug_line:
 
 Contents of the .debug_abbrev section:
 
-  Number TAG \(0x0\)
+  Number TAG \((0x)?0\)
    1      DW_TAG_compile_unit    \[has children\]
     DW_AT_stmt_list    DW_FORM_data4
     DW_AT_high_pc      DW_FORM_addr
@@ -209,15 +209,15 @@ dw2-3-compressedgabi.o: +file format .*
 
 Contents of the .debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x5e \(32-bit\)
    Version:       2
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
-    <c>   DW_AT_stmt_list   : 0x0
+    <c>   DW_AT_stmt_list   : (0x)?0
     <10>   DW_AT_high_pc     : 0x4
-    <14>   DW_AT_low_pc      : 0x0
+    <14>   DW_AT_low_pc      : (0x)?0
     <18>   DW_AT_name        : file1.txt
     <22>   DW_AT_producer    : GNU C 3.3.3
     <2e>   DW_AT_language    : 1	\(ANSI C\)
@@ -227,7 +227,7 @@ Contents of the .debug_info section:
     <32>   DW_AT_decl_line   : 2
     <33>   DW_AT_name        : func_cu1
     <3c>   DW_AT_type        : <0x85>
-    <40>   DW_AT_low_pc      : 0x0
+    <40>   DW_AT_low_pc      : (0x)?0
     <44>   DW_AT_high_pc     : 0x4
     <48>   DW_AT_frame_base  : 1 byte block: 55 	\(DW_OP_reg5 \([^()]*\)\)
  <1><4a>: Abbrev Number: 3 \(DW_TAG_base_type\)
@@ -264,7 +264,7 @@ Contents of the .debug_info section:
 
 Contents of the .debug_abbrev section:
 
-  Number TAG \(0x0\)
+  Number TAG \((0x)?0\)
    1      DW_TAG_compile_unit    \[has children\]
     DW_AT_stmt_list    DW_FORM_data4
     DW_AT_high_pc      DW_FORM_addr
@@ -318,7 +318,7 @@ Contents of the .debug_abbrev section:
 
 Raw dump of debug contents of section .debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      62
   DWARF Version:               2
   Prologue Length:             35
@@ -352,7 +352,7 @@ Raw dump of debug contents of section .debug_line:
   1	0	0	0	file1.txt
 
  Line Number Statements:
-  \[0x0000002d\]  Extended opcode 2: set Address to 0x0
+  \[0x0000002d\]  Extended opcode 2: set Address to (0x)?0
   \[0x00000034\]  Advance Line by 3 to 4
   \[0x00000036\]  Copy
   \[0x00000037\]  Copy \(view 1\)
diff --git a/binutils/testsuite/binutils-all/objdump.W b/binutils/testsuite/binutils-all/objdump.W
index 8d21505..ddeeec9 100644
--- a/binutils/testsuite/binutils-all/objdump.W
+++ b/binutils/testsuite/binutils-all/objdump.W
@@ -3,13 +3,13 @@
 
 Contents of the .z?debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x4e \(32-bit\)
    Version:       2
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
-    <c>   DW_AT_stmt_list   : 0x0
+    <c>   DW_AT_stmt_list   : (0x)?0
     <10>   DW_AT_high_pc     : 0x.
     <14>   DW_AT_low_pc      : 0x.
     <18>   DW_AT_name        : file1.txt
@@ -32,7 +32,7 @@ Contents of the .z?debug_info section:
 
 Raw dump of debug contents of section .z?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      62
   DWARF Version:               2
   Prologue Length:             35
@@ -76,7 +76,7 @@ Raw dump of debug contents of section .z?debug_line:
 
 Contents of the .zdebug_abbrev section:
 
-  Number TAG \(0x0\)
+  Number TAG \((0x)?0\)
    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/objdump.WK2 b/binutils/testsuite/binutils-all/objdump.WK2
index be7817f..66c805d 100644
--- a/binutils/testsuite/binutils-all/objdump.WK2
+++ b/binutils/testsuite/binutils-all/objdump.WK2
@@ -14,13 +14,13 @@ Contents of the .debug_str section \(loaded from .*debuglink.o\):
 
 Contents of the .debug_info section \(loaded from .*debuglink.o\):
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x12 \(32-bit\)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
-    <c>   DW_AT_name        : \(indirect string, offset: 0x0\): string-1
+    <c>   DW_AT_name        : \(indirect string, offset: (0x)?0\): string-1
  <0><10>: Abbrev Number: 2 \(DW_TAG_subprogram\)
-    <11>   DW_AT_name        : \(alt indirect string, offset: 0x0\) string-3
+    <11>   DW_AT_name        : \(alt indirect string, offset: (0x)?0\) string-3
 #pass
diff --git a/binutils/testsuite/binutils-all/pr26112.r b/binutils/testsuite/binutils-all/pr26112.r
index f284413..30a86ae 100644
--- a/binutils/testsuite/binutils-all/pr26112.r
+++ b/binutils/testsuite/binutils-all/pr26112.r
@@ -1,9 +1,9 @@
 Contents of the .debug_macro section:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Version:                     5
   Offset size:                 4
-  Offset into .debug_line:     0x0
+  Offset into .debug_line:     (0x)?0
 
  DW_MACRO_start_file - lineno: 0 filenum: 1
  DW_MACRO_define_strx lineno : 1 macro : -
diff --git a/binutils/testsuite/binutils-all/pr26160.r b/binutils/testsuite/binutils-all/pr26160.r
index 1536e01..e8ec2ad 100644
--- a/binutils/testsuite/binutils-all/pr26160.r
+++ b/binutils/testsuite/binutils-all/pr26160.r
@@ -1,15 +1,15 @@
 Contents of the .debug_info.dwo section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x178 \(32-bit\)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  8
    Section contributions:
-    .debug_abbrev.dwo:       0x0  0x154
-    .debug_line.dwo:         0x0  0x40
-    .debug_loc.dwo:          0x0  0x0
-    .debug_str_offsets.dwo:  0x0  0x14
+    .debug_abbrev.dwo:       (0x)?0  0x154
+    .debug_line.dwo:         (0x)?0  0x40
+    .debug_loc.dwo:          (0x)?0  (0x)?0
+    .debug_str_offsets.dwo:  (0x)?0  0x14
  <0><b>: Abbrev Number: 12 \(DW_TAG_compile_unit\)
     <c>   DW_AT_producer    : GNU C\+\+ 4.7.x-google 20120720 \(prerelease\)
     <37>   DW_AT_language    : 4	\(C\+\+\)
@@ -30,7 +30,7 @@ Contents of the .debug_info.dwo section:
     <a5>   DW_AT_decl_file   : 1
     <a6>   DW_AT_decl_line   : 30
     <a7>   DW_AT_type        : <0x90>
-    <ab>   DW_AT_low_pc      : \(addr_index: 0x0\): <no .debug_addr section>
+    <ab>   DW_AT_low_pc      : \(addr_index: (0x)?0\): <no .debug_addr section>
     <ac>   DW_AT_high_pc     : 0x304
     <b4>   DW_AT_frame_base  : 1 byte block: 9c 	\(DW_OP_call_frame_cfa\)
     <b6>   DW_AT_GNU_all_tail_call_sites: 1
@@ -121,12 +121,12 @@ Contents of the .debug_info.dwo section:
   Compilation Unit @ offset 0x17c:
    Length:        0x5af \(32-bit\)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  8
    Section contributions:
     .debug_abbrev.dwo:       0x154  0x21d
     .debug_line.dwo:         0x40  0x3d
-    .debug_loc.dwo:          0x0  0x0
+    .debug_loc.dwo:          (0x)?0  (0x)?0
     .debug_str_offsets.dwo:  0x14  0x44
  <0><187>: Abbrev Number: 12 \(DW_TAG_compile_unit\)
     <188>   DW_AT_producer    : GNU C\+\+ 4.7.x-google 20120720 \(prerelease\)
@@ -141,7 +141,7 @@ Contents of the .debug_info.dwo section:
     <215>   DW_AT_sibling     : <0x242>
  <2><219>: Abbrev Number: 14 \(DW_TAG_subprogram\)
     <21a>   DW_AT_external    : 1
-    <21a>   DW_AT_name        : \(indexed string: 0x0\): testcase1
+    <21a>   DW_AT_name        : \(indexed string: (0x)?0\): testcase1
     <21b>   DW_AT_decl_file   : 1
     <21c>   DW_AT_decl_line   : 28
     <21d>   DW_AT_linkage_name: \(indexed string: 0xc\): _ZN2C19testcase1Ev
@@ -194,7 +194,7 @@ Contents of the .debug_info.dwo section:
     <267>   DW_AT_sibling     : <0x294>
  <2><26b>: Abbrev Number: 14 \(DW_TAG_subprogram\)
     <26c>   DW_AT_external    : 1
-    <26c>   DW_AT_name        : \(indexed string: 0x0\): testcase1
+    <26c>   DW_AT_name        : \(indexed string: (0x)?0\): testcase1
     <26d>   DW_AT_decl_file   : 1
     <26e>   DW_AT_decl_line   : 40
     <26f>   DW_AT_linkage_name: \(indexed string: 0x7\): _ZN2C29testcase1Ev
@@ -239,7 +239,7 @@ Contents of the .debug_info.dwo section:
     <2aa>   DW_AT_sibling     : <0x2cd>
  <2><2ae>: Abbrev Number: 14 \(DW_TAG_subprogram\)
     <2af>   DW_AT_external    : 1
-    <2af>   DW_AT_name        : \(indexed string: 0x0\): testcase1
+    <2af>   DW_AT_name        : \(indexed string: (0x)?0\): testcase1
     <2b0>   DW_AT_decl_file   : 1
     <2b1>   DW_AT_decl_line   : 50
     <2b2>   DW_AT_linkage_name: \(indexed string: 0x2\): _ZN2C39testcase1Ev
@@ -274,7 +274,7 @@ Contents of the .debug_info.dwo section:
     <2dd>   DW_AT_decl_file   : 1
     <2de>   DW_AT_decl_line   : 70
     <2df>   DW_AT_linkage_name: _Z4f13iv
-    <2e8>   DW_AT_low_pc      : \(addr_index: 0x0\): <no .debug_addr section>
+    <2e8>   DW_AT_low_pc      : \(addr_index: (0x)?0\): <no .debug_addr section>
     <2e9>   DW_AT_high_pc     : 0x6
     <2f1>   DW_AT_frame_base  : 1 byte block: 9c 	\(DW_OP_call_frame_cfa\)
     <2f3>   DW_AT_GNU_all_call_sites: 1
@@ -758,13 +758,13 @@ Contents of the .debug_info.dwo section:
   Compilation Unit @ offset 0x72f:
    Length:        0xcb \(32-bit\)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  8
    Section contributions:
     .debug_abbrev.dwo:       0x371  0xbd
     .debug_line.dwo:         0x7d  0x3e
-    .debug_loc.dwo:          0x0  0x0
-    .debug_str_offsets.dwo:  0x0  0x0
+    .debug_loc.dwo:          (0x)?0  (0x)?0
+    .debug_str_offsets.dwo:  (0x)?0  (0x)?0
  <0><73a>: Abbrev Number: 10 \(DW_TAG_compile_unit\)
     <73b>   DW_AT_producer    : GNU C\+\+ 4.7.x-google 20120720 \(prerelease\)
     <766>   DW_AT_language    : 4	\(C\+\+\)
@@ -786,7 +786,7 @@ Contents of the .debug_info.dwo section:
     <7d3>   DW_AT_decl_line   : 32
     <7d4>   DW_AT_linkage_name: _Z4t16av
     <7dd>   DW_AT_type        : <0x7c4>
-    <7e1>   DW_AT_low_pc      : \(addr_index: 0x0\): <no .debug_addr section>
+    <7e1>   DW_AT_low_pc      : \(addr_index: (0x)?0\): <no .debug_addr section>
     <7e2>   DW_AT_high_pc     : 0x13
     <7ea>   DW_AT_frame_base  : 1 byte block: 9c 	\(DW_OP_call_frame_cfa\)
     <7ec>   DW_AT_GNU_all_tail_call_sites: 1
@@ -801,12 +801,12 @@ Contents of the .debug_info.dwo section:
   Compilation Unit @ offset 0x7fe:
    Length:        0x329 \(32-bit\)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  8
    Section contributions:
     .debug_abbrev.dwo:       0x42e  0x1f2
     .debug_line.dwo:         0xbb  0x3d
-    .debug_loc.dwo:          0x0  0x0
+    .debug_loc.dwo:          (0x)?0  (0x)?0
     .debug_str_offsets.dwo:  0x58  0x18
  <0><809>: Abbrev Number: 12 \(DW_TAG_compile_unit\)
     <80a>   DW_AT_producer    : GNU C\+\+ 4.7.x-google 20120720 \(prerelease\)
@@ -878,7 +878,7 @@ Contents of the .debug_info.dwo section:
     <908>   DW_AT_decl_file   : 1
     <909>   DW_AT_decl_line   : 70
     <90a>   DW_AT_linkage_name: _Z4f13iv
-    <913>   DW_AT_low_pc      : \(addr_index: 0x0\): <no .debug_addr section>
+    <913>   DW_AT_low_pc      : \(addr_index: (0x)?0\): <no .debug_addr section>
     <914>   DW_AT_high_pc     : 0x6
     <91c>   DW_AT_frame_base  : 1 byte block: 9c 	\(DW_OP_call_frame_cfa\)
     <91e>   DW_AT_GNU_all_call_sites: 1
@@ -1099,22 +1099,22 @@ Contents of the .debug_info.dwo section:
 
 Contents of the .debug_types.dwo section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0xf7 \(32-bit\)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  8
    Signature:     0xb534bdc1f01629bb
    Type Offset:   0x25
    Section contributions:
-    .debug_abbrev.dwo:       0x0  0x154
-    .debug_line.dwo:         0x0  0x40
-    .debug_loc.dwo:          0x0  0x0
-    .debug_str_offsets.dwo:  0x0  0x14
+    .debug_abbrev.dwo:       (0x)?0  0x154
+    .debug_line.dwo:         (0x)?0  0x40
+    .debug_loc.dwo:          (0x)?0  (0x)?0
+    .debug_str_offsets.dwo:  (0x)?0  0x14
  <0><17>: Abbrev Number: 1 \(DW_TAG_type_unit\)
     <18>   DW_AT_language    : 4	\(C\+\+\)
     <19>   DW_AT_GNU_odr_signature: 0x880a5c4d6e59da8a
-    <21>   DW_AT_stmt_list   : 0x0
+    <21>   DW_AT_stmt_list   : (0x)?0
  <1><25>: Abbrev Number: 2 \(DW_TAG_class_type\)
     <26>   DW_AT_name        : C3
     <29>   DW_AT_byte_size   : 4
@@ -1130,7 +1130,7 @@ Contents of the .debug_types.dwo section:
     <39>   DW_AT_accessibility: 1	\(public\)
  <2><3a>: Abbrev Number: 4 \(DW_TAG_subprogram\)
     <3b>   DW_AT_external    : 1
-    <3b>   DW_AT_name        : \(indexed string: 0x0\): testcase1
+    <3b>   DW_AT_name        : \(indexed string: (0x)?0\): testcase1
     <3c>   DW_AT_decl_file   : 2
     <3d>   DW_AT_decl_line   : 50
     <3e>   DW_AT_linkage_name: _ZN2C39testcase1Ev
@@ -1208,19 +1208,19 @@ Contents of the .debug_types.dwo section:
   Compilation Unit @ offset 0xfb:
    Length:        0xf1 \(32-bit\)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  8
    Signature:     0xab98c7bc886f5266
    Type Offset:   0x25
    Section contributions:
-    .debug_abbrev.dwo:       0x0  0x154
-    .debug_line.dwo:         0x0  0x40
-    .debug_loc.dwo:          0x0  0x0
-    .debug_str_offsets.dwo:  0x0  0x14
+    .debug_abbrev.dwo:       (0x)?0  0x154
+    .debug_line.dwo:         (0x)?0  0x40
+    .debug_loc.dwo:          (0x)?0  (0x)?0
+    .debug_str_offsets.dwo:  (0x)?0  0x14
  <0><112>: Abbrev Number: 1 \(DW_TAG_type_unit\)
     <113>   DW_AT_language    : 4	\(C\+\+\)
     <114>   DW_AT_GNU_odr_signature: 0xae4af0d8bfcef94b
-    <11c>   DW_AT_stmt_list   : 0x0
+    <11c>   DW_AT_stmt_list   : (0x)?0
  <1><120>: Abbrev Number: 2 \(DW_TAG_class_type\)
     <121>   DW_AT_name        : C2
     <124>   DW_AT_byte_size   : 4
@@ -1236,7 +1236,7 @@ Contents of the .debug_types.dwo section:
     <134>   DW_AT_accessibility: 1	\(public\)
  <2><135>: Abbrev Number: 4 \(DW_TAG_subprogram\)
     <136>   DW_AT_external    : 1
-    <136>   DW_AT_name        : \(indexed string: 0x0\): testcase1
+    <136>   DW_AT_name        : \(indexed string: (0x)?0\): testcase1
     <137>   DW_AT_decl_file   : 2
     <138>   DW_AT_decl_line   : 40
     <139>   DW_AT_linkage_name: _ZN2C29testcase1Ev
@@ -1309,19 +1309,19 @@ Contents of the .debug_types.dwo section:
   Compilation Unit @ offset 0x1f0:
    Length:        0x141 \(32-bit\)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  8
    Signature:     0xb5faa2a4b7a919c4
    Type Offset:   0x25
    Section contributions:
-    .debug_abbrev.dwo:       0x0  0x154
-    .debug_line.dwo:         0x0  0x40
-    .debug_loc.dwo:          0x0  0x0
-    .debug_str_offsets.dwo:  0x0  0x14
+    .debug_abbrev.dwo:       (0x)?0  0x154
+    .debug_line.dwo:         (0x)?0  0x40
+    .debug_loc.dwo:          (0x)?0  (0x)?0
+    .debug_str_offsets.dwo:  (0x)?0  0x14
  <0><207>: Abbrev Number: 1 \(DW_TAG_type_unit\)
     <208>   DW_AT_language    : 4	\(C\+\+\)
     <209>   DW_AT_GNU_odr_signature: 0xc7fbeb753b05ade3
-    <211>   DW_AT_stmt_list   : 0x0
+    <211>   DW_AT_stmt_list   : (0x)?0
  <1><215>: Abbrev Number: 2 \(DW_TAG_class_type\)
     <216>   DW_AT_name        : C1
     <219>   DW_AT_byte_size   : 4
@@ -1337,7 +1337,7 @@ Contents of the .debug_types.dwo section:
     <229>   DW_AT_accessibility: 1	\(public\)
  <2><22a>: Abbrev Number: 4 \(DW_TAG_subprogram\)
     <22b>   DW_AT_external    : 1
-    <22b>   DW_AT_name        : \(indexed string: 0x0\): testcase1
+    <22b>   DW_AT_name        : \(indexed string: (0x)?0\): testcase1
     <22c>   DW_AT_decl_file   : 2
     <22d>   DW_AT_decl_line   : 28
     <22e>   DW_AT_linkage_name: _ZN2C19testcase1Ev
diff --git a/binutils/testsuite/binutils-all/readelf.h b/binutils/testsuite/binutils-all/readelf.h
index 01103fb..05858d7 100644
--- a/binutils/testsuite/binutils-all/readelf.h
+++ b/binutils/testsuite/binutils-all/readelf.h
@@ -8,7 +8,7 @@ ELF Header:
   Type:                              REL \(Relocatable file\)
   Machine:                           .*
   Version:                           0x1
-  Entry point address:               0x0
+  Entry point address:               (0x)?0
   Start of program headers:          0 \(bytes into file\)
   Start of section headers:          .* \(bytes into file\)
   Flags:                             .*
diff --git a/binutils/testsuite/binutils-all/readelf.h.thin b/binutils/testsuite/binutils-all/readelf.h.thin
index 32ea2b7..4be5373 100644
--- a/binutils/testsuite/binutils-all/readelf.h.thin
+++ b/binutils/testsuite/binutils-all/readelf.h.thin
@@ -10,7 +10,7 @@ ELF Header:
   Type:                              REL \(Relocatable file\)
   Machine:                           .*
   Version:                           0x1
-  Entry point address:               0x0
+  Entry point address:               (0x)?0
   Start of program headers:          0 \(bytes into file\)
   Start of section headers:          .* \(bytes into file\)
   Flags:                             .*
diff --git a/binutils/testsuite/binutils-all/readelf.wKis b/binutils/testsuite/binutils-all/readelf.wKis
index a8ab252..0028fc2 100644
--- a/binutils/testsuite/binutils-all/readelf.wKis
+++ b/binutils/testsuite/binutils-all/readelf.wKis
@@ -6,15 +6,15 @@ Contents of the .debug_str section \(loaded from .*debuglink.o\):
 #...
 Contents of the .debug_info section \(loaded from .*debuglink.o\):
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x12 \(32-bit\)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
-    <c>   DW_AT_name        : \(indirect string, offset: 0x0\): string-1
+    <c>   DW_AT_name        : \(indirect string, offset: (0x)?0\): string-1
  <0><10>: Abbrev Number: 2 \(DW_TAG_subprogram\)
-    <11>   DW_AT_name        : \(alt indirect string, offset: 0x0\) string-3
+    <11>   DW_AT_name        : \(alt indirect string, offset: (0x)?0\) string-3
 #...
 Contents of the .debug_str section \(loaded from .*linkdebug.debug\):
 
diff --git a/binutils/testsuite/binutils-all/readelf.wa b/binutils/testsuite/binutils-all/readelf.wa
index 43d60b1..aba1106 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 (0x0)
+  Number TAG (0)
    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/testranges-ia64.d b/binutils/testsuite/binutils-all/testranges-ia64.d
index 9713236..e1e29e7 100644
--- a/binutils/testsuite/binutils-all/testranges-ia64.d
+++ b/binutils/testsuite/binutils-all/testranges-ia64.d
@@ -7,9 +7,9 @@
 Contents of the .debug_ranges section:
 
     Offset   Begin    End
-    00000000 00000001 00000002 
+    00000000 00000001 00000002 ?
     00000000 <End of list>
-    00000010 00000000 00000002 
+    00000010 00000000 00000002 ?
     00000010 <End of list>
 
 #pass
diff --git a/binutils/testsuite/binutils-all/testranges.d b/binutils/testsuite/binutils-all/testranges.d
index ba07a6f..dd20175 100644
--- a/binutils/testsuite/binutils-all/testranges.d
+++ b/binutils/testsuite/binutils-all/testranges.d
@@ -7,9 +7,9 @@
 Contents of the \.z?debug_ranges section:
 
     Offset   Begin    End
-    00000000 00000001 00000002 
+    00000000 00000001 00000002 ?
     00000000 <End of list>
-    00000010 00000000 00000002 
+    00000010 00000000 00000002 ?
     00000010 <End of list>
 
 #pass
diff --git a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
index c4898d7..e125829 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 \(0x0\)
+  Number TAG \((0x)?0\)
    1      DW_TAG_compile_unit    \[has children\]
     DW_AT_producer     DW_FORM_strp
     DW_AT_language     DW_FORM_data1
@@ -29,25 +29,25 @@ Contents of the .[z]?debug_abbrev section:
 
 Contents of the .[z]?debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x5e \(32-bit\)
    Version:       3
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    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
+    <c>   DW_AT_producer    : \(indirect string, offset: (0x)?0\): GNU C 4.4.4
     <10>   DW_AT_language    : 1	\(ANSI C\)
     <11>   DW_AT_name        : \(indirect string, offset: 0x18\): compressed-1.c
     <15>   DW_AT_comp_dir    : \(indirect string, offset: 0x16\): .
-    <19>   DW_AT_low_pc      : 0x0
+    <19>   DW_AT_low_pc      : (0x)?0
     <21>   DW_AT_high_pc     : 0x15
-    <29>   DW_AT_stmt_list   : 0x0
+    <29>   DW_AT_stmt_list   : (0x)?0
  <1><2d>: Abbrev Number: 2 \(DW_TAG_subprogram\)
     <2e>   DW_AT_external    : 1
     <2f>   DW_AT_name        : \(indirect string, offset: 0xc\): foo2
     <33>   DW_AT_decl_file   : 1
     <34>   DW_AT_decl_line   : 10
-    <35>   DW_AT_low_pc      : 0x0
+    <35>   DW_AT_low_pc      : (0x)?0
     <3d>   DW_AT_high_pc     : 0x2
     <45>   DW_AT_frame_base  : 1 byte block: 9c 	\(DW_OP_call_frame_cfa\)
  <1><47>: Abbrev Number: 2 \(DW_TAG_subprogram\)
@@ -62,7 +62,7 @@ Contents of the .[z]?debug_info section:
 
 Raw dump of debug contents of section .[z]?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      67
   DWARF Version:               .
   Prologue Length:             37
@@ -93,10 +93,10 @@ Raw dump of debug contents of section .[z]?debug_line:
   1	0	0	0	compressed-1.c
 
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
   \[0x.*\]  Advance Line by 10 to 11
   \[0x.*\]  Copy
-  \[0x.*\]  Special opcode 6: advance Address by 0 to 0x0 and Line by 1 to 12 \(view 1\)
+  \[0x.*\]  Special opcode 6: advance Address by 0 to (0x)?0 and Line by 1 to 12 \(view 1\)
   \[0x.*\]  Advance Line by -7 to 5
   \[0x.*\]  Special opcode 229: advance Address by 16 to 0x10 and Line by 0 to 5
   \[0x.*\]  Special opcode 6: advance Address by 0 to 0x10 and Line by 1 to 6 \(view 1\)
@@ -108,7 +108,7 @@ Contents of the .[z]?debug_pubnames section:
 
   Length:                              32
   Version:                             2
-  Offset into .[z]?debug_info section:     0x0
+  Offset into .[z]?debug_info section:     (0x)?0
   Size of area in .[z]?debug_info section: 98
 
     Offset	Name
@@ -119,13 +119,13 @@ Contents of the .[z]?debug_aranges section:
 
   Length:                   44
   Version:                  2
-  Offset into .[z]?debug_info:  0x0
+  Offset into .[z]?debug_info:  (0x)?0
   Pointer Size:             8
   Segment Size:             0
 
     Address            Length
-    0000000000000000 0000000000000015 
-    0000000000000000 0000000000000000 
+    0000000000000000 0000000000000015 ?
+    0000000000000000 0000000000000000 ?
 
 Contents of the .[z]?debug_str section:
 
diff --git a/binutils/testsuite/binutils-all/x86-64/pr26808.dump b/binutils/testsuite/binutils-all/x86-64/pr26808.dump
index dc87983..db6f14d 100644
--- a/binutils/testsuite/binutils-all/x86-64/pr26808.dump
+++ b/binutils/testsuite/binutils-all/x86-64/pr26808.dump
@@ -1,15 +1,15 @@
 Contents of the .debug_info.dwo section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset 0:
    Length:        0x178 (32-bit)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: 0
    Pointer Size:  8
    Section contributions:
-    .debug_abbrev.dwo:       0x0  0x154
-    .debug_line.dwo:         0x0  0x40
-    .debug_loc.dwo:          0x0  0x0
-    .debug_str_offsets.dwo:  0x0  0x14
+    .debug_abbrev.dwo:       0  0x154
+    .debug_line.dwo:         0  0x40
+    .debug_loc.dwo:          0  0
+    .debug_str_offsets.dwo:  0  0x14
  <0><b>: Abbrev Number: 12 (DW_TAG_compile_unit)
     <c>   DW_AT_producer    : GNU C++ 4.7.x-google 20120720 (prerelease)
     <37>   DW_AT_language    : 4	(C++)
@@ -30,7 +30,7 @@ Contents of the .debug_info.dwo section:
     <a5>   DW_AT_decl_file   : 1
     <a6>   DW_AT_decl_line   : 30
     <a7>   DW_AT_type        : <0x90>
-    <ab>   DW_AT_low_pc      : (index: 0x0): 0
+    <ab>   DW_AT_low_pc      : (index: 0): 0
     <ac>   DW_AT_high_pc     : 0x304
     <b4>   DW_AT_frame_base  : 1 byte block: 9c 	(DW_OP_call_frame_cfa)
     <b6>   DW_AT_GNU_all_tail_call_sites: 1
@@ -121,12 +121,12 @@ Contents of the .debug_info.dwo section:
   Compilation Unit @ offset 0x17c:
    Length:        0x5af (32-bit)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: 0
    Pointer Size:  8
    Section contributions:
     .debug_abbrev.dwo:       0x154  0x21d
     .debug_line.dwo:         0x40  0x3d
-    .debug_loc.dwo:          0x0  0x0
+    .debug_loc.dwo:          0  0
     .debug_str_offsets.dwo:  0x14  0x44
  <0><187>: Abbrev Number: 12 (DW_TAG_compile_unit)
     <188>   DW_AT_producer    : GNU C++ 4.7.x-google 20120720 (prerelease)
@@ -141,7 +141,7 @@ Contents of the .debug_info.dwo section:
     <215>   DW_AT_sibling     : <0x242>
  <2><219>: Abbrev Number: 14 (DW_TAG_subprogram)
     <21a>   DW_AT_external    : 1
-    <21a>   DW_AT_name        : (indexed string: 0x0): testcase1
+    <21a>   DW_AT_name        : (indexed string: 0): testcase1
     <21b>   DW_AT_decl_file   : 1
     <21c>   DW_AT_decl_line   : 28
     <21d>   DW_AT_linkage_name: (indexed string: 0xc): _ZN2C19testcase1Ev
@@ -194,7 +194,7 @@ Contents of the .debug_info.dwo section:
     <267>   DW_AT_sibling     : <0x294>
  <2><26b>: Abbrev Number: 14 (DW_TAG_subprogram)
     <26c>   DW_AT_external    : 1
-    <26c>   DW_AT_name        : (indexed string: 0x0): testcase1
+    <26c>   DW_AT_name        : (indexed string: 0): testcase1
     <26d>   DW_AT_decl_file   : 1
     <26e>   DW_AT_decl_line   : 40
     <26f>   DW_AT_linkage_name: (indexed string: 0x7): _ZN2C29testcase1Ev
@@ -239,7 +239,7 @@ Contents of the .debug_info.dwo section:
     <2aa>   DW_AT_sibling     : <0x2cd>
  <2><2ae>: Abbrev Number: 14 (DW_TAG_subprogram)
     <2af>   DW_AT_external    : 1
-    <2af>   DW_AT_name        : (indexed string: 0x0): testcase1
+    <2af>   DW_AT_name        : (indexed string: 0): testcase1
     <2b0>   DW_AT_decl_file   : 1
     <2b1>   DW_AT_decl_line   : 50
     <2b2>   DW_AT_linkage_name: (indexed string: 0x2): _ZN2C39testcase1Ev
@@ -274,7 +274,7 @@ Contents of the .debug_info.dwo section:
     <2dd>   DW_AT_decl_file   : 1
     <2de>   DW_AT_decl_line   : 70
     <2df>   DW_AT_linkage_name: _Z4f13iv
-    <2e8>   DW_AT_low_pc      : (index: 0x0): 0
+    <2e8>   DW_AT_low_pc      : (index: 0): 0
     <2e9>   DW_AT_high_pc     : 0x6
     <2f1>   DW_AT_frame_base  : 1 byte block: 9c 	(DW_OP_call_frame_cfa)
     <2f3>   DW_AT_GNU_all_call_sites: 1
@@ -758,13 +758,13 @@ Contents of the .debug_info.dwo section:
   Compilation Unit @ offset 0x72f:
    Length:        0xcb (32-bit)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: 0
    Pointer Size:  8
    Section contributions:
     .debug_abbrev.dwo:       0x371  0xbd
     .debug_line.dwo:         0x7d  0x3e
-    .debug_loc.dwo:          0x0  0x0
-    .debug_str_offsets.dwo:  0x0  0x0
+    .debug_loc.dwo:          0  0
+    .debug_str_offsets.dwo:  0  0
  <0><73a>: Abbrev Number: 10 (DW_TAG_compile_unit)
     <73b>   DW_AT_producer    : GNU C++ 4.7.x-google 20120720 (prerelease)
     <766>   DW_AT_language    : 4	(C++)
@@ -786,7 +786,7 @@ Contents of the .debug_info.dwo section:
     <7d3>   DW_AT_decl_line   : 32
     <7d4>   DW_AT_linkage_name: _Z4t16av
     <7dd>   DW_AT_type        : <0x7c4>
-    <7e1>   DW_AT_low_pc      : (index: 0x0): 0
+    <7e1>   DW_AT_low_pc      : (index: 0): 0
     <7e2>   DW_AT_high_pc     : 0x13
     <7ea>   DW_AT_frame_base  : 1 byte block: 9c 	(DW_OP_call_frame_cfa)
     <7ec>   DW_AT_GNU_all_tail_call_sites: 1
@@ -801,12 +801,12 @@ Contents of the .debug_info.dwo section:
   Compilation Unit @ offset 0x7fe:
    Length:        0x329 (32-bit)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: 0
    Pointer Size:  8
    Section contributions:
     .debug_abbrev.dwo:       0x42e  0x1f2
     .debug_line.dwo:         0xbb  0x3d
-    .debug_loc.dwo:          0x0  0x0
+    .debug_loc.dwo:          0  0
     .debug_str_offsets.dwo:  0x58  0x18
  <0><809>: Abbrev Number: 12 (DW_TAG_compile_unit)
     <80a>   DW_AT_producer    : GNU C++ 4.7.x-google 20120720 (prerelease)
@@ -878,7 +878,7 @@ Contents of the .debug_info.dwo section:
     <908>   DW_AT_decl_file   : 1
     <909>   DW_AT_decl_line   : 70
     <90a>   DW_AT_linkage_name: _Z4f13iv
-    <913>   DW_AT_low_pc      : (index: 0x0): 0
+    <913>   DW_AT_low_pc      : (index: 0): 0
     <914>   DW_AT_high_pc     : 0x6
     <91c>   DW_AT_frame_base  : 1 byte block: 9c 	(DW_OP_call_frame_cfa)
     <91e>   DW_AT_GNU_all_call_sites: 1
@@ -1099,22 +1099,22 @@ Contents of the .debug_info.dwo section:
 
 Contents of the .debug_types.dwo section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset 0:
    Length:        0xf7 (32-bit)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: 0
    Pointer Size:  8
    Signature:     0xb534bdc1f01629bb
    Type Offset:   0x25
    Section contributions:
-    .debug_abbrev.dwo:       0x0  0x154
-    .debug_line.dwo:         0x0  0x40
-    .debug_loc.dwo:          0x0  0x0
-    .debug_str_offsets.dwo:  0x0  0x14
+    .debug_abbrev.dwo:       0  0x154
+    .debug_line.dwo:         0  0x40
+    .debug_loc.dwo:          0  0
+    .debug_str_offsets.dwo:  0  0x14
  <0><17>: Abbrev Number: 1 (DW_TAG_type_unit)
     <18>   DW_AT_language    : 4	(C++)
     <19>   DW_AT_GNU_odr_signature: 0x880a5c4d6e59da8a
-    <21>   DW_AT_stmt_list   : 0x0
+    <21>   DW_AT_stmt_list   : 0
  <1><25>: Abbrev Number: 2 (DW_TAG_class_type)
     <26>   DW_AT_name        : C3
     <29>   DW_AT_byte_size   : 4
@@ -1130,7 +1130,7 @@ Contents of the .debug_types.dwo section:
     <39>   DW_AT_accessibility: 1	(public)
  <2><3a>: Abbrev Number: 4 (DW_TAG_subprogram)
     <3b>   DW_AT_external    : 1
-    <3b>   DW_AT_name        : (indexed string: 0x0): testcase1
+    <3b>   DW_AT_name        : (indexed string: 0): testcase1
     <3c>   DW_AT_decl_file   : 2
     <3d>   DW_AT_decl_line   : 50
     <3e>   DW_AT_linkage_name: _ZN2C39testcase1Ev
@@ -1208,19 +1208,19 @@ Contents of the .debug_types.dwo section:
   Compilation Unit @ offset 0xfb:
    Length:        0xf1 (32-bit)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: 0
    Pointer Size:  8
    Signature:     0xab98c7bc886f5266
    Type Offset:   0x25
    Section contributions:
-    .debug_abbrev.dwo:       0x0  0x154
-    .debug_line.dwo:         0x0  0x40
-    .debug_loc.dwo:          0x0  0x0
-    .debug_str_offsets.dwo:  0x0  0x14
+    .debug_abbrev.dwo:       0  0x154
+    .debug_line.dwo:         0  0x40
+    .debug_loc.dwo:          0  0
+    .debug_str_offsets.dwo:  0  0x14
  <0><112>: Abbrev Number: 1 (DW_TAG_type_unit)
     <113>   DW_AT_language    : 4	(C++)
     <114>   DW_AT_GNU_odr_signature: 0xae4af0d8bfcef94b
-    <11c>   DW_AT_stmt_list   : 0x0
+    <11c>   DW_AT_stmt_list   : 0
  <1><120>: Abbrev Number: 2 (DW_TAG_class_type)
     <121>   DW_AT_name        : C2
     <124>   DW_AT_byte_size   : 4
@@ -1236,7 +1236,7 @@ Contents of the .debug_types.dwo section:
     <134>   DW_AT_accessibility: 1	(public)
  <2><135>: Abbrev Number: 4 (DW_TAG_subprogram)
     <136>   DW_AT_external    : 1
-    <136>   DW_AT_name        : (indexed string: 0x0): testcase1
+    <136>   DW_AT_name        : (indexed string: 0): testcase1
     <137>   DW_AT_decl_file   : 2
     <138>   DW_AT_decl_line   : 40
     <139>   DW_AT_linkage_name: _ZN2C29testcase1Ev
@@ -1309,19 +1309,19 @@ Contents of the .debug_types.dwo section:
   Compilation Unit @ offset 0x1f0:
    Length:        0x141 (32-bit)
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: 0
    Pointer Size:  8
    Signature:     0xb5faa2a4b7a919c4
    Type Offset:   0x25
    Section contributions:
-    .debug_abbrev.dwo:       0x0  0x154
-    .debug_line.dwo:         0x0  0x40
-    .debug_loc.dwo:          0x0  0x0
-    .debug_str_offsets.dwo:  0x0  0x14
+    .debug_abbrev.dwo:       0  0x154
+    .debug_line.dwo:         0  0x40
+    .debug_loc.dwo:          0  0
+    .debug_str_offsets.dwo:  0  0x14
  <0><207>: Abbrev Number: 1 (DW_TAG_type_unit)
     <208>   DW_AT_language    : 4	(C++)
     <209>   DW_AT_GNU_odr_signature: 0xc7fbeb753b05ade3
-    <211>   DW_AT_stmt_list   : 0x0
+    <211>   DW_AT_stmt_list   : 0
  <1><215>: Abbrev Number: 2 (DW_TAG_class_type)
     <216>   DW_AT_name        : C1
     <219>   DW_AT_byte_size   : 4
@@ -1337,7 +1337,7 @@ Contents of the .debug_types.dwo section:
     <229>   DW_AT_accessibility: 1	(public)
  <2><22a>: Abbrev Number: 4 (DW_TAG_subprogram)
     <22b>   DW_AT_external    : 1
-    <22b>   DW_AT_name        : (indexed string: 0x0): testcase1
+    <22b>   DW_AT_name        : (indexed string: 0): testcase1
     <22c>   DW_AT_decl_file   : 2
     <22d>   DW_AT_decl_line   : 28
     <22e>   DW_AT_linkage_name: _ZN2C19testcase1Ev