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.

54 files changed, 153 insertions, 154 deletions

diff --git a/gas/testsuite/gas/aarch64/dwarf.d b/gas/testsuite/gas/aarch64/dwarf.d
index b0581fb..9e4184a 100644
--- a/gas/testsuite/gas/aarch64/dwarf.d
+++ b/gas/testsuite/gas/aarch64/dwarf.d
@@ -18,11 +18,10 @@ Contents of the .debug_aranges section:
 
   Length:                   (44|28)
   Version:                  2
-  Offset into .debug_info:  0x0
+  Offset into .debug_info:  (0x)?0
   Pointer Size:             (8|4)
   Segment Size:             0
 
     Address[ ]+Length
-    0+ 0+8[ ]+
-    0+ 0+[ ]+
-
+    0+ 0+8 ?
+    0+ 0+ ?
diff --git a/gas/testsuite/gas/cris/rd-dw2-1.d b/gas/testsuite/gas/cris/rd-dw2-1.d
index ee99381..fcf3170 100644
--- a/gas/testsuite/gas/cris/rd-dw2-1.d
+++ b/gas/testsuite/gas/cris/rd-dw2-1.d
@@ -4,8 +4,8 @@
 # A most simple instruction sequence.
 #...
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 4 to 5
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to (0x)?0 and Line by 4 to 5
   \[0x.*\]  Special opcode .*: advance Address by 2 to 0x2 and Line by 1 to 6
   \[0x.*\]  Special opcode .*: advance Address by 2 to 0x4 and Line by 1 to 7
   \[0x.*\]  Special opcode .*: advance Address by 2 to 0x6 and Line by 1 to 8
diff --git a/gas/testsuite/gas/cris/rd-dw2-10.d b/gas/testsuite/gas/cris/rd-dw2-10.d
index 115246d..0ca9208 100644
--- a/gas/testsuite/gas/cris/rd-dw2-10.d
+++ b/gas/testsuite/gas/cris/rd-dw2-10.d
@@ -5,7 +5,7 @@
 # Continued line.
 #...
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 6 to 7
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to (0x)?0 and Line by 6 to 7
   \[0x.*\]  Advance PC by 4 to 0x4
   \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-11.d b/gas/testsuite/gas/cris/rd-dw2-11.d
index 147c48c..67d57dc 100644
--- a/gas/testsuite/gas/cris/rd-dw2-11.d
+++ b/gas/testsuite/gas/cris/rd-dw2-11.d
@@ -5,8 +5,8 @@
 # Highly "fragmented" code.
 #...
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 4 to 5
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to (0x)?0 and Line by 4 to 5
   \[0x.*\]  Special opcode .*: advance Address by 2 to 0x2 and Line by 1 to 6
   \[0x.*\]  Advance PC by 126 to 0x80
   \[0x.*\]  Special opcode .*: advance Address by 0 to 0x80 and Line by 2 to 8
diff --git a/gas/testsuite/gas/cris/rd-dw2-12.d b/gas/testsuite/gas/cris/rd-dw2-12.d
index aeb2e32..a1c4895 100644
--- a/gas/testsuite/gas/cris/rd-dw2-12.d
+++ b/gas/testsuite/gas/cris/rd-dw2-12.d
@@ -5,8 +5,8 @@
 # Pushes and other prefixes.
 #...
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 4 to 5
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to (0x)?0 and Line by 4 to 5
   \[0x.*\]  Special opcode .*: advance Address by 4 to 0x4 and Line by 1 to 6
   \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8 and Line by 1 to 7
   \[0x.*\]  Special opcode .*: advance Address by 4 to 0xc and Line by 2 to 9
diff --git a/gas/testsuite/gas/cris/rd-dw2-13.d b/gas/testsuite/gas/cris/rd-dw2-13.d
index 79234e3..42c9b52 100644
--- a/gas/testsuite/gas/cris/rd-dw2-13.d
+++ b/gas/testsuite/gas/cris/rd-dw2-13.d
@@ -5,8 +5,8 @@
 # PIC prefix relocs.
 #...
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 5 to 6
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to (0x)?0 and Line by 5 to 6
   \[0x.*\]  Special opcode .*: advance Address by 6 to 0x6 and Line by 1 to 7
   \[0x.*\]  Special opcode .*: advance Address by 8 to 0xe and Line by 1 to 8
   \[0x.*\]  Special opcode .*: advance Address by 6 to 0x14 and Line by 1 to 9
diff --git a/gas/testsuite/gas/cris/rd-dw2-14.d b/gas/testsuite/gas/cris/rd-dw2-14.d
index d34fa46..dabbc15 100644
--- a/gas/testsuite/gas/cris/rd-dw2-14.d
+++ b/gas/testsuite/gas/cris/rd-dw2-14.d
@@ -5,8 +5,8 @@
 # Prefixes of various sizes.
 #...
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 8 to 9
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to (0x)?0 and Line by 8 to 9
   \[0x.*\]  Special opcode .*: advance Address by 2 to 0x2 and Line by 1 to 10
   \[0x.*\]  Special opcode .*: advance Address by 4 to 0x6 and Line by 1 to 11
   \[0x.*\]  Special opcode .*: advance Address by 4 to 0xa and Line by 1 to 12
diff --git a/gas/testsuite/gas/cris/rd-dw2-15.d b/gas/testsuite/gas/cris/rd-dw2-15.d
index 361d7fe..b4bdd68 100644
--- a/gas/testsuite/gas/cris/rd-dw2-15.d
+++ b/gas/testsuite/gas/cris/rd-dw2-15.d
@@ -5,8 +5,8 @@
 # Various prefixes, assembled standalone.
 #...
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 8 to 9
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to (0x)?0 and Line by 8 to 9
   \[0x.*\]  Special opcode .*: advance Address by 2 to 0x2 and Line by 1 to 10
   \[0x.*\]  Special opcode .*: advance Address by 2 to 0x4 and Line by 2 to 12
   \[0x.*\]  Special opcode .*: advance Address by 2 to 0x6 and Line by 1 to 13
