[Bug other/114748] New: libcpp aclocal.m4 and configure incorrectly regenerated

[Bug other/114748] New: libcpp aclocal.m4 and configure incorrectly regenerated

[clyon at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114748

            Bug ID: 114748
           Summary: libcpp aclocal.m4 and configure incorrectly
                    regenerated
           Product: gcc
           Version: unknown
            Status: UNCONFIRMED
          Severity: minor
          Priority: P3
         Component: other
          Assignee: unassigned at gcc dot gnu.org
          Reporter: clyon at gcc dot gnu.org
  Target Milestone: ---

Running either 'autoreconf' or 'aclocal -I ../config' in libcpp/ generates
aclocal.m4 and configure scripts with slightly different contents from what is
currently in the repo:

diff --git a/libcpp/aclocal.m4 b/libcpp/aclocal.m4
index 4fc81709622..4d898ea2c97 100644
--- a/libcpp/aclocal.m4
+++ b/libcpp/aclocal.m4
@@ -26,6 +26,7 @@ m4_include([../config/lib-ld.m4])
 m4_include([../config/lib-link.m4])
 m4_include([../config/lib-prefix.m4])
 m4_include([../config/nls.m4])
+m4_include([../config/override.m4])
 m4_include([../config/po.m4])
 m4_include([../config/progtest.m4])
 m4_include([../config/warnings.m4])
diff --git a/libcpp/configure b/libcpp/configure
index 8a38c0546e3..930f2d59307 100755
--- a/libcpp/configure
+++ b/libcpp/configure
@@ -2670,6 +2670,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



+
+
+
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then


Are these files incorrect in the repo?

I tried to remove ../config/override.m4 and run either 'autoreconf' or 'aclocal
-I ../config', then the result is the same as what is in the repo: override.m4
is not needed by libcpp, but still analyzed by aclocal, and it does have a
sligh effect when generating configure.


Is the fix to commit the above differences, or is there another recipe to
regenerate these files?

[Bug preprocessor/114748] libcpp aclocal.m4 and configure incorrectly regenerated

[pinskia at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114748

--- Comment #1 from Andrew Pinski <pinskia at gcc dot gnu.org> ---
The last time aclocal.m4 had an include for override.m4 was
r9-3776-g22e052725189a4 .  Are you sure you are using the correct
autoconf/automake version?

[Bug preprocessor/114748] libcpp aclocal.m4 and configure incorrectly regenerated

[pinskia at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114748

--- Comment #2 from Andrew Pinski <pinskia at gcc dot gnu.org> ---
So I went back to the gcc 9.1.0 release and aclocal there didn't change and
didn't have the include for override.m4 . I am trying to figure out where this
changed ...

[Bug preprocessor/114748] [14 Regression] libcpp aclocal.m4 and configure incorrectly regenerated

[pinskia at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114748

Andrew Pinski <pinskia at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Version|unknown                     |14.0
            Summary|libcpp aclocal.m4 and       |[14 Regression] libcpp
                   |configure incorrectly       |aclocal.m4 and configure
                   |regenerated                 |incorrectly regenerated
   Target Milestone|---                         |14.0

--- Comment #3 from Andrew Pinski <pinskia at gcc dot gnu.org> ---
This is a regression from GCC 13.1.0 release. Tracking down when it changed ...

[Bug preprocessor/114748] [14 Regression] libcpp aclocal.m4 and configure incorrectly regenerated

[pinskia at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114748

Andrew Pinski <pinskia at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
     Ever confirmed|0                           |1
   Last reconfirmed|                            |2024-04-16
             Status|UNCONFIRMED                 |NEW

--- Comment #4 from Andrew Pinski <pinskia at gcc dot gnu.org> ---
r14-5424-gdb50aea6259545 didn't properly regenerate aclocal.m4.

[Bug preprocessor/114748] [14 Regression] libcpp aclocal.m4 and configure incorrectly regenerated

[arsen at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114748

--- Comment #5 from Arsen Arsenović <arsen at gcc dot gnu.org> ---
hm, that's odd, my local machine can also regenerate to Cristophes version also
today.. I wonder why it did not back then.. what should we do about it?

[Bug preprocessor/114748] [14 Regression] libcpp aclocal.m4 and configure incorrectly regenerated

[clyon at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114748

--- Comment #6 from Christophe Lyon <clyon at gcc dot gnu.org> ---
(In reply to Andrew Pinski from comment #1)
> The last time aclocal.m4 had an include for override.m4 was
> r9-3776-g22e052725189a4 . 

IIUC that commit actually removed the include for override.m4 ?

> Are you sure you are using the correct autoconf/automake version?
Yes, autoconf-2.69 and automake-1.15.1. I'm updating autoregen.py in the
sourceware buildbot.

[Bug preprocessor/114748] [14 Regression] libcpp aclocal.m4 and configure incorrectly regenerated

[clyon at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114748

--- Comment #7 from Christophe Lyon <clyon at gcc dot gnu.org> ---
So yes indeed at r14-5423-gfbe4e64365ec7f, autoreconf will generate the same
contents, but starting at r14-5424-gdb50aea6259545 we get this discrepancy.

We can probably commit the "fixed" version, but should we investigate why
override.m4 is needed again?

[Bug preprocessor/114748] [14 Regression] libcpp aclocal.m4 and configure incorrectly regenerated

[jakub at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114748

Jakub Jelinek <jakub at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |jakub at gcc dot gnu.org

--- Comment #8 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
(In reply to Christophe Lyon from comment #7)
> So yes indeed at r14-5423-gfbe4e64365ec7f, autoreconf will generate the same
> contents, but starting at r14-5424-gdb50aea6259545 we get this discrepancy.
> 
> We can probably commit the "fixed" version, but should we investigate why
> override.m4 is needed again?

The reason why r14-5424 now requires override.m4 can be seen from aclocal -I
../config --verbose.
iconv.m4 added use of AC_PREREQ macro and override.m4 (re)defines that.
Before that AC_PREREQ wasn't used and so nothing required override.m4.

Can you just post the #c0 patch with a ChangeLog entry
        * aclocal.m4: Regenerate.
        * configure: Regenerate.
?

[Bug preprocessor/114748] [14 Regression] libcpp aclocal.m4 and configure incorrectly regenerated

[cvs-commit at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114748

--- Comment #9 from GCC Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Christophe Lyon <clyon@gcc.gnu.org>:

https://gcc.gnu.org/g:a9fefbf71726bb0ce89c79e547ab3319af3227a8

commit r14-10006-ga9fefbf71726bb0ce89c79e547ab3319af3227a8
Author: Christophe Lyon <christophe.lyon@linaro.org>
Date:   Wed Apr 17 13:56:19 2024 +0000

    libcpp: Regenerate aclocal.m4 and configure [PR 114748]

    As discussed in the PR, aclocal.m4 and configure were incorrectly
    regenerated at some point.

    2024-04-17  Christophe Lyon  <christophe.lyon@linaro.org>

            PR preprocessor/114748
            libcpp/
            * aclocal.m4: Regenerate.
            * configure: Regenerate.

[Bug preprocessor/114748] [14 Regression] libcpp aclocal.m4 and configure incorrectly regenerated

[clyon at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114748

Christophe Lyon <clyon at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
             Status|NEW                         |RESOLVED

--- Comment #10 from Christophe Lyon <clyon at gcc dot gnu.org> ---
Fixed on trunk