https://gcc.gnu.org/g:d58a2bf47606f0624012ec43e8456d41f7903c2d
commit r17-5270-gd58a2bf47606f0624012ec43e8456d41f7903c2d Author: Pietro Monteiro <[email protected]> Date: Fri Oct 16 17:01:19 2026 -0400 config: mmap: Avoid the sanitizer configure check failure Sync this commit from binutils-gdb. Then change AC_FUNC_MMAP to GCC_AC_FUNC_MMAP where applicable and regenerate all autoconf files. commit 219822fd5db6305592b45677a3b38c02b523360e Author: H.J. Lu <[email protected]> AuthorDate: Tue Apr 9 06:39:21 2024 -0700 Commit: H.J. Lu <[email protected]> CommitDate: Wed Apr 10 03:57:02 2024 -0700 mmap: Avoid the sanitizer configure check failure When -fsanitize=address,undefined is used to build, the mmap configure check failed with ================================================================= ==231796==ERROR: LeakSanitizer: detected memory leaks Direct leak of 4096 byte(s) in 1 object(s) allocated from: #0 0x7cdd3d0defdf in __interceptor_malloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:69 #1 0x5750c7f6d72b in main /home/alan/build/gas-san/all/bfd/conftest.c:239 Direct leak of 4096 byte(s) in 1 object(s) allocated from: #0 0x7cdd3d0defdf in __interceptor_malloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:69 #1 0x5750c7f6d2e1 in main /home/alan/build/gas-san/all/bfd/conftest.c:190 SUMMARY: AddressSanitizer: 8192 byte(s) leaked in 2 allocation(s). Define GCC_AC_FUNC_MMAP with export ASAN_OPTIONS=detect_leaks=0 to avoid the sanitizer configure check failure. config/ChangeLog: * mmap.m4 (GCC_AC_FUNC_MMAP): New. * no-executables.m4 (GCC_NO_EXECUTABLES): Use GCC_AC_FUNC_MMAP instead of AC_FUNC_MMAP. libga68/ChangeLog: * Makefile.in: Regenerate. * acinclude.m4: Include ../config/mmap.m4. libgcc/ChangeLog: * configure.ac: Include ../config/mmap.m4. libgcobol/ChangeLog: * Makefile.in: Regenerate. * acinclude.m4: Include ../config/mmap.m4. libgfortran/ChangeLog: * Makefile.in: Regenerate. * acinclude.m4: Include ../config/mmap.m4. libgm2/ChangeLog: * Makefile.in: Regenerate. * acinclude.m4: Include ../config/mmap.m4. * libm2cor/Makefile.in: Regenerate. * libm2iso/Makefile.in: Regenerate. * libm2log/Makefile.in: Regenerate. * libm2min/Makefile.in: Regenerate. * libm2pim/Makefile.in: Regenerate. libgrust/ChangeLog: * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * libformat_parser/Makefile.in: Regenerate. * libproc_macro_internal/Makefile.in: Regenerate. * acinclude.m4: New file. Include ../config/mmap.m4. libiberty/ChangeLog: * acinclude.m4: Change AC_FUNC_MMAP to GCC_AC_FUNC_MMAP. * configure: Regenerate. libobjc/ChangeLog: * acinclude.m4: Include ../config/mmap.m4. libquadmath/ChangeLog: * Makefile.in: Regenerate. * acinclude.m4: Include ../config/mmap.m4. libssp/ChangeLog: * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * acinclude.m4: New file. Include ../config/mmap.m4. libstdc++-v3/ChangeLog: * Makefile.in: Regenerate. * acinclude.m4: Include ../config/mmap.m4. * 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. zlib/ChangeLog: * Makefile.in: Regenerate. * acinclude.m4: Include ../config/mmap.m4. * configure: Regenerate. * configure.ac: Change AC_FUNC_MMAP to GCC_AC_FUNC_MMAP. Signed-off-by: Pietro Monteiro <[email protected]> Diff: --- config/mmap.m4 | 22 ++++++++++++++++++++++ config/no-executables.m4 | 4 ++-- libga68/Makefile.in | 3 ++- libga68/acinclude.m4 | 1 + 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 | 1 + 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/acinclude.m4 | 4 +++- libiberty/configure | 5 +++++ 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 +- 51 files changed, 132 insertions(+), 34 deletions(-) diff --git a/config/mmap.m4 b/config/mmap.m4 index fba0d9d36573..326b97b91f4f 100644 --- a/config/mmap.m4 +++ b/config/mmap.m4 @@ -95,3 +95,25 @@ 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 c40d81725caa..75812307c666 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([AC_FUNC_MMAP], +m4_define([GCC_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([AC_FUNC_MMAP]) + m4_defn([GCC_AC_FUNC_MMAP]) fi) m4_divert_pop()dnl diff --git a/libga68/Makefile.in b/libga68/Makefile.in index 28e03a5c6123..1a57949b8681 100644 --- a/libga68/Makefile.in +++ b/libga68/Makefile.in @@ -129,7 +129,8 @@ 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)/m4/autoconf.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../config/mmap.m4 $(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 index 6c8576d71f53..1f2e62136891 100644 --- a/libga68/acinclude.m4 +++ b/libga68/acinclude.m4 @@ -8,4 +8,5 @@ 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/libgcc/configure.ac b/libgcc/configure.ac index 97dc1489257a..246d246ced8d 100644 --- a/libgcc/configure.ac +++ b/libgcc/configure.ac @@ -4,6 +4,7 @@ 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 2c26a49e4452..b2174b41a898 100644 --- a/libgcobol/Makefile.in +++ b/libgcobol/Makefile.in @@ -134,6 +134,7 @@ 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 3b03ecff2a4d..f1c5982003b4 100644 --- a/libgcobol/acinclude.m4 +++ b/libgcobol/acinclude.m4 @@ -9,6 +9,7 @@ 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 8564b7de6757..11481635fc49 100644 --- a/libgfortran/Makefile.in +++ b/libgfortran/Makefile.in @@ -175,6 +175,7 @@ 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 9c3625dc0d7e..118bed2b41b8 100644 --- a/libgfortran/acinclude.m4 +++ b/libgfortran/acinclude.m4 @@ -1,4 +1,5 @@ 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 721e93d2f577..df2ab3ba91e4 100644 --- a/libgm2/Makefile.in +++ b/libgm2/Makefile.in @@ -104,7 +104,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 d61d8b2aeff1..6f20f0cad573 100644 --- a/libgm2/acinclude.m4 +++ b/libgm2/acinclude.m4 @@ -783,3 +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 9781e1f436a3..31d6cb40e5f0 100644 --- a/libgm2/libm2cor/Makefile.in +++ b/libgm2/libm2cor/Makefile.in @@ -122,7 +122,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 73bead4999cf..da09bb6f5d70 100644 --- a/libgm2/libm2iso/Makefile.in +++ b/libgm2/libm2iso/Makefile.in @@ -122,7 +122,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 ee38fe18800c..771df336c059 100644 --- a/libgm2/libm2log/Makefile.in +++ b/libgm2/libm2log/Makefile.in @@ -122,7 +122,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 f664754f18ea..318cc80391d5 100644 --- a/libgm2/libm2min/Makefile.in +++ b/libgm2/libm2min/Makefile.in @@ -122,7 +122,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 48a08eafb1cd..b745db15e3c3 100644 --- a/libgm2/libm2pim/Makefile.in +++ b/libgm2/libm2pim/Makefile.in @@ -122,7 +122,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 767aa8b3ad9f..29d31b55de29 100644 --- a/libgrust/Makefile.in +++ b/libgrust/Makefile.in @@ -104,7 +104,8 @@ 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)/configure.ac + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/../config/mmap.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 new file mode 100644 index 000000000000..a1318c5589dc --- /dev/null +++ b/libgrust/acinclude.m4 @@ -0,0 +1,11 @@ +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 afe66dff53b8..8839171d224b 100644 --- a/libgrust/aclocal.m4 +++ b/libgrust/aclocal.m4 @@ -1263,3 +1263,4 @@ 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 b64ca2a41474..294b554fb036 100644 --- a/libgrust/libformat_parser/Makefile.in +++ b/libgrust/libformat_parser/Makefile.in @@ -103,7 +103,8 @@ 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)/configure.ac + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/../config/mmap.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 cc03c1a174cd..fe5c42fb6ad4 100644 --- a/libgrust/libproc_macro_internal/Makefile.in +++ b/libgrust/libproc_macro_internal/Makefile.in @@ -103,7 +103,8 @@ 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)/configure.ac + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/../config/mmap.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/acinclude.m4 b/libiberty/acinclude.m4 index ec2959e98468..b2dd0f1ba98a 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([AC_FUNC_MMAP]) +[AC_REQUIRE([GCC_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. @@ -192,3 +192,5 @@ AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction, STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown]) ]) + +m4_include([../config/mmap.m4]) diff --git a/libiberty/configure b/libiberty/configure index 5d4457d67370..228cfd4740a1 100755 --- a/libiberty/configure +++ b/libiberty/configure @@ -7874,6 +7874,9 @@ 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 : @@ -8052,6 +8055,8 @@ $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/acinclude.m4 b/libobjc/acinclude.m4 index 42750892e643..3944e2c49610 100644 --- a/libobjc/acinclude.m4 +++ b/libobjc/acinclude.m4 @@ -9,6 +9,7 @@ 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 ef7c3640bcb1..0cb6e0dacf60 100644 --- a/libquadmath/Makefile.in +++ b/libquadmath/Makefile.in @@ -107,7 +107,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 3703cd68efdf..7b67ffab3c1f 100644 --- a/libquadmath/acinclude.m4 +++ b/libquadmath/acinclude.m4 @@ -4,6 +4,7 @@ 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 8d8be3e5f778..5a7aa7a7fa39 100644 --- a/libssp/Makefile.in +++ b/libssp/Makefile.in @@ -106,7 +106,8 @@ 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)/configure.ac + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/../config/mmap.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 new file mode 100644 index 000000000000..a1318c5589dc --- /dev/null +++ b/libssp/acinclude.m4 @@ -0,0 +1,11 @@ +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 47f54fc80cbb..abf200760d55 100644 --- a/libssp/aclocal.m4 +++ b/libssp/aclocal.m4 @@ -1184,3 +1184,4 @@ 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 915e9acbf2f3..5c4f8afc0437 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -113,7 +113,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 a8be306c127d..9315c5e074ba 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -5900,3 +5900,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/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in index 7a37f5edf0a2..a7856596a02f 100644 --- a/libstdc++-v3/doc/Makefile.in +++ b/libstdc++-v3/doc/Makefile.in @@ -113,7 +113,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 d081481293ff..961afd8acbeb 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -113,7 +113,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 db5e83803d52..5d52cd942f9d 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -115,7 +115,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 54d8eff693b1..fcc9d48d1077 100644 --- a/libstdc++-v3/po/Makefile.in +++ b/libstdc++-v3/po/Makefile.in @@ -113,7 +113,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 105a3a64de21..a60b9f05594e 100644 --- a/libstdc++-v3/python/Makefile.in +++ b/libstdc++-v3/python/Makefile.in @@ -114,7 +114,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 104033fd6796..c9170331d93a 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -114,7 +114,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 bd684bb4209c..43b0a0cb1f9d 100644 --- a/libstdc++-v3/src/c++11/Makefile.in +++ b/libstdc++-v3/src/c++11/Makefile.in @@ -114,7 +114,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 6dff0d9491d5..fd5c714a7cd8 100644 --- a/libstdc++-v3/src/c++17/Makefile.in +++ b/libstdc++-v3/src/c++17/Makefile.in @@ -114,7 +114,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 067419d2e485..34ed9647f1bf 100644 --- a/libstdc++-v3/src/c++20/Makefile.in +++ b/libstdc++-v3/src/c++20/Makefile.in @@ -114,7 +114,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 f3ea90ce2478..9cb2ae13214a 100644 --- a/libstdc++-v3/src/c++23/Makefile.in +++ b/libstdc++-v3/src/c++23/Makefile.in @@ -115,7 +115,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 13c3a03b236b..3b915bd2cc47 100644 --- a/libstdc++-v3/src/c++26/Makefile.in +++ b/libstdc++-v3/src/c++26/Makefile.in @@ -114,7 +114,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 c8df597f40d5..1a3ab1232ae2 100644 --- a/libstdc++-v3/src/c++98/Makefile.in +++ b/libstdc++-v3/src/c++98/Makefile.in @@ -114,7 +114,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 a9248197f8c7..9d87d0f03710 100644 --- a/libstdc++-v3/src/experimental/Makefile.in +++ b/libstdc++-v3/src/experimental/Makefile.in @@ -114,7 +114,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 b138a079deb1..381207aa9952 100644 --- a/libstdc++-v3/src/filesystem/Makefile.in +++ b/libstdc++-v3/src/filesystem/Makefile.in @@ -114,7 +114,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 6ce97c433956..1491cfd0f959 100644 --- a/libstdc++-v3/src/libbacktrace/Makefile.in +++ b/libstdc++-v3/src/libbacktrace/Makefile.in @@ -145,7 +145,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 3aed09d10492..051524c921e5 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -113,7 +113,8 @@ 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)/configure.ac + $(top_srcdir)/../config/cet.m4 $(top_srcdir)/../config/mmap.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 23b5afe576d0..b1ebbfab3c58 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)/acinclude.m4 $(top_srcdir)/../config/mmap.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 9a5f5485716a..3b8be00d7022 100644 --- a/zlib/acinclude.m4 +++ b/zlib/acinclude.m4 @@ -1,3 +1,4 @@ +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 656efeed6bdf..5ba3fbf65a60 100755 --- a/zlib/configure +++ b/zlib/configure @@ -11775,6 +11775,9 @@ done +save_ASAN_OPTIONS="$ASAN_OPTIONS" + ASAN_OPTIONS=detect_leaks=0 + export ASAN_OPTIONS for ac_func in getpagesize do : @@ -11953,6 +11956,8 @@ $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 434bfcb072a4..57e47cc06aeb 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 - AC_FUNC_MMAP + GCC_AC_FUNC_MMAP AC_CHECK_FUNCS(memcpy strerror) fi
