* dwarf.c (dwarf_vmatoa): Rename to dwarf_vmatoa_1 and add a

	precision parameter.
	(dwarf_vmatoa): New wrapper for dwarf_vmatoa_1.
	(print_dwarf_vma): Use dwarf_vmatoa_1.
	(SAFE_BYTE_GET): Add check that VAL is big enough to contain
	AMOUNT bytes.
	(process_debug_info): Use an unsigned int for the offset size.
	(process_debug_pubnames): Likewise.
	(display_debug_aranges): Likewise.
	(struct Frame_Chunk): Use dwarf_vma type for pc_begin and pc_range
	fields.
	(frame_display_row): Use print_dwarf_vma to display dwarf_vma
	values.
	(display_debug_frames): Likewise.

	* binutils-all/x86-64/compressed-1a.d: Update expected output to
	allow for 64-bit addresses.

	* ld-elf/eh1.d: Update expected output to allow for
	64-bit addresses.
	* ld-elf/eh2.d: Likewise.
	* ld-elf/eh3.d: Likewise.
	* ld-elf/eh4.d: Likewise.
	* ld-elf/eh5.d: Likewise.
	* ld-elf/eh6.d: Likewise.
	* ld-mips-elf/eh-frame1-n64.d: Likewise.
	* ld-mips-elf/eh-frame2-n64.d: Likewise.
	* ld-mips-elf/eh-frame3.d: Likewise.

	* gas/cfi/cfi-alpha-1.d: Update expected output to allow for
	64-bit addresses.
	* gas/cfi/cfi-alpha-3.d: Likewise.
	* gas/cfi/cfi-arm-1.d: Likewise.
	* gas/cfi/cfi-common-1.d: Likewise.
	* gas/cfi/cfi-common-2.d: Likewise.
	* gas/cfi/cfi-common-3.d: Likewise.
	* gas/cfi/cfi-common-4.d: Likewise.
	* gas/cfi/cfi-common-5.d: Likewise.
	* gas/cfi/cfi-common-6.d: Likewise.
	* gas/cfi/cfi-common-7.d: Likewise.
	* gas/cfi/cfi-hppa-1.d: Likewise.
	* gas/cfi/cfi-i386-2.d: Likewise.
	* gas/cfi/cfi-i386.d: Likewise.
	* gas/cfi/cfi-m68k.d: Likewise.
	* gas/cfi/cfi-mips-1.d: Likewise.
	* gas/cfi/cfi-ppc-1.d: Likewise.
	* gas/cfi/cfi-s390-1.d: Likewise.
	* gas/cfi/cfi-s390x-1.d: Likewise.
	* gas/cfi/cfi-sh-1.d: Likewise.
	* gas/cfi/cfi-sparc-1.d: Likewise.
	* gas/cfi/cfi-sparc64-1.d: Likewise.
	* gas/cfi/cfi-x86_64.d: Likewise.

10 files changed, 275 insertions, 262 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index cb5e77df7a..c471ccd4fa 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+2013-09-12  Nick Clifton  <nickc@redhat.com>
+
+	* ld-elf/eh1.d: Update expected output to allow for
+	64-bit addresses.
+	* ld-elf/eh2.d: Likewise.
+	* ld-elf/eh3.d: Likewise.
+	* ld-elf/eh4.d: Likewise.
+	* ld-elf/eh5.d: Likewise.
+	* ld-elf/eh6.d: Likewise.
+	* ld-mips-elf/eh-frame1-n64.d: Likewise.
+	* ld-mips-elf/eh-frame2-n64.d: Likewise.
+	* ld-mips-elf/eh-frame3.d: Likewise.
+
 2013-09-04  Vidya Praveen  <vidyapraveen@arm.com>
 
 	* ld-arm/export-class.exp: Fix the condition.
diff --git a/ld/testsuite/ld-elf/eh1.d b/ld/testsuite/ld-elf/eh1.d
index 4455b0d9cb..bdf84cc2b8 100644
--- a/ld/testsuite/ld-elf/eh1.d
+++ b/ld/testsuite/ld-elf/eh1.d
@@ -7,7 +7,7 @@
 
 Contents of the .eh_frame section:
 
-00000000 00000014 00000000 CIE
+0+0000 0+014 0+0000 CIE
   Version:               1
   Augmentation:          ""
   Code alignment factor: 1
@@ -23,12 +23,12 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078
-  DW_CFA_advance_loc: 0 to 00400078
+0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+400078..0+400078
+  DW_CFA_advance_loc: 0 to 0+400078
   DW_CFA_def_cfa_offset: 16
   DW_CFA_offset: r6 \(rbp\) at cfa-16
-  DW_CFA_advance_loc: 0 to 00400078
+  DW_CFA_advance_loc: 0 to 0+400078
   DW_CFA_def_cfa_register: r6 \(rbp\)
 
-00000038 ZERO terminator
+0+0038 ZERO terminator
 
diff --git a/ld/testsuite/ld-elf/eh2.d b/ld/testsuite/ld-elf/eh2.d
index c5b5a73a33..65ad44805c 100644
--- a/ld/testsuite/ld-elf/eh2.d
+++ b/ld/testsuite/ld-elf/eh2.d
@@ -7,7 +7,7 @@
 
 Contents of the .eh_frame section:
 
-00000000 00000014 00000000 CIE
+0+0000 0+0014 0+0000 CIE
   Version:               1
   Augmentation:          ""
   Code alignment factor: 1
@@ -23,12 +23,12 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078
-  DW_CFA_advance_loc: 0 to 00400078
+0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+400078..0+400078
+  DW_CFA_advance_loc: 0 to 0+400078
   DW_CFA_def_cfa_offset: 16
   DW_CFA_offset: r6 \(rbp\) at cfa-16
-  DW_CFA_advance_loc: 0 to 00400078
+  DW_CFA_advance_loc: 0 to 0+400078
   DW_CFA_def_cfa_register: r6 \(rbp\)
 
-00000038 ZERO terminator
+0+0038 ZERO terminator
 
diff --git a/ld/testsuite/ld-elf/eh3.d b/ld/testsuite/ld-elf/eh3.d
index b3bd7567c4..2d322dddd3 100644
--- a/ld/testsuite/ld-elf/eh3.d
+++ b/ld/testsuite/ld-elf/eh3.d
@@ -7,7 +7,7 @@
 
 Contents of the .eh_frame section:
 
