From b0a7971ad46c265bd979b17eba3d97a9a63187eb Mon Sep 17 00:00:00 2001 From: Christian Eggers Date: Mon, 4 Nov 2019 08:34:54 +0100 Subject: [PATCH] ld: Fix printed sizes in map file For targets with octets_per_byte > 1, testsuite/ld-scripts/rgn-over* produce wrong sizes in the generated map files: .text 0x0000000000001000 0x6 ^^^ # correct *(.txt) .txt 0x0000000000001000 0xc tmpdir/rgn-over.o ^^^ # should also be 0x6 * ldlang.c (print_input_section): Shift printed size by opb_shift. --- ld/ChangeLog | 4 ++++ ld/ldlang.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 431e5b62b1f..f3aa29817fa 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2019-11-06 Christian Eggers + + * ldlang.c (print_input_section): Shift printed size by opb_shift. + 2019-11-05 Alan Modra * emulparams/aarch64elf.sh (GENERATE_SHLIB_SCRIPT), diff --git a/ld/ldlang.c b/ld/ldlang.c index df7f6594863..eedcb7f4050 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -4653,7 +4653,7 @@ print_input_section (asection *i, bfd_boolean is_discarded) size = 0; } - minfo ("0x%V %W %pB\n", addr, size, i->owner); + minfo ("0x%V %W %pB\n", addr, TO_ADDR (size), i->owner); if (size != i->rawsize && i->rawsize != 0) { @@ -4669,7 +4669,7 @@ print_input_section (asection *i, bfd_boolean is_discarded) --len; } - minfo (_("%W (size before relaxing)\n"), i->rawsize); + minfo (_("%W (size before relaxing)\n"), TO_ADDR (i->rawsize)); } if (i->output_section != NULL