From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 59578 invoked by alias); 8 Apr 2016 05:16:27 -0000 Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org Received: (qmail 59020 invoked by uid 89); 8 Apr 2016 05:15:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 spammy=2016-04-08, output_offset, rejects, howto X-HELO: mail-pf0-f173.google.com Received: from mail-pf0-f173.google.com (HELO mail-pf0-f173.google.com) (209.85.192.173) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Fri, 08 Apr 2016 05:15:13 +0000 Received: by mail-pf0-f173.google.com with SMTP id c20so69481425pfc.1 for ; Thu, 07 Apr 2016 22:15:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=EEamUDD9nahl4w1X7Pg5FnpYn/Vrq0JtOb7YofT5PKI=; b=H4h8Np/MtYS8m9xDS1afwL6iMJid1ko0pt1kW07sHTxwmdW/d57Yd+yzsDzhHcsIy0 FhBbLccUVJV+R0+uv6qgJSkJN1XF8WSSJUUfPg4yGENmAEVPqrTPcK1bYFkcf5NqqFt0 t9uFvpCF2v8GWh8WWWXcQdT+kFtyNVFk7hYitpeETwEdBBA7V2SdV5XixmXQuQSI7Yy4 V6DKMssQwZwPCQsDmBGr6WbJ4bkk1l5APcMETdYh2+AocMXTBwxCCDMZIddfJXBM4PEN IymdEQebWchkEj1VY4Nb4LFBSC7XZIEXnvl2ltHzp9ARSKvU79/ZiyFf81ybF6/RdiB9 rjlg== X-Gm-Message-State: AD7BkJIvekBQHAbsDR4oW6TDSbyiW7sRJ6wFP5f/e52hiG3MlztVhEcFF4ymW/btEzPBbw== X-Received: by 10.98.79.205 with SMTP id f74mr10028590pfj.68.1460092511968; Thu, 07 Apr 2016 22:15:11 -0700 (PDT) Received: from bubble.grove.modra.org (CPE-58-160-146-233.sa.bigpond.net.au. [58.160.146.233]) by smtp.gmail.com with ESMTPSA id ul7sm15680927pac.41.2016.04.07.22.15.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Apr 2016 22:15:11 -0700 (PDT) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id B65A8EA0157; Fri, 8 Apr 2016 14:45:05 +0930 (ACST) Date: Fri, 08 Apr 2016 05:16:00 -0000 From: Alan Modra To: dgisselq@ieee.org Cc: binutils@sourceware.org Subject: Re: [PATCH] Missing TO_ADDR Message-ID: <20160408051505.GQ18129@bubble.grove.modra.org> References: <20160330073151.GK15812@bubble.grove.modra.org> <1459339484.9097.134.camel@jericho> <20160331073959.GT15812@bubble.grove.modra.org> <1459440197.9097.234.camel@jericho> <20160401013145.GB27246@bubble.grove.modra.org> <1459521728.9097.239.camel@jericho> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1459521728.9097.239.camel@jericho> User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes X-SW-Source: 2016-04/txt/msg00139.txt.bz2 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 > > * 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 * 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