From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id D5FB63858D35 for ; Fri, 16 Jun 2023 16:15:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D5FB63858D35 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 08AC721D50; Fri, 16 Jun 2023 16:15:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1686932101; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=M2HH9YJ8tXnV4TV5Wa48gCj0Gt2WTJL71l923dgdvMM=; b=G+mvKIkf3ZX/1/sONgQcmkLAFCnqg69Eg4CEziosAibwFYk/5F7gH7/Js9MpWdFUu7bswK +etlndKW5t9vu2zCNTp2sMNblTGiZmjT8jtalH1/sdIaBGNwHYdfruDbT3ydohzpiaAp3k 2VhT2GaeM3X7GjuzV/6i3YSA6BEWuX0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1686932101; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=M2HH9YJ8tXnV4TV5Wa48gCj0Gt2WTJL71l923dgdvMM=; b=1PeM2Wh1dy8slzSGI3w8/O5Rtr21tlPMYtMpdi+0Jm3DnS1h5Abt1cwvXe3QDgVC/Jf0bV vE5gHIEj6GN4chBA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id F1036138E8; Fri, 16 Jun 2023 16:15:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id /YnROoSKjGTbFAAAMHmgww (envelope-from ); Fri, 16 Jun 2023 16:15:00 +0000 From: Martin Jambor To: Marek Polacek Cc: GCC Patches Subject: [PATCH] Regenerate some autotools generated files (Was: Re: [PATCH v3] configure: Implement --enable-host-pie) In-Reply-To: References: <20230509194158.329137-1-polacek@redhat.com> User-Agent: Notmuch/0.37 (https://notmuchmail.org) Emacs/28.2 (x86_64-suse-linux-gnu) Date: Fri, 16 Jun 2023 18:15:00 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Fri, Jun 16 2023, Marek Polacek wrote: > On Fri, Jun 16, 2023 at 12:26:23PM +0200, Martin Jambor wrote: >> Hello, >> >> On Thu, Jun 15 2023, Marek Polacek via Gcc-patches wrote: >> > On Mon, Jun 05, 2023 at 09:06:43PM -0600, Jeff Law wrote: >> >> >> >> >> >> On 6/5/23 10:18, Marek Polacek via Gcc-patches wrote: >> >> > Ping. Anyone have any further comments? >> >> Given this was approved before, but got reverted due to issues (which have >> >> since been addressed) -- I think you might as well go forward and sooner >> >> rather than later so that we can catch fallout earlier. >> > >> > Thanks, pushed now, after rebasing, adjusting the patch for >> > r14-1385, and testing with and without --enable-host-pie on >> > both Debian and Fedora. >> > >> > If something comes up and I can't fix it quickly enough, I'll >> > have to revert the patch. We'll see. >> > >> >> The script that regularly checks that the checked-in autotools-generated >> files are in sync now complain about the following diff. Unless someone >> stops me because I overlooked something or for some other reason, I will >> commit it later on as obvious. > > Please, go ahead. > >> I wonder where the "line" differences come from, perhaps you added a >> comment after running autoconf/automake/...? The zlib/Makefile.in hunks > > Arg, I think I must've messed up the #lines when rebasing though I don't > know what went wrong with zlib/Makefile.in. But I don't think the latter > will actually make any difference. > >> like something we should have, though, even if I did not check whether >> it makes any difference in practice. And I want the checking script to >> shut up too ;-) > > Thanks and sorry. > No worries, I have committed the following. Thanks and have a nice weekend, Martin As discussed in https://gcc.gnu.org/pipermail/gcc-patches/2023-June/621976.html this should put the autotools generated files in sync to what they were generated from (and make an automated checker happy). Tested by bootstrapping on top of only a few revisions ago. zlib/ChangeLog: 2023-06-16 Martin Jambor * Makefile.in: Regenerate. * configure: Likewise. gcc/ChangeLog: 2023-06-16 Martin Jambor * configure: Regenerate. --- gcc/configure | 4 ++-- zlib/Makefile.in | 2 ++ zlib/configure | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gcc/configure b/gcc/configure index a4563a9cade..f7b4b283ca2 100755 --- a/gcc/configure +++ b/gcc/configure @@ -19847,7 +19847,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19848 "configure" +#line 19850 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19953,7 +19953,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19954 "configure" +#line 19956 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/zlib/Makefile.in b/zlib/Makefile.in index 3f5102d1b87..80fe3b69116 100644 --- a/zlib/Makefile.in +++ b/zlib/Makefile.in @@ -353,6 +353,8 @@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ +enable_host_pie = @enable_host_pie@ +enable_host_shared = @enable_host_shared@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ diff --git a/zlib/configure b/zlib/configure index 77be6c284e3..9308866a636 100755 --- a/zlib/configure +++ b/zlib/configure @@ -10763,7 +10763,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10778 "configure" +#line 10766 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10869,7 +10869,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10884 "configure" +#line 10872 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -- 2.40.1