This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: [PATCH] Missing TO_ADDR
- From: Alan Modra <amodra at gmail dot com>
- To: dgisselq at ieee dot org
- Cc: binutils at sourceware dot org
- Date: Fri, 8 Apr 2016 14:45:05 +0930
- Subject: Re: [PATCH] Missing TO_ADDR
- Authentication-results: sourceware.org; auth=none
- References: <20160330073151 dot GK15812 at bubble dot grove dot modra dot org> <1459339484 dot 9097 dot 134 dot camel at jericho> <20160331073959 dot GT15812 at bubble dot grove dot modra dot org> <1459440197 dot 9097 dot 234 dot camel at jericho> <20160401013145 dot GB27246 at bubble dot grove dot modra dot org> <1459521728 dot 9097 dot 239 dot camel at jericho>
On Fri, Apr 01, 2016 at 10:42:08AM -0400, Dan wrote:
> Alan,
>
> Sorry, I'm still kind of new to the whole idea of posting patches. Will
> this work better?
>
> 2016-04-01 Dan Gisselquist <dgisselq@ieee.org>
>
> * ld/ldlang.c: Updated minfo lines so that map file sizes are
> given in the target machines address units.
> * ld/ldlang.c: Fixed three other references to section sizes
> that didn't go through the size in octets to target address
> units translation
>
> I used diff -Naur -up this time ...
Thanks, but..
Hunk #1 FAILED at 1886.
Hunk #2 succeeded at 4001 (offset -1 lines).
Hunk #3 succeeded at 4311 (offset -1 lines).
Hunk #4 succeeded at 4356 (offset -1 lines).
Hunk #5 succeeded at 4389 (offset -1 lines).
Hunk #6 FAILED at 5069.
Hunk #7 FAILED at 5086.
3 out of 7 hunks FAILED -- saving rejects to file ld/ldlang.c.rej
..so I put it aside until I wasn't quite so busy. The rejects turned
out to be due to me already committing those changes. Here's what I
committed for you, and the style of changelog we use around here.
2016-04-08 Dan Gisselquist <dgisselq@ieee.org>
* ldlang.c (print_output_section_statement): Show minfo size
in target machine address units.
(print_reloc_statement): Likewise.
(print_padding_statement): Likewise.
(print_data_statement): Likewise. Ensure minimum print_dot
increment of one address unit.
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 9fca810..5fbea3f 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -4001,7 +4001,7 @@ print_output_section_statement
++len;
}
- minfo ("0x%V %W", section->vma, section->size);
+ minfo ("0x%V %W", section->vma, TO_ADDR (section->size));
if (section->vma != section->lma)
minfo (_(" load address 0x%V"), section->lma);
@@ -4311,7 +4311,9 @@ print_data_statement (lang_data_statement_type *data)
break;
}
- minfo ("0x%V %W %s 0x%v", addr, size, name, data->value);
+ if (size < TO_SIZE ((unsigned) 1))
+ size = TO_SIZE ((unsigned) 1);
+ minfo ("0x%V %W %s 0x%v", addr, TO_ADDR (size), name, data->value);
if (data->exp->type.node_class != etree_value)
{
@@ -4354,7 +4356,7 @@ print_reloc_statement (lang_reloc_statement_type *reloc)
size = bfd_get_reloc_size (reloc->howto);
- minfo ("0x%V %W RELOC %s ", addr, size, reloc->howto->name);
+ minfo ("0x%V %W RELOC %s ", addr, TO_ADDR (size), reloc->howto->name);
if (reloc->name != NULL)
minfo ("%s+", reloc->name);
@@ -4387,7 +4389,7 @@ print_padding_statement (lang_padding_statement_type *s)
addr = s->output_offset;
if (s->output_section != NULL)
addr += s->output_section->vma;
- minfo ("0x%V %W ", addr, (bfd_vma) s->size);
+ minfo ("0x%V %W ", addr, TO_ADDR (s->size));
if (s->fill->size != 0)
{
--
Alan Modra
Australia Development Lab, IBM