From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32544 invoked by alias); 6 Jun 2014 10:10:31 -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 32531 invoked by uid 89); 6 Jun 2014 10:10:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: service87.mimecast.com Received: from service87.mimecast.com (HELO service87.mimecast.com) (91.220.42.44) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 06 Jun 2014 10:10:28 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Fri, 06 Jun 2014 11:10:26 +0100 Received: from [10.1.208.33] ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 6 Jun 2014 11:10:22 +0100 Message-ID: <53919391.9070309@arm.com> Date: Fri, 06 Jun 2014 10:10:00 -0000 From: Richard Earnshaw User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:15.0) Gecko/20120907 Thunderbird/15.0.1 MIME-Version: 1.0 To: =?ISO-8859-15?Q?Martin_Storsj=F6?= CC: "binutils@sourceware.org" , Marcus Shawcroft Subject: Re: [PATCH] aarch64: Fix the documentation on :pg_hi21: References: <538C8006.4000807@arm.com> <1401737495-10944-1-git-send-email-martin@martin.st> In-Reply-To: X-MC-Unique: 114060611102600601 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable X-IsSubscribed: yes X-SW-Source: 2014-06/txt/msg00056.txt.bz2 On 03/06/14 21:20, Martin Storsj=F6 wrote: > On Mon, 2 Jun 2014, Martin Storsjo wrote: >=20 >> The syntax described, including a leading '#', was not supported >> in practice. (For :lo12: it is optional.) >> --- >> Added a ChangeLog entry. >> --- >> gas/ChangeLog | 4 ++++ >> gas/doc/c-aarch64.texi | 10 +++++----- >> 2 files changed, 9 insertions(+), 5 deletions(-) >> >> diff --git a/gas/ChangeLog b/gas/ChangeLog >> index 98186d3..911511e 100644 >> --- a/gas/ChangeLog >> +++ b/gas/ChangeLog >> @@ -1,3 +1,7 @@ >> +2014-06-02 Martin Storsjo >> + >> + * doc/c-aarch64.texi: Fix the documentation on :pg_hi21:. >> + >> 2014-05-22 Alan Modra >> >> * listing.c (listing_warning, listing_error): Add space after colon. >> diff --git a/gas/doc/c-aarch64.texi b/gas/doc/c-aarch64.texi >> index cce4f61..3d84123 100644 >> --- a/gas/doc/c-aarch64.texi >> +++ b/gas/doc/c-aarch64.texi >> @@ -186,24 +186,24 @@ For example to load the 48-bit absolute address of= @var{foo} into x0: >> @cindex ADRP, ADD, LDR/STR group relocations, AArch64 >> Relocations for @samp{ADRP}, and @samp{ADD}, @samp{LDR} or @samp{STR} >> instructions can be generated by prefixing the label with >> -@samp{#:pg_hi21:} and @samp{#:lo12:} respectively. >> +@samp{:pg_hi21:} and @samp{:lo12:} respectively. >> >> For example to use 33-bit (+/-4GB) pc-relative addressing to >> load the address of @var{foo} into x0: >> >> @smallexample >> - adrp x0, #:pg_hi21:foo >> + adrp x0, :pg_hi21:foo >> add x0, x0, #:lo12:foo >> @end smallexample >> >> Or to load the value of @var{foo} into x0: >> >> @smallexample >> - adrp x0, #:pg_hi21:foo >> + adrp x0, :pg_hi21:foo >> ldr x0, [x0, #:lo12:foo] >> @end smallexample >> >> -Note that @samp{#:pg_hi21:} is optional. >> +Note that @samp{:pg_hi21:} is optional. >> >> @smallexample >> adrp x0, foo >> @@ -212,7 +212,7 @@ Note that @samp{#:pg_hi21:} is optional. >> is equivalent to >> >> @smallexample >> - adrp x0, #:pg_hi21:foo >> + adrp x0, :pg_hi21:foo >> @end smallexample >> >> @node AArch64 Floating Point >> --=20 >> 1.8.5.2 (Apple Git-48) >=20 > Can someone apply and push this one? It was approved by Marcus yesterday,= =20 > but since I can't push it myself, the ChangeLog has gotten another=20 > conflicting entry now - so whoever applies it will have to fix it up. (I= =20 > won't try to send a new resolved patch because someone else will probably= =20 > touch the ChangeLog inbetween again, before someone gets to pushing it.) >=20 This is why we ask for ChangeLog entries to not be sent as patches. It's far easier to paste Martin Storsjo * doc/c-aarch64.texi: Fix the documentation on :pg_hi21:. directly into the ChangeLog file (inserting the correct date) when preparing the patch for upload than to resolve the conflicts that occur when trying to apply a conflicting diff. The date is the date the patch is applied, not the date you posted it, so it will most likely have to be fixed up anyway. R.