From: Pietro Monteiro <[email protected]>
Upgrade to autoconf 2.73 and automake 1.19
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): Change 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.
fixincludes/ChangeLog:
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
gcc/ChangeLog:
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.
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.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.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* 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 +-
libga68/Makefile.in | 3 +-
libga68/acinclude.m4 | 12 --
libga68/m4/autoconf.m4 | 133 --------------------
libgcc/configure.ac | 1 -
libgcobol/Makefile.in | 1 -
libgcobol/acinclude.m4 | 1 -
libgfortran/Makefile.in | 1 -
libgfortran/acinclude.m4 | 1 -
libgm2/Makefile.in | 3 +-
libgm2/acinclude.m4 | 2 +-
libgm2/libm2cor/Makefile.in | 3 +-
libgm2/libm2iso/Makefile.in | 3 +-
libgm2/libm2log/Makefile.in | 3 +-
libgm2/libm2min/Makefile.in | 3 +-
libgm2/libm2pim/Makefile.in | 3 +-
libgrust/Makefile.in | 3 +-
libgrust/acinclude.m4 | 11 --
libgrust/aclocal.m4 | 1 -
libgrust/libformat_parser/Makefile.in | 3 +-
libgrust/libproc_macro_internal/Makefile.in | 3 +-
libiberty/Makefile.in | 1 -
libiberty/acinclude.m4 | 2 +-
libiberty/aclocal.m4 | 1 -
libiberty/configure | 5 -
libobjc/Makefile.in | 1 -
libobjc/acinclude.m4 | 1 -
libquadmath/Makefile.in | 3 +-
libquadmath/acinclude.m4 | 1 -
libssp/Makefile.in | 3 +-
libssp/acinclude.m4 | 11 --
libssp/aclocal.m4 | 1 -
libstdc++-v3/Makefile.in | 3 +-
libstdc++-v3/acinclude.m4 | 1 -
libstdc++-v3/doc/Makefile.in | 3 +-
libstdc++-v3/include/Makefile.in | 3 +-
libstdc++-v3/libsupc++/Makefile.in | 3 +-
libstdc++-v3/po/Makefile.in | 3 +-
libstdc++-v3/python/Makefile.in | 3 +-
libstdc++-v3/src/Makefile.in | 3 +-
libstdc++-v3/src/c++11/Makefile.in | 3 +-
libstdc++-v3/src/c++17/Makefile.in | 3 +-
libstdc++-v3/src/c++20/Makefile.in | 3 +-
libstdc++-v3/src/c++23/Makefile.in | 3 +-
libstdc++-v3/src/c++26/Makefile.in | 3 +-
libstdc++-v3/src/c++98/Makefile.in | 3 +-
libstdc++-v3/src/experimental/Makefile.in | 3 +-
libstdc++-v3/src/filesystem/Makefile.in | 3 +-
libstdc++-v3/src/libbacktrace/Makefile.in | 3 +-
libstdc++-v3/testsuite/Makefile.in | 3 +-
zlib/Makefile.in | 2 +-
zlib/acinclude.m4 | 1 -
zlib/configure | 5 -
zlib/configure.ac | 2 +-
56 files changed, 36 insertions(+), 278 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/libga68/Makefile.in b/libga68/Makefile.in
index 0dc0917d95ebe..4fe9878f39054 100644
--- a/libga68/Makefile.in
+++ b/libga68/Makefile.in
@@ -129,8 +129,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/../config/mmap.m4 $(top_srcdir)/m4/autoconf.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/autoconf.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
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/Makefile.in b/libgcobol/Makefile.in
index 9ad6aba9f8108..17244471d0863 100644
--- a/libgcobol/Makefile.in
+++ b/libgcobol/Makefile.in
@@ -134,7 +134,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/autoconf.m4 \
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/acx.m4 \
- $(top_srcdir)/../config/mmap.m4 \
$(top_srcdir)/../config/no-executables.m4 \
$(top_srcdir)/../config/enable.m4 \
$(top_srcdir)/../config/tls.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/Makefile.in b/libgfortran/Makefile.in
index 11481635fc49e..8564b7de67573 100644
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -175,7 +175,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/ax_pthread.m4
\
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/acx.m4 \
- $(top_srcdir)/../config/mmap.m4 \
$(top_srcdir)/../config/no-executables.m4 \
$(top_srcdir)/../config/math.m4 \
$(top_srcdir)/../config/ax_check_define.m4 \
diff --git a/libgfortran/acinclude.m4 b/libgfortran/acinclude.m4
index 890516a6aedbe..837f1719345f6 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/Makefile.in b/libgm2/Makefile.in
index df2ab3ba91e42..721e93d2f5770 100644
--- a/libgm2/Makefile.in
+++ b/libgm2/Makefile.in
@@ -104,8 +104,7 @@ am__aclocal_m4_deps =
$(top_srcdir)/ax_python_interpreter.m4 \
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
diff --git a/libgm2/acinclude.m4 b/libgm2/acinclude.m4
index 6f20f0cad573e..4bc86d075adaf 100644
--- a/libgm2/acinclude.m4
+++ b/libgm2/acinclude.m4
@@ -783,4 +783,4 @@ 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/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in
index 31d6cb40e5f08..9781e1f436a3a 100644
--- a/libgm2/libm2cor/Makefile.in
+++ b/libgm2/libm2cor/Makefile.in
@@ -122,8 +122,7 @@ am__aclocal_m4_deps =
$(top_srcdir)/ax_python_interpreter.m4 \
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in
index da09bb6f5d70d..73bead4999cfc 100644
--- a/libgm2/libm2iso/Makefile.in
+++ b/libgm2/libm2iso/Makefile.in
@@ -122,8 +122,7 @@ am__aclocal_m4_deps =
$(top_srcdir)/ax_python_interpreter.m4 \
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in
index 771df336c0596..ee38fe18800c4 100644
--- a/libgm2/libm2log/Makefile.in
+++ b/libgm2/libm2log/Makefile.in
@@ -122,8 +122,7 @@ am__aclocal_m4_deps =
$(top_srcdir)/ax_python_interpreter.m4 \
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in
index 318cc80391d5d..f664754f18ea5 100644
--- a/libgm2/libm2min/Makefile.in
+++ b/libgm2/libm2min/Makefile.in
@@ -122,8 +122,7 @@ am__aclocal_m4_deps =
$(top_srcdir)/ax_python_interpreter.m4 \
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in
index b745db15e3c32..48a08eafb1cd4 100644
--- a/libgm2/libm2pim/Makefile.in
+++ b/libgm2/libm2pim/Makefile.in
@@ -122,8 +122,7 @@ am__aclocal_m4_deps =
$(top_srcdir)/ax_python_interpreter.m4 \
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libgrust/Makefile.in b/libgrust/Makefile.in
index 29d31b55de29a..767aa8b3ad9f5 100644
--- a/libgrust/Makefile.in
+++ b/libgrust/Makefile.in
@@ -104,8 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/toolexeclibdir.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
- $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/../config/mmap.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
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/libgrust/aclocal.m4 b/libgrust/aclocal.m4
index 8839171d224b3..afe66dff53b8a 100644
--- a/libgrust/aclocal.m4
+++ b/libgrust/aclocal.m4
@@ -1263,4 +1263,3 @@ m4_include([../ltoptions.m4])
m4_include([../ltsugar.m4])
m4_include([../ltversion.m4])
m4_include([../lt~obsolete.m4])
-m4_include([acinclude.m4])
diff --git a/libgrust/libformat_parser/Makefile.in
b/libgrust/libformat_parser/Makefile.in
index 294b554fb036d..b64ca2a414746 100644
--- a/libgrust/libformat_parser/Makefile.in
+++ b/libgrust/libformat_parser/Makefile.in
@@ -103,8 +103,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/toolexeclibdir.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
- $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/../config/mmap.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libgrust/libproc_macro_internal/Makefile.in
b/libgrust/libproc_macro_internal/Makefile.in
index fe5c42fb6ad4e..cc03c1a174cd1 100644
--- a/libgrust/libproc_macro_internal/Makefile.in
+++ b/libgrust/libproc_macro_internal/Makefile.in
@@ -103,8 +103,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/toolexeclibdir.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
- $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/../config/mmap.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
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/libiberty/aclocal.m4 b/libiberty/aclocal.m4
index 46cefc36edc6c..5151f5fee189d 100644
--- a/libiberty/aclocal.m4
+++ b/libiberty/aclocal.m4
@@ -18,7 +18,6 @@ m4_include([../config/clang-plugin.m4])
m4_include([../config/enable.m4])
m4_include([../config/gcc-plugin.m4])
m4_include([../config/hwcaps.m4])
-m4_include([../config/mmap.m4])
m4_include([../config/no-executables.m4])
m4_include([../config/override.m4])
m4_include([../config/picflag.m4])
diff --git a/libiberty/configure b/libiberty/configure
index 16a9b04609cea..1da4310dd0915 100755
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -7859,9 +7859,6 @@ if test x$gcc_no_link = xyes; then
fi
fi
if test "x${ac_cv_func_mmap_fixed_mapped}" != xno; then
- save_ASAN_OPTIONS="$ASAN_OPTIONS"
- ASAN_OPTIONS=detect_leaks=0
- export ASAN_OPTIONS
for ac_func in getpagesize
do :
@@ -8040,8 +8037,6 @@ $as_echo "#define HAVE_MMAP 1" >>confdefs.h
fi
rm -f conftest.mmap conftest.txt
- ASAN_OPTIONS="$save_ASAN_OPTIONS"
-
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strncmp" >&5
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/Makefile.in b/libquadmath/Makefile.in
index 0cb6e0dacf60b..ef7c3640bcb15 100644
--- a/libquadmath/Makefile.in
+++ b/libquadmath/Makefile.in
@@ -107,8 +107,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \
$(top_srcdir)/../config/enable.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
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/Makefile.in b/libssp/Makefile.in
index 5a7aa7a7fa390..8d8be3e5f7784 100644
--- a/libssp/Makefile.in
+++ b/libssp/Makefile.in
@@ -106,8 +106,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/toolexeclibdir.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
- $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/../config/mmap.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
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/libssp/aclocal.m4 b/libssp/aclocal.m4
index abf200760d555..47f54fc80cbbd 100644
--- a/libssp/aclocal.m4
+++ b/libssp/aclocal.m4
@@ -1184,4 +1184,3 @@ m4_include([../ltoptions.m4])
m4_include([../ltsugar.m4])
m4_include([../ltversion.m4])
m4_include([../lt~obsolete.m4])
-m4_include([acinclude.m4])
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index 5c4f8afc04377..915e9acbf2f31 100644
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -113,8 +113,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
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/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in
index a7856596a02f7..7a37f5edf0a2d 100644
--- a/libstdc++-v3/doc/Makefile.in
+++ b/libstdc++-v3/doc/Makefile.in
@@ -113,8 +113,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 961afd8acbebe..d081481293fff 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -113,8 +113,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libstdc++-v3/libsupc++/Makefile.in
b/libstdc++-v3/libsupc++/Makefile.in
index 5d52cd942f9da..db5e83803d52e 100644
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -115,8 +115,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(bits_HEADERS) $(std_HEADERS)
diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
index fcc9d48d10773..54d8eff693b1c 100644
--- a/libstdc++-v3/po/Makefile.in
+++ b/libstdc++-v3/po/Makefile.in
@@ -113,8 +113,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libstdc++-v3/python/Makefile.in b/libstdc++-v3/python/Makefile.in
index a60b9f05594e0..105a3a64de212 100644
--- a/libstdc++-v3/python/Makefile.in
+++ b/libstdc++-v3/python/Makefile.in
@@ -114,8 +114,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index c9170331d93aa..104033fd6796b 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -114,8 +114,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libstdc++-v3/src/c++11/Makefile.in
b/libstdc++-v3/src/c++11/Makefile.in
index 43b0a0cb1f9db..bd684bb4209ce 100644
--- a/libstdc++-v3/src/c++11/Makefile.in
+++ b/libstdc++-v3/src/c++11/Makefile.in
@@ -114,8 +114,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libstdc++-v3/src/c++17/Makefile.in
b/libstdc++-v3/src/c++17/Makefile.in
index fd5c714a7cd84..6dff0d9491d59 100644
--- a/libstdc++-v3/src/c++17/Makefile.in
+++ b/libstdc++-v3/src/c++17/Makefile.in
@@ -114,8 +114,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libstdc++-v3/src/c++20/Makefile.in
b/libstdc++-v3/src/c++20/Makefile.in
index 34ed9647f1bf9..067419d2e485d 100644
--- a/libstdc++-v3/src/c++20/Makefile.in
+++ b/libstdc++-v3/src/c++20/Makefile.in
@@ -114,8 +114,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libstdc++-v3/src/c++23/Makefile.in
b/libstdc++-v3/src/c++23/Makefile.in
index 9cb2ae13214a8..f3ea90ce24780 100644
--- a/libstdc++-v3/src/c++23/Makefile.in
+++ b/libstdc++-v3/src/c++23/Makefile.in
@@ -115,8 +115,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libstdc++-v3/src/c++26/Makefile.in
b/libstdc++-v3/src/c++26/Makefile.in
index 3b915bd2cc478..13c3a03b236b4 100644
--- a/libstdc++-v3/src/c++26/Makefile.in
+++ b/libstdc++-v3/src/c++26/Makefile.in
@@ -114,8 +114,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libstdc++-v3/src/c++98/Makefile.in
b/libstdc++-v3/src/c++98/Makefile.in
index 1a3ab1232ae25..c8df597f40d5f 100644
--- a/libstdc++-v3/src/c++98/Makefile.in
+++ b/libstdc++-v3/src/c++98/Makefile.in
@@ -114,8 +114,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libstdc++-v3/src/experimental/Makefile.in
b/libstdc++-v3/src/experimental/Makefile.in
index 9d87d0f037109..a9248197f8c7a 100644
--- a/libstdc++-v3/src/experimental/Makefile.in
+++ b/libstdc++-v3/src/experimental/Makefile.in
@@ -114,8 +114,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libstdc++-v3/src/filesystem/Makefile.in
b/libstdc++-v3/src/filesystem/Makefile.in
index 381207aa9952f..b138a079deb19 100644
--- a/libstdc++-v3/src/filesystem/Makefile.in
+++ b/libstdc++-v3/src/filesystem/Makefile.in
@@ -114,8 +114,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libstdc++-v3/src/libbacktrace/Makefile.in
b/libstdc++-v3/src/libbacktrace/Makefile.in
index 1491cfd0f959a..6ce97c433956c 100644
--- a/libstdc++-v3/src/libbacktrace/Makefile.in
+++ b/libstdc++-v3/src/libbacktrace/Makefile.in
@@ -145,8 +145,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/libstdc++-v3/testsuite/Makefile.in
b/libstdc++-v3/testsuite/Makefile.in
index 051524c921e55..3aed09d104922 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -113,8 +113,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/gc++filt.m4 \
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
- $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/zlib/Makefile.in b/zlib/Makefile.in
index b1ebbfab3c586..23b5afe576d0b 100644
--- a/zlib/Makefile.in
+++ b/zlib/Makefile.in
@@ -103,7 +103,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/cet.m4 \
$(top_srcdir)/../config/toolexeclibdir.m4 \
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/mmap.m4 \
+ $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/no-executables.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
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 b/zlib/configure
index 5ba3fbf65a607..656efeed6bdf9 100755
--- a/zlib/configure
+++ b/zlib/configure
@@ -11775,9 +11775,6 @@ done
-save_ASAN_OPTIONS="$ASAN_OPTIONS"
- ASAN_OPTIONS=detect_leaks=0
- export ASAN_OPTIONS
for ac_func in getpagesize
do :
@@ -11956,8 +11953,6 @@ $as_echo "#define HAVE_MMAP 1" >>confdefs.h
fi
rm -f conftest.mmap conftest.txt
- ASAN_OPTIONS="$save_ASAN_OPTIONS"
-
fi
for ac_func in memcpy strerror
do :
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