diff --git a/gas/testsuite/gas/cris/rd-dw2-3.d b/gas/testsuite/gas/cris/rd-dw2-3.d
index dadf66c..aec1c7c 100644
--- a/gas/testsuite/gas/cris/rd-dw2-3.d
+++ b/gas/testsuite/gas/cris/rd-dw2-3.d
@@ -5,8 +5,8 @@
 # Simple branch-expansion, type 1.
 #...
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 7 to 8
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to (0x)?0 and Line by 7 to 8
   \[0x.*\]  Special opcode .*: advance Address by 12 to 0xc and Line by 1 to 9
   \[0x.*\]  Advance PC by 2 to 0xe
   \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-4.d b/gas/testsuite/gas/cris/rd-dw2-4.d
index f8fb7b0..6614eb6 100644
--- a/gas/testsuite/gas/cris/rd-dw2-4.d
+++ b/gas/testsuite/gas/cris/rd-dw2-4.d
@@ -5,8 +5,8 @@
 # Simple branch-expansion, type 2.
 #...
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 7 to 8
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to (0x)?0 and Line by 7 to 8
   \[0x.*\]  Advance PC by 32780 to 0x800c
   \[0x.*\]  Special opcode .*: advance Address by 0 to 0x800c and Line by 3 to 11
   \[0x.*\]  Advance PC by 2 to 0x800e
diff --git a/gas/testsuite/gas/cris/rd-dw2-5.d b/gas/testsuite/gas/cris/rd-dw2-5.d
index ee4c6ffa..e9664f1 100644
--- a/gas/testsuite/gas/cris/rd-dw2-5.d
+++ b/gas/testsuite/gas/cris/rd-dw2-5.d
@@ -5,8 +5,8 @@
 # Simple branch-expansion, type 3.
 #...
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 7 to 8
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to (0x)?0 and Line by 7 to 8
   \[0x.*\]  Advance PC by 32770 to 0x8002
   \[0x.*\]  Special opcode .*: advance Address by 0 to 0x8002 and Line by 2 to 10
   \[0x.*\]  Special opcode .*: advance Address by 12 to 0x800e and Line by 1 to 11
diff --git a/gas/testsuite/gas/cris/rd-dw2-6.d b/gas/testsuite/gas/cris/rd-dw2-6.d
index 0771ac0..1c2051b 100644
--- a/gas/testsuite/gas/cris/rd-dw2-6.d
+++ b/gas/testsuite/gas/cris/rd-dw2-6.d
@@ -5,8 +5,8 @@
 # Complicated branch expansion.
 #...
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 7 to 8
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to (0x)?0 and Line by 7 to 8
   \[0x.*\]  Special opcode .*: advance Address by 2 to 0x2 and Line by 2 to 10
   \[0x.*\]  Advance PC by 32360 to 0x7e6a
   \[0x.*\]  Special opcode .*: advance Address by 0 to 0x7e6a and Line by 3 to 13
diff --git a/gas/testsuite/gas/cris/rd-dw2-7.d b/gas/testsuite/gas/cris/rd-dw2-7.d
index c62fae8..d463ebb 100644
--- a/gas/testsuite/gas/cris/rd-dw2-7.d
+++ b/gas/testsuite/gas/cris/rd-dw2-7.d
@@ -5,8 +5,8 @@
 # Most simple broken word.
 #...
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 2 to 3
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to (0x)?0 and Line by 2 to 3
   \[0x.*\]  Special opcode .*: advance Address by 4 to 0x4 and Line by 4 to 7
   \[0x.*\]  Special opcode .*: advance Address by 14 to 0x12 and Line by 8 to 15
   \[0x.*\]  Advance PC by 32768 to 0x8012
diff --git a/gas/testsuite/gas/cris/rd-dw2-8.d b/gas/testsuite/gas/cris/rd-dw2-8.d
index fb08aa7..a50de2f 100644
--- a/gas/testsuite/gas/cris/rd-dw2-8.d
+++ b/gas/testsuite/gas/cris/rd-dw2-8.d
@@ -5,8 +5,8 @@
 # Simple broken word, table with two labels.
 #...
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 2 to 3
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to (0x)?0 and Line by 2 to 3
   \[0x.*\]  Special opcode .*: advance Address by 6 to 0x6 and Line by 5 to 8
   \[0x.*\]  Advance Line by 9 to 17
   \[0x.*\]  Special opcode .*: advance Address by 20 to 0x1a and Line by 0 to 17
diff --git a/gas/testsuite/gas/cris/rd-dw2-9.d b/gas/testsuite/gas/cris/rd-dw2-9.d
index a83d89f..0f2a12c 100644
--- a/gas/testsuite/gas/cris/rd-dw2-9.d
+++ b/gas/testsuite/gas/cris/rd-dw2-9.d
@@ -5,8 +5,8 @@
 # Long broken word table.
 #...
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 3 to 4
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to (0x)?0 and Line by 3 to 4
   \[0x.*\]  Special opcode .*: advance Address by 2 to 0x2 and Line by 4 to 8
   \[0x.*\]  Special opcode .*: advance Address by 4 to 0x6 and Line by 1 to 9
   \[0x.*\]  Special opcode .*: advance Address by 4 to 0xa and Line by 1 to 10
diff --git a/gas/testsuite/gas/elf/dwarf-3-func.d b/gas/testsuite/gas/elf/dwarf-3-func.d
index 0196f69..e17dff2 100644
--- a/gas/testsuite/gas/elf/dwarf-3-func.d
+++ b/gas/testsuite/gas/elf/dwarf-3-func.d
@@ -36,7 +36,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\]
 #...
  +2 +DW_TAG_subprogram +\[no children\]
