Restore changes to libiberty sources created in commit 219822fd5db6305592b45677a3b38c...

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 00af4acca66e0356a05133aa55ec74ed9c71fdec..6d8c88ebfe77b22d505d5993f4c87fb56f32d74c 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -510,6 +510,7 @@ aclocal_deps = \
        $(srcdir)/../config/cet.m4 \
        $(srcdir)/../config/enable.m4 \
        $(srcdir)/../config/gcc-plugin.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 a8f2146b0f56790abe2612c9aa74867c8df67cce..49f621bf6297fdc6e004730b3e08ccffa39eb737 100644 (file)
--- 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_TRY_RUN([
 /* Test by Jim Wilson and Kaveh Ghazi.

diff --git a/libiberty/aclocal.m4 b/libiberty/aclocal.m4
index 5151f5fee189df5232e611a04775b2c3fc5c6b07..0362840911f7df54eb557f5af95e4855e93ea24f 100644 (file)
--- a/libiberty/aclocal.m4
+++ b/libiberty/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -18,6 +18,7 @@ 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 359f19ac0379a46ea92f9183a8e23aaad1eb6f60..4c72b5a92831da97f11562143fe5a8845d521b93 100755 (executable)
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -7997,6 +7997,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 :
@@ -8175,6 +8178,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