From: Pietro Monteiro <[email protected]>
Upgrade to autoconf 2.73 and automake 1.19.
The workaround to AC_FUNC_MMAP introduced by r17-5270-gd58a2bf47606f0
is not needed anymore, so remove GCC_AC_FUNC_MMAP and all it's uses.
Update contrib/ci-containers/autoregen to use the correct versions.
Update gcc/doc/install.texi to use the correct versions too.
c++tools/ChangeLog:
* config.h.in: Regenerate.
* configure: Regenerate.
config/ChangeLog:
* mmap.m4 (GCC_AC_FUNC_MMAP): Remove.
* no-executables.m4 (GCC_NO_EXECUTABLES): Use AC_FUNC_MMAP
instead of GCC_AC_FUNC_MMAP.
* override.m4 (_GCC_AUTOCONF_VERSION): Bump from 2.69 to 2.73.
ChangeLog:
* configure: Regenerate.
* libgo/Makefile.in: Regenerate.
* libgo/aclocal.m4: Regenerate.
* libgo/config.h.in: Regenerate.
* libgo/configure: Regenerate.
* libgo/testsuite/Makefile.in: Regenerate.
contrib/ChangeLog:
* ci-containers/autoregen/Containerfile: Install autoconf 2.73 and
automake 1.19
* ci-containers/autoregen/autoregen.py: Sync from buider repo and use
autoconf 2.73 and automake 1.19
fixincludes/ChangeLog:
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
gcc/ChangeLog:
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.
* doc/install.texi (Tools/packages necessary for modifying GCC): Update
autoconf to 2.73 and automake to 1.19.
gcc/m2/ChangeLog:
* configure: Regenerate.
* gm2config.aci.in: Regenerate.
gnattools/ChangeLog:
* configure: Regenerate.
gotools/ChangeLog:
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* configure: Regenerate.
libada/ChangeLog:
* configure: Regenerate.
libatomic/ChangeLog:
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* auto-config.h.in: Regenerate.
* configure: Regenerate.
* testsuite/Makefile.in: Regenerate.
libbacktrace/ChangeLog:
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
libcc1/ChangeLog:
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* cc1plugin-config.h.in: Regenerate.
* configure: Regenerate.
libcody/ChangeLog:
* configure: Regenerate.
libcpp/ChangeLog:
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.
libdecnumber/ChangeLog:
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.
libffi/ChangeLog:
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* fficonfig.h.in: Regenerate.
* include/Makefile.in: Regenerate.
* man/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
libga68/ChangeLog:
* Makefile.am: Remove mention to autoreconf version
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
* acinclude.m4: Removed.
* m4/autoconf.m4: Removed.
libgcc/ChangeLog:
* config.in: Regenerate.
* configure: Regenerate.
* configure.ac: Stop including config/mmap.m4.
libgcobol/ChangeLog:
* Makefile.in: Regenerate.
* acinclude.m4: Stop including config/mmap.m4.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
libgfortran/ChangeLog:
* Makefile.in: Regenerate.
* acinclude.m4: Stop including config/mmap.m4.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
libgm2/ChangeLog:
* Makefile.in: Regenerate.
* acinclude.m4: Stop including config/mmap.m4.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
* libm2cor/Makefile.in: Regenerate.
* libm2iso/Makefile.in: Regenerate.
* libm2log/Makefile.in: Regenerate.
* libm2min/Makefile.in: Regenerate.
* libm2pim/Makefile.in: Regenerate.
libgomp/ChangeLog:
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
* testsuite/Makefile.in: Regenerate.
libgrust/ChangeLog:
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* libformat_parser/Makefile.in: Regenerate.
* libproc_macro_internal/Makefile.in: Regenerate.
* acinclude.m4: Removed.
libiberty/ChangeLog:
* Makefile.in (aclocal_deps): Stop tracking config/mmap.m4.
* acinclude.m4 (libiberty_AC_FUNC_STRNCMP): Use AC_FUNC_MMAP
instead of GCC_AC_FUNC_MMAP.
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.
libitm/ChangeLog:
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
* testsuite/Makefile.in: Regenerate.
libobjc/ChangeLog:
* Makefile.in (aclocal_deps): Stop tracking config/mmap.m4.
* acinclude.m4: Stop including config/mmap.m4.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
libphobos/ChangeLog:
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
* libdruntime/Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
libquadmath/ChangeLog:
* Makefile.in: Regenerate.
* acinclude.m4: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
libsanitizer/ChangeLog:
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* asan/Makefile.in: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
* hwasan/Makefile.in: Regenerate.
* interception/Makefile.in: Regenerate.
* libbacktrace/Makefile.in: Regenerate.
* lsan/Makefile.in: Regenerate.
* sanitizer_common/Makefile.in: Regenerate.
* tsan/Makefile.in: Regenerate.
* ubsan/Makefile.in: Regenerate.
libssp/ChangeLog:
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
* acinclude.m4: Removed.
libstdc++-v3/ChangeLog:
* Makefile.in: Regenerate.
* acinclude.m4: Stop including config/mmap.m4.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
* doc/Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* python/Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* src/c++11/Makefile.in: Regenerate.
* src/c++17/Makefile.in: Regenerate.
* src/c++20/Makefile.in: Regenerate.
* src/c++23/Makefile.in: Regenerate.
* src/c++26/Makefile.in: Regenerate.
* src/c++98/Makefile.in: Regenerate.
* src/experimental/Makefile.in: Regenerate.
* src/filesystem/Makefile.in: Regenerate.
* src/libbacktrace/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
libvtv/ChangeLog:
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* testsuite/Makefile.in: Regenerate.
lto-plugin/ChangeLog:
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
zlib/ChangeLog:
* Makefile.in: Regenerate.
* acinclude.m4: Stop including config/mmap.m4.
* configure.ac: Use AC_FUNC_MMAP instead of GCC_AC_FUNC_MMAP.
Signed-off-by: Pietro Monteiro <[email protected]>
---
config/mmap.m4 | 22 ---
config/no-executables.m4 | 4 +-
config/override.m4 | 2 +-
contrib/ci-containers/autoregen/Containerfile | 4 +-
contrib/ci-containers/autoregen/autoregen.py | 10 +-
gcc/doc/install.texi | 11 +-
libga68/Makefile.am | 4 +-
libga68/acinclude.m4 | 12 --
libga68/m4/autoconf.m4 | 133 ------------------
libgcc/configure.ac | 1 -
libgcobol/acinclude.m4 | 1 -
libgfortran/acinclude.m4 | 1 -
libgm2/acinclude.m4 | 1 -
libgrust/acinclude.m4 | 11 --
libiberty/Makefile.in | 1 -
libiberty/acinclude.m4 | 2 +-
libobjc/Makefile.in | 1 -
libobjc/acinclude.m4 | 1 -
libquadmath/acinclude.m4 | 1 -
libssp/acinclude.m4 | 11 --
libstdc++-v3/acinclude.m4 | 1 -
zlib/acinclude.m4 | 1 -
zlib/configure.ac | 2 +-
23 files changed, 17 insertions(+), 221 deletions(-)
delete mode 100644 libga68/acinclude.m4
delete mode 100644 libga68/m4/autoconf.m4
delete mode 100644 libgrust/acinclude.m4
delete mode 100644 libssp/acinclude.m4
diff --git a/config/mmap.m4 b/config/mmap.m4
index 326b97b91f4f5..fba0d9d36573c 100644
--- a/config/mmap.m4
+++ b/config/mmap.m4
@@ -95,25 +95,3 @@ if test $gcc_cv_func_mmap_anon = yes; then
[Define if mmap with MAP_ANON(YMOUS) works.])
fi
])
-
-dnl
-dnl Avoid the sanitizer run-time memory leak failure in the mmap configure
-dnl test. This should be removed when autoconf with commit:
-dnl
-dnl commit 09b6e78d1592ce10fdc975025d699ee41444aa3f
-dnl Author: Paul Eggert <[email protected]>
-dnl Date: Fri Feb 5 21:06:20 2016 -0800
-dnl Fix memory leak in AC_FUNC_MMAP
-dnl
-dnl * lib/autoconf/functions.m4 (AC_FUNC_MMAP): Fix memory leak
-dnl in test case, found by configuring with gcc -fsanitize=address.
-dnl
-dnl is in use.
-dnl
-AC_DEFUN([GCC_AC_FUNC_MMAP],
- save_ASAN_OPTIONS="$ASAN_OPTIONS"
- ASAN_OPTIONS=detect_leaks=0
- export ASAN_OPTIONS
- m4_defn([AC_FUNC_MMAP])
- ASAN_OPTIONS="$save_ASAN_OPTIONS"
-)
diff --git a/config/no-executables.m4 b/config/no-executables.m4
index 75812307c666e..c40d81725caa7 100644
--- a/config/no-executables.m4
+++ b/config/no-executables.m4
@@ -49,14 +49,14 @@ m4_defn([AC_LINK_IFELSE]))
dnl This is a shame. We have to provide a default for some link tests,
dnl similar to the default for run tests.
-m4_define([GCC_AC_FUNC_MMAP],
+m4_define([AC_FUNC_MMAP],
if test x$gcc_no_link = xyes; then
if test "x${ac_cv_func_mmap_fixed_mapped+set}" != xset; then
ac_cv_func_mmap_fixed_mapped=no
fi
fi
if test "x${ac_cv_func_mmap_fixed_mapped}" != xno; then
- m4_defn([GCC_AC_FUNC_MMAP])
+ m4_defn([AC_FUNC_MMAP])
fi)
m4_divert_pop()dnl
diff --git a/config/override.m4 b/config/override.m4
index 5a1bffe60189c..021bb7ff632c8 100644
--- a/config/override.m4
+++ b/config/override.m4
@@ -29,7 +29,7 @@ m4_copy_force([_AC_PREREQ], [AC_PREREQ])
dnl Ensure exactly this Autoconf version is used
m4_ifndef([_GCC_AUTOCONF_VERSION],
- [m4_define([_GCC_AUTOCONF_VERSION], [2.69])])
+ [m4_define([_GCC_AUTOCONF_VERSION], [2.73])])
dnl Test for the exact version when AC_INIT is expanded.
dnl This allows one to update the tree in steps (for testing)
diff --git a/contrib/ci-containers/autoregen/Containerfile
b/contrib/ci-containers/autoregen/Containerfile
index 3cabba827e692..15f3b945e96d5 100644
--- a/contrib/ci-containers/autoregen/Containerfile
+++ b/contrib/ci-containers/autoregen/Containerfile
@@ -1,7 +1,7 @@
FROM debian:stable-slim
-ARG AUTOCONF_VERSION=2.69
-ARG AUTOMAKE_VERSION=1.15.1
+ARG AUTOCONF_VERSION=2.73
+ARG AUTOMAKE_VERSION=1.19
# Run time deps
RUN set -eux; \
diff --git a/contrib/ci-containers/autoregen/autoregen.py
b/contrib/ci-containers/autoregen/autoregen.py
index 7ac17c1b9dd89..5d0dcd516d63a 100755
--- a/contrib/ci-containers/autoregen/autoregen.py
+++ b/contrib/ci-containers/autoregen/autoregen.py
@@ -15,11 +15,11 @@ from pathlib import Path
# On Gentoo, vanilla unpatched autotools are packaged separately.
# We place the vanilla names first as we want to prefer those if both exist.
-AUTOCONF_NAMES = ["autoconf-vanilla-2.69", "autoconf-2.69", "autoconf"]
-AUTOMAKE_NAMES = ["automake-vanilla-1.15", "automake-1.15.1", "automake"]
-ACLOCAL_NAMES = ["aclocal-vanilla-1.15", "aclocal-1.15.1", "aclocal"]
-AUTOHEADER_NAMES = ["autoheader-vanilla-2.69", "autoheader-2.69", "autoheader"]
-AUTORECONF_NAMES = ["autoreconf-vanilla-2.69", "autoreconf-2.69", "autoreconf"]
+AUTOCONF_NAMES = ["autoconf-vanilla-2.73", "autoconf-2.73", "autoconf"]
+AUTOMAKE_NAMES = ["automake-vanilla-1.19", "automake-1.19", "automake"]
+ACLOCAL_NAMES = ["aclocal-vanilla-1.19", "aclocal-1.19", "aclocal"]
+AUTOHEADER_NAMES = ["autoheader-vanilla-2.73", "autoheader-2.73", "autoheader"]
+AUTORECONF_NAMES = ["autoreconf-vanilla-2.73", "autoreconf-2.73", "autoreconf"]
# Pick the first for each list that exists on this system.
AUTOCONF_BIN = next(name for name in AUTOCONF_NAMES if shutil.which(name))
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index f24968af10d68..abf64e86fc99d 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -548,26 +548,23 @@ The in-tree configuration requires GNU gettext version
0.22 or later.
@heading Tools/packages necessary for modifying GCC
@table @asis
-@item autoconf version 2.69
+@item autoconf version 2.73
@itemx GNU m4 version 1.4.6 (or later)
Necessary when modifying @file{configure.ac}, @file{aclocal.m4}, etc.@:
to regenerate @file{configure} and @file{config.in} files.
-@item automake version 1.15.1
+@item automake version 1.19
Necessary when modifying a @file{Makefile.am} file to regenerate its
associated @file{Makefile.in}.
Much of GCC does not use automake, so directly edit the @file{Makefile.in}
-file. Specifically this applies to the @file{gcc}, @file{intl},
+file. Specifically this applies to the @file{gcc},
@file{libcpp}, @file{libiberty}, @file{libobjc} directories as well
as any of their subdirectories.
-For directories that use automake, GCC requires the latest release in
-the 1.15 series, which is currently 1.15.1. When regenerating a directory
-to a newer version, please update all the directories using an older 1.15
-to the latest released version.
+For directories that use automake, GCC requires the 1.19 release.
@item gettext version 0.14.5 (or later)
diff --git a/libga68/Makefile.am b/libga68/Makefile.am
index 7730045231bd7..ec3491abd6d9c 100644
--- a/libga68/Makefile.am
+++ b/libga68/Makefile.am
@@ -16,9 +16,7 @@
# <http://www.gnu.org/licenses/>.
#
#
-# if this file is changed then you need to run
-#
-# autoreconf2.69
+# if this file is changed then you need to run autoreconf
AUTOMAKE_OPTIONS = 1.8 foreign
ACLOCAL_AMFLAGS = -I .. -I ../config
diff --git a/libga68/acinclude.m4 b/libga68/acinclude.m4
deleted file mode 100644
index 1f2e621368917..0000000000000
--- a/libga68/acinclude.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl Copyright (C) 2025-2026 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-m4_include([../config/mmap.m4])
-m4_include([m4/autoconf.m4])
diff --git a/libga68/m4/autoconf.m4 b/libga68/m4/autoconf.m4
deleted file mode 100644
index daf67322f35e6..0000000000000
--- a/libga68/m4/autoconf.m4
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# Minimal autoconf support for the Algol 68 language.
-# Adapted from the Algol 68 language support files.
-#
-
-# ------------------- #
-# Language selection.
-# ------------------- #
-
-# AC_LANG(A68)
-# ------------
-AC_LANG_DEFINE([Algol 68], [a68], [A68], [A68], [],
-[ac_ext=a68
-ac_compile='$A68 -c $A68FLAGS conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
-ac_link='$A68 -o conftest$ac_exeext $A68FLAGS $LDFLAGS conftest.$ac_ext $LIBS
>&AS_MESSAGE_LOG_FD'
-ac_compiler_gnu=yes
-])
-
-# AC_LANG_A68
-# -----------
-AU_DEFUN([AC_LANG_A68], [AC_LANG(Algol 68)])
-
-# ------------------- #
-# Producing programs.
-# ------------------- #
-
-# AC_LANG_PROGRAM(Algol 68)([PROLOGUE], [BODY])
-# ---------------------------------------------
-m4_define([AC_LANG_PROGRAM(Algol 68)],
-[$1
-begin $2 m4_ifnblank([$2],[;])
- skip
-end])
-
-# _AC_LANG_IO_PROGRAM(Algol 68)
-# -----------------------------
-# Produce source that performs I/O.
-m4_define([_AC_LANG_IO_PROGRAM(Algol 68)],
-[AC_LANG_PROGRAM([],
-[if int fd = fcreate ("conftest.out", 8r0777); fd = -1
- then perror ("error creating conftest.out")
- elif fclose (fd) = -1 then perror ("error closing conftest.out")
- fi
-])])
-
-# AC_LANG_CALL(Algol 68)(PROLOGUE, FUNCTION)
-# ------------------------------------------
-# Avoid conflicting decl of main.
-m4_define([AC_LANG_CALL(Algol 68)],
-[AC_LANG_PROGRAM([],[])])
-
-# AC_LANG_FUNC_LINK_TRY(Algol 68)(FUNCTION)
-# -----------------------------------------
-# Try to link a program which calls FUNCTION.
-m4_define([AC_LANG_FUNC_LINK_TRY(Algol 68)],
-[AC_LANG_PROGRAM([],[])])
-
-# AC_LANG_BOOL_COMPILE_TRY(Algol 68)(PROLOGUE, EXPRESSION)
-# --------------------------------------------------------
-# Return a program which is valid if EXPRESSION is nonzero.
-m4_define([AC_LANG_BOOL_COMPILE_TRY(Algol 68)],
-[AC_LANG_PROGRAM([], [@<:@$2@:>@INT test multiple;
- 0])])
-
-# AC_LANG_INT_SAVE(Algol 68)(PROLOGUE, EXPRESSION)
-# ------------------------------------------------
-m4_define([AC_LANG_INT_SAVE(Algol 68)],
-[AC_LANG_PROGRAM([
-proc itoa = (int i) string:
- begin if i = 0
- then "0"
- else int n := ABS i;
- string res;
- while n /= 0
- do int rem = n %* 10;
- res := (REPR (rem > 9 | (rem - 10) + ABS "a"
- | rem + ABS "0")
- + res);
- n %:= 10
- od;
- (i < 0 | "-" + res | res)
- fi
- end;
-
-int ret := 0;
-int fd = fopen ("conftest.val", file o wronly)/
-(fd = -1 | ret := 1; stop);
-(fputs (fd, itoa ($2)) = 0 | ret := 1; stop)
-])])
-
-# ---------------------- #
-# Looking for compilers. #
-# ---------------------- #
-
-# AC_LANG_COMPILER(Algol 68)
-# --------------------------
-AC_DEFUN([AC_LANG_COMPILER(Algol 68)],
-[AC_REQUIRE([AC_PROG_A68])])
-
-# AC_PROG_A68
-# ------------
-AN_MAKEVAR([A68], [AC_PROG_A68])
-AN_PROGRAM([ga68], [AC_PROG_A68])
-AC_DEFUN([AC_PROG_A68],
-[AC_LANG_PUSH(Algol 68)dnl
-AC_ARG_VAR([A68], [Algol 68 compiler command])dnl
-AC_ARG_VAR([A68FLAGS], [Algol 68 compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-m4_ifval([$1],
- [AC_CHECK_TOOLS(A68, [$1])],
-[AC_CHECK_TOOL(A68, ga68)
-if test -z "$A68"; then
- if test -n "$ac_tool_prefix"; then
- AC_CHECK_PROG(A68, [${ac_tool_prefix}ga68], [$ac_tool_prefix}ga68])
- fi
-fi
-if test -z "$A68"; then
- AC_CHECK_PROG(A68, ga68, ga68, , , false)
-fi
-])
-
-# Provide some information about the compiler.
-_AS_ECHO_LOG([checking for _AC_LANG compiler version])
-set X $ac_compile
-ac_compiler=$[2]
-_AC_DO_LIMIT([$ac_compiler --version >&AS_MESSAGE_LOG_FD])
-m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
-m4_expand_once([_AC_COMPILER_OBJEXT])[]dnl
-if test -z "$A68FLAGS"; then
- A68FLAGS="-g -O2"
-fi
-AC_LANG_POP(Algol 68)dnl
-])# AC_PROG_A68
diff --git a/libgcc/configure.ac b/libgcc/configure.ac
index 06dfcc7a60948..9ac05016b0a93 100644
--- a/libgcc/configure.ac
+++ b/libgcc/configure.ac
@@ -4,7 +4,6 @@ sinclude(../config/enable.m4)
sinclude(../config/tls.m4)
sinclude(../config/toolexeclibdir.m4)
sinclude(../config/acx.m4)
-sinclude(../config/mmap.m4)
sinclude(../config/no-executables.m4)
sinclude(../config/lib-ld.m4)
sinclude(../config/override.m4)
diff --git a/libgcobol/acinclude.m4 b/libgcobol/acinclude.m4
index f1c5982003b42..3b03ecff2a4dc 100644
--- a/libgcobol/acinclude.m4
+++ b/libgcobol/acinclude.m4
@@ -9,7 +9,6 @@ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR
A
dnl PARTICULAR PURPOSE.
m4_include(../config/acx.m4)
-m4_include(../config/mmap.m4)
m4_include(../config/no-executables.m4)
m4_include(../config/enable.m4)
m4_include(../config/tls.m4)
diff --git a/libgfortran/acinclude.m4 b/libgfortran/acinclude.m4
index 044514770b337..8392034a422c8 100644
--- a/libgfortran/acinclude.m4
+++ b/libgfortran/acinclude.m4
@@ -1,5 +1,4 @@
m4_include(../config/acx.m4)
-m4_include(../config/mmap.m4)
m4_include(../config/no-executables.m4)
m4_include(../config/math.m4)
m4_include(../config/ax_check_define.m4)
diff --git a/libgm2/acinclude.m4 b/libgm2/acinclude.m4
index 6f20f0cad573e..d61d8b2aeff19 100644
--- a/libgm2/acinclude.m4
+++ b/libgm2/acinclude.m4
@@ -783,4 +783,3 @@ m4_include([../config/gc++filt.m4])
m4_include([../config/tls.m4])
m4_include([../config/gthr.m4])
m4_include([../config/cet.m4])
-m4_include([../config/mmap.m4])
diff --git a/libgrust/acinclude.m4 b/libgrust/acinclude.m4
deleted file mode 100644
index a1318c5589dcc..0000000000000
--- a/libgrust/acinclude.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-dnl Copyright (C) 2026 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-m4_include([../config/mmap.m4])
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 38d770d89d6aa..34a43e269608d 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -512,7 +512,6 @@ aclocal_deps = \
$(srcdir)/../config/enable.m4 \
$(srcdir)/../config/gcc-plugin.m4 \
$(srcdir)/../config/hwcaps.m4 \
- $(srcdir)/../config/mmap.m4 \
$(srcdir)/../config/no-executables.m4 \
$(srcdir)/../config/override.m4 \
$(srcdir)/../config/picflag.m4 \
diff --git a/libiberty/acinclude.m4 b/libiberty/acinclude.m4
index 41285c5bf0806..ec2959e984686 100644
--- a/libiberty/acinclude.m4
+++ b/libiberty/acinclude.m4
@@ -19,7 +19,7 @@ dnl On some versions of SunOS4 at least, strncmp reads a word
at a time
dnl but erroneously reads past the end of strings. This can cause
dnl a SEGV in some cases.
AC_DEFUN([libiberty_AC_FUNC_STRNCMP],
-[AC_REQUIRE([GCC_AC_FUNC_MMAP])
+[AC_REQUIRE([AC_FUNC_MMAP])
AC_CACHE_CHECK([for working strncmp], ac_cv_func_strncmp_works,
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
/* Test by Jim Wilson and Kaveh Ghazi.
diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index 87e4ba6724cd0..4d0f2e896fff4 100644
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -297,7 +297,6 @@ aclocal_deps = \
$(srcdir)/../config/enable.m4 \
$(srcdir)/../config/gcc-plugin.m4 \
$(srcdir)/../config/lthostflags.m4 \
- $(srcdir)/../config/mmap.m4 \
$(srcdir)/../config/multi.m4 \
$(srcdir)/../config/no-executables.m4 \
$(srcdir)/../config/override.m4 \
diff --git a/libobjc/acinclude.m4 b/libobjc/acinclude.m4
index 3944e2c496102..42750892e643a 100644
--- a/libobjc/acinclude.m4
+++ b/libobjc/acinclude.m4
@@ -9,7 +9,6 @@ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR
A
dnl PARTICULAR PURPOSE.
m4_include(../config/acx.m4)
-m4_include(../config/mmap.m4)
m4_include(../config/no-executables.m4)
m4_include(../config/enable.m4)
m4_include(../config/tls.m4)
diff --git a/libquadmath/acinclude.m4 b/libquadmath/acinclude.m4
index 7b67ffab3c1fb..3703cd68efdf7 100644
--- a/libquadmath/acinclude.m4
+++ b/libquadmath/acinclude.m4
@@ -4,7 +4,6 @@ dnl This whole bit snagged from libgfortran.
sinclude(../libtool.m4)
sinclude(../config/enable.m4)
sinclude(../config/cet.m4)
-sinclude(../config/mmap.m4)
dnl The lines below arrange for aclocal not to bring an installed
dnl libtool.m4 into aclocal.m4, while still arranging for automake to
dnl add a definition of LIBTOOL to Makefile.in.
diff --git a/libssp/acinclude.m4 b/libssp/acinclude.m4
deleted file mode 100644
index a1318c5589dcc..0000000000000
--- a/libssp/acinclude.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-dnl Copyright (C) 2026 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-m4_include([../config/mmap.m4])
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 8b4ccc1e692da..8e9605cb35cd3 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -5900,4 +5900,3 @@ m4_include([../config/gc++filt.m4])
m4_include([../config/tls.m4])
m4_include([../config/gthr.m4])
m4_include([../config/cet.m4])
-m4_include([../config/mmap.m4])
diff --git a/zlib/acinclude.m4 b/zlib/acinclude.m4
index 3b8be00d7022f..9a5f5485716a5 100644
--- a/zlib/acinclude.m4
+++ b/zlib/acinclude.m4
@@ -1,4 +1,3 @@
-sinclude(../config/mmap.m4)
sinclude(../config/no-executables.m4)
sinclude(../libtool.m4)
dnl The lines below arrange for aclocal not to bring libtool.m4
diff --git a/zlib/configure.ac b/zlib/configure.ac
index cb9203630a402..f30e570a0822b 100644
--- a/zlib/configure.ac
+++ b/zlib/configure.ac
@@ -80,7 +80,7 @@ if test -n "$with_cross_host"; then
AC_DEFINE(HAVE_MEMCPY)
AC_DEFINE(HAVE_STRERROR)
else
- GCC_AC_FUNC_MMAP
+ AC_FUNC_MMAP
AC_CHECK_FUNCS(memcpy strerror)
fi
--
2.56.0