diff --git a/gas/testsuite/gas/elf/dwarf-4-cu.d b/gas/testsuite/gas/elf/dwarf-4-cu.d
index 85a0739..8fc901d 100644
--- a/gas/testsuite/gas/elf/dwarf-4-cu.d
+++ b/gas/testsuite/gas/elf/dwarf-4-cu.d
@@ -3,9 +3,9 @@
 #readelf: -wi
 
 #...
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x.*
    Version:       4
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  .
 #pass
diff --git a/gas/testsuite/gas/elf/dwarf-5-cu.d b/gas/testsuite/gas/elf/dwarf-5-cu.d
index 7db20a3..fe305ea 100644
--- a/gas/testsuite/gas/elf/dwarf-5-cu.d
+++ b/gas/testsuite/gas/elf/dwarf-5-cu.d
@@ -3,10 +3,10 @@
 #readelf: -wi
 
 #...
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x.*
    Version:       5
    Unit Type:     DW_UT_compile \(1\)
-   Abbrev Offset: 0x0
+   Abbrev Offset: (0x)?0
    Pointer Size:  .
 #pass
diff --git a/gas/testsuite/gas/elf/dwarf-5-dir0.d b/gas/testsuite/gas/elf/dwarf-5-dir0.d
index 7a8361e..bf85202 100644
--- a/gas/testsuite/gas/elf/dwarf-5-dir0.d
+++ b/gas/testsuite/gas/elf/dwarf-5-dir0.d
@@ -5,15 +5,15 @@
 #...
  The Directory Table \(offset 0x.*, lines 4, columns 1\):
   Entry	Name
-  0	\(indirect line string, offset: 0x0\): .*/gas/testsuite
+  0	\(indirect line string, offset: (0x)?0\): .*/gas/testsuite
   1	\(indirect line string, offset: 0x.*\): ../not-the-build-directory
   2	\(indirect line string, offset: 0x.*\): secondary directory
   3	\(indirect line string, offset: 0x.*\): /tmp
 
  The File Name Table \(offset 0x.*, lines 3, columns 3\):
   Entry	Dir	MD5				Name
-  0	1 0x0	\(indirect line string, offset: 0x.*\): master-source-file.c
-  1	2 0x0	\(indirect line string, offset: 0x.*\): secondary source file
+  0	1 (0x)?0	\(indirect line string, offset: 0x.*\): master-source-file.c
+  1	2 (0x)?0	\(indirect line string, offset: 0x.*\): secondary source file
   2	3 0x95828e8bc4f7404dbf7526fb7bd0f192	\(indirect line string, offset: 0x.*\): foo.c
 #pass
 
diff --git a/gas/testsuite/gas/elf/dwarf-5-file0.d b/gas/testsuite/gas/elf/dwarf-5-file0.d
index 2502b80..c978b79 100644
--- a/gas/testsuite/gas/elf/dwarf-5-file0.d
+++ b/gas/testsuite/gas/elf/dwarf-5-file0.d
@@ -12,8 +12,8 @@
 
  The File Name Table \(offset 0x.*, lines 3, columns 3\):
   Entry	Dir	MD5				Name
-  0	1 0x0	\(indirect line string, offset: 0x.*\): master source file
-  1	2 0x0	\(indirect line string, offset: 0x.*\): secondary source file
+  0	1 (0x)?0	\(indirect line string, offset: 0x.*\): master source file
+  1	2 (0x)?0	\(indirect line string, offset: 0x.*\): secondary source file
   2	3 0x95828e8bc4f7404dbf7526fb7bd0f192	\(indirect line string, offset: 0x.*\): foo.c
 #pass
 
diff --git a/gas/testsuite/gas/elf/dwarf-5-func-global.d b/gas/testsuite/gas/elf/dwarf-5-func-global.d
index 09b10fd..03c425d 100644
--- a/gas/testsuite/gas/elf/dwarf-5-func-global.d
+++ b/gas/testsuite/gas/elf/dwarf-5-func-global.d
@@ -28,7 +28,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\]
 #...
  +2 +DW_TAG_subprogram +\[no children\]
diff --git a/gas/testsuite/gas/elf/dwarf-5-func-local.d b/gas/testsuite/gas/elf/dwarf-5-func-local.d
index fd97841..ae63515 100644
--- a/gas/testsuite/gas/elf/dwarf-5-func-local.d
+++ b/gas/testsuite/gas/elf/dwarf-5-func-local.d
@@ -26,7 +26,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\]
 #...
  +2 +DW_TAG_subprogram +\[no children\]
diff --git a/gas/testsuite/gas/elf/dwarf-5-func.d b/gas/testsuite/gas/elf/dwarf-5-func.d
index 11a78b2..0d331c6 100644
--- a/gas/testsuite/gas/elf/dwarf-5-func.d
+++ b/gas/testsuite/gas/elf/dwarf-5-func.d
@@ -38,7 +38,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\]
 #...
  +2 +DW_TAG_subprogram +\[no children\]
diff --git a/gas/testsuite/gas/elf/dwarf2-1.d b/gas/testsuite/gas/elf/dwarf2-1.d
index d1e0752..573e3d1 100644
--- a/gas/testsuite/gas/elf/dwarf2-1.d
+++ b/gas/testsuite/gas/elf/dwarf2-1.d
@@ -4,13 +4,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     : 0x10
     <14>   DW_AT_low_pc      : 0x8
     <18>   DW_AT_name        : file1.txt
@@ -33,7 +33,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
@@ -77,7 +77,7 @@ Raw dump of debug contents of section .[z]?debug_line:
 
 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
diff --git a/gas/testsuite/gas/elf/dwarf2-2.d b/gas/testsuite/gas/elf/dwarf2-2.d
index eb33a01..030f49e 100644
--- a/gas/testsuite/gas/elf/dwarf2-2.d
+++ b/gas/testsuite/gas/elf/dwarf2-2.d
@@ -4,13 +4,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     : 0x10
     <14>   DW_AT_low_pc      : 0x8
     <18>   DW_AT_name        : file1.txt
