From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/14119 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Rich Felker Newsgroups: gmane.linux.lib.musl.general Subject: Re: [PATCH] remove unused variables from dynlink.c Date: Sun, 12 May 2019 10:31:31 -0400 Message-ID: <20190512143131.GO23599@brightrain.aerifal.cx> References: <20190512015050.wjm37cco537skyf5@gmail.com> <20190512135107.GM23599@brightrain.aerifal.cx> <20190512135418.GN23599@brightrain.aerifal.cx> <20190512142408.2to3ealai3cbtbf5@gmail.com> Reply-To: musl@lists.openwall.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="38061"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Mutt/1.5.21 (2010-09-15) To: musl@lists.openwall.com Original-X-From: musl-return-14135-gllmg-musl=m.gmane.org@lists.openwall.com Sun May 12 16:31:46 2019 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.89) (envelope-from ) id 1hPpVy-0009lq-4P for gllmg-musl@m.gmane.org; Sun, 12 May 2019 16:31:46 +0200 Original-Received: (qmail 20476 invoked by uid 550); 12 May 2019 14:31:44 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 20456 invoked from network); 12 May 2019 14:31:43 -0000 Content-Disposition: inline In-Reply-To: <20190512142408.2to3ealai3cbtbf5@gmail.com> Original-Sender: Rich Felker Xref: news.gmane.org gmane.linux.lib.musl.general:14119 Archived-At: On Sun, May 12, 2019 at 10:24:08PM +0800, Fangrui Song wrote: > On 2019-05-12, Rich Felker wrote: > >On Sun, May 12, 2019 at 09:51:07AM -0400, Rich Felker wrote: > >>On Sun, May 12, 2019 at 09:50:50AM +0800, Fangrui Song wrote: > >>> > >>> --- > >>> ldso/dynlink.c | 1 - > >>> 1 file changed, 1 deletion(-) > >>> > >>> diff --git a/ldso/dynlink.c b/ldso/dynlink.c > >>> index 42a5470d..ad0cdba2 100644 > >>> --- a/ldso/dynlink.c > >>> +++ b/ldso/dynlink.c > >>> @@ -86,7 +86,6 @@ struct dso { > >>> size_t relro_start, relro_end; > >>> uintptr_t *new_dtv; > >>> unsigned char *new_tls; > >>> - volatile int new_dtv_idx, new_tls_idx; > >>> struct td_index *td_index; > >>> struct dso *fini_next; > >>> char *shortname; > >>> -- > >>> 2.21.0 > >> > >>Looks ok. Your mail client seems to have corrupted the patch though; > >>git am is rejecting it for some reason. I'll apply it manually. In the > >>future if you can't get your mail client to send patches inline > >>without breaking the formatting, attachments are fine/preferred. > > > >For future reference, I found what happened: it seems to have removed > >the leading space at the beginning of the context lines (lines with no > >+ or -). > > > >Rich > > Weird. I created the patch with `git format-patch --stdout -1 HEAD`, > sent an email with neomutt to myself, then resent (e) it to the > musl mailing list. Just now I checked my copy of the sent mail has the > desired leading \t. The \t is part of the content, but unified diff lines have a single character *before* the content that's either space (pure context) or + or - (line added or removed). Something in your mail processing seems to have stripped the space and left only the tab (presumably thinking space+tab is "the same as" just a tab... *sigh*) Oddly, GNU patch accepts the version with the space stripped, but this can't be done in general; it would be ambiguous if there were also leading spaces in the content. git[-am/-apply] is a lot more strict about things like this. Rich