aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2013-09-12 09:14:47 +0000
committerNick Clifton <nickc@redhat.com>2013-09-12 09:14:47 +0000
commitbf5117e32d50399e78fef3b9d776683b275d924d (patch)
tree13453db39c59912c8e45f5638762e56fc9aa97ce
parent1aa4cd774ca674ee6061e2068a410bb67c8bc812 (diff)
downloadfsf-binutils-gdb-bf5117e32d50399e78fef3b9d776683b275d924d.zip
fsf-binutils-gdb-bf5117e32d50399e78fef3b9d776683b275d924d.tar.gz
fsf-binutils-gdb-bf5117e32d50399e78fef3b9d776683b275d924d.tar.bz2
* 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.
-rw-r--r--binutils/ChangeLog17
-rw-r--r--binutils/dwarf.c200
-rw-r--r--binutils/testsuite/ChangeLog5
-rw-r--r--binutils/testsuite/binutils-all/x86-64/compressed-1a.d4
-rw-r--r--gas/testsuite/ChangeLog26
-rw-r--r--gas/testsuite/gas/cfi/cfi-alpha-1.d6
-rw-r--r--gas/testsuite/gas/cfi/cfi-alpha-3.d18
-rw-r--r--gas/testsuite/gas/cfi/cfi-arm-1.d4
-rw-r--r--gas/testsuite/gas/cfi/cfi-common-1.d4
-rw-r--r--gas/testsuite/gas/cfi/cfi-common-2.d4
-rw-r--r--gas/testsuite/gas/cfi/cfi-common-3.d4
-rw-r--r--gas/testsuite/gas/cfi/cfi-common-4.d6
-rw-r--r--gas/testsuite/gas/cfi/cfi-common-5.d6
-rw-r--r--gas/testsuite/gas/cfi/cfi-common-6.d16
-rw-r--r--gas/testsuite/gas/cfi/cfi-common-7.d4
-rw-r--r--gas/testsuite/gas/cfi/cfi-hppa-1.d18
-rw-r--r--gas/testsuite/gas/cfi/cfi-i386-2.d8
-rw-r--r--gas/testsuite/gas/cfi/cfi-i386.d128
-rw-r--r--gas/testsuite/gas/cfi/cfi-m68k.d16
-rw-r--r--gas/testsuite/gas/cfi/cfi-mips-1.d12
-rw-r--r--gas/testsuite/gas/cfi/cfi-ppc-1.d12
-rw-r--r--gas/testsuite/gas/cfi/cfi-s390-1.d8
-rw-r--r--gas/testsuite/gas/cfi/cfi-s390x-1.d8
-rw-r--r--gas/testsuite/gas/cfi/cfi-sh-1.d12
-rw-r--r--gas/testsuite/gas/cfi/cfi-sparc-1.d6
-rw-r--r--gas/testsuite/gas/cfi/cfi-sparc64-1.d6
-rw-r--r--gas/testsuite/gas/cfi/cfi-x86_64.d226
-rw-r--r--ld/testsuite/ChangeLog13
-rw-r--r--ld/testsuite/ld-elf/eh1.d10
-rw-r--r--ld/testsuite/ld-elf/eh2.d10
-rw-r--r--ld/testsuite/ld-elf/eh3.d10
-rw-r--r--ld/testsuite/ld-elf/eh4.d12
-rw-r--r--ld/testsuite/ld-elf/eh5.d36
-rw-r--r--ld/testsuite/ld-elf/eh6.d2
-rw-r--r--ld/testsuite/ld-mips-elf/eh-frame1-n64.d308
-rw-r--r--ld/testsuite/ld-mips-elf/eh-frame2-n64.d76
-rw-r--r--ld/testsuite/ld-mips-elf/eh-frame3.d60
37 files changed, 705 insertions, 616 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 89f354d..423611c 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,20 @@
+2013-09-12 Nick Clifton <nickc@redhat.com>
+
+ * 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.
+
2013-09-10 Nick Clifton <nickc@redhat.com>
* dwarf.c (display_debug_frames): Check for DW64_CIE_ID when
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 00dad39..8a233aa 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -139,52 +139,27 @@ get_encoded_value (unsigned char *data,
return val;
}
-/* Print a dwarf_vma value (typically an address, offset or length) in
- hexadecimal format, followed by a space. The length of the value (and
- hence the precision displayed) is determined by the byte_size parameter. */
-
-static void
-print_dwarf_vma (dwarf_vma val, unsigned byte_size)
-{
- static char buff[18];
- int offset = 0;
-
- /* Printf does not have a way of specifiying a maximum field width for an
- integer value, so we print the full value into a buffer and then select
- the precision we need. */
#if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2)
#ifndef __MINGW32__
- snprintf (buff, sizeof (buff), "%16.16llx ", val);
+#define DWARF_VMA_FMT "ll"
+#define DWARF_VMA_FMT_LONG "%16.16llx"
#else
- snprintf (buff, sizeof (buff), "%016I64x ", val);
+#define DWARF_VMA_FMT "I64"
+#define DWARF_VMA_FMT_LONG "%016I64x"
#endif
#else
- snprintf (buff, sizeof (buff), "%16.16lx ", val);
+#define DWARF_VMA_FMT "l"
+#define DWARF_VMA_FMT_LONG "%16.16lx"
#endif
- if (byte_size != 0)
- {
- if (byte_size > 0 && byte_size <= 8)
- offset = 16 - 2 * byte_size;
- else
- error (_("Wrong size in print_dwarf_vma"));
- }
-
- fputs (buff + offset, stdout);
-}
-
-#if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2)
-#ifndef __MINGW32__
-#define DWARF_VMA_FMT "ll"
-#else
-#define DWARF_VMA_FMT "I64"
-#endif
-#else
-#define DWARF_VMA_FMT "l"
-#endif
+/* Convert a dwarf vma value into a string. Returns a pointer to a static
+ buffer containing the converted VALUE. The value is converted according
+ to the printf formating character FMTCH. If NUM_BYTES is non-zero then
+ it specifies the maximum number of bytes to be displayed in the converted
+ value and FMTCH is ignored - hex is always used. */
static const char *
-dwarf_vmatoa (const char *fmtch, dwarf_vma value)
+dwarf_vmatoa_1 (const char *fmtch, dwarf_vma value, unsigned num_bytes)
{
/* As dwarf_vmatoa is used more then once in a printf call
for output, we are cycling through an fixed array of pointers
@@ -194,17 +169,45 @@ dwarf_vmatoa (const char *fmtch, dwarf_vma value)
{
char place[64];
} buf[16];
- char fmt[32];
char *ret;
- sprintf (fmt, "%%%s%s", DWARF_VMA_FMT, fmtch);
-
ret = buf[buf_pos++].place;
buf_pos %= ARRAY_SIZE (buf);
- snprintf (ret, sizeof (buf[0].place), fmt, value);
+ if (num_bytes)
+ {
+ /* Printf does not have a way of specifiying a maximum field width for an
+ integer value, so we print the full value into a buffer and then select
+ the precision we need. */
+ snprintf (ret, sizeof (buf[0].place), DWARF_VMA_FMT_LONG, value);
+ if (num_bytes > 8)
+ num_bytes = 8;
+ return ret + (16 - 2 * num_bytes);
+ }
+ else
+ {
+ char fmt[32];
+
+ sprintf (fmt, "%%%s%s", DWARF_VMA_FMT, fmtch);
+ snprintf (ret, sizeof (buf[0].place), fmt, value);
+ return ret;
+ }
+}
- return ret;
+static inline const char *
+dwarf_vmatoa (const char * fmtch, dwarf_vma value)
+{
+ return dwarf_vmatoa_1 (fmtch, value, 0);
+}
+
+/* Print a dwarf_vma value (typically an address, offset or length) in
+ hexadecimal format, followed by a space. The length of the VALUE (and
+ hence the precision displayed) is determined by the NUM_BYTES parameter. */
+
+static void
+print_dwarf_vma (dwarf_vma value, unsigned num_bytes)
+{
+ printf ("%s ", dwarf_vmatoa_1 (NULL, value, num_bytes));
}
/* Format a 64-bit value, given as two 32-bit values, in hex.
@@ -285,6 +288,7 @@ read_uleb128 (unsigned char * data,
#define SAFE_BYTE_GET(VAL, PTR, AMOUNT, END) \
do \
{ \
+ int dummy [sizeof (VAL) < (AMOUNT) ? -1 : 0] ATTRIBUTE_UNUSED ; \
unsigned int amount = (AMOUNT); \
if (((PTR) + amount) >= (END)) \
{ \
@@ -810,7 +814,7 @@ static const char *
get_FORM_name (unsigned long form)
{
const char *name;
-
+
if (form == 0)
return "DW_FORM value: 0";
@@ -2192,7 +2196,7 @@ process_debug_info (struct dwarf_section *section,
unsigned char *tags;
int level, last_level, saved_level;
dwarf_vma cu_offset;
- int offset_size;
+ unsigned int offset_size;
int initial_length_size;
dwarf_vma signature_high = 0;
dwarf_vma signature_low = 0;
@@ -3490,7 +3494,7 @@ display_debug_pubnames (struct dwarf_section *section,
{
unsigned char *data;
unsigned long offset;
- int offset_size, initial_length_size;
+ unsigned int offset_size, initial_length_size;
data = start;
@@ -3773,7 +3777,7 @@ display_debug_macro (struct dwarf_section *section,
dwarf_vma nargs, n;
SAFE_BYTE_GET_AND_INC (count, curr, 1, end);
-
+
memset (extended_op_buf, 0, sizeof (extended_op_buf));
extended_ops = extended_op_buf;
if (count)
@@ -4517,8 +4521,8 @@ display_debug_aranges (struct dwarf_section *section,
dwarf_vma address;
unsigned char address_size;
int excess;
- int offset_size;
- int initial_length_size;
+ unsigned int offset_size;
+ unsigned int initial_length_size;
hdrptr = start;
@@ -4889,8 +4893,8 @@ typedef struct Frame_Chunk
char *augmentation;
unsigned int code_factor;
int data_factor;
- unsigned long pc_begin;
- unsigned long pc_range;
+ dwarf_vma pc_begin;
+ dwarf_vma pc_range;
int cfa_reg;
int cfa_offset;
int ra;
@@ -5075,7 +5079,7 @@ frame_display_row (Frame_Chunk *fc, int *need_col_headers, int *max_regs)
printf ("\n");
}
- printf ("%0*lx ", eh_addr_size * 2, fc->pc_begin);
+ print_dwarf_vma (fc->pc_begin, eh_addr_size);
if (fc->cfa_exp)
strcpy (tmp, "exp");
else
@@ -5145,16 +5149,16 @@ display_debug_frames (struct dwarf_section *section,
{
unsigned char *saved_start;
unsigned char *block_end;
- unsigned long length;
- unsigned long cie_id;
+ dwarf_vma length;
+ dwarf_vma cie_id;
Frame_Chunk *fc;
Frame_Chunk *cie;
int need_col_headers = 1;
unsigned char *augmentation_data = NULL;
unsigned long augmentation_data_len = 0;
- int encoded_ptr_size = saved_eh_addr_size;
- int offset_size;
- int initial_length_size;
+ unsigned int encoded_ptr_size = saved_eh_addr_size;
+ unsigned int offset_size;
+ unsigned int initial_length_size;
saved_start = start;
@@ -5181,8 +5185,9 @@ display_debug_frames (struct dwarf_section *section,
block_end = saved_start + length + initial_length_size;
if (block_end > end)
{
- warn ("Invalid length %#08lx in FDE at %#08lx\n",
- length, (unsigned long)(saved_start - section_start));
+ warn ("Invalid length 0x%s in FDE at %#08lx\n",
+ dwarf_vmatoa_1 (NULL, length, offset_size),
+ (unsigned long) (saved_start - section_start));
block_end = end;
}
@@ -5242,15 +5247,18 @@ display_debug_frames (struct dwarf_section *section,
}
cie = fc;
+ printf ("\n%08lx ", (unsigned long) (saved_start - section_start));
+ print_dwarf_vma (length, fc->ptr_size);
+ print_dwarf_vma (cie_id, fc->ptr_size);
+
if (do_debug_frames_interp)
- printf ("\n%08lx %08lx %08lx CIE \"%s\" cf=%d df=%d ra=%d\n",
- (unsigned long)(saved_start - section_start), length, cie_id,
- fc->augmentation, fc->code_factor, fc->data_factor,
- fc->ra);
+ {
+ printf ("CIE \"%s\" cf=%d df=%d ra=%d\n", fc->augmentation,
+ fc->code_factor, fc->data_factor, fc->ra);
+ }
else
{
- printf ("\n%08lx %08lx %08lx CIE\n",
- (unsigned long)(saved_start - section_start), length, cie_id);
+ printf ("CIE\n");
printf (" Version: %d\n", version);
printf (" Augmentation: \"%s\"\n", fc->augmentation);
if (version >= 4)
@@ -5317,8 +5325,9 @@ display_debug_frames (struct dwarf_section *section,
if (!cie)
{
- warn ("Invalid CIE pointer %#08lx in FDE at %#08lx\n",
- cie_id, (unsigned long)(saved_start - section_start));
+ warn ("Invalid CIE pointer 0x%s in FDE at %#08lx\n",
+ dwarf_vmatoa_1 (NULL, cie_id, offset_size),
+ (unsigned long) (saved_start - section_start));
fc->ncols = 0;
fc->col_type = (short int *) xmalloc (sizeof (short int));
fc->col_offset = (int *) xmalloc (sizeof (int));
@@ -5365,7 +5374,7 @@ display_debug_frames (struct dwarf_section *section,
run of the "objcopy on compressed debug sections" test for an
example of this. */
SAFE_BYTE_GET_AND_INC (fc->pc_range, start, encoded_ptr_size, end);
-
+
if (cie->augmentation[0] == 'z')
{
augmentation_data_len = LEB ();
@@ -5373,12 +5382,19 @@ display_debug_frames (struct dwarf_section *section,
start += augmentation_data_len;
}
- printf ("\n%08lx %08lx %08lx FDE cie=%08lx pc=",
- (unsigned long)(saved_start - section_start), length, cie_id,
+ printf ("\n%08lx %s %s FDE cie=%08lx pc=",
+ (unsigned long)(saved_start - section_start),
+ dwarf_vmatoa_1 (NULL, length, fc->ptr_size),
+ dwarf_vmatoa_1 (NULL, cie_id, fc->ptr_size),
(unsigned long)(cie->chunk_start - section_start));
+
if (fc->segment_size)
printf ("%04lx:", segment_selector);
- printf ("%08lx..%08lx\n", fc->pc_begin, fc->pc_begin + fc->pc_range);
+
+ printf ("%s..%s\n",
+ dwarf_vmatoa_1 (NULL, fc->pc_begin, fc->ptr_size),
+ dwarf_vmatoa_1 (NULL, fc->pc_begin + fc->pc_range, fc->ptr_size));
+
if (! do_debug_frames_interp && augmentation_data_len)
{
unsigned long i;
@@ -5526,7 +5542,8 @@ display_debug_frames (struct dwarf_section *section,
{
unsigned op, opa;
unsigned long ul, reg, roffs;
- long l, ofs;
+ long l;
+ dwarf_vma ofs;
dwarf_vma vma;
const char *reg_prefix = "";
@@ -5543,9 +5560,11 @@ display_debug_frames (struct dwarf_section *section,
if (do_debug_frames_interp)
frame_display_row (fc, &need_col_headers, &max_regs);
else
- printf (" DW_CFA_advance_loc: %d to %08lx\n",
+ printf (" DW_CFA_advance_loc: %d to %s\n",
opa * fc->code_factor,
- fc->pc_begin + opa * fc->code_factor);
+ dwarf_vmatoa_1 (NULL,
+ fc->pc_begin + opa * fc->code_factor,
+ fc->ptr_size));
fc->pc_begin += opa * fc->code_factor;
break;
@@ -5587,7 +5606,8 @@ display_debug_frames (struct dwarf_section *section,
if (do_debug_frames_interp)
frame_display_row (fc, &need_col_headers, &max_regs);
else
- printf (" DW_CFA_set_loc: %08lx\n", (unsigned long)vma);
+ printf (" DW_CFA_set_loc: %s\n",
+ dwarf_vmatoa_1 (NULL, vma, fc->ptr_size));
fc->pc_begin = vma;
break;
@@ -5596,9 +5616,11 @@ display_debug_frames (struct dwarf_section *section,
if (do_debug_frames_interp)
frame_display_row (fc, &need_col_headers, &max_regs);
else
- printf (" DW_CFA_advance_loc1: %ld to %08lx\n",
- ofs * fc->code_factor,
- fc->pc_begin + ofs * fc->code_factor);
+ printf (" DW_CFA_advance_loc1: %ld to %s\n",
+ (unsigned long) (ofs * fc->code_factor),
+ dwarf_vmatoa_1 (NULL,
+ fc->pc_begin + ofs * fc->code_factor,
+ fc->ptr_size));
fc->pc_begin += ofs * fc->code_factor;
break;
@@ -5607,9 +5629,11 @@ display_debug_frames (struct dwarf_section *section,
if (do_debug_frames_interp)
frame_display_row (fc, &need_col_headers, &max_regs);
else
- printf (" DW_CFA_advance_loc2: %ld to %08lx\n",
- ofs * fc->code_factor,
- fc->pc_begin + ofs * fc->code_factor);
+ printf (" DW_CFA_advance_loc2: %ld to %s\n",
+ (unsigned long) (ofs * fc->code_factor),
+ dwarf_vmatoa_1 (NULL,
+ fc->pc_begin + ofs * fc->code_factor,
+ fc->ptr_size));
fc->pc_begin += ofs * fc->code_factor;
break;
@@ -5618,9 +5642,11 @@ display_debug_frames (struct dwarf_section *section,
if (do_debug_frames_interp)
frame_display_row (fc, &need_col_headers, &max_regs);
else
- printf (" DW_CFA_advance_loc4: %ld to %08lx\n",
- ofs * fc->code_factor,
- fc->pc_begin + ofs * fc->code_factor);
+ printf (" DW_CFA_advance_loc4: %ld to %s\n",
+ (unsigned long) (ofs * fc->code_factor),
+ dwarf_vmatoa_1 (NULL,
+ fc->pc_begin + ofs * fc->code_factor,
+ fc->ptr_size));
fc->pc_begin += ofs * fc->code_factor;
break;
@@ -5881,9 +5907,11 @@ display_debug_frames (struct dwarf_section *section,
if (do_debug_frames_interp)
frame_display_row (fc, &need_col_headers, &max_regs);
else
- printf (" DW_CFA_MIPS_advance_loc8: %ld to %08lx\n",
- ofs * fc->code_factor,
- fc->pc_begin + ofs * fc->code_factor);
+ printf (" DW_CFA_MIPS_advance_loc8: %ld to %s\n",
+ (unsigned long) (ofs * fc->code_factor),
+ dwarf_vmatoa_1 (NULL,
+ fc->pc_begin + ofs * fc->code_factor,
+ fc->ptr_size));
fc->pc_begin += ofs * fc->code_factor;
break;
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index a7fd24b..ac2de1f 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-12 Nick Clifton <nickc@redhat.com>
+
+ * binutils-all/x86-64/compressed-1a.d: Update expected output to
+ allow for 64-bit addresses.
+
2013-08-22 Nick Clifton <nickc@redhat.com>
* binutils-all/nm.exp: --size-sort test: Add more ELF-like
diff --git a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
index 45f974d..0dfbdc1 100644
--- a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
+++ b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
@@ -151,7 +151,7 @@ Contents of the .[z]?debug_frame section:
DW_CFA_nop
DW_CFA_nop
-00000018 00000014 00000000 FDE cie=00000000 pc=00000000..00000002
+00000018 00000014 00000000 FDE cie=00000000 pc=0+0000..0+0002
-00000030 00000014 00000000 FDE cie=00000000 pc=00000010..00000015
+00000030 00000014 00000000 FDE cie=00000000 pc=0+0010..0+0015
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 2110cd9..d960d7a 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,29 @@
+2013-09-12 Nick Clifton <nickc@redhat.com>
+
+ * 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.
+
2013-09-04 Tristan Gingold <gingold@adacore.com>
* gas/ppc/aix.exp: Run xcoff-toc-1 test.
diff --git a/gas/testsuite/gas/cfi/cfi-alpha-1.d b/gas/testsuite/gas/cfi/cfi-alpha-1.d
index c132f89..36f03be 100644
--- a/gas/testsuite/gas/cfi/cfi-alpha-1.d
+++ b/gas/testsuite/gas/cfi/cfi-alpha-1.d
@@ -2,7 +2,7 @@
#name: CFI on alpha
Contents of the .eh_frame section:
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+00 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: 4
@@ -13,8 +13,8 @@ Contents of the .eh_frame section:
DW_CFA_def_cfa_register: r30
DW_CFA_nop
-00000014 00000020 00000018 FDE cie=00000000 pc=00000000..00000034
- DW_CFA_advance_loc: 24 to 00000018
+00000014 0+0020 0+0018 FDE cie=00000000 pc=0+0000..0+0034
+ DW_CFA_advance_loc: 24 to 0+0018
DW_CFA_def_cfa: r15 ofs 32
DW_CFA_offset: r26 at cfa-32
DW_CFA_offset: r9 at cfa-24
diff --git a/gas/testsuite/gas/cfi/cfi-alpha-3.d b/gas/testsuite/gas/cfi/cfi-alpha-3.d
index 3c84ce7..79bf9bd 100644
--- a/gas/testsuite/gas/cfi/cfi-alpha-3.d
+++ b/gas/testsuite/gas/cfi/cfi-alpha-3.d
@@ -2,7 +2,7 @@
#name: CFI on alpha, 3
Contents of the .eh_frame section:
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: 4
@@ -13,20 +13,20 @@ Contents of the .eh_frame section:
DW_CFA_def_cfa_register: r30
DW_CFA_nop
-00000014 00000028 00000018 FDE cie=00000000 pc=00000000..00000040
- DW_CFA_advance_loc: 4 to 00000004
+00000014 0+0028 0+0018 FDE cie=00000000 pc=0+0000..0+0040
+ DW_CFA_advance_loc: 4 to 0+0004
DW_CFA_def_cfa_offset: 32
- DW_CFA_advance_loc: 4 to 00000008
+ DW_CFA_advance_loc: 4 to 0+0008
DW_CFA_offset: r26 at cfa-32
- DW_CFA_advance_loc: 4 to 0000000c
+ DW_CFA_advance_loc: 4 to 0+000c
DW_CFA_offset: r9 at cfa-24
- DW_CFA_advance_loc: 4 to 00000010
+ DW_CFA_advance_loc: 4 to 0+0010
DW_CFA_offset: r15 at cfa-16
- DW_CFA_advance_loc: 4 to 00000014
+ DW_CFA_advance_loc: 4 to 0+0014
DW_CFA_offset: r34 at cfa-8
- DW_CFA_advance_loc: 4 to 00000018
+ DW_CFA_advance_loc: 4 to 0+0018
DW_CFA_def_cfa_register: r15
- DW_CFA_advance_loc: 36 to 0000003c
+ DW_CFA_advance_loc: 36 to 0+003c
DW_CFA_def_cfa: r30 ofs 0
DW_CFA_nop
DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-arm-1.d b/gas/testsuite/gas/cfi/cfi-arm-1.d
index e3b534c..8987a7c 100644
--- a/gas/testsuite/gas/cfi/cfi-arm-1.d
+++ b/gas/testsuite/gas/cfi/cfi-arm-1.d
@@ -3,7 +3,7 @@
Contents of the .eh_frame section:
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: 2
@@ -13,7 +13,7 @@ Contents of the .eh_frame section:
DW_CFA_def_cfa: r13 ofs 0
-00000014 00000020 00000018 FDE cie=00000000 pc=00000000..00000018
+00000014 0+0020 0+0018 FDE cie=0+0000 pc=0+0000..0+0018
DW_CFA_advance_loc: 4 to 00000004
DW_CFA_def_cfa: r12 ofs 0
DW_CFA_advance_loc: 4 to 00000008
diff --git a/gas/testsuite/gas/cfi/cfi-common-1.d b/gas/testsuite/gas/cfi/cfi-common-1.d
index 81f3473..40000b8 100644
--- a/gas/testsuite/gas/cfi/cfi-common-1.d
+++ b/gas/testsuite/gas/cfi/cfi-common-1.d
@@ -3,7 +3,7 @@
#...
Contents of the .eh_frame section:
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: .*
@@ -15,7 +15,7 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-00000014 000000(18|1c|20) 00000018 FDE cie=00000000 pc=.*
+00000014 0+00(18|1c|20) 0+0018 FDE cie=0+0000 pc=.*
DW_CFA_advance_loc: 4 to .*
DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
DW_CFA_offset(_extended_sf|): r1( \((rdx|ecx)\)|) at cfa-8
diff --git a/gas/testsuite/gas/cfi/cfi-common-2.d b/gas/testsuite/gas/cfi/cfi-common-2.d
index 184f17d..1e7092c 100644
--- a/gas/testsuite/gas/cfi/cfi-common-2.d
+++ b/gas/testsuite/gas/cfi/cfi-common-2.d
@@ -3,7 +3,7 @@
#...
Contents of the .eh_frame section:
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: .*
@@ -11,7 +11,7 @@ Contents of the .eh_frame section:
Return address column: .*
Augmentation data: [01]b
#...
-00000014 000000[12][c0] 00000018 FDE cie=00000000 pc=.*
+00000014 0+00[12][c0] 0+0018 FDE cie=0+0000 pc=.*
DW_CFA_advance_loc: 4 to .*
DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
DW_CFA_advance_loc: 4 to .*
diff --git a/gas/testsuite/gas/cfi/cfi-common-3.d b/gas/testsuite/gas/cfi/cfi-common-3.d
index b1611e2..954556d 100644
--- a/gas/testsuite/gas/cfi/cfi-common-3.d
+++ b/gas/testsuite/gas/cfi/cfi-common-3.d
@@ -3,7 +3,7 @@
#...
Contents of the .eh_frame section:
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: .*
@@ -11,7 +11,7 @@ Contents of the .eh_frame section:
Return address column: .*
Augmentation data: [01]b
#...
-00000014 00000010 00000018 FDE cie=00000000 pc=.*
+00000014 0+0010 0+0018 FDE cie=00000000 pc=.*
DW_CFA_advance_loc: 4 to .*
DW_CFA_remember_state
DW_CFA_restore_state
diff --git a/gas/testsuite/gas/cfi/cfi-common-4.d b/gas/testsuite/gas/cfi/cfi-common-4.d
index deef6f8..24b218b 100644
--- a/gas/testsuite/gas/cfi/cfi-common-4.d
+++ b/gas/testsuite/gas/cfi/cfi-common-4.d
@@ -3,7 +3,7 @@
#...
Contents of the .eh_frame section:
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: .*
@@ -11,11 +11,11 @@ Contents of the .eh_frame section:
Return address column: .*
Augmentation data: [01]b
#...
-00000014 00000010 00000018 FDE cie=00000000 pc=.*
+00000014 0+0010 0+0018 FDE cie=0+0000 pc=.*
DW_CFA_remember_state
DW_CFA_restore_state
#...
-00000028 0000001[04] 0000002c FDE cie=00000000 pc=.*
+00000028 0+001[04] 0+002c FDE cie=0+0000 pc=.*
DW_CFA_remember_state
DW_CFA_restore_state
#pass
diff --git a/gas/testsuite/gas/cfi/cfi-common-5.d b/gas/testsuite/gas/cfi/cfi-common-5.d
index 81fc212..fa2292f 100644
--- a/gas/testsuite/gas/cfi/cfi-common-5.d
+++ b/gas/testsuite/gas/cfi/cfi-common-5.d
@@ -2,7 +2,7 @@
#name: CFI common 5
Contents of the .eh_frame section:
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: .*
@@ -10,13 +10,13 @@ Contents of the .eh_frame section:
Return address column: .*
Augmentation data: [01]b
#...
-00000014 00000014 00000018 FDE cie=00000000 pc=.*
+00000014 0+0014 0+0018 FDE cie=0+0000 pc=.*
DW_CFA_advance_loc: 4 to .*
DW_CFA_remember_state
DW_CFA_advance_loc: 4 to .*
DW_CFA_restore_state
#...
-0000002c 0000001[48] 00000030 FDE cie=00000000 pc=.*
+0000002c 0+001[48] 0+0030 FDE cie=0+0000 pc=.*
DW_CFA_advance_loc: 4 to .*
DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
DW_CFA_advance_loc: 4 to .*
diff --git a/gas/testsuite/gas/cfi/cfi-common-6.d b/gas/testsuite/gas/cfi/cfi-common-6.d
index c4ed010..16fc20a 100644
--- a/gas/testsuite/gas/cfi/cfi-common-6.d
+++ b/gas/testsuite/gas/cfi/cfi-common-6.d
@@ -3,7 +3,7 @@
#...
Contents of the .eh_frame section:
-00000000 00000018 00000000 CIE
+00000000 0+0018 0+0000 CIE
Version: 1
Augmentation: "zPLR"
Code alignment factor: .*
@@ -15,14 +15,14 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-0000001c 00000018 00000020 FDE cie=00000000 pc=000000(00|24)..000000(04|28)
+0000001c 0+0018 0+0020 FDE cie=0+0000 pc=0+00(00|24)..0+00(04|28)
Augmentation data: (00 00 00 00 de ad be ef|ef be ad de 00 00 00 00)
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
-00000038 00000010 00000000 CIE
+00000038 0+0010 0+0000 CIE
Version: 1
Augmentation: "zLR"
Code alignment factor: .*
@@ -32,21 +32,21 @@ Contents of the .eh_frame section:
DW_CFA_nop
-0000004c 00000018 00000018 FDE cie=00000038 pc=000000(04|58)..000000(08|5c)
+0000004c 0+0018 0+0018 FDE cie=0+0038 pc=0+00(04|58)..0+00(08|5c)
Augmentation data: (00 00 00 00 de ad be ef|ef be ad de 00 00 00 00)
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
-00000068 00000018 0000006c FDE cie=00000000 pc=000000(08|78)..000000(0c|7c)
+00000068 0+0018 0+006c FDE cie=0+0000 pc=0+00(08|78)..0+00(0c|7c)
Augmentation data: (00 00 00 00 be ef de ad|ad de ef be 00 00 00 00)
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
-00000084 00000018 00000000 CIE
+00000084 0+0018 0+0000 CIE
Version: 1
Augmentation: "zPLR"
Code alignment factor: .*
@@ -58,14 +58,14 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-000000a0 00000014 00000020 FDE cie=00000084 pc=000000(0c|b4)..000000(10|b8)
+000000a0 0+0014 0+0020 FDE cie=0+0084 pc=0+00(0c|b4)..0+00(10|b8)
Augmentation data: .. .. .. ..
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
-000000b8 00000014 00000038 FDE cie=00000084 pc=000000(10|d0)..000000(14|d4)
+000000b8 0+0014 0+0038 FDE cie=0+0084 pc=0+00(10|d0)..0+00(14|d4)
Augmentation data: .. .. .. ..
DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-common-7.d b/gas/testsuite/gas/cfi/cfi-common-7.d
index 17a999d..3241a9f 100644
--- a/gas/testsuite/gas/cfi/cfi-common-7.d
+++ b/gas/testsuite/gas/cfi/cfi-common-7.d
@@ -3,7 +3,7 @@
#...
Contents of the .eh_frame section:
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: .*
@@ -15,7 +15,7 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-00000014 000000(18|1c|20) 00000018 FDE cie=00000000 pc=.*
+00000014 0+00(18|1c|20) 0+0018 FDE cie=0+0000 pc=.*
DW_CFA_advance_loc: 16 to .*
DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
DW_CFA_advance_loc[24]: 75040 to .*
diff --git a/gas/testsuite/gas/cfi/cfi-hppa-1.d b/gas/testsuite/gas/cfi/cfi-hppa-1.d
index cbb0767..e434c4f 100644
--- a/gas/testsuite/gas/cfi/cfi-hppa-1.d
+++ b/gas/testsuite/gas/cfi/cfi-hppa-1.d
@@ -2,7 +2,7 @@
#name: CFI on hppa
Contents of the .eh_frame section:
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: 4
@@ -12,25 +12,25 @@ Contents of the .eh_frame section:
DW_CFA_def_cfa: r30 ofs 0
-00000014 000000(18|20) 00000018 FDE cie=00000000 pc=00000000..00000018
- DW_CFA_advance_loc: 8 to 00000008
+00000014 0+00(18|20) 0+0018 FDE cie=0+0000 pc=0+0000..0+0018
+ DW_CFA_advance_loc: 8 to 0+0008
DW_CFA_def_cfa_register: r3
- DW_CFA_advance_loc: 4 to 0000000c
+ DW_CFA_advance_loc: 4 to 0+000c
DW_CFA_def_cfa_offset: 4660
- DW_CFA_advance_loc: 8 to 00000014
+ DW_CFA_advance_loc: 8 to 0+0014
DW_CFA_def_cfa_register: r30
DW_CFA_nop
-0000003[08] 000000(18|20) 0000003[4c] FDE cie=00000000 pc=00000018..00000040
- DW_CFA_advance_loc: 12 to 00000024
+0000003[08] 0+00(18|20) 0+003[4c] FDE cie=0+0000 pc=0+0018..0+0040
+ DW_CFA_advance_loc: 12 to 0+0024
DW_CFA_def_cfa_register: r3
DW_CFA_offset_extended_sf: r2 at cfa-24
- DW_CFA_advance_loc: 24 to 0000003c
+ DW_CFA_advance_loc: 24 to 0+003c
DW_CFA_def_cfa_register: r30
DW_CFA_nop
DW_CFA_nop
-000000[45]c 0000001[08] 000000[56]0 FDE cie=00000000 pc=00000040..00000048
+000000[45]c 0+001[08] 0+00[56]0 FDE cie=0+0000 pc=0+0040..0+0048
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-i386-2.d b/gas/testsuite/gas/cfi/cfi-i386-2.d
index 339b47b..2161b01 100644
--- a/gas/testsuite/gas/cfi/cfi-i386-2.d
+++ b/gas/testsuite/gas/cfi/cfi-i386-2.d
@@ -2,7 +2,7 @@
#name: CFI on i386, 2
Contents of the .eh_frame section:
-00000000 00000014 00000000 CIE
+00000000 0+0014 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: 1
@@ -15,11 +15,11 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-00000018 00000018 0000001c FDE cie=00000000 pc=00000020..00000029
- DW_CFA_advance_loc: 1 to 00000021
+00000018 0+0018 0+001c FDE cie=0+0000 pc=0+0020..0+0029
+ DW_CFA_advance_loc: 1 to 0+0021
DW_CFA_def_cfa_offset: 8
DW_CFA_offset: r5 at cfa-8
- DW_CFA_advance_loc: 4 to 00000025
+ DW_CFA_advance_loc: 4 to 0+0025
DW_CFA_offset: r3 at cfa-12
DW_CFA_def_cfa_offset: 12
DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-i386.d b/gas/testsuite/gas/cfi/cfi-i386.d
index 9b24003..bf08509 100644
--- a/gas/testsuite/gas/cfi/cfi-i386.d
+++ b/gas/testsuite/gas/cfi/cfi-i386.d
@@ -3,7 +3,7 @@
#...
Contents of the .eh_frame section:
-00000000 00000014 00000000 CIE
+00000000 0+0014 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: 1
@@ -16,13 +16,13 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-00000018 00000014 0000001c FDE cie=00000000 pc=00000000..00000012
- DW_CFA_advance_loc: 6 to 00000006
+00000018 0+0014 0+001c FDE cie=0+0000 pc=0+0000..0+0012
+ DW_CFA_advance_loc: 6 to 0+0006
DW_CFA_def_cfa_offset: 4664
- DW_CFA_advance_loc: 11 to 00000011
+ DW_CFA_advance_loc: 11 to 0+0011
DW_CFA_def_cfa_offset: 4
-00000030 00000018 00000034 FDE cie=00000000 pc=00000012..0000001f
+00000030 0+0018 0+0034 FDE cie=0+0000 pc=0+0012..0+001f
DW_CFA_advance_loc: 1 to 00000013
DW_CFA_def_cfa_offset: 8
DW_CFA_offset: r5 \(ebp\) at cfa-8
@@ -31,23 +31,23 @@ Contents of the .eh_frame section:
DW_CFA_advance_loc: 9 to 0000001e
DW_CFA_def_cfa_register: r4 \(esp\)
-0000004c 00000014 00000050 FDE cie=00000000 pc=0000001f..0000002f
- DW_CFA_advance_loc: 2 to 00000021
+0000004c 0+0014 0+0050 FDE cie=0+0000 pc=0+001f..0+002f
+ DW_CFA_advance_loc: 2 to 0+0021
DW_CFA_def_cfa_register: r3 \(ebx\)
- DW_CFA_advance_loc: 13 to 0000002e
+ DW_CFA_advance_loc: 13 to 0+002e
DW_CFA_def_cfa: r4 \(esp\) ofs 4
-00000064 00000010 00000068 FDE cie=00000000 pc=0000002f..00000035
+00000064 0+0010 0+0068 FDE cie=0+000 pc=0+002f..0+0035
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
-00000078 00000010 0000007c FDE cie=00000000 pc=00000035..00000044
+00000078 0+0010 0+007c FDE cie=0+0000 pc=0+0035..0+0044
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
-0000008c 00000010 00000000 CIE
+0000008c 0+0010 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: 1
@@ -58,110 +58,110 @@ Contents of the .eh_frame section:
DW_CFA_undefined: r8 \(eip\)
DW_CFA_nop
-000000a0 000000ac 00000018 FDE cie=0000008c pc=00000044..00000079
- DW_CFA_advance_loc: 1 to 00000045
+0+00a0 0+00ac 0+0018 FDE cie=0+008c pc=0+0044..0+0079
+ DW_CFA_advance_loc: 1 to 0+0045
DW_CFA_undefined: r0 \(eax\)
- DW_CFA_advance_loc: 1 to 00000046
+ DW_CFA_advance_loc: 1 to 0+0046
DW_CFA_undefined: r1 \(ecx\)
- DW_CFA_advance_loc: 1 to 00000047
+ DW_CFA_advance_loc: 1 to 0+0047
DW_CFA_undefined: r2 \(edx\)
- DW_CFA_advance_loc: 1 to 00000048
+ DW_CFA_advance_loc: 1 to 0+0048
DW_CFA_undefined: r3 \(ebx\)
- DW_CFA_advance_loc: 1 to 00000049
+ DW_CFA_advance_loc: 1 to 0+0049
DW_CFA_undefined: r4 \(esp\)
- DW_CFA_advance_loc: 1 to 0000004a
+ DW_CFA_advance_loc: 1 to 0+004a
DW_CFA_undefined: r5 \(ebp\)
- DW_CFA_advance_loc: 1 to 0000004b
+ DW_CFA_advance_loc: 1 to 0+004b
DW_CFA_undefined: r6 \(esi\)
- DW_CFA_advance_loc: 1 to 0000004c
+ DW_CFA_advance_loc: 1 to 0+004c
DW_CFA_undefined: r7 \(edi\)
- DW_CFA_advance_loc: 1 to 0000004d
+ DW_CFA_advance_loc: 1 to 0+004d
DW_CFA_undefined: r9 \(eflags\)
- DW_CFA_advance_loc: 1 to 0000004e
+ DW_CFA_advance_loc: 1 to 0+004e
DW_CFA_undefined: r40 \(es\)
- DW_CFA_advance_loc: 1 to 0000004f
+ DW_CFA_advance_loc: 1 to 0+004f
DW_CFA_undefined: r41 \(cs\)
- DW_CFA_advance_loc: 1 to 00000050
+ DW_CFA_advance_loc: 1 to 0+0050
DW_CFA_undefined: r43 \(ds\)
- DW_CFA_advance_loc: 1 to 00000051
+ DW_CFA_advance_loc: 1 to 0+0051
DW_CFA_undefined: r42 \(ss\)
- DW_CFA_advance_loc: 1 to 00000052
+ DW_CFA_advance_loc: 1 to 0+0052
DW_CFA_undefined: r44 \(fs\)
- DW_CFA_advance_loc: 1 to 00000053
+ DW_CFA_advance_loc: 1 to 0+0053
DW_CFA_undefined: r45 \(gs\)
- DW_CFA_advance_loc: 1 to 00000054
+ DW_CFA_advance_loc: 1 to 0+0054
DW_CFA_undefined: r48 \(tr\)
- DW_CFA_advance_loc: 1 to 00000055
+ DW_CFA_advance_loc: 1 to 0+0055
DW_CFA_undefined: r49 \(ldtr\)
- DW_CFA_advance_loc: 1 to 00000056
+ DW_CFA_advance_loc: 1 to 0+0056
DW_CFA_undefined: r39 \(mxcsr\)
- DW_CFA_advance_loc: 1 to 00000057
+ DW_CFA_advance_loc: 1 to 0+0057
DW_CFA_undefined: r21 \(xmm0\)
- DW_CFA_advance_loc: 1 to 00000058
+ DW_CFA_advance_loc: 1 to 0+0058
DW_CFA_undefined: r22 \(xmm1\)
- DW_CFA_advance_loc: 1 to 00000059
+ DW_CFA_advance_loc: 1 to 0+0059
DW_CFA_undefined: r23 \(xmm2\)
- DW_CFA_advance_loc: 1 to 0000005a
+ DW_CFA_advance_loc: 1 to 0+005a
DW_CFA_undefined: r24 \(xmm3\)
- DW_CFA_advance_loc: 1 to 0000005b
+ DW_CFA_advance_loc: 1 to 0+005b
DW_CFA_undefined: r25 \(xmm4\)
- DW_CFA_advance_loc: 1 to 0000005c
+ DW_CFA_advance_loc: 1 to 0+005c
DW_CFA_undefined: r26 \(xmm5\)
- DW_CFA_advance_loc: 1 to 0000005d
+ DW_CFA_advance_loc: 1 to 0+005d
DW_CFA_undefined: r27 \(xmm6\)
- DW_CFA_advance_loc: 1 to 0000005e
+ DW_CFA_advance_loc: 1 to 0+005e
DW_CFA_undefined: r28 \(xmm7\)
- DW_CFA_advance_loc: 1 to 0000005f
+ DW_CFA_advance_loc: 1 to 0+005f
DW_CFA_undefined: r37 \(fcw\)
- DW_CFA_advance_loc: 1 to 00000060
+ DW_CFA_advance_loc: 1 to 0+0060
DW_CFA_undefined: r38 \(fsw\)
- DW_CFA_advance_loc: 1 to 00000061
+ DW_CFA_advance_loc: 1 to 0+0061
DW_CFA_undefined: r11 \(st\(?0?\)?\)
- DW_CFA_advance_loc: 1 to 00000062
+ DW_CFA_advance_loc: 1 to 0+0062
DW_CFA_undefined: r12 \(st\(?1\)?\)
- DW_CFA_advance_loc: 1 to 00000063
+ DW_CFA_advance_loc: 1 to 0+0063
DW_CFA_undefined: r13 \(st\(?2\)?\)
- DW_CFA_advance_loc: 1 to 00000064
+ DW_CFA_advance_loc: 1 to 0+0064
DW_CFA_undefined: r14 \(st\(?3\)?\)
- DW_CFA_advance_loc: 1 to 00000065
+ DW_CFA_advance_loc: 1 to 0+0065
DW_CFA_undefined: r15 \(st\(?4\)?\)
- DW_CFA_advance_loc: 1 to 00000066
+ DW_CFA_advance_loc: 1 to 0+0066
DW_CFA_undefined: r16 \(st\(?5\)?\)
- DW_CFA_advance_loc: 1 to 00000067
+ DW_CFA_advance_loc: 1 to 0+0067
DW_CFA_undefined: r17 \(st\(?6\)?\)
- DW_CFA_advance_loc: 1 to 00000068
+ DW_CFA_advance_loc: 1 to 0+0068
DW_CFA_undefined: r18 \(st\(?7\)?\)
- DW_CFA_advance_loc: 1 to 00000069
+ DW_CFA_advance_loc: 1 to 0+0069
DW_CFA_undefined: r29 \(mm0\)
- DW_CFA_advance_loc: 1 to 0000006a
+ DW_CFA_advance_loc: 1 to 0+006a
DW_CFA_undefined: r30 \(mm1\)
- DW_CFA_advance_loc: 1 to 0000006b
+ DW_CFA_advance_loc: 1 to 0+006b
DW_CFA_undefined: r31 \(mm2\)
- DW_CFA_advance_loc: 1 to 0000006c
+ DW_CFA_advance_loc: 1 to 0+006c
DW_CFA_undefined: r32 \(mm3\)
- DW_CFA_advance_loc: 1 to 0000006d
+ DW_CFA_advance_loc: 1 to 0+006d
DW_CFA_undefined: r33 \(mm4\)
- DW_CFA_advance_loc: 1 to 0000006e
+ DW_CFA_advance_loc: 1 to 0+006e
DW_CFA_undefined: r34 \(mm5\)
- DW_CFA_advance_loc: 1 to 0000006f
+ DW_CFA_advance_loc: 1 to 0+006f
DW_CFA_undefined: r35 \(mm6\)
- DW_CFA_advance_loc: 1 to 00000070
+ DW_CFA_advance_loc: 1 to 0+0070
DW_CFA_undefined: r36 \(mm7\)
- DW_CFA_advance_loc: 1 to 00000071
+ DW_CFA_advance_loc: 1 to 0+0071
DW_CFA_undefined: r93 \(k0\)
- DW_CFA_advance_loc: 1 to 00000072
+ DW_CFA_advance_loc: 1 to 0+0072
DW_CFA_undefined: r94 \(k1\)
- DW_CFA_advance_loc: 1 to 00000073
+ DW_CFA_advance_loc: 1 to 0+0073
DW_CFA_undefined: r95 \(k2\)
- DW_CFA_advance_loc: 1 to 00000074
+ DW_CFA_advance_loc: 1 to 0+0074
DW_CFA_undefined: r96 \(k3\)
- DW_CFA_advance_loc: 1 to 00000075
+ DW_CFA_advance_loc: 1 to 0+0075
DW_CFA_undefined: r97 \(k4\)
- DW_CFA_advance_loc: 1 to 00000076
+ DW_CFA_advance_loc: 1 to 0+0076
DW_CFA_undefined: r98 \(k5\)
- DW_CFA_advance_loc: 1 to 00000077
+ DW_CFA_advance_loc: 1 to 0+0077
DW_CFA_undefined: r99 \(k6\)
- DW_CFA_advance_loc: 1 to 00000078
+ DW_CFA_advance_loc: 1 to 0+0078
DW_CFA_undefined: r100 \(k7\)
DW_CFA_nop
DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-m68k.d b/gas/testsuite/gas/cfi/cfi-m68k.d
index 4bced7a..017c788 100644
--- a/gas/testsuite/gas/cfi/cfi-m68k.d
+++ b/gas/testsuite/gas/cfi/cfi-m68k.d
@@ -2,7 +2,7 @@
#name: CFI on m68k
Contents of the .eh_frame section:
-00000000 00000014 00000000 CIE
+0+0000 0+0014 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: 2
@@ -15,22 +15,22 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-00000018 00000014 0000001c FDE cie=00000000 pc=00000000..0000000c
- DW_CFA_advance_loc: 4 to 00000004
+0+0018 0+0014 0+001c FDE cie=0+0000 pc=0+0000..0+000c
+ DW_CFA_advance_loc: 4 to 0+0004
DW_CFA_def_cfa_offset: 4664
- DW_CFA_advance_loc: 6 to 0000000a
+ DW_CFA_advance_loc: 6 to 0+000a
DW_CFA_def_cfa_offset: 4
-00000030 00000018 00000034 FDE cie=00000000 pc=0000000c..00000018
- DW_CFA_advance_loc: 4 to 00000010
+0+0030 0+0018 0+0034 FDE cie=0+0000 pc=0+000c..0+0018
+ DW_CFA_advance_loc: 4 to 0+0010
DW_CFA_def_cfa_offset: 8
DW_CFA_offset: r14 at cfa-8
DW_CFA_def_cfa_register: r14
- DW_CFA_advance_loc: 6 to 00000016
+ DW_CFA_advance_loc: 6 to 0+0016
DW_CFA_def_cfa_register: r15
DW_CFA_nop
-0000004c 00000010 00000050 FDE cie=00000000 pc=00000018..0000001c
+0+004c 0+0010 0+0050 FDE cie=0+0000 pc=0+0018..0+001c
DW_CFA_nop
DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-mips-1.d b/gas/testsuite/gas/cfi/cfi-mips-1.d
index bd37752..6635b9f 100644
--- a/gas/testsuite/gas/cfi/cfi-mips-1.d
+++ b/gas/testsuite/gas/cfi/cfi-mips-1.d
@@ -2,7 +2,7 @@
#name: CFI on mips, 1
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
@@ -15,13 +15,13 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-00000018 0000001c 0000001c FDE cie=00000000 pc=00000000..0000002c
- DW_CFA_advance_loc: 4 to 00000004
+0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+0000..0+002c
+ DW_CFA_advance_loc: 4 to 0+0004
DW_CFA_def_cfa_offset: 8
- DW_CFA_advance_loc: 4 to 00000008
+ DW_CFA_advance_loc: 4 to 0+0008
DW_CFA_offset: r30 at cfa-8
- DW_CFA_advance_loc: 4 to 0000000c
+ DW_CFA_advance_loc: 4 to 0+000c
DW_CFA_def_cfa: r30 ofs 8
- DW_CFA_advance_loc: 24 to 00000024
+ DW_CFA_advance_loc: 24 to 0+0024
DW_CFA_def_cfa: r29 ofs 0
DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-ppc-1.d b/gas/testsuite/gas/cfi/cfi-ppc-1.d
index 907fe0b..62b4a8e 100644
--- a/gas/testsuite/gas/cfi/cfi-ppc-1.d
+++ b/gas/testsuite/gas/cfi/cfi-ppc-1.d
@@ -6,7 +6,7 @@
Contents of the .eh_frame section:
-00000000 00000010 00000000 CIE
+0+0000 0+0010 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: [24]
@@ -16,16 +16,16 @@ Contents of the .eh_frame section:
DW_CFA_def_cfa: r1 ofs 0
-00000014 00000020 00000018 FDE cie=00000000 pc=00000000..00000070
- DW_CFA_advance_loc: 4 to 00000004
+0+0014 0+0020 0+0018 FDE cie=0+0000 pc=0+0000..0+0070
+ DW_CFA_advance_loc: 4 to 0+0004
DW_CFA_def_cfa_offset: 48
- DW_CFA_advance_loc: 16 to 00000014
+ DW_CFA_advance_loc: 16 to 0+0014
DW_CFA_offset: r27 at cfa-20
DW_CFA_offset: r26 at cfa-24
DW_CFA_offset_extended_sf: r65 at cfa\+4
- DW_CFA_advance_loc: 8 to 0000001c
+ DW_CFA_advance_loc: 8 to 0+001c
DW_CFA_offset: r28 at cfa-16
- DW_CFA_advance_loc: 8 to 00000024
+ DW_CFA_advance_loc: 8 to 0+0024
DW_CFA_offset: r29 at cfa-12
DW_CFA_nop
DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-s390-1.d b/gas/testsuite/gas/cfi/cfi-s390-1.d
index 4ba11d4..5c7684e 100644
--- a/gas/testsuite/gas/cfi/cfi-s390-1.d
+++ b/gas/testsuite/gas/cfi/cfi-s390-1.d
@@ -4,7 +4,7 @@
Contents of the .eh_frame section:
-00000000 00000010 00000000 CIE
+0+0000 0+0010 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: 1
@@ -14,8 +14,8 @@ Contents of the .eh_frame section:
DW_CFA_def_cfa: r15 ofs 96
-00000014 00000024 00000018 FDE cie=00000000 pc=00000000..0000004e
- DW_CFA_advance_loc: 4 to 00000004
+0+0014 0+0024 0+0018 FDE cie=0+0000 pc=0+0000..0+004e
+ DW_CFA_advance_loc: 4 to 0+0004
DW_CFA_offset: r15 at cfa-36
DW_CFA_offset: r14 at cfa-40
DW_CFA_offset: r13 at cfa-44
@@ -24,7 +24,7 @@ Contents of the .eh_frame section:
DW_CFA_offset: r10 at cfa-56
DW_CFA_offset: r9 at cfa-60
DW_CFA_offset: r8 at cfa-64
- DW_CFA_advance_loc: 22 to 0000001a
+ DW_CFA_advance_loc: 22 to 0+001a
DW_CFA_def_cfa_offset: 192
DW_CFA_nop
DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-s390x-1.d b/gas/testsuite/gas/cfi/cfi-s390x-1.d
index af076ab..6ed5749 100644
--- a/gas/testsuite/gas/cfi/cfi-s390x-1.d
+++ b/gas/testsuite/gas/cfi/cfi-s390x-1.d
@@ -4,7 +4,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
@@ -17,8 +17,8 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-00000018 00000024 0000001c FDE cie=00000000 pc=00000000..00000070
- DW_CFA_advance_loc: 6 to 00000006
+0+0018 0+0024 0+001c FDE cie=0+0000 pc=0+0000..0+0070
+ DW_CFA_advance_loc: 6 to 0+0006
DW_CFA_offset: r15 at cfa-40
DW_CFA_offset: r14 at cfa-48
DW_CFA_offset: r13 at cfa-56
@@ -27,7 +27,7 @@ Contents of the .eh_frame section:
DW_CFA_offset: r10 at cfa-80
DW_CFA_offset: r9 at cfa-88
DW_CFA_offset: r8 at cfa-96
- DW_CFA_advance_loc: 8 to 0000000e
+ DW_CFA_advance_loc: 8 to 0+000e
DW_CFA_def_cfa_offset: 320
DW_CFA_nop
DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-sh-1.d b/gas/testsuite/gas/cfi/cfi-sh-1.d
index b2ee634..60dcf9b 100644
--- a/gas/testsuite/gas/cfi/cfi-sh-1.d
+++ b/gas/testsuite/gas/cfi/cfi-sh-1.d
@@ -2,7 +2,7 @@
#name: CFI on SH
Contents of the .eh_frame section:
-00000000 00000010 00000000 CIE
+0+0000 0+0010 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: 2
@@ -12,16 +12,16 @@ Contents of the .eh_frame section:
DW_CFA_def_cfa: r15 ofs 0
-00000014 00000020 00000018 FDE cie=00000000 pc=00000000..0000002c
- DW_CFA_advance_loc: 2 to 00000002
+0+0014 0+0020 0+0018 FDE cie=0+0000 pc=0+0000..0+002c
+ DW_CFA_advance_loc: 2 to 0+0002
DW_CFA_def_cfa_offset: 4
- DW_CFA_advance_loc: 2 to 00000004
+ DW_CFA_advance_loc: 2 to 0+0004
DW_CFA_def_cfa_offset: 8
DW_CFA_offset: r15 at cfa-4
DW_CFA_offset: r17 at cfa-8
- DW_CFA_advance_loc: 6 to 0000000a
+ DW_CFA_advance_loc: 6 to 0+000a
DW_CFA_def_cfa_register: r14
- DW_CFA_advance_loc: 2 to 0000000c
+ DW_CFA_advance_loc: 2 to 0+000c
DW_CFA_def_cfa_offset: 40
DW_CFA_nop
DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-sparc-1.d b/gas/testsuite/gas/cfi/cfi-sparc-1.d
index b4cd68d..d73f30b 100644
--- a/gas/testsuite/gas/cfi/cfi-sparc-1.d
+++ b/gas/testsuite/gas/cfi/cfi-sparc-1.d
@@ -4,7 +4,7 @@
Contents of the .eh_frame section:
-00000000 00000010 00000000 CIE
+0+0000 0+0010 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: 4
@@ -14,8 +14,8 @@ Contents of the .eh_frame section:
DW_CFA_def_cfa: r14 ofs 0
-00000014 00000014 00000018 FDE cie=00000000 pc=00000000..00000024
- DW_CFA_advance_loc: 4 to 00000004
+0+0014 0+0014 0+0018 FDE cie=0+0000 pc=0+0000..0+0024
+ DW_CFA_advance_loc: 4 to 0+0004
DW_CFA_def_cfa_register: r30
DW_CFA_GNU_window_save
DW_CFA_register: r15 in r31
diff --git a/gas/testsuite/gas/cfi/cfi-sparc64-1.d b/gas/testsuite/gas/cfi/cfi-sparc64-1.d
index 26dbe16..656ddd9 100644
--- a/gas/testsuite/gas/cfi/cfi-sparc64-1.d
+++ b/gas/testsuite/gas/cfi/cfi-sparc64-1.d
@@ -4,7 +4,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: 4
@@ -17,8 +17,8 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-00000018 00000014 0000001c FDE cie=00000000 pc=00000000..00000030
- DW_CFA_advance_loc: 4 to 00000004
+0+0018 0+0014 0+001c FDE cie=0+0000 pc=0+0000..0+0030
+ DW_CFA_advance_loc: 4 to 0+0004
DW_CFA_def_cfa_register: r30
DW_CFA_GNU_window_save
DW_CFA_register: r15 in r31
diff --git a/gas/testsuite/gas/cfi/cfi-x86_64.d b/gas/testsuite/gas/cfi/cfi-x86_64.d
index 22d1465..592416a 100644
--- a/gas/testsuite/gas/cfi/cfi-x86_64.d
+++ b/gas/testsuite/gas/cfi/cfi-x86_64.d
@@ -3,7 +3,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
@@ -16,42 +16,42 @@ Contents of the .eh_frame section:
DW_CFA_nop
DW_CFA_nop
-00000018 00000014 0000001c FDE cie=00000000 pc=00000000..00000014
- DW_CFA_advance_loc: 7 to 00000007
+0+0018 0+0014 0+001c FDE cie=0+0000 pc=0+0000..0+0014
+ DW_CFA_advance_loc: 7 to 0+0007
DW_CFA_def_cfa_offset: 4668
- DW_CFA_advance_loc: 12 to 00000013
+ DW_CFA_advance_loc: 12 to 0+0013
DW_CFA_def_cfa_offset: 8
-00000030 0000001c 00000034 FDE cie=00000000 pc=00000014..00000022
- DW_CFA_advance_loc: 1 to 00000015
+0+0030 0+001c 0+0034 FDE cie=0+0000 pc=0+0014..0+0022
+ DW_CFA_advance_loc: 1 to 0+0015
DW_CFA_def_cfa_offset: 16
DW_CFA_offset: r6 \(rbp\) at cfa-16
- DW_CFA_advance_loc: 3 to 00000018
+ DW_CFA_advance_loc: 3 to 0+0018
DW_CFA_def_cfa_register: r6 \(rbp\)
- DW_CFA_advance_loc: 9 to 00000021
+ DW_CFA_advance_loc: 9 to 0+0021
DW_CFA_def_cfa: r7 \(rsp\) ofs 8
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
-00000050 00000014 00000054 FDE cie=00000000 pc=00000022..00000035
- DW_CFA_advance_loc: 3 to 00000025
+0+0050 0+0014 0+0054 FDE cie=0+0000 pc=0+0022..0+0035
+ DW_CFA_advance_loc: 3 to 0+0025
DW_CFA_def_cfa_register: r8 \(r8\)
- DW_CFA_advance_loc: 15 to 00000034
+ DW_CFA_advance_loc: 15 to 0+0034
DW_CFA_def_cfa_register: r7 \(rsp\)
DW_CFA_nop
-00000068 00000010 0000006c FDE cie=00000000 pc=00000035..0000003b
+0+0068 0+0010 0+006c FDE cie=0+0000 pc=0+0035..0+003b
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
-0000007c 00000010 00000080 FDE cie=00000000 pc=0000003b..0000004d
+0+007c 0+0010 0+0080 FDE cie=0+0000 pc=0+003b..0+004d
DW_CFA_nop
DW_CFA_nop
DW_CFA_nop
-00000090 00000010 00000000 CIE
+0+0090 0+0010 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: 1
@@ -61,30 +61,30 @@ Contents of the .eh_frame section:
DW_CFA_def_cfa: r7 \(rsp\) ofs 8
-000000a4 0000002c 00000018 FDE cie=00000090 pc=0000004d..00000058
- DW_CFA_advance_loc: 1 to 0000004e
+0+00a4 0+002c 0+0018 FDE cie=0+0090 pc=0+004d..0+0058
+ DW_CFA_advance_loc: 1 to 0+004e
DW_CFA_def_cfa_offset: 16
- DW_CFA_advance_loc: 1 to 0000004f
+ DW_CFA_advance_loc: 1 to 0+004f
DW_CFA_def_cfa_register: r8 \(r8\)
- DW_CFA_advance_loc: 1 to 00000050
+ DW_CFA_advance_loc: 1 to 0+0050
DW_CFA_def_cfa_offset: 4676
- DW_CFA_advance_loc: 1 to 00000051
+ DW_CFA_advance_loc: 1 to 0+0051
DW_CFA_offset_extended_sf: r4 \(rsi\) at cfa\+16
- DW_CFA_advance_loc: 1 to 00000052
+ DW_CFA_advance_loc: 1 to 0+0052
DW_CFA_register: r8 \(r8\) in r9 \(r9\)
- DW_CFA_advance_loc: 1 to 00000053
+ DW_CFA_advance_loc: 1 to 0+0053
DW_CFA_remember_state
- DW_CFA_advance_loc: 1 to 00000054
+ DW_CFA_advance_loc: 1 to 0+0054
DW_CFA_restore: r6 \(rbp\)
- DW_CFA_advance_loc: 1 to 00000055
+ DW_CFA_advance_loc: 1 to 0+0055
DW_CFA_undefined: r16 \(rip\)
- DW_CFA_advance_loc: 1 to 00000056
+ DW_CFA_advance_loc: 1 to 0+0056
DW_CFA_same_value: r3 \(rbx\)
- DW_CFA_advance_loc: 1 to 00000057
+ DW_CFA_advance_loc: 1 to 0+0057
DW_CFA_restore_state
DW_CFA_nop
-000000d4 00000010 00000000 CIE
+0+00d4 0+0010 0+0000 CIE
Version: 1
Augmentation: "zR"
Code alignment factor: 1
@@ -95,178 +95,178 @@ Contents of the .eh_frame section:
DW_CFA_undefined: r16 \(rip\)
DW_CFA_nop
-000000e8 0000011[04] 00000018 FDE cie=000000d4 pc=00000058..000000af
- DW_CFA_advance_loc: 1 to 00000059
+0+00e8 0+011[04] 0+0018 FDE cie=0+00d4 pc=0+0058..0+00af
+ DW_CFA_advance_loc: 1 to 0+0059
DW_CFA_undefined: r0 \(rax\)
- DW_CFA_advance_loc: 1 to 0000005a
+ DW_CFA_advance_loc: 1 to 0+005a
DW_CFA_undefined: r2 \(rcx\)
- DW_CFA_advance_loc: 1 to 0000005b
+ DW_CFA_advance_loc: 1 to 0+005b
DW_CFA_undefined: r1 \(rdx\)
- DW_CFA_advance_loc: 1 to 0000005c
+ DW_CFA_advance_loc: 1 to 0+005c
DW_CFA_undefined: r3 \(rbx\)
- DW_CFA_advance_loc: 1 to 0000005d
+ DW_CFA_advance_loc: 1 to 0+005d
DW_CFA_undefined: r7 \(rsp\)
- DW_CFA_advance_loc: 1 to 0000005e
+ DW_CFA_advance_loc: 1 to 0+005e
DW_CFA_undefined: r6 \(rbp\)
- DW_CFA_advance_loc: 1 to 0000005f
+ DW_CFA_advance_loc: 1 to 0+005f
DW_CFA_undefined: r4 \(rsi\)
- DW_CFA_advance_loc: 1 to 00000060
+ DW_CFA_advance_loc: 1 to 0+0060
DW_CFA_undefined: r5 \(rdi\)
- DW_CFA_advance_loc: 1 to 00000061
+ DW_CFA_advance_loc: 1 to 0+0061
DW_CFA_undefined: r8 \(r8\)
- DW_CFA_advance_loc: 1 to 00000062
+ DW_CFA_advance_loc: 1 to 0+0062
DW_CFA_undefined: r9 \(r9\)
- DW_CFA_advance_loc: 1 to 00000063
+ DW_CFA_advance_loc: 1 to 0+0063
DW_CFA_undefined: r10 \(r10\)
- DW_CFA_advance_loc: 1 to 00000064
+ DW_CFA_advance_loc: 1 to 0+0064
DW_CFA_undefined: r11 \(r11\)
- DW_CFA_advance_loc: 1 to 00000065
+ DW_CFA_advance_loc: 1 to 0+0065
DW_CFA_undefined: r12 \(r12\)
- DW_CFA_advance_loc: 1 to 00000066
+ DW_CFA_advance_loc: 1 to 0+0066
DW_CFA_undefined: r13 \(r13\)
- DW_CFA_advance_loc: 1 to 00000067
+ DW_CFA_advance_loc: 1 to 0+0067
DW_CFA_undefined: r14 \(r14\)
- DW_CFA_advance_loc: 1 to 00000068
+ DW_CFA_advance_loc: 1 to 0+0068
DW_CFA_undefined: r15 \(r15\)
- DW_CFA_advance_loc: 1 to 00000069
+ DW_CFA_advance_loc: 1 to 0+0069
DW_CFA_undefined: r49 \([er]flags\)
- DW_CFA_advance_loc: 1 to 0000006a
+ DW_CFA_advance_loc: 1 to 0+006a
DW_CFA_undefined: r50 \(es\)
- DW_CFA_advance_loc: 1 to 0000006b
+ DW_CFA_advance_loc: 1 to 0+006b
DW_CFA_undefined: r51 \(cs\)
- DW_CFA_advance_loc: 1 to 0000006c
+ DW_CFA_advance_loc: 1 to 0+006c
DW_CFA_undefined: r53 \(ds\)
- DW_CFA_advance_loc: 1 to 0000006d
+ DW_CFA_advance_loc: 1 to 0+006d
DW_CFA_undefined: r52 \(ss\)
- DW_CFA_advance_loc: 1 to 0000006e
+ DW_CFA_advance_loc: 1 to 0+006e
DW_CFA_undefined: r54 \(fs\)
- DW_CFA_advance_loc: 1 to 0000006f
+ DW_CFA_advance_loc: 1 to 0+006f
DW_CFA_undefined: r55 \(gs\)
- DW_CFA_advance_loc: 1 to 00000070
+ DW_CFA_advance_loc: 1 to 0+0070
DW_CFA_undefined: r62 \(tr\)
- DW_CFA_advance_loc: 1 to 00000071
+ DW_CFA_advance_loc: 1 to 0+0071
DW_CFA_undefined: r63 \(ldtr\)
- DW_CFA_advance_loc: 1 to 00000072
+ DW_CFA_advance_loc: 1 to 0+0072
DW_CFA_undefined: r58 \(fs\.base\)
- DW_CFA_advance_loc: 1 to 00000073
+ DW_CFA_advance_loc: 1 to 0+0073
DW_CFA_undefined: r59 \(gs\.base\)
- DW_CFA_advance_loc: 1 to 00000074
+ DW_CFA_advance_loc: 1 to 0+0074
DW_CFA_undefined: r64 \(mxcsr\)
- DW_CFA_advance_loc: 1 to 00000075
+ DW_CFA_advance_loc: 1 to 0+0075
DW_CFA_undefined: r17 \(xmm0\)
- DW_CFA_advance_loc: 1 to 00000076
+ DW_CFA_advance_loc: 1 to 0+0076
DW_CFA_undefined: r18 \(xmm1\)
- DW_CFA_advance_loc: 1 to 00000077
+ DW_CFA_advance_loc: 1 to 0+0077
DW_CFA_undefined: r19 \(xmm2\)
- DW_CFA_advance_loc: 1 to 00000078
+ DW_CFA_advance_loc: 1 to 0+0078
DW_CFA_undefined: r20 \(xmm3\)
- DW_CFA_advance_loc: 1 to 00000079
+ DW_CFA_advance_loc: 1 to 0+0079
DW_CFA_undefined: r21 \(xmm4\)
- DW_CFA_advance_loc: 1 to 0000007a
+ DW_CFA_advance_loc: 1 to 0+007a
DW_CFA_undefined: r22 \(xmm5\)
- DW_CFA_advance_loc: 1 to 0000007b
+ DW_CFA_advance_loc: 1 to 0+007b
DW_CFA_undefined: r23 \(xmm6\)
- DW_CFA_advance_loc: 1 to 0000007c
+ DW_CFA_advance_loc: 1 to 0+007c
DW_CFA_undefined: r24 \(xmm7\)
- DW_CFA_advance_loc: 1 to 0000007d
+ DW_CFA_advance_loc: 1 to 0+007d
DW_CFA_undefined: r25 \(xmm8\)
- DW_CFA_advance_loc: 1 to 0000007e
+ DW_CFA_advance_loc: 1 to 0+007e
DW_CFA_undefined: r26 \(xmm9\)
- DW_CFA_advance_loc: 1 to 0000007f
+ DW_CFA_advance_loc: 1 to 0+007f
DW_CFA_undefined: r27 \(xmm10\)
- DW_CFA_advance_loc: 1 to 00000080
+ DW_CFA_advance_loc: 1 to 0+0080
DW_CFA_undefined: r28 \(xmm11\)
- DW_CFA_advance_loc: 1 to 00000081
+ DW_CFA_advance_loc: 1 to 0+0081
DW_CFA_undefined: r29 \(xmm12\)
- DW_CFA_advance_loc: 1 to 00000082
+ DW_CFA_advance_loc: 1 to 0+0082
DW_CFA_undefined: r30 \(xmm13\)
- DW_CFA_advance_loc: 1 to 00000083
+ DW_CFA_advance_loc: 1 to 0+0083
DW_CFA_undefined: r31 \(xmm14\)
- DW_CFA_advance_loc: 1 to 00000084
+ DW_CFA_advance_loc: 1 to 0+0084
DW_CFA_undefined: r32 \(xmm15\)
- DW_CFA_advance_loc: 1 to 00000085
+ DW_CFA_advance_loc: 1 to 0+0085
DW_CFA_undefined: r65 \(fcw\)
- DW_CFA_advance_loc: 1 to 00000086
+ DW_CFA_advance_loc: 1 to 0+0086
DW_CFA_undefined: r66 \(fsw\)
- DW_CFA_advance_loc: 1 to 00000087
+ DW_CFA_advance_loc: 1 to 0+0087
DW_CFA_undefined: r33 \(st\(?0?\)?\)
- DW_CFA_advance_loc: 1 to 00000088
+ DW_CFA_advance_loc: 1 to 0+0088
DW_CFA_undefined: r34 \(st\(?1\)?\)
- DW_CFA_advance_loc: 1 to 00000089
+ DW_CFA_advance_loc: 1 to 0+0089
DW_CFA_undefined: r35 \(st\(?2\)?\)
- DW_CFA_advance_loc: 1 to 0000008a
+ DW_CFA_advance_loc: 1 to 0+008a
DW_CFA_undefined: r36 \(st\(?3\)?\)
- DW_CFA_advance_loc: 1 to 0000008b
+ DW_CFA_advance_loc: 1 to 0+008b
DW_CFA_undefined: r37 \(st\(?4\)?\)
- DW_CFA_advance_loc: 1 to 0000008c
+ DW_CFA_advance_loc: 1 to 0+008c
DW_CFA_undefined: r38 \(st\(?5\)?\)
- DW_CFA_advance_loc: 1 to 0000008d
+ DW_CFA_advance_loc: 1 to 0+008d
DW_CFA_undefined: r39 \(st\(?6\)?\)
- DW_CFA_advance_loc: 1 to 0000008e
+ DW_CFA_advance_loc: 1 to 0+008e
DW_CFA_undefined: r40 \(st\(?7\)?\)
- DW_CFA_advance_loc: 1 to 0000008f
+ DW_CFA_advance_loc: 1 to 0+008f
DW_CFA_undefined: r41 \(mm0\)
- DW_CFA_advance_loc: 1 to 00000090
+ DW_CFA_advance_loc: 1 to 0+0090
DW_CFA_undefined: r42 \(mm1\)
- DW_CFA_advance_loc: 1 to 00000091
+ DW_CFA_advance_loc: 1 to 0+0091
DW_CFA_undefined: r43 \(mm2\)
- DW_CFA_advance_loc: 1 to 00000092
+ DW_CFA_advance_loc: 1 to 0+0092
DW_CFA_undefined: r44 \(mm3\)
- DW_CFA_advance_loc: 1 to 00000093
+ DW_CFA_advance_loc: 1 to 0+0093
DW_CFA_undefined: r45 \(mm4\)
- DW_CFA_advance_loc: 1 to 00000094
+ DW_CFA_advance_loc: 1 to 0+0094
DW_CFA_undefined: r46 \(mm5\)
- DW_CFA_advance_loc: 1 to 00000095
+ DW_CFA_advance_loc: 1 to 0+0095
DW_CFA_undefined: r47 \(mm6\)
- DW_CFA_advance_loc: 1 to 00000096
+ DW_CFA_advance_loc: 1 to 0+0096
DW_CFA_undefined: r48 \(mm7\)
- DW_CFA_advance_loc: 1 to 00000097
+ DW_CFA_advance_loc: 1 to 0+0097
DW_CFA_undefined: r67 \(xmm16\)
- DW_CFA_advance_loc: 1 to 00000098
+ DW_CFA_advance_loc: 1 to 0+0098
DW_CFA_undefined: r68 \(xmm17\)
- DW_CFA_advance_loc: 1 to 00000099
+ DW_CFA_advance_loc: 1 to 0+0099
DW_CFA_undefined: r69 \(xmm18\)
- DW_CFA_advance_loc: 1 to 0000009a
+ DW_CFA_advance_loc: 1 to 0+009a
DW_CFA_undefined: r70 \(xmm19\)
- DW_CFA_advance_loc: 1 to 0000009b
+ DW_CFA_advance_loc: 1 to 0+009b
DW_CFA_undefined: r71 \(xmm20\)
- DW_CFA_advance_loc: 1 to 0000009c
+ DW_CFA_advance_loc: 1 to 0+009c
DW_CFA_undefined: r72 \(xmm21\)
- DW_CFA_advance_loc: 1 to 0000009d
+ DW_CFA_advance_loc: 1 to 0+009d
DW_CFA_undefined: r73 \(xmm22\)
- DW_CFA_advance_loc: 1 to 0000009e
+ DW_CFA_advance_loc: 1 to 0+009e
DW_CFA_undefined: r74 \(xmm23\)
- DW_CFA_advance_loc: 1 to 0000009f
+ DW_CFA_advance_loc: 1 to 0+009f
DW_CFA_undefined: r75 \(xmm24\)
- DW_CFA_advance_loc: 1 to 000000a0
+ DW_CFA_advance_loc: 1 to 0+00a0
DW_CFA_undefined: r76 \(xmm25\)
- DW_CFA_advance_loc: 1 to 000000a1
+ DW_CFA_advance_loc: 1 to 0+00a1
DW_CFA_undefined: r77 \(xmm26\)
- DW_CFA_advance_loc: 1 to 000000a2
+ DW_CFA_advance_loc: 1 to 0+00a2
DW_CFA_undefined: r78 \(xmm27\)
- DW_CFA_advance_loc: 1 to 000000a3
+ DW_CFA_advance_loc: 1 to 0+00a3
DW_CFA_undefined: r79 \(xmm28\)
- DW_CFA_advance_loc: 1 to 000000a4
+ DW_CFA_advance_loc: 1 to 0+00a4
DW_CFA_undefined: r80 \(xmm29\)
- DW_CFA_advance_loc: 1 to 000000a5
+ DW_CFA_advance_loc: 1 to 0+00a5
DW_CFA_undefined: r81 \(xmm30\)
- DW_CFA_advance_loc: 1 to 000000a6
+ DW_CFA_advance_loc: 1 to 0+00a6
DW_CFA_undefined: r82 \(xmm31\)
- DW_CFA_advance_loc: 1 to 000000a7
+ DW_CFA_advance_loc: 1 to 0+00a7
DW_CFA_undefined: r118 \(k0\)
- DW_CFA_advance_loc: 1 to 000000a8
+ DW_CFA_advance_loc: 1 to 0+00a8
DW_CFA_undefined: r119 \(k1\)
- DW_CFA_advance_loc: 1 to 000000a9
+ DW_CFA_advance_loc: 1 to 0+00a9
DW_CFA_undefined: r120 \(k2\)
- DW_CFA_advance_loc: 1 to 000000aa
+ DW_CFA_advance_loc: 1 to 0+00aa
DW_CFA_undefined: r121 \(k3\)
- DW_CFA_advance_loc: 1 to 000000ab
+ DW_CFA_advance_loc: 1 to 0+00ab
DW_CFA_undefined: r122 \(k4\)
- DW_CFA_advance_loc: 1 to 000000ac
+ DW_CFA_advance_loc: 1 to 0+00ac
DW_CFA_undefined: r123 \(k5\)
- DW_CFA_advance_loc: 1 to 000000ad
+ DW_CFA_advance_loc: 1 to 0+00ad
DW_CFA_undefined: r124 \(k6\)
- DW_CFA_advance_loc: 1 to 000000ae
+ DW_CFA_advance_loc: 1 to 0+00ae
DW_CFA_undefined: r125 \(k7\)
DW_CFA_nop
DW_CFA_nop
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index cb5e77d..c471ccd 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 4455b0d..bdf84cc 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 c5b5a73..65ad448 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 b3bd756..2d322dd 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 fe3e84b..b5eec2f 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 f862382..9fea117 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 32a5473..7812af2 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 f0c4dcd..2a7aa30 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 80a092c..05ba94f 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 8225a3c..10d0cd8 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