@@ -33,7 +33,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
@@ -77,7 +77,7 @@ Raw dump of debug contents of section .[z]?debug_line:
 
 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
diff --git a/gas/testsuite/gas/elf/dwarf2-20.d b/gas/testsuite/gas/elf/dwarf2-20.d
index e0c6c8d..0467301 100644
--- a/gas/testsuite/gas/elf/dwarf2-20.d
+++ b/gas/testsuite/gas/elf/dwarf2-20.d
@@ -10,11 +10,11 @@ Contents of the .debug_aranges section:
 
 [ 	]+Length:[ 	]+(16|28|44)
 [ 	]+Version:.*
-[ 	]+Offset into .debug_info:[ 	]+0x0
+[ 	]+Offset into .debug_info:[ 	]+(0x)?0
 [ 	]+Pointer Size:[ 	]+(2|4|8)
 [ 	]+Segment Size:[ 	]+0
 
 [ 	]+Address[ 	]+Length
-[ 	]+0+000 0+010 
-[ 	]+0+000 0+000 
+[ 	]+0+000 0+010 ?
+[ 	]+0+000 0+000 ?
 #pass
diff --git a/gas/testsuite/gas/elf/dwarf2-3.d b/gas/testsuite/gas/elf/dwarf2-3.d
index 62dbe54..c20249c 100644
--- a/gas/testsuite/gas/elf/dwarf2-3.d
+++ b/gas/testsuite/gas/elf/dwarf2-3.d
@@ -5,7 +5,7 @@
 
 Raw dump of debug contents of section \.z?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      41
   DWARF Version:               3
   Prologue Length:             35
diff --git a/gas/testsuite/gas/elf/dwarf2-5.d b/gas/testsuite/gas/elf/dwarf2-5.d
index 257bb55..ced12e7 100644
--- a/gas/testsuite/gas/elf/dwarf2-5.d
+++ b/gas/testsuite/gas/elf/dwarf2-5.d
@@ -11,7 +11,7 @@ Hex dump of section '\.rodata':
 
 Raw dump of debug contents of section \.debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      [0-9]*
   DWARF Version:               3
   Prologue Length:             [0-9]*
@@ -42,9 +42,9 @@ Raw dump of debug contents of section \.debug_line:
   1	0	0	0	dwarf2-5\.c
 
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
   \[0x.*\]  Copy
-  \[0x.*\]  Special opcode [0-9]*: advance Address by 0 to 0x0 and Line by 1 to 2 \(view 1\)
+  \[0x.*\]  Special opcode [0-9]*: advance Address by 0 to (0x)?0 and Line by 1 to 2 \(view 1\)
   \[0x.*\]  Special opcode [0-9]*: advance Address by 8 to 0x8 and Line by 1 to 3
   \[0x.*\]  Special opcode [0-9]*: advance Address by 0 to 0x8 and Line by 1 to 4 \(view 1\)
   \[0x.*\]  Special opcode [0-9]*: advance Address by 0 to 0x8 and Line by 1 to 5 \(view 2\)
diff --git a/gas/testsuite/gas/elf/dwarf2-6.d b/gas/testsuite/gas/elf/dwarf2-6.d
index 10fe237..90747c9 100644
--- a/gas/testsuite/gas/elf/dwarf2-6.d
+++ b/gas/testsuite/gas/elf/dwarf2-6.d
@@ -6,7 +6,7 @@
 
 Raw dump of debug contents of section .debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      84
   DWARF Version:               2
   Prologue Length:             36
@@ -41,7 +41,7 @@ Raw dump of debug contents of section .debug_line:
 
 
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
   \[0x.*\]  Copy
   \[0x.*\]  Copy \(view 1\)
   \[0x.*\]  Extended opcode 2: set Address to 0x1
diff --git a/gas/testsuite/gas/i386/debug1.d b/gas/testsuite/gas/i386/debug1.d
index f78ad06..4bed875 100644
--- a/gas/testsuite/gas/i386/debug1.d
+++ b/gas/testsuite/gas/i386/debug1.d
@@ -4,7 +4,7 @@
 
 Raw dump of debug contents of section \.z?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      .*
   DWARF Version:               3
   Prologue Length:             .*
@@ -36,8 +36,8 @@ Raw dump of debug contents of section \.z?debug_line:
   1	1	0	0	debug1.s
 
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode 7: advance Address by 0 to 0x0 and Line by 2 to 3
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode 7: advance Address by 0 to (0x)?0 and Line by 2 to 3
   \[0x.*\]  Special opcode 20: advance Address by 1 to 0x1 and Line by 1 to 4
   \[0x.*\]  Special opcode 20: advance Address by 1 to 0x2 and Line by 1 to 5
   \[0x.*\]  Advance PC by 1 to 0x3
diff --git a/gas/testsuite/gas/i386/dw2-compress-1.d b/gas/testsuite/gas/i386/dw2-compress-1.d
index 04f7ded..dc3ae13 100644
--- a/gas/testsuite/gas/i386/dw2-compress-1.d
+++ b/gas/testsuite/gas/i386/dw2-compress-1.d
@@ -4,15 +4,15 @@
 
 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     : 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\)
@@ -22,7 +22,7 @@ Contents of the .z?debug_info section:
     <32>   DW_AT_decl_line   : 2
     <33>   DW_AT_name        : func_cu1
     <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\)
@@ -33,7 +33,7 @@ Contents of the .z?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
@@ -60,7 +60,7 @@ Contents of the .debug_abbrev section:
 
 Raw dump of debug contents of section .z?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      62
   DWARF Version:               .
   Prologue Length:             35
@@ -94,7 +94,7 @@ Raw dump of debug contents of section .z?debug_line:
   1	0	0	0	file1.txt
 
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
   \[0x.*\]  Advance Line by 3 to 4
   \[0x.*\]  Copy
   \[0x.*\]  Copy \(view 1\)
diff --git a/gas/testsuite/gas/i386/dw2-compress-3a.d b/gas/testsuite/gas/i386/dw2-compress-3a.d
index 50a1e28..0b99018 100644
--- a/gas/testsuite/gas/i386/dw2-compress-3a.d
+++ b/gas/testsuite/gas/i386/dw2-compress-3a.d
@@ -5,17 +5,17 @@
 
 Contents of the .debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x32 \(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_producer    : \(indirect string, offset: 0x2\): GNU C 4.8.3
     <10>   DW_AT_language    : 1	\(ANSI C\)
     <11>   DW_AT_name        : \(indirect string, offset: 0xe\): dw2-compress-3.c
-    <15>   DW_AT_comp_dir    : \(indirect string, offset: 0x0\): .
-    <19>   DW_AT_stmt_list   : 0x0
+    <15>   DW_AT_comp_dir    : \(indirect string, offset: (0x)?0\): .
+    <19>   DW_AT_stmt_list   : (0x)?0
  <1><1d>: Abbrev Number: 2 \(DW_TAG_variable\)
     <1e>   DW_AT_name        : foo
     <22>   DW_AT_decl_file   : 1
@@ -31,7 +31,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_producer     DW_FORM_strp
     DW_AT_language     DW_FORM_data1
@@ -57,16 +57,16 @@ Contents of the .debug_aranges section:
 
   Length:                   20
   Version:                  2
-  Offset into .debug_info:  0x0
+  Offset into .debug_info:  (0x)?0
   Pointer Size:             4
   Segment Size:             0
 
     Address    Length
-    00000000 00000000 
+    00000000 00000000 ?
 
 Raw dump of debug contents of section .debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      45
   DWARF Version:               3
   Prologue Length:             39
diff --git a/gas/testsuite/gas/i386/dw2-compress-3b.d b/gas/testsuite/gas/i386/dw2-compress-3b.d
index 798d553..0b21122 100644
--- a/gas/testsuite/gas/i386/dw2-compress-3b.d
+++ b/gas/testsuite/gas/i386/dw2-compress-3b.d
@@ -5,17 +5,17 @@
 
 Contents of the .debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x32 \(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_producer    : \(indirect string, offset: 0x2\): GNU C 4.8.3
     <10>   DW_AT_language    : 1	\(ANSI C\)
     <11>   DW_AT_name        : \(indirect string, offset: 0xe\): dw2-compress-3.c
-    <15>   DW_AT_comp_dir    : \(indirect string, offset: 0x0\): .
-    <19>   DW_AT_stmt_list   : 0x0
+    <15>   DW_AT_comp_dir    : \(indirect string, offset: (0x)?0\): .
+    <19>   DW_AT_stmt_list   : (0x)?0
  <1><1d>: Abbrev Number: 2 \(DW_TAG_variable\)
     <1e>   DW_AT_name        : foo
     <22>   DW_AT_decl_file   : 1
@@ -31,7 +31,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_producer     DW_FORM_strp
     DW_AT_language     DW_FORM_data1
@@ -57,16 +57,16 @@ Contents of the .debug_aranges section:
 
   Length:                   20
   Version:                  2
-  Offset into .debug_info:  0x0
+  Offset into .debug_info:  (0x)?0
   Pointer Size:             4
   Segment Size:             0
 
     Address    Length
-    00000000 00000000 
+    00000000 00000000 ?
 
 Raw dump of debug contents of section .debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      45
   DWARF Version:               3
   Prologue Length:             39
diff --git a/gas/testsuite/gas/i386/dw2-compressed-1.d b/gas/testsuite/gas/i386/dw2-compressed-1.d
index ea771c4..2615d99 100644
--- a/gas/testsuite/gas/i386/dw2-compressed-1.d
+++ b/gas/testsuite/gas/i386/dw2-compressed-1.d
@@ -5,15 +5,15 @@
 
 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\)
@@ -23,7 +23,7 @@ Contents of the .debug_info section:
     <32>   DW_AT_decl_line   : 2
     <33>   DW_AT_name        : func_cu1
     <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\)
@@ -34,7 +34,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
@@ -61,7 +61,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:               .
   Prologue Length:             35
@@ -95,7 +95,7 @@ Raw dump of debug contents of section .debug_line:
   1	0	0	0	file1.txt
 
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
   \[0x.*\]  Advance Line by 3 to 4
   \[0x.*\]  Copy
   \[0x.*\]  Copy \(view 1\)
diff --git a/gas/testsuite/gas/i386/dw2-compressed-3a.d b/gas/testsuite/gas/i386/dw2-compressed-3a.d
index e4fcf53..5a14845 100644
--- a/gas/testsuite/gas/i386/dw2-compressed-3a.d
+++ b/gas/testsuite/gas/i386/dw2-compressed-3a.d
@@ -5,17 +5,17 @@
 
 Contents of the .debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x32 \(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_producer    : \(indirect string, offset: 0x2\): GNU C 4.8.3
     <10>   DW_AT_language    : 1	\(ANSI C\)
     <11>   DW_AT_name        : \(indirect string, offset: 0xe\): dw2-compress-3.c
-    <15>   DW_AT_comp_dir    : \(indirect string, offset: 0x0\): .
-    <19>   DW_AT_stmt_list   : 0x0
+    <15>   DW_AT_comp_dir    : \(indirect string, offset: (0x)?0\): .
+    <19>   DW_AT_stmt_list   : (0x)?0
  <1><1d>: Abbrev Number: 2 \(DW_TAG_variable\)
     <1e>   DW_AT_name        : foo
     <22>   DW_AT_decl_file   : 1
@@ -31,7 +31,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_producer     DW_FORM_strp
     DW_AT_language     DW_FORM_data1
@@ -57,16 +57,16 @@ Contents of the .debug_aranges section:
 
   Length:                   20
   Version:                  2
-  Offset into .debug_info:  0x0
+  Offset into .debug_info:  (0x)?0
   Pointer Size:             4
   Segment Size:             0
 
     Address    Length
-    00000000 00000000 
+    00000000 00000000 ?
 
 Raw dump of debug contents of section .debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      45
   DWARF Version:               3
   Prologue Length:             39
diff --git a/gas/testsuite/gas/i386/dw2-compressed-3b.d b/gas/testsuite/gas/i386/dw2-compressed-3b.d
index 37f6b7e..6c2cd12 100644
--- a/gas/testsuite/gas/i386/dw2-compressed-3b.d
+++ b/gas/testsuite/gas/i386/dw2-compressed-3b.d
@@ -5,17 +5,17 @@
 
 Contents of the .debug_info section:
 
-  Compilation Unit @ offset 0x0:
+  Compilation Unit @ offset (0x)?0:
    Length:        0x32 \(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_producer    : \(indirect string, offset: 0x2\): GNU C 4.8.3
     <10>   DW_AT_language    : 1	\(ANSI C\)
     <11>   DW_AT_name        : \(indirect string, offset: 0xe\): dw2-compress-3.c
-    <15>   DW_AT_comp_dir    : \(indirect string, offset: 0x0\): .
-    <19>   DW_AT_stmt_list   : 0x0
+    <15>   DW_AT_comp_dir    : \(indirect string, offset: (0x)?0\): .
+    <19>   DW_AT_stmt_list   : (0x)?0
  <1><1d>: Abbrev Number: 2 \(DW_TAG_variable\)
     <1e>   DW_AT_name        : foo
     <22>   DW_AT_decl_file   : 1
@@ -31,7 +31,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_producer     DW_FORM_strp
     DW_AT_language     DW_FORM_data1
@@ -57,16 +57,16 @@ Contents of the .debug_aranges section:
 
   Length:                   20
   Version:                  2
-  Offset into .debug_info:  0x0
+  Offset into .debug_info:  (0x)?0
   Pointer Size:             4
   Segment Size:             0
 
     Address    Length
-    00000000 00000000 
+    00000000 00000000 ?
 
 Raw dump of debug contents of section .debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      45
   DWARF Version:               3
   Prologue Length:             39
diff --git a/gas/testsuite/gas/i386/dwarf2-line-1.d b/gas/testsuite/gas/i386/dwarf2-line-1.d
index 196f099..d9baafd 100644
--- a/gas/testsuite/gas/i386/dwarf2-line-1.d
+++ b/gas/testsuite/gas/i386/dwarf2-line-1.d
@@ -4,7 +4,7 @@
 
 Raw dump of debug contents of section \.z?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      .*
   DWARF Version:               3
   Prologue Length:             .*
@@ -36,8 +36,8 @@ Raw dump of debug contents of section \.z?debug_line:
   1	1	0	0	dwarf2-line-1.s
 
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode 13: advance Address by 0 to 0x0 and Line by 8 to 9
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode 13: advance Address by 0 to (0x)?0 and Line by 8 to 9
   \[0x.*\]  Special opcode 20: advance Address by 1 to 0x1 and Line by 1 to 10
   \[0x.*\]  Advance PC by 1 to 0x2
   \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/i386/dwarf2-line-2.d b/gas/testsuite/gas/i386/dwarf2-line-2.d
index 2553fea..2fb07b7 100644
--- a/gas/testsuite/gas/i386/dwarf2-line-2.d
+++ b/gas/testsuite/gas/i386/dwarf2-line-2.d
@@ -4,7 +4,7 @@
 
 Raw dump of debug contents of section .z?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      62
   DWARF Version:               .
   Prologue Length:             35
@@ -38,11 +38,11 @@ Raw dump of debug contents of section .z?debug_line:
   1	0	0	0	file1.txt
 
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
   \[0x.*\]  Advance Line by 3 to 4
   \[0x.*\]  Copy
   \[0x.*\]  Copy \(view 1\)
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
   \[0x.*\]  Extended opcode 1: End of Sequence
 
 
diff --git a/gas/testsuite/gas/i386/dwarf2-line-4.d b/gas/testsuite/gas/i386/dwarf2-line-4.d
index 0403c3e..6846ae2 100644
--- a/gas/testsuite/gas/i386/dwarf2-line-4.d
+++ b/gas/testsuite/gas/i386/dwarf2-line-4.d
@@ -4,7 +4,7 @@
 
 Raw dump of debug contents of section \.z?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      .*
   DWARF Version:               3
   Prologue Length:             .*
diff --git a/gas/testsuite/gas/i386/dwarf4-line-1.d b/gas/testsuite/gas/i386/dwarf4-line-1.d
index 762bdce..7901868 100644
--- a/gas/testsuite/gas/i386/dwarf4-line-1.d
+++ b/gas/testsuite/gas/i386/dwarf4-line-1.d
@@ -4,7 +4,7 @@
 
 Raw dump of debug contents of section \.z?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      .*
   DWARF Version:               4
   Prologue Length:             .*
diff --git a/gas/testsuite/gas/i386/dwarf5-line-1.d b/gas/testsuite/gas/i386/dwarf5-line-1.d
index 6ec5191..dc6d44c 100644
--- a/gas/testsuite/gas/i386/dwarf5-line-1.d
+++ b/gas/testsuite/gas/i386/dwarf5-line-1.d
@@ -4,7 +4,7 @@
 
 Raw dump of debug contents of section \.z?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      .*
   DWARF Version:               5
   Address size \(bytes\):        .*
@@ -33,11 +33,11 @@ Raw dump of debug contents of section \.z?debug_line:
 
  The Directory Table \(offset 0x.*, lines 1, columns 1\):
   Entry	Name
-  0	\(indirect line string, offset: 0x.*\): .*/gas/testsuite
+  0	\(indirect line string, offset: 0.*\): .*/gas/testsuite
 
  The File Name Table \(offset 0x.*, lines 2, columns 3\):
   Entry	Dir	MD5				Name
   0	0 0xbbd69fc03ce253b2dbaab2522dd519ae	\(indirect line string, offset: 0x.*\): core.c
-  1	0 0x0	\(indirect line string, offset: 0x.*\): types.h
+  1	0 (0x)?0	\(indirect line string, offset: 0x.*\): types.h
 
  No Line Number Statements\.
diff --git a/gas/testsuite/gas/i386/dwarf5-line-2.d b/gas/testsuite/gas/i386/dwarf5-line-2.d
index 4bb849b..0890b16 100644
--- a/gas/testsuite/gas/i386/dwarf5-line-2.d
+++ b/gas/testsuite/gas/i386/dwarf5-line-2.d
@@ -4,7 +4,7 @@
 
 Raw dump of debug contents of section \.z?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      .*
   DWARF Version:               5
   Address size \(bytes\):        .*
@@ -33,7 +33,7 @@ Raw dump of debug contents of section \.z?debug_line:
 
  The Directory Table \(offset 0x.*, lines 1, columns 1\):
   Entry	Name
-  0	\(indirect line string, offset: 0x.*\): .*/gas/testsuite
+  0	\(indirect line string, offset: 0.*\): .*/gas/testsuite
 
  The File Name Table \(offset 0x.*, lines 1, columns 3\):
   Entry	Dir	MD5				Name
diff --git a/gas/testsuite/gas/i386/dwarf5-line-3.d b/gas/testsuite/gas/i386/dwarf5-line-3.d
index 0159b96..2a07a17 100644
--- a/gas/testsuite/gas/i386/dwarf5-line-3.d
+++ b/gas/testsuite/gas/i386/dwarf5-line-3.d
@@ -4,7 +4,7 @@
 
 Raw dump of debug contents of section \.z?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      .*
   DWARF Version:               5
   Address size \(bytes\):        .*
@@ -33,7 +33,7 @@ Raw dump of debug contents of section \.z?debug_line:
 
  The Directory Table \(offset 0x.*, lines 1, columns 1\):
   Entry	Name
-  0	\(indirect line string, offset: 0x.*\): .*
+  0	\(indirect line string, offset: 0.*\): .*
 
  The File Name Table \(offset 0x.*, lines 2, columns 2\):
   Entry	Dir	Name
@@ -41,8 +41,8 @@ Raw dump of debug contents of section \.z?debug_line:
   1	0	\(indirect line string, offset: 0x.*\): dwarf5-line-3.S
 
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode 7: advance Address by 0 to 0x0 and Line by 2 to 3
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode 7: advance Address by 0 to (0x)?0 and Line by 2 to 3
   \[0x.*\]  Advance PC by 1 to 0x1
   \[0x.*\]  Extended opcode 1: End of Sequence
 
diff --git a/gas/testsuite/gas/i386/dwarf5-line-4.d b/gas/testsuite/gas/i386/dwarf5-line-4.d
index a3af48e..71623ae 100644
--- a/gas/testsuite/gas/i386/dwarf5-line-4.d
+++ b/gas/testsuite/gas/i386/dwarf5-line-4.d
@@ -4,7 +4,7 @@
 
 Raw dump of debug contents of section \.z?debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      .*
   DWARF Version:               5
   Address size \(bytes\):        .*
@@ -33,7 +33,7 @@ Raw dump of debug contents of section \.z?debug_line:
 
  The Directory Table \(offset 0x.*, lines 2, columns 1\):
   Entry	Name
-  0	\(indirect line string, offset: 0x.*\): .*
+  0	\(indirect line string, offset: 0.*\): .*
   1	\(indirect line string, offset: 0x.*\): .*
 
  The File Name Table \(offset 0x.*, lines 2, columns 2\):
@@ -42,8 +42,8 @@ Raw dump of debug contents of section \.z?debug_line:
   1	1	\(indirect line string, offset: 0x.*\): dwarf5-line-4.s
 
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode 7: advance Address by 0 to 0x0 and Line by 2 to 3
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode 7: advance Address by 0 to (0x)?0 and Line by 2 to 3
   \[0x.*\]  Advance PC by 1 to 0x1
   \[0x.*\]  Extended opcode 1: End of Sequence
 
diff --git a/gas/testsuite/gas/ia64/pr13167.d b/gas/testsuite/gas/ia64/pr13167.d
index e447cb6..10c98bc 100644
--- a/gas/testsuite/gas/ia64/pr13167.d
+++ b/gas/testsuite/gas/ia64/pr13167.d
@@ -2,7 +2,7 @@
 
 Raw dump of debug contents of section \.debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      51
   DWARF Version:               3
   Prologue Length:             26
diff --git a/gas/testsuite/gas/lns/lns-big-delta.d b/gas/testsuite/gas/lns/lns-big-delta.d
index 5641adc..d75d7d7 100644
--- a/gas/testsuite/gas/lns/lns-big-delta.d
+++ b/gas/testsuite/gas/lns/lns-big-delta.d
@@ -4,10 +4,10 @@
 Raw dump of debug contents of section \.debug_line:
 #...
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
   \[0x.*\]  Copy
   \[0x.*\]  Advance Line by 1 to 2
-  \[0x.*\]  Advance PC by fixed size amount 0 to 0x0
+  \[0x.*\]  Advance PC by fixed size amount 0 to (0x)?0
   \[0x.*\]  Copy \(view 1\)
   \[0x.*\]  Advance Line by 1 to 3
   \[0x.*\]  Extended opcode 2: set Address to 0x.*
diff --git a/gas/testsuite/gas/mips/loc-swap-2.d b/gas/testsuite/gas/mips/loc-swap-2.d
index 27bc810..b88868a 100644
--- a/gas/testsuite/gas/mips/loc-swap-2.d
+++ b/gas/testsuite/gas/mips/loc-swap-2.d
@@ -6,7 +6,7 @@
 
 Raw dump of debug contents of section .debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      60
   DWARF Version:               3
   Prologue Length:             35
@@ -37,10 +37,10 @@ Raw dump of debug contents of section .debug_line:
   1	0	0	0	loc-swap-2.s
 
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode 11: advance Address by 0 to 0x0 and Line by 6 to 7
-  \[0x.*\]  Special opcode 7: advance Address by 0 to 0x0 and Line by 2 to 9 \(view 1\)
-  \[0x.*\]  Special opcode 6: advance Address by 0 to 0x0 and Line by 1 to 10 \(view 2\)
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode 11: advance Address by 0 to (0x)?0 and Line by 6 to 7
+  \[0x.*\]  Special opcode 7: advance Address by 0 to (0x)?0 and Line by 2 to 9 \(view 1\)
+  \[0x.*\]  Special opcode 6: advance Address by 0 to (0x)?0 and Line by 1 to 10 \(view 2\)
   \[0x.*\]  Special opcode 120: advance Address by 8 to 0x8 and Line by 3 to 13
   \[0x.*\]  Special opcode 62: advance Address by 4 to 0xc and Line by 1 to 14
   \[0x.*\]  Special opcode 6: advance Address by 0 to 0xc and Line by 1 to 15 \(view 1\)
diff --git a/gas/testsuite/gas/mips/loc-swap-3.d b/gas/testsuite/gas/mips/loc-swap-3.d
index 595493c..e72f7d7 100644
--- a/gas/testsuite/gas/mips/loc-swap-3.d
+++ b/gas/testsuite/gas/mips/loc-swap-3.d
@@ -5,13 +5,13 @@
 #...
  Line Number Statements:
 .*  Set prologue_end to true
-.*  Extended opcode 2: set Address to 0x[01]
+.*  Extended opcode 2: set Address to (0x)?[01]
 .*  Copy
 #------------------------------------------------------------------------
 # There used to be a bogus:
 #   Set prologue_end to true
 # here
 #------------------------------------------------------------------------
-.*  Special opcode 6: advance Address by 0 to 0x[01] and Line by 1 to 2 \(view 1\)
+.*  Special opcode 6: advance Address by 0 to (0x)?[01] and Line by 1 to 2 \(view 1\)
 .*  Advance PC by .*
 .*  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/mips/loc-swap.d b/gas/testsuite/gas/mips/loc-swap.d
index 80c7be4..68546e1 100644
--- a/gas/testsuite/gas/mips/loc-swap.d
+++ b/gas/testsuite/gas/mips/loc-swap.d
@@ -9,7 +9,7 @@
 
 Raw dump of debug contents of section \.debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      67
   DWARF Version:               3
   Prologue Length:             33
@@ -40,8 +40,8 @@ Raw dump of debug contents of section \.debug_line:
   1	0	0	0	loc-swap\.s
 
  Line Number Statements:
-  \[0x.*\]  Extended opcode 2: set Address to 0x0
-  \[0x.*\]  Special opcode 11: advance Address by 0 to 0x0 and Line by 6 to 7
+  \[0x.*\]  Extended opcode 2: set Address to (0x)?0
+  \[0x.*\]  Special opcode 11: advance Address by 0 to (0x)?0 and Line by 6 to 7
   \[0x.*\]  Special opcode 63: advance Address by 4 to 0x4 and Line by 2 to 9
   \[0x.*\]  Special opcode 120: advance Address by 8 to 0xc and Line by 3 to 12
   \[0x.*\]  Special opcode 7: advance Address by 0 to 0xc and Line by 2 to 14 \(view 1\)
diff --git a/gas/testsuite/gas/mips/micromips@loc-swap-2.d b/gas/testsuite/gas/mips/micromips@loc-swap-2.d
index c63a854..4940816 100644
--- a/gas/testsuite/gas/mips/micromips@loc-swap-2.d
+++ b/gas/testsuite/gas/mips/micromips@loc-swap-2.d
@@ -6,7 +6,7 @@
 
 Raw dump of debug contents of section .debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      60
   DWARF Version:               3
   Prologue Length:             35
diff --git a/gas/testsuite/gas/mips/micromips@loc-swap.d b/gas/testsuite/gas/mips/micromips@loc-swap.d
index 6ebb510..1c090ae 100644
--- a/gas/testsuite/gas/mips/micromips@loc-swap.d
+++ b/gas/testsuite/gas/mips/micromips@loc-swap.d
@@ -10,7 +10,7 @@
 
 Raw dump of debug contents of section \.debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      67
   DWARF Version:               3
   Prologue Length:             33
diff --git a/gas/testsuite/gas/mips/mips16@loc-swap-2.d b/gas/testsuite/gas/mips/mips16@loc-swap-2.d
index 39fd33d..ebc31c1 100644
--- a/gas/testsuite/gas/mips/mips16@loc-swap-2.d
+++ b/gas/testsuite/gas/mips/mips16@loc-swap-2.d
@@ -6,7 +6,7 @@
 
 Raw dump of debug contents of section .debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      60
   DWARF Version:               3
   Prologue Length:             35
diff --git a/gas/testsuite/gas/mips/mips16@loc-swap.d b/gas/testsuite/gas/mips/mips16@loc-swap.d
index 14cd766..3b522b1 100644
--- a/gas/testsuite/gas/mips/mips16@loc-swap.d
+++ b/gas/testsuite/gas/mips/mips16@loc-swap.d
@@ -9,7 +9,7 @@
 
 Raw dump of debug contents of section \.debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      67
   DWARF Version:               3
   Prologue Length:             33
diff --git a/gas/testsuite/gas/mips/mips16e@loc-swap.d b/gas/testsuite/gas/mips/mips16e@loc-swap.d
index 62e342b..f1294cc 100644
--- a/gas/testsuite/gas/mips/mips16e@loc-swap.d
+++ b/gas/testsuite/gas/mips/mips16e@loc-swap.d
@@ -9,7 +9,7 @@
 
 Raw dump of debug contents of section \.debug_line:
 
-  Offset:                      0x0
+  Offset:                      (0x)?0
   Length:                      67
   DWARF Version:               3
   Prologue Length:             33