From: Martin Jambor <mjambor@suse.cz>
To: Marek Polacek <polacek@redhat.com>
Cc: GCC Patches <gcc-patches@gcc.gnu.org>
Subject: [PATCH] Regenerate some autotools generated files (Was: Re: [PATCH v3] configure: Implement --enable-host-pie)
Date: Fri, 16 Jun 2023 18:15:00 +0200 [thread overview]
Message-ID: <ri68rcj4c57.fsf@suse.cz> (raw)
In-Reply-To: <ZIxWSnwd4FMcGrDc@redhat.com>
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 <mjambor@suse.cz>
* Makefile.in: Regenerate.
* configure: Likewise.
gcc/ChangeLog:
2023-06-16 Martin Jambor <mjambor@suse.cz>
* 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
prev parent reply other threads:[~2023-06-16 16:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-09 19:41 [PATCH] configure: Implement --enable-host-pie Marek Polacek
2023-05-16 15:29 ` Marek Polacek
2023-05-16 20:11 ` Iain Sandoe
2023-05-18 23:32 ` [PATCH v2] " Marek Polacek
2023-05-19 8:01 ` Iain Sandoe
2023-05-19 18:56 ` [PATCH v3] " Marek Polacek
2023-06-05 16:18 ` Marek Polacek
2023-06-06 3:06 ` Jeff Law
2023-06-15 20:58 ` Marek Polacek
2023-06-16 10:26 ` Martin Jambor
2023-06-16 12:32 ` Marek Polacek
2023-06-16 16:15 ` Martin Jambor [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ri68rcj4c57.fsf@suse.cz \
--to=mjambor@suse.cz \
--cc=gcc-patches@gcc.gnu.org \
--cc=polacek@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).