-00000000 00000014 00000000 CIE
+0+0000 0+0014 0+0000 CIE
   Version:               1
   Augmentation:          ""
   Code alignment factor: 1
@@ -23,12 +23,12 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078
-  DW_CFA_advance_loc: 0 to 00400078
+0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+400078..0+400078
+  DW_CFA_advance_loc: 0 to 0+400078
   DW_CFA_def_cfa_offset: 16
   DW_CFA_offset: r6 \(rbp\) at cfa-16
-  DW_CFA_advance_loc: 0 to 00400078
+  DW_CFA_advance_loc: 0 to 0+400078
   DW_CFA_def_cfa_register: r6 \(rbp\)
 
-00000038 ZERO terminator
+0+0038 ZERO terminator
 #pass
diff --git a/ld/testsuite/ld-elf/eh4.d b/ld/testsuite/ld-elf/eh4.d
index fe3e84b9b9..b5eec2f4d1 100644
--- a/ld/testsuite/ld-elf/eh4.d
+++ b/ld/testsuite/ld-elf/eh4.d
@@ -7,7 +7,7 @@
 
 Contents of the .eh_frame section:
 
-00000000 00000014 00000000 CIE
+0+0000 0+0014 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 1
@@ -20,15 +20,15 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000018 00000014 0000001c FDE cie=00000000 pc=00000400..00000413
-  DW_CFA_set_loc: 00000404
+0+0018 0+0014 0+001c FDE cie=0+0000 pc=0+0400..0+0413
+  DW_CFA_set_loc: 0+0404
   DW_CFA_def_cfa_offset: 80
 
-00000030 00000014 00000034 FDE cie=00000000 pc=00000413..00000426
-  DW_CFA_set_loc: 00000417
+0+0030 0+0014 0+0034 FDE cie=0+0000 pc=0+0413..0+0426
+  DW_CFA_set_loc: 0+0417
   DW_CFA_def_cfa_offset: 80
 
-00000048 00000024 0000004c FDE cie=00000000 pc=[0-9a-f]+\.\.[0-9a-f]+
+0+0048 0+0024 0+004c FDE cie=0+0000 pc=[0-9a-f]+\.\.[0-9a-f]+
   DW_CFA_def_cfa_offset: 16
   DW_CFA_advance_loc: [0-9a-f]+ to [0-9a-f]+
   DW_CFA_def_cfa_offset: 24
diff --git a/ld/testsuite/ld-elf/eh5.d b/ld/testsuite/ld-elf/eh5.d
index f8623825d1..9fea11777c 100644
--- a/ld/testsuite/ld-elf/eh5.d
+++ b/ld/testsuite/ld-elf/eh5.d
@@ -8,7 +8,7 @@
 
 Contents of the .eh_frame section:
 
-00000000 0000001[04] 00000000 CIE
+0+0000 0+001[04] 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: .*
@@ -20,14 +20,14 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 #...
-0000001[48] 00000014 0000001[8c] FDE cie=00000000 pc=.*
+0+001[48] 0+0014 0+001[8c] FDE cie=0+0000 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-000000(2c|30) 00000014 00000000 CIE
+0+00(2c|30) 0+0014 0+0000 CIE
   Version:               1
   Augmentation:          "zPR"
   Code alignment factor: .*
@@ -37,21 +37,21 @@ Contents of the .eh_frame section:
 
   DW_CFA_nop
 
-0000004[48] 00000014 0000001c FDE cie=000000(2c|30) pc=.*
+0+004[48] 0+0014 0+001c FDE cie=0+00(2c|30) pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-000000(5c|60) 00000014 0000006[04] FDE cie=00000000 pc=.*
+0+00(5c|60) 0+0014 0+006[04] FDE cie=0+0000 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-0000007[48] 0000001[8c] 00000000 CIE
+0+007[48] 0+001[8c] 0+0000 CIE
   Version:               1
   Augmentation:          "zPLR"
   Code alignment factor: .*
@@ -63,7 +63,7 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 #...
-0000009[08] 0000001c 0000002[04] FDE cie=0000007[48] pc=.*
+0+009[08] 0+001c 0+002[04] FDE cie=0+007[48] pc=.*
   Augmentation data:     (ef be ad de 00 00 00 00|00 00 00 00 de ad be ef)
 
   DW_CFA_advance_loc: 4 to .*
@@ -72,7 +72,7 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000000b[08] 0000001[04] 00000000 CIE
+0+00b[08] 0+001[04] 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: .*
@@ -82,12 +82,12 @@ Contents of the .eh_frame section:
 
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
 #...
-000000(c4|d0) 0000001[04] 0000001[8c] FDE cie=000000b[08] pc=.*
+0+00(c4|d0) 0+001[04] 0+001[8c] FDE cie=0+00b[08] pc=.*
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 #...
-000000[de]8 00000014 00000000 CIE
+0+00[de]8 0+0014 0+0000 CIE
   Version:               1
   Augmentation:          "zPR"
   Code alignment factor: .*
@@ -97,19 +97,19 @@ Contents of the .eh_frame section:
 
   DW_CFA_nop
 
-00000(0f|10)0 00000014 0000001c FDE cie=000000[de]8 pc=.*
+0+0(0f|10)0 0+0014 0+001c FDE cie=0+00[de]8 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-000001[01]8 0000001[04] 000000(5c|64) FDE cie=000000b[08] pc=.*
+0+01[01]8 0+001[04] 0+00(5c|64) FDE cie=0+00b[08] pc=.*
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 #...
-000001(1c|30) 0000001[8c] 00000000 CIE
+0+01(1c|30) 0+001[8c] 0+0000 CIE
   Version:               1
   Augmentation:          "zPLR"
   Code alignment factor: .*
@@ -121,7 +121,7 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 #...
-000001(38|50) 0000001c 0000002[04] FDE cie=000001(1c|30) pc=.*
+0+01(38|50) 0+001c 0+002[04] FDE cie=0+01(1c|30) pc=.*
   Augmentation data:     (ef be ad de 00 00 00 00|00 00 00 00 de ad be ef)
 
   DW_CFA_advance_loc: 4 to .*
@@ -130,28 +130,28 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000001(58|70) 00000014 000001(5c|74) FDE cie=00000000 pc=.*
+0+01(58|70) 0+0014 0+01(5c|74) FDE cie=0+0000 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 #...
-000001(70|88) 00000014 00000(01c|148|15c) FDE cie=00000(02c|030|170) pc=.*
+0+01(70|88) 0+0014 0+0(01c|148|15c) FDE cie=0+0(02c|030|170) pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-000001(88|a0) 00000014 000001(8c|a4) FDE cie=00000000 pc=.*
+0+01(88|a0) 0+0014 0+01(8c|a4) FDE cie=0+0000 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 #...
-000001(a0|b8|d4) 0000001c 00000(020|130|144) FDE cie=00000(074|078|1b8) pc=.*
+0+01(a0|b8|d4) 0+001c 0+0(020|130|144) FDE cie=0+0(074|078|1b8) pc=.*
   Augmentation data:     (ef be ad de 00 00 00 00|00 00 00 00 de ad be ef)
 
   DW_CFA_advance_loc: 4 to .*
diff --git a/ld/testsuite/ld-elf/eh6.d b/ld/testsuite/ld-elf/eh6.d
index 32a5473ebc..7812af293e 100644
--- a/ld/testsuite/ld-elf/eh6.d
+++ b/ld/testsuite/ld-elf/eh6.d
@@ -5,7 +5,7 @@
 
 Contents of the .eh_frame section:
 
-00000000 0000001[4c] 00000000 CIE
+0+0000 0+001[4c] 0+0000 CIE
   Version:               1
   Augmentation:          "zPR"
   Code alignment factor: 1
diff --git a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
index f0c4dcdbf7..2a7aa305b4 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
@@ -8,34 +8,34 @@
 
 Relocation section '\.rel\.dyn' .*:
  *Offset .*
-000000000000  [0-9a-f]+ R_MIPS_NONE *
+0+00+000  [0-9a-f]+ R_MIPS_NONE *
  *Type2: R_MIPS_NONE *
  *Type3: R_MIPS_NONE *
 # Initial PCs for the FDEs attached to CIE 0x120
-000000030148  [0-9a-f]+ R_MIPS_REL32 *
+0+00030148  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030168  [0-9a-f]+ R_MIPS_REL32 *
+0+00030168  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030308  [0-9a-f]+ R_MIPS_REL32 *
+0+00030308  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030328  [0-9a-f]+ R_MIPS_REL32 *
+0+00030328  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-0000000300cb  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
+0+000300cb  [0-9a-f]+ R_MIPS_REL32      0+00+00+00 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030138  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
+0+00030138  [0-9a-f]+ R_MIPS_REL32      0+00+00+00 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030192  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
+0+00030192  [0-9a-f]+ R_MIPS_REL32      0+00+00+00 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
 Contents of the \.eh_frame section:
 
-00000000 00000014 00000000 CIE
+0+0000 0+0014 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 1
@@ -43,15 +43,15 @@ Contents of the \.eh_frame section:
   Return address column: 31
   Augmentation data:     1c
 
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
+  DW_CFA_advance_loc: 0 to 0+0000
+  DW_CFA_advance_loc: 0 to 0+0000
+  DW_CFA_advance_loc: 0 to 0+0000
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-00000018 0000001c 0000001c FDE cie=00000000 pc=00020000..00020010
+0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+020000..0+020010
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -60,7 +60,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000038 0000001c 0000003c FDE cie=00000000 pc=00020010..00020030
+0+0038 0+001c 0+003c FDE cie=0+0000 pc=0+020010..0+020030
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -70,7 +70,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
 
 # basic2 removed
-00000058 0000001c 0000005c FDE cie=00000000 pc=00020030..00020060
+0+0058 0+001c 0+005c FDE cie=0+0000 pc=0+020030..0+020060
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -80,7 +80,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
 
 # basic3 removed
-00000078 0000001c 0000007c FDE cie=00000000 pc=00020060..000200a0
+0+0078 0+001c 0+007c FDE cie=0+0000 pc=0+020060..0+0200a0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -90,7 +90,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
 
 # basic4 removed
-00000098 0000001c 0000009c FDE cie=00000000 pc=000200a0..000200f0
+0+0098 0+001c 0+009c FDE cie=0+0000 pc=0+0200a0..0+0200f0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -99,7 +99,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000000b8 00000024 00000000 CIE
+0+00b8 0+0024 0+0000 CIE
   Version:               1
   Augmentation:          "zRP"
   Code alignment factor: 1
@@ -107,13 +107,13 @@ Contents of the \.eh_frame section:
   Return address column: 31
   Augmentation data:     1c 00 00 00 00 00 00 00 00 00
 
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
+  DW_CFA_advance_loc: 0 to 0+0000
+  DW_CFA_advance_loc: 0 to 0+0000
+  DW_CFA_advance_loc: 0 to 0+0000
+  DW_CFA_advance_loc: 0 to 0+0000
+  DW_CFA_advance_loc: 0 to 0+0000
+  DW_CFA_advance_loc: 0 to 0+0000
+  DW_CFA_advance_loc: 0 to 0+0000
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -121,25 +121,25 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000000e0 0000001c 0000002c FDE cie=000000b8 pc=000200f0..00020100
-  DW_CFA_advance_loc: 0 to 000200f0
-  DW_CFA_advance_loc: 0 to 000200f0
-  DW_CFA_advance_loc: 0 to 000200f0
-  DW_CFA_advance_loc: 0 to 000200f0
-  DW_CFA_advance_loc: 0 to 000200f0
-  DW_CFA_advance_loc: 0 to 000200f0
-  DW_CFA_advance_loc: 0 to 000200f0
+0+00e0 0+001c 0+002c FDE cie=0+00b8 pc=0+0200f0..0+020100
+  DW_CFA_advance_loc: 0 to 0+0200f0
+  DW_CFA_advance_loc: 0 to 0+0200f0
+  DW_CFA_advance_loc: 0 to 0+0200f0
+  DW_CFA_advance_loc: 0 to 0+0200f0
+  DW_CFA_advance_loc: 0 to 0+0200f0
+  DW_CFA_advance_loc: 0 to 0+0200f0
+  DW_CFA_advance_loc: 0 to 0+0200f0
 
-00000100 0000001c 0000004c FDE cie=000000b8 pc=00020100..00020120
-  DW_CFA_advance_loc: 0 to 00020100
-  DW_CFA_advance_loc: 0 to 00020100
-  DW_CFA_advance_loc: 0 to 00020100
-  DW_CFA_advance_loc: 0 to 00020100
-  DW_CFA_advance_loc: 0 to 00020100
-  DW_CFA_advance_loc: 0 to 00020100
-  DW_CFA_advance_loc: 0 to 00020100
+0+0100 0+001c 0+004c FDE cie=0+00b8 pc=0+020100..0+020120
+  DW_CFA_advance_loc: 0 to 0+020100
+  DW_CFA_advance_loc: 0 to 0+020100
+  DW_CFA_advance_loc: 0 to 0+020100
+  DW_CFA_advance_loc: 0 to 0+020100
+  DW_CFA_advance_loc: 0 to 0+020100
+  DW_CFA_advance_loc: 0 to 0+020100
+  DW_CFA_advance_loc: 0 to 0+020100
 
-00000120 0000001c 00000000 CIE
+0+0120 0+001c 0+0000 CIE
   Version:               1
   Augmentation:          "zP"
   Code alignment factor: 1
@@ -148,25 +148,25 @@ Contents of the \.eh_frame section:
   Augmentation data:     50 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 
 
-00000140 0000001c 00000024 FDE cie=00000120 pc=00020120..00020130
-  DW_CFA_advance_loc: 0 to 00020120
-  DW_CFA_advance_loc: 0 to 00020120
-  DW_CFA_advance_loc: 0 to 00020120
-  DW_CFA_advance_loc: 0 to 00020120
-  DW_CFA_advance_loc: 0 to 00020120
-  DW_CFA_advance_loc: 0 to 00020120
-  DW_CFA_advance_loc: 0 to 00020120
-
-00000160 0000001c 00000044 FDE cie=00000120 pc=00020130..00020150
-  DW_CFA_advance_loc: 0 to 00020130
-  DW_CFA_advance_loc: 0 to 00020130
-  DW_CFA_advance_loc: 0 to 00020130
-  DW_CFA_advance_loc: 0 to 00020130
-  DW_CFA_advance_loc: 0 to 00020130
-  DW_CFA_advance_loc: 0 to 00020130
-  DW_CFA_advance_loc: 0 to 00020130
-
-00000180 0000001c 00000000 CIE
+0+0140 0+001c 0+0024 FDE cie=0+0120 pc=0+020120..0+020130
+  DW_CFA_advance_loc: 0 to 0+020120
+  DW_CFA_advance_loc: 0 to 0+020120
+  DW_CFA_advance_loc: 0 to 0+020120
+  DW_CFA_advance_loc: 0 to 0+020120
+  DW_CFA_advance_loc: 0 to 0+020120
+  DW_CFA_advance_loc: 0 to 0+020120
+  DW_CFA_advance_loc: 0 to 0+020120
+
+0+0160 0+001c 0+0044 FDE cie=0+0120 pc=0+020130..0+020150
+  DW_CFA_advance_loc: 0 to 0+020130
+  DW_CFA_advance_loc: 0 to 0+020130
+  DW_CFA_advance_loc: 0 to 0+020130
+  DW_CFA_advance_loc: 0 to 0+020130
+  DW_CFA_advance_loc: 0 to 0+020130
+  DW_CFA_advance_loc: 0 to 0+020130
+  DW_CFA_advance_loc: 0 to 0+020130
+
+0+0180 0+001c 0+0000 CIE
   Version:               1
   Augmentation:          "zPR"
   Code alignment factor: 1
@@ -174,42 +174,42 @@ Contents of the \.eh_frame section:
   Return address column: 31
   Augmentation data:     00 00 00 00 00 00 00 00 00 1c
 
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-
-000001a0 0000001c 00000024 FDE cie=00000180 pc=00020150..00020160
-  DW_CFA_advance_loc: 0 to 00020150
-  DW_CFA_advance_loc: 0 to 00020150
-  DW_CFA_advance_loc: 0 to 00020150
-  DW_CFA_advance_loc: 0 to 00020150
-  DW_CFA_advance_loc: 0 to 00020150
-  DW_CFA_advance_loc: 0 to 00020150
-  DW_CFA_advance_loc: 0 to 00020150
+  DW_CFA_advance_loc: 0 to 0+0000
+  DW_CFA_advance_loc: 0 to 0+0000
+  DW_CFA_advance_loc: 0 to 0+0000
+  DW_CFA_advance_loc: 0 to 0+0000
+  DW_CFA_advance_loc: 0 to 0+0000
+
+0+01a0 0+001c 0+0024 FDE cie=0+0180 pc=0+020150..0+020160
+  DW_CFA_advance_loc: 0 to 0+020150
+  DW_CFA_advance_loc: 0 to 0+020150
+  DW_CFA_advance_loc: 0 to 0+020150
+  DW_CFA_advance_loc: 0 to 0+020150
+  DW_CFA_advance_loc: 0 to 0+020150
+  DW_CFA_advance_loc: 0 to 0+020150
+  DW_CFA_advance_loc: 0 to 0+020150
 
 # FDE for .discard removed
 # zPR2 removed
-000001c0 0000001c 00000044 FDE cie=00000180 pc=00020160..00020190
-  DW_CFA_advance_loc: 0 to 00020160
-  DW_CFA_advance_loc: 0 to 00020160
-  DW_CFA_advance_loc: 0 to 00020160
-  DW_CFA_advance_loc: 0 to 00020160
-  DW_CFA_advance_loc: 0 to 00020160
-  DW_CFA_advance_loc: 0 to 00020160
-  DW_CFA_advance_loc: 0 to 00020160
+0+01c0 0+001c 0+0044 FDE cie=0+0180 pc=0+020160..0+020190
+  DW_CFA_advance_loc: 0 to 0+020160
+  DW_CFA_advance_loc: 0 to 0+020160
+  DW_CFA_advance_loc: 0 to 0+020160
+  DW_CFA_advance_loc: 0 to 0+020160
+  DW_CFA_advance_loc: 0 to 0+020160
+  DW_CFA_advance_loc: 0 to 0+020160
+  DW_CFA_advance_loc: 0 to 0+020160
 
-000001e0 0000001c 00000064 FDE cie=00000180 pc=00020190..000201d0
-  DW_CFA_advance_loc: 0 to 00020190
-  DW_CFA_advance_loc: 0 to 00020190
-  DW_CFA_advance_loc: 0 to 00020190
-  DW_CFA_advance_loc: 0 to 00020190
-  DW_CFA_advance_loc: 0 to 00020190
-  DW_CFA_advance_loc: 0 to 00020190
-  DW_CFA_advance_loc: 0 to 00020190
+0+01e0 0+001c 0+0064 FDE cie=0+0180 pc=0+020190..0+0201d0
+  DW_CFA_advance_loc: 0 to 0+020190
+  DW_CFA_advance_loc: 0 to 0+020190
+  DW_CFA_advance_loc: 0 to 0+020190
+  DW_CFA_advance_loc: 0 to 0+020190
+  DW_CFA_advance_loc: 0 to 0+020190
+  DW_CFA_advance_loc: 0 to 0+020190
+  DW_CFA_advance_loc: 0 to 0+020190
 
-00000200 0000001c 00000204 FDE cie=00000000 pc=000201d0..000201e0
+0+0200 0+001c 0+0204 FDE cie=0+0000 pc=0+0201d0..0+0201e0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -219,7 +219,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
 
 # basic1 removed, followed by repeat of above
-00000220 0000001c 00000224 FDE cie=00000000 pc=000201e0..000201f0
+0+0220 0+001c 0+0224 FDE cie=0+0000 pc=0+0201e0..0+0201f0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -228,7 +228,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000240 0000001c 00000244 FDE cie=00000000 pc=000201f0..00020210
+0+0240 0+001c 0+0244 FDE cie=0+0000 pc=0+0201f0..0+020210
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -237,7 +237,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000260 0000001c 00000264 FDE cie=00000000 pc=00020210..00020240
+0+0260 0+001c 0+0264 FDE cie=0+0000 pc=0+020210..0+020240
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -246,7 +246,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000280 0000001c 00000284 FDE cie=00000000 pc=00020240..00020280
+0+0280 0+001c 0+0284 FDE cie=0+0000 pc=0+020240..0+020280
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -255,7 +255,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000002a0 0000001c 000002a4 FDE cie=00000000 pc=00020280..000202d0
+0+02a0 0+001c 0+02a4 FDE cie=0+0000 pc=0+020280..0+0202d0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -264,70 +264,70 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000002c0 0000001c 0000020c FDE cie=000000b8 pc=000202d0..000202e0
-  DW_CFA_advance_loc: 0 to 000202d0
-  DW_CFA_advance_loc: 0 to 000202d0
-  DW_CFA_advance_loc: 0 to 000202d0
-  DW_CFA_advance_loc: 0 to 000202d0
-  DW_CFA_advance_loc: 0 to 000202d0
-  DW_CFA_advance_loc: 0 to 000202d0
-  DW_CFA_advance_loc: 0 to 000202d0
+0+02c0 0+001c 0+020c FDE cie=0+00b8 pc=0+0202d0..0+0202e0
+  DW_CFA_advance_loc: 0 to 0+0202d0
+  DW_CFA_advance_loc: 0 to 0+0202d0
+  DW_CFA_advance_loc: 0 to 0+0202d0
+  DW_CFA_advance_loc: 0 to 0+0202d0
+  DW_CFA_advance_loc: 0 to 0+0202d0
+  DW_CFA_advance_loc: 0 to 0+0202d0
+  DW_CFA_advance_loc: 0 to 0+0202d0
 
-000002e0 0000001c 0000022c FDE cie=000000b8 pc=000202e0..00020300
-  DW_CFA_advance_loc: 0 to 000202e0
-  DW_CFA_advance_loc: 0 to 000202e0
-  DW_CFA_advance_loc: 0 to 000202e0
-  DW_CFA_advance_loc: 0 to 000202e0
-  DW_CFA_advance_loc: 0 to 000202e0
-  DW_CFA_advance_loc: 0 to 000202e0
-  DW_CFA_advance_loc: 0 to 000202e0
+0+02e0 0+001c 0+022c FDE cie=0+00b8 pc=0+0202e0..0+020300
+  DW_CFA_advance_loc: 0 to 0+0202e0
+  DW_CFA_advance_loc: 0 to 0+0202e0
+  DW_CFA_advance_loc: 0 to 0+0202e0
+  DW_CFA_advance_loc: 0 to 0+0202e0
+  DW_CFA_advance_loc: 0 to 0+0202e0
+  DW_CFA_advance_loc: 0 to 0+0202e0
+  DW_CFA_advance_loc: 0 to 0+0202e0
 
-00000300 0000001c 000001e4 FDE cie=00000120 pc=00020300..00020310
-  DW_CFA_advance_loc: 0 to 00020300
-  DW_CFA_advance_loc: 0 to 00020300
-  DW_CFA_advance_loc: 0 to 00020300
-  DW_CFA_advance_loc: 0 to 00020300
-  DW_CFA_advance_loc: 0 to 00020300
-  DW_CFA_advance_loc: 0 to 00020300
-  DW_CFA_advance_loc: 0 to 00020300
+0+0300 0+001c 0+01e4 FDE cie=0+0120 pc=0+020300..0+020310
+  DW_CFA_advance_loc: 0 to 0+020300
+  DW_CFA_advance_loc: 0 to 0+020300
+  DW_CFA_advance_loc: 0 to 0+020300
+  DW_CFA_advance_loc: 0 to 0+020300
+  DW_CFA_advance_loc: 0 to 0+020300
+  DW_CFA_advance_loc: 0 to 0+020300
+  DW_CFA_advance_loc: 0 to 0+020300
 
-00000320 0000001c 00000204 FDE cie=00000120 pc=00020310..00020330
-  DW_CFA_advance_loc: 0 to 00020310
-  DW_CFA_advance_loc: 0 to 00020310
-  DW_CFA_advance_loc: 0 to 00020310
-  DW_CFA_advance_loc: 0 to 00020310
-  DW_CFA_advance_loc: 0 to 00020310
-  DW_CFA_advance_loc: 0 to 00020310
-  DW_CFA_advance_loc: 0 to 00020310
+0+0320 0+001c 0+0204 FDE cie=0+0120 pc=0+020310..0+020330
+  DW_CFA_advance_loc: 0 to 0+020310
+  DW_CFA_advance_loc: 0 to 0+020310
+  DW_CFA_advance_loc: 0 to 0+020310
+  DW_CFA_advance_loc: 0 to 0+020310
+  DW_CFA_advance_loc: 0 to 0+020310
+  DW_CFA_advance_loc: 0 to 0+020310
+  DW_CFA_advance_loc: 0 to 0+020310
 
-00000340 0000001c 000001c4 FDE cie=00000180 pc=00020330..00020340
-  DW_CFA_advance_loc: 0 to 00020330
-  DW_CFA_advance_loc: 0 to 00020330
-  DW_CFA_advance_loc: 0 to 00020330
-  DW_CFA_advance_loc: 0 to 00020330
-  DW_CFA_advance_loc: 0 to 00020330
-  DW_CFA_advance_loc: 0 to 00020330
-  DW_CFA_advance_loc: 0 to 00020330
+0+0340 0+001c 0+01c4 FDE cie=0+0180 pc=0+020330..0+020340
+  DW_CFA_advance_loc: 0 to 0+020330
+  DW_CFA_advance_loc: 0 to 0+020330
+  DW_CFA_advance_loc: 0 to 0+020330
+  DW_CFA_advance_loc: 0 to 0+020330
+  DW_CFA_advance_loc: 0 to 0+020330
+  DW_CFA_advance_loc: 0 to 0+020330
+  DW_CFA_advance_loc: 0 to 0+020330
 
-00000360 0000001c 000001e4 FDE cie=00000180 pc=00020340..00020370
-  DW_CFA_advance_loc: 0 to 00020340
-  DW_CFA_advance_loc: 0 to 00020340
-  DW_CFA_advance_loc: 0 to 00020340
-  DW_CFA_advance_loc: 0 to 00020340
-  DW_CFA_advance_loc: 0 to 00020340
-  DW_CFA_advance_loc: 0 to 00020340
-  DW_CFA_advance_loc: 0 to 00020340
+0+0360 0+001c 0+01e4 FDE cie=0+0180 pc=0+020340..0+020370
+  DW_CFA_advance_loc: 0 to 0+020340
+  DW_CFA_advance_loc: 0 to 0+020340
+  DW_CFA_advance_loc: 0 to 0+020340
+  DW_CFA_advance_loc: 0 to 0+020340
+  DW_CFA_advance_loc: 0 to 0+020340
+  DW_CFA_advance_loc: 0 to 0+020340
+  DW_CFA_advance_loc: 0 to 0+020340
 
-00000380 0000001c 00000204 FDE cie=00000180 pc=00020370..000203b0
-  DW_CFA_advance_loc: 0 to 00020370
-  DW_CFA_advance_loc: 0 to 00020370
-  DW_CFA_advance_loc: 0 to 00020370
-  DW_CFA_advance_loc: 0 to 00020370
-  DW_CFA_advance_loc: 0 to 00020370
-  DW_CFA_advance_loc: 0 to 00020370
-  DW_CFA_advance_loc: 0 to 00020370
+0+0380 0+001c 0+0204 FDE cie=0+0180 pc=0+020370..0+0203b0
+  DW_CFA_advance_loc: 0 to 0+020370
+  DW_CFA_advance_loc: 0 to 0+020370
+  DW_CFA_advance_loc: 0 to 0+020370
+  DW_CFA_advance_loc: 0 to 0+020370
+  DW_CFA_advance_loc: 0 to 0+020370
+  DW_CFA_advance_loc: 0 to 0+020370
+  DW_CFA_advance_loc: 0 to 0+020370
 
-000003a0 0000001c 000003a4 FDE cie=00000000 pc=000203b0..000203c0
+0+03a0 0+001c 0+03a4 FDE cie=0+0000 pc=0+0203b0..0+0203c0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
diff --git a/ld/testsuite/ld-mips-elf/eh-frame2-n64.d b/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
index 80a092cc55..05ba94f1eb 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
@@ -8,34 +8,34 @@
 
 Relocation section '\.rel\.dyn' .*:
  *Offset .*
-000000000000  [0-9a-f]+ R_MIPS_NONE *
+0+00000  [0-9a-f]+ R_MIPS_NONE *
  *Type2: R_MIPS_NONE *
  *Type3: R_MIPS_NONE *
 # Initial PCs for the FDEs attached to CIE 0x118
-000000030140  [0-9a-f]+ R_MIPS_REL32 *
+0+00030140  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030160  [0-9a-f]+ R_MIPS_REL32 *
+0+00030160  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030300  [0-9a-f]+ R_MIPS_REL32 *
+0+00030300  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030320  [0-9a-f]+ R_MIPS_REL32 *
+0+00030320  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-0000000300cb  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
+0+000300cb  [0-9a-f]+ R_MIPS_REL32      0+000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030130  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
+0+00030130  [0-9a-f]+ R_MIPS_REL32      0+000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-00000003018a  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
+0+0003018a  [0-9a-f]+ R_MIPS_REL32      0+000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
 Contents of the \.eh_frame section:
 
-00000000 00000014 00000000 CIE
+0+0000 0+0014 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 1
@@ -51,7 +51,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000018 0000001c 0000001c FDE cie=00000000 pc=00020000..00020010
+0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+020000..0+020010
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -60,7 +60,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000038 0000001c 0000003c FDE cie=00000000 pc=00020010..00020030
+0+0038 0+001c 0+003c FDE cie=0+0000 pc=0+020010..0+020030
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -70,7 +70,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
 
 # basic2 removed
-00000058 0000001c 0000005c FDE cie=00000000 pc=00020030..00020060
+0+0058 0+001c 0+005c FDE cie=0+0000 pc=0+020030..0+020060
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -80,7 +80,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
 
 # basic3 removed
-00000078 0000001c 0000007c FDE cie=00000000 pc=00020060..000200a0
+0+0078 0+001c 0+007c FDE cie=0+0000 pc=0+020060..0+0200a0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -90,7 +90,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
 
 # basic4 removed
-00000098 0000001c 0000009c FDE cie=00000000 pc=000200a0..000200f0
+0+0098 0+001c 0+009c FDE cie=0+0000 pc=0+0200a0..0+0200f0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -99,7 +99,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000000b8 0000001c 00000000 CIE
+0+00b8 0+001c 0+0000 CIE
   Version:               1
   Augmentation:          "zRP"
   Code alignment factor: 1
@@ -113,7 +113,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000000d8 0000001c 00000024 FDE cie=000000b8 pc=000200f0..00020100
+0+00d8 0+001c 0+0024 FDE cie=0+00b8 pc=0+0200f0..0+020100
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -122,7 +122,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000000f8 0000001c 00000044 FDE cie=000000b8 pc=00020100..00020120
+0+00f8 0+001c 0+0044 FDE cie=0+00b8 pc=0+020100..0+020120
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -131,7 +131,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000118 0000001c 00000000 CIE
+0+0118 0+001c 0+0000 CIE
   Version:               1
   Augmentation:          "zP"
   Code alignment factor: 1
@@ -140,7 +140,7 @@ Contents of the \.eh_frame section:
   Augmentation data:     50 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 
 
-00000138 0000001c 00000024 FDE cie=00000118 pc=00020120..00020130
+0+0138 0+001c 0+0024 FDE cie=0+0118 pc=0+020120..0+020130
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -149,7 +149,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000158 0000001c 00000044 FDE cie=00000118 pc=00020130..00020150
+0+0158 0+001c 0+0044 FDE cie=0+0118 pc=0+020130..0+020150
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -158,7 +158,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000178 0000001c 00000000 CIE
+0+0178 0+001c 0+0000 CIE
   Version:               1
   Augmentation:          "zPR"
   Code alignment factor: 1
@@ -172,7 +172,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000198 0000001c 00000024 FDE cie=00000178 pc=00020150..00020160
+0+0198 0+001c 0+0024 FDE cie=0+0178 pc=0+020150..0+020160
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -183,7 +183,7 @@ Contents of the \.eh_frame section:
 
 # FDE for .discard removed
 # zPR2 removed
-000001b8 0000001c 00000044 FDE cie=00000178 pc=00020160..00020190
+0+01b8 0+001c 0+0044 FDE cie=0+0178 pc=0+020160..0+020190
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -192,7 +192,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000001d8 0000001c 00000064 FDE cie=00000178 pc=00020190..000201d0
+0+01d8 0+001c 0+0064 FDE cie=0+0178 pc=0+020190..0+0201d0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -201,7 +201,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000001f8 0000001c 000001fc FDE cie=00000000 pc=000201d0..000201e0
+0+01f8 0+001c 0+01fc FDE cie=0+0000 pc=0+0201d0..0+0201e0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -211,7 +211,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
 
 # basic1 removed, followed by repeat of above
-00000218 0000001c 0000021c FDE cie=00000000 pc=000201e0..000201f0
+0+0218 0+001c 0+021c FDE cie=0+0000 pc=0+0201e0..0+0201f0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -220,7 +220,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000238 0000001c 0000023c FDE cie=00000000 pc=000201f0..00020210
+0+0238 0+001c 0+023c FDE cie=0+0000 pc=0+0201f0..0+020210
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -229,7 +229,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000258 0000001c 0000025c FDE cie=00000000 pc=00020210..00020240
+0+0258 0+001c 0+025c FDE cie=0+0000 pc=0+020210..0+020240
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -238,7 +238,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000278 0000001c 0000027c FDE cie=00000000 pc=00020240..00020280
+0+0278 0+001c 0+027c FDE cie=0+0000 pc=0+020240..0+020280
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -247,7 +247,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000298 0000001c 0000029c FDE cie=00000000 pc=00020280..000202d0
+0+0298 0+001c 0+029c FDE cie=0+0000 pc=0+020280..0+0202d0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -256,7 +256,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000002b8 0000001c 00000204 FDE cie=000000b8 pc=000202d0..000202e0
+0+02b8 0+001c 0+0204 FDE cie=0+00b8 pc=0+0202d0..0+0202e0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -265,7 +265,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000002d8 0000001c 00000224 FDE cie=000000b8 pc=000202e0..00020300
+0+02d8 0+001c 0+0224 FDE cie=0+00b8 pc=0+0202e0..0+020300
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -274,7 +274,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000002f8 0000001c 000001e4 FDE cie=00000118 pc=00020300..00020310
+0+02f8 0+001c 0+01e4 FDE cie=0+0118 pc=0+020300..0+020310
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -283,7 +283,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000318 0000001c 00000204 FDE cie=00000118 pc=00020310..00020330
+0+0318 0+001c 0+0204 FDE cie=0+0118 pc=0+020310..0+020330
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -292,7 +292,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000338 0000001c 000001c4 FDE cie=00000178 pc=00020330..00020340
+0+0338 0+001c 0+01c4 FDE cie=0+0178 pc=0+020330..0+020340
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -301,7 +301,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000358 0000001c 000001e4 FDE cie=00000178 pc=00020340..00020370
+0+0358 0+001c 0+01e4 FDE cie=0+0178 pc=0+020340..0+020370
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -310,7 +310,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000378 0000001c 00000204 FDE cie=00000178 pc=00020370..000203b0
+0+0378 0+001c 0+0204 FDE cie=0+0178 pc=0+020370..0+0203b0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -319,7 +319,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000398 0000001c 0000039c FDE cie=00000000 pc=000203b0..000203c0
+0+0398 0+001c 0+039c FDE cie=0+0000 pc=0+0203b0..0+0203c0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
diff --git a/ld/testsuite/ld-mips-elf/eh-frame3.d b/ld/testsuite/ld-mips-elf/eh-frame3.d
index 8225a3c14d..10d0cd851e 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame3.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame3.d
@@ -11,7 +11,7 @@
 
 Contents of the \.eh_frame section:
 
-00000000 0000000c 00000000 CIE
+0+0000 0+000c 0+0000 CIE
   Version:               1
   Augmentation:          ""
   Code alignment factor: 1
@@ -22,20 +22,20 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000010 00000014 00000014 FDE cie=00000000 pc=00020000..00020010
+0+0010 0+0014 0+0014 FDE cie=0+0000 pc=0+020000..0+020010
 
-00000028 00000014 0000002c FDE cie=00000000 pc=00020010..00020030
+0+0028 0+0014 0+002c FDE cie=0+0000 pc=0+020010..0+020030
 
 # basic2 removed
-00000040 00000014 00000044 FDE cie=00000000 pc=00020030..00020060
+0+0040 0+0014 0+0044 FDE cie=0+0000 pc=0+020030..0+020060
 
 # basic3 removed
-00000058 00000014 0000005c FDE cie=00000000 pc=00020060..000200a0
+0+0058 0+0014 0+005c FDE cie=0+0000 pc=0+020060..0+0200a0
 
 # basic4 removed
-00000070 00000014 00000074 FDE cie=00000000 pc=000200a0..000200f0
+0+0070 0+0014 0+0074 FDE cie=0+0000 pc=0+0200a0..0+0200f0
 
-00000088 0000001c 00000000 CIE
+0+0088 0+001c 0+0000 CIE
   Version:               1
   Augmentation:          "zP"
   Code alignment factor: 1
@@ -51,7 +51,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000000a8 0000001c 00000024 FDE cie=00000088 pc=000200f0..00020100
+0+00a8 0+001c 0+0024 FDE cie=0+0088 pc=0+0200f0..0+020100
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -60,7 +60,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000000c8 0000001c 00000044 FDE cie=00000088 pc=00020100..00020120
+0+00c8 0+001c 0+0044 FDE cie=0+0088 pc=0+020100..0+020120
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -69,7 +69,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000000e8 0000001c 00000000 CIE
+0+00e8 0+001c 0+0000 CIE
   Version:               1
   Augmentation:          "zP"
   Code alignment factor: 1
@@ -78,7 +78,7 @@ Contents of the \.eh_frame section:
   Augmentation data:     50 00 00 00 00 00 00 00 00 00 00 00 50 60 70 80
 
 
-00000108 0000001c 00000024 FDE cie=000000e8 pc=00020120..00020130
+0+0108 0+001c 0+0024 FDE cie=0+00e8 pc=0+020120..0+020130
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -87,7 +87,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000128 0000001c 00000044 FDE cie=000000e8 pc=00020130..00020150
+0+0128 0+001c 0+0044 FDE cie=0+00e8 pc=0+020130..0+020150
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -96,7 +96,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000148 0000001c 00000000 CIE
+0+0148 0+001c 0+0000 CIE
   Version:               1
   Augmentation:          "zPR"
   Code alignment factor: 1
@@ -110,7 +110,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000168 0000001c 00000024 FDE cie=00000148 pc=00020150..00020160
+0+0168 0+001c 0+0024 FDE cie=0+0148 pc=0+020150..0+020160
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -121,7 +121,7 @@ Contents of the \.eh_frame section:
 
 # FDE for .discard removed
 # zPR2 removed
-00000188 0000001c 00000044 FDE cie=00000148 pc=00020160..00020190
+0+0188 0+001c 0+0044 FDE cie=0+0148 pc=0+020160..0+020190
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -130,7 +130,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000001a8 0000001c 00000064 FDE cie=00000148 pc=00020190..000201d0
+0+01a8 0+001c 0+0064 FDE cie=0+0148 pc=0+020190..0+0201d0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -139,20 +139,20 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000001c8 00000014 000001cc FDE cie=00000000 pc=000201d0..000201e0
+0+01c8 0+0014 0+01cc FDE cie=0+0000 pc=0+0201d0..0+0201e0
 
 # basic1 removed, followed by repeat of above
-000001e0 00000014 000001e4 FDE cie=00000000 pc=000201e0..000201f0
+0+01e0 0+0014 0+01e4 FDE cie=0+0000 pc=0+0201e0..0+0201f0
 
-000001f8 00000014 000001fc FDE cie=00000000 pc=000201f0..00020210
+0+01f8 0+0014 0+01fc FDE cie=0+0000 pc=0+0201f0..0+020210
 
-00000210 00000014 00000214 FDE cie=00000000 pc=00020210..00020240
+0+0210 0+0014 0+0214 FDE cie=0+0000 pc=0+020210..0+020240
 
-00000228 00000014 0000022c FDE cie=00000000 pc=00020240..00020280
+0+0228 0+0014 0+022c FDE cie=0+0000 pc=0+020240..0+020280
 
-00000240 00000014 00000244 FDE cie=00000000 pc=00020280..000202d0
+0+0240 0+0014 0+0244 FDE cie=0+0000 pc=0+020280..0+0202d0
 
-00000258 0000001c 000001d4 FDE cie=00000088 pc=000202d0..000202e0
+0+0258 0+001c 0+01d4 FDE cie=0+0088 pc=0+0202d0..0+0202e0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -161,7 +161,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000278 0000001c 000001f4 FDE cie=00000088 pc=000202e0..00020300
+0+0278 0+001c 0+01f4 FDE cie=0+0088 pc=0+0202e0..0+020300
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -170,7 +170,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000298 0000001c 000001b4 FDE cie=000000e8 pc=00020300..00020310
+0+0298 0+001c 0+01b4 FDE cie=0+00e8 pc=0+020300..0+020310
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -179,7 +179,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000002b8 0000001c 000001d4 FDE cie=000000e8 pc=00020310..00020330
+0+02b8 0+001c 0+01d4 FDE cie=0+00e8 pc=0+020310..0+020330
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -188,7 +188,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000002d8 0000001c 00000194 FDE cie=00000148 pc=00020330..00020340
+0+02d8 0+001c 0+0194 FDE cie=0+0148 pc=0+020330..0+020340
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -199,7 +199,7 @@ Contents of the \.eh_frame section:
 
 # FDE for .discard removed
 # zPR2 removed
-000002f8 0000001c 000001b4 FDE cie=00000148 pc=00020340..00020370
+0+02f8 0+001c 0+01b4 FDE cie=0+0148 pc=0+020340..0+020370
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -208,7 +208,7 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000318 0000001c 000001d4 FDE cie=00000148 pc=00020370..000203b0
+0+0318 0+001c 0+01d4 FDE cie=0+0148 pc=0+020370..0+0203b0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -217,4 +217,4 @@ Contents of the \.eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000338 00000014 0000033c FDE cie=00000000 pc=000203b0..000203c0
+0+0338 0+0014 0+033c FDE cie=0+0000 pc=0+0203b0..0+0203c0