From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.2 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by inbox.vuxu.org (OpenSMTPD) with SMTP id 7aac7176 for ; Mon, 20 Jan 2020 21:00:20 +0000 (UTC) Received: (qmail 24039 invoked by uid 550); 20 Jan 2020 21:00:18 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 24018 invoked from network); 20 Jan 2020 21:00:18 -0000 Date: Mon, 20 Jan 2020 16:00:06 -0500 From: Rich Felker To: musl@lists.openwall.com Message-ID: <20200120210006.GN30412@brightrain.aerifal.cx> References: <20200108134809.GB24159@dtznix> <20200108200640.GV30412@brightrain.aerifal.cx> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200108200640.GV30412@brightrain.aerifal.cx> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: Rich Felker Subject: Re: [musl] PATCH: Fix cfi awk scripts for gawk 5 warning On Wed, Jan 08, 2020 at 03:06:40PM -0500, Rich Felker wrote: > On Wed, Jan 08, 2020 at 01:48:09PM -0600, Will Dietz wrote: > > When `awk` is gawk 5.0.1, the cfi awk scripts print a warning > > due to unnecessarily escaping '@' character (see attached patch). > > > > Warning message example: > > > > awk: ./tools/add-cfi.x86_64.awk:79: warning: regexp escape sequence `\@' is not a known regexp operator > > > > Trivial patch addressing this is attached. > > > > Unsure which awk implementations are relevant, > > tested with gawk 4.2.1, gawk 5.0.1, and mawk 1.3.4. > > Also tested with busybox 1.31.1, didn't check config options used (if that matters). > > > > For all, `.cfi_startproc` seems to be inserted appropriately on example used for testing > > (src/math/x86_64/lrintf.s) and no warnings were printed. > > > > Minor issue, but seems might as well fix if there aren't awk's requiring escaping '@'. > > > > Thanks! > > > > ~Will > > > From 004799af62609eab3261ea9a75794dd7281ce02e Mon Sep 17 00:00:00 2001 > > From: Will Dietz > > Date: Wed, 8 Jan 2020 13:20:44 -0600 > > Subject: [PATCH] tools/add-cfi.{i386,x86_64}.awk: fix for gawk 5, '\@' -> '@' > > > > --- > > tools/add-cfi.i386.awk | 2 +- > > tools/add-cfi.x86_64.awk | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/tools/add-cfi.i386.awk b/tools/add-cfi.i386.awk > > index 9162e309..d05037de 100644 > > --- a/tools/add-cfi.i386.awk > > +++ b/tools/add-cfi.i386.awk > > @@ -81,7 +81,7 @@ function adjust_sp_offset(delta) { > > in_function = 0 > > } > > } > > -/^\.type [a-zA-Z0-9_]+,\@function/ { > > +/^\.type [a-zA-Z0-9_]+,@function/ { > > functions[substr($2, 1, length($2)-10)] = 1 > > } > > # not interested in assembler directives beyond this, just pass them through > > diff --git a/tools/add-cfi.x86_64.awk b/tools/add-cfi.x86_64.awk > > index bbc90daa..7e1513d6 100644 > > --- a/tools/add-cfi.x86_64.awk > > +++ b/tools/add-cfi.x86_64.awk > > @@ -76,7 +76,7 @@ function adjust_sp_offset(delta) { > > in_function = 0 > > } > > } > > -/^\.type [a-zA-Z0-9_]+,\@function/ { > > +/^\.type [a-zA-Z0-9_]+,@function/ { > > functions[substr($2, 1, length($2)-10)] = 1 > > } > > # not interested in assembler directives beyond this, just pass them through > > -- > > 2.25.0-rc1 > > > > I think this should be okay, but I'll probably wait until after > release to commit just in case. > > At some point it may make sense to remove these entirely, if we can > get rid of most of the external asm files. Others have reported hitting this, and I think it looks fine. I'm testing with Busybox awk and as long as it works (I expect it to) I'll include it in this release. Rich