This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] ld: Fix printed sizes in map file


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=b0a7971ad46c265bd979b17eba3d97a9a63187eb

commit b0a7971ad46c265bd979b17eba3d97a9a63187eb
Author: Christian Eggers <ceggers@gmx.de>
Date:   Mon Nov 4 08:34:54 2019 +0100

    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.

Diff:
---
 ld/ChangeLog | 4 ++++
 ld/ldlang.c  | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 431e5b6..f3aa298 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2019-11-06  Christian Eggers  <ceggers@gmx.de>
+
+	* ldlang.c (print_input_section): Shift printed size by opb_shift.
+
 2019-11-05  Alan Modra  <amodra@gmail.com>
 
 	* emulparams/aarch64elf.sh (GENERATE_SHLIB_SCRIPT),
diff --git a/ld/ldlang.c b/ld/ldlang.c
index df7f659..eedcb7f 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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]