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).

Replace AC_FUNC_MMAP with GCC_AC_FUNC_MMAP to avoid the sanitizer
configure check failure.

bfd/

	* configure.ac: Replace AC_FUNC_MMAP with GCC_AC_FUNC_MMAP.
	* Makefile.in: Regenerated.
	* aclocal.m4: Likewise.
	* configure: Likewise.

binutils/

	* configure.ac: Replace AC_FUNC_MMAP with GCC_AC_FUNC_MMAP.
	* Makefile.in: Regenerated.
	* aclocal.m4: Likewise.
	* configure: Likewise.

ld/

	* configure.ac: Replace AC_FUNC_MMAP with GCC_AC_FUNC_MMAP.
	* Makefile.in: Regenerated.
	* aclocal.m4: Likewise.
	* configure: Likewise.

libctf/

	* configure.ac: Replace AC_FUNC_MMAP with GCC_AC_FUNC_MMAP.
	* Makefile.in: Regenerated.
	* aclocal.m4: Likewise.
	* configure: Likewise.

libsframe/

	* configure.ac: Replace AC_FUNC_MMAP with GCC_AC_FUNC_MMAP.
	* Makefile.in: Regenerated.
	* aclocal.m4: Likewise.
	* configure: Likewise.

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index faaa0c424b80d3025a01da059db3ef7cea325c24..3092bff29356ed37bad0fa798f022684f131ed38 100644 (file)
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -125,7 +125,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
        $(top_srcdir)/../config/lib-ld.m4 \
        $(top_srcdir)/../config/lib-link.m4 \
        $(top_srcdir)/../config/lib-prefix.m4 \
-       $(top_srcdir)/../config/nls.m4 \
+       $(top_srcdir)/../config/mmap.m4 $(top_srcdir)/../config/nls.m4 \
        $(top_srcdir)/../config/override.m4 \
        $(top_srcdir)/../config/pkg.m4 \
        $(top_srcdir)/../config/plugins.m4 \

diff --git a/bfd/aclocal.m4 b/bfd/aclocal.m4
index 4b3fd56cfc93a989b21123b3d3cab1cedf6ea4dc..8364b5dba69518698d7322244f27bec565f3c499 100644 (file)
--- a/bfd/aclocal.m4
+++ b/bfd/aclocal.m4
@@ -1180,6 +1180,7 @@ m4_include([../config/lead-dot.m4])
 m4_include([../config/lib-ld.m4])
 m4_include([../config/lib-link.m4])
 m4_include([../config/lib-prefix.m4])
+m4_include([../config/mmap.m4])
 m4_include([../config/nls.m4])
 m4_include([../config/override.m4])
 m4_include([../config/pkg.m4])

diff --git a/bfd/configure b/bfd/configure
index 210550ae042edbe384334fee6fedbf612535c672..89fe4388171815f72bacf01eb25ea996136ffd3f 100755 (executable)
--- a/bfd/configure
+++ b/bfd/configure
@@ -17332,6 +17332,9 @@ done
 
 
 
+save_ASAN_OPTIONS="$ASAN_OPTIONS"
+  ASAN_OPTIONS=detect_leaks=0
+  export ASAN_OPTIONS
 
 for ac_func in getpagesize
 do :
@@ -17510,6 +17513,8 @@ $as_echo "#define HAVE_MMAP 1" >>confdefs.h
 fi
 rm -f conftest.mmap conftest.txt
 
+  ASAN_OPTIONS="$save_ASAN_OPTIONS"
+
 for ac_func in madvise mprotect
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

diff --git a/bfd/configure.ac b/bfd/configure.ac
index 02d8ba963184652b5222f4cfc241264689b375d3..29ede92b99394e326c80e66a4c511518fa2db6f8 100644 (file)
--- a/bfd/configure.ac
+++ b/bfd/configure.ac
@@ -1029,7 +1029,7 @@ AC_MSG_RESULT($bfd_file_ptr)
 AC_SUBST(bfd_file_ptr)
 AC_SUBST(bfd_ufile_ptr)
 
-AC_FUNC_MMAP
+GCC_AC_FUNC_MMAP
 AC_CHECK_FUNCS(madvise mprotect)
 case ${want_mmap}+${ac_cv_func_mmap_fixed_mapped} in
   true+yes )  AC_DEFINE(USE_MMAP, 1, [Use mmap if it's available?]) ;;

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 842a6d99b54ce7802200d23a963dfecf594df1c9..67fa5b3b8d9bac57551bdc224a8b2df3aef1a172 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -152,7 +152,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \
        $(top_srcdir)/../config/lib-ld.m4 \
        $(top_srcdir)/../config/lib-link.m4 \
        $(top_srcdir)/../config/lib-prefix.m4 \
-       $(top_srcdir)/../config/nls.m4 \
+       $(top_srcdir)/../config/mmap.m4 $(top_srcdir)/../config/nls.m4 \
        $(top_srcdir)/../config/override.m4 \
        $(top_srcdir)/../config/pkg.m4 \
        $(top_srcdir)/../config/plugins.m4 \

diff --git a/binutils/aclocal.m4 b/binutils/aclocal.m4
index 1238894b07bbfa38fbc7f62aaf09236999311a37..eb1433a68bd8fc24059d2eae3fe58dcaaa7921b3 100644 (file)
--- a/binutils/aclocal.m4
+++ b/binutils/aclocal.m4
@@ -1200,6 +1200,7 @@ m4_include([../config/lead-dot.m4])
 m4_include([../config/lib-ld.m4])
 m4_include([../config/lib-link.m4])
 m4_include([../config/lib-prefix.m4])
+m4_include([../config/mmap.m4])
 m4_include([../config/nls.m4])
 m4_include([../config/override.m4])
 m4_include([../config/pkg.m4])

diff --git a/binutils/configure b/binutils/configure
index 2b9f52720c3edf510797c3a59a6cc057f89ac515..5d87b6b3e665776c816e6d77fd94dc43e056a469 100755 (executable)
--- a/binutils/configure
+++ b/binutils/configure
@@ -15231,6 +15231,9 @@ done
 
 
 
+save_ASAN_OPTIONS="$ASAN_OPTIONS"
+  ASAN_OPTIONS=detect_leaks=0
+  export ASAN_OPTIONS
 
 for ac_func in getpagesize
 do :
@@ -15409,6 +15412,8 @@ $as_echo "#define HAVE_MMAP 1" >>confdefs.h
 fi
 rm -f conftest.mmap conftest.txt
 
+  ASAN_OPTIONS="$save_ASAN_OPTIONS"
+
 for ac_func in fseeko fseeko64 getc_unlocked mkdtemp mkstemp utimensat utimes
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

diff --git a/binutils/configure.ac b/binutils/configure.ac
index dac72c1bdd4de6a248ef19dbd16a916d750d3049..ac3e418392fd1b9243bd513547f81c9a90660c24 100644 (file)
--- a/binutils/configure.ac
+++ b/binutils/configure.ac
@@ -199,7 +199,7 @@ AC_SUBST(DEMANGLER_NAME)
 AC_CHECK_HEADERS(fcntl.h inttypes.h stdint.h sys/file.h \
                 sys/stat.h sys/time.h sys/types.h unistd.h)
 AC_HEADER_SYS_WAIT
-AC_FUNC_MMAP
+GCC_AC_FUNC_MMAP
 AC_CHECK_FUNCS(fseeko fseeko64 getc_unlocked mkdtemp mkstemp utimensat utimes)
 
 AC_MSG_CHECKING([for mbstate_t])

diff --git a/ld/Makefile.in b/ld/Makefile.in
index abb0565718fa3a8e3f7d4f4b542d403b51470cf8..8350f00a5215090c293c9d3d3c0ab57df7a3a037 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -126,7 +126,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \
        $(top_srcdir)/../config/lib-ld.m4 \
        $(top_srcdir)/../config/lib-link.m4 \
        $(top_srcdir)/../config/lib-prefix.m4 \
-       $(top_srcdir)/../config/nls.m4 \
+       $(top_srcdir)/../config/mmap.m4 $(top_srcdir)/../config/nls.m4 \
        $(top_srcdir)/../config/override.m4 \
        $(top_srcdir)/../config/pkg.m4 \
        $(top_srcdir)/../config/plugins.m4 \

diff --git a/ld/aclocal.m4 b/ld/aclocal.m4
index d9feb988d64adf5284cce620fea9d990eea8a965..01c2dc2694d6c7422e17086f4a67248244510d15 100644 (file)
--- a/ld/aclocal.m4
+++ b/ld/aclocal.m4
@@ -1202,6 +1202,7 @@ m4_include([../config/lead-dot.m4])
 m4_include([../config/lib-ld.m4])
 m4_include([../config/lib-link.m4])
 m4_include([../config/lib-prefix.m4])
+m4_include([../config/mmap.m4])
 m4_include([../config/nls.m4])
 m4_include([../config/override.m4])
 m4_include([../config/pkg.m4])

diff --git a/ld/configure b/ld/configure
index 96ef1f8bb656fef792c4d963216bef952bb2aa2e..ba0024699d4e2f12f42774e4805d8f70210ff45c 100755 (executable)
--- a/ld/configure
+++ b/ld/configure
@@ -18802,6 +18802,9 @@ done
 
 
 
+save_ASAN_OPTIONS="$ASAN_OPTIONS"
+  ASAN_OPTIONS=detect_leaks=0
+  export ASAN_OPTIONS
 
 for ac_func in getpagesize
 do :
@@ -18980,6 +18983,8 @@ $as_echo "#define HAVE_MMAP 1" >>confdefs.h
 fi
 rm -f conftest.mmap conftest.txt
 
+  ASAN_OPTIONS="$save_ASAN_OPTIONS"
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
 $as_echo_n "checking for library containing dlopen... " >&6; }

diff --git a/ld/configure.ac b/ld/configure.ac
index 4a11787ae716f6e402ce07251e66cad47a794c88..0d4aa4c2373f2d8c2b1ab9bae738287ea21a92ab 100644 (file)
--- a/ld/configure.ac
+++ b/ld/configure.ac
@@ -401,7 +401,7 @@ BFD_BINARY_FOPEN
 
 AC_CHECK_DECLS([asprintf, environ, stpcpy])
 
-AC_FUNC_MMAP
+GCC_AC_FUNC_MMAP
 
 AC_SEARCH_LIBS([dlopen], [dl])
 

diff --git a/libctf/Makefile.in b/libctf/Makefile.in
index 1cdf105a32340f005c7d42b6203370cf29b06b70..54f5daa79eeac030edb948b84fdbd08a827138c6 100644 (file)
--- a/libctf/Makefile.in
+++ b/libctf/Makefile.in
@@ -145,7 +145,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \
        $(top_srcdir)/../config/lib-ld.m4 \
        $(top_srcdir)/../config/lib-link.m4 \
        $(top_srcdir)/../config/lib-prefix.m4 \
-       $(top_srcdir)/../config/nls.m4 \
+       $(top_srcdir)/../config/mmap.m4 $(top_srcdir)/../config/nls.m4 \
        $(top_srcdir)/../config/override.m4 \
        $(top_srcdir)/../config/po.m4 \
        $(top_srcdir)/../config/progtest.m4 \

diff --git a/libctf/aclocal.m4 b/libctf/aclocal.m4
index e64180daf89a0d6a5fcf85ce356c267f4cfb4f92..fc2b7d7ddcc97a8e0d0ae43ea961911debb6decb 100644 (file)
--- a/libctf/aclocal.m4
+++ b/libctf/aclocal.m4
@@ -1240,6 +1240,7 @@ m4_include([../config/lead-dot.m4])
 m4_include([../config/lib-ld.m4])
 m4_include([../config/lib-link.m4])
 m4_include([../config/lib-prefix.m4])
+m4_include([../config/mmap.m4])
 m4_include([../config/nls.m4])
 m4_include([../config/override.m4])
 m4_include([../config/po.m4])

diff --git a/libctf/configure b/libctf/configure
index 3701bd8e796f4dea1ad1daa477e532784a1e7e35..778c141571eb7edf395c4733cbb2035114356322 100755 (executable)
--- a/libctf/configure
+++ b/libctf/configure
@@ -15989,6 +15989,9 @@ done
 
 
 
+save_ASAN_OPTIONS="$ASAN_OPTIONS"
+  ASAN_OPTIONS=detect_leaks=0
+  export ASAN_OPTIONS
 
 for ac_func in getpagesize
 do :
@@ -16167,6 +16170,8 @@ $as_echo "#define HAVE_MMAP 1" >>confdefs.h
 fi
 rm -f conftest.mmap conftest.txt
 
+  ASAN_OPTIONS="$save_ASAN_OPTIONS"
+
 # Needed for BFD capability checks.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlsym" >&5
 $as_echo_n "checking for library containing dlsym... " >&6; }

diff --git a/libctf/configure.ac b/libctf/configure.ac
index e4e430615bd987b41e51ad0c3b21ffe2d298ed5e..f327d48f249307924814d07737a6063236355183 100644 (file)
--- a/libctf/configure.ac
+++ b/libctf/configure.ac
@@ -65,7 +65,7 @@ AM_MAINTAINER_MODE
 AM_INSTALL_LIBBFD
 ACX_PROG_CC_WARNING_OPTS([-Wall], [ac_libctf_warn_cflags])
 
-AC_FUNC_MMAP
+GCC_AC_FUNC_MMAP
 # Needed for BFD capability checks.
 AC_SEARCH_LIBS(dlsym, dl)
 AM_ZLIB

diff --git a/libsframe/Makefile.in b/libsframe/Makefile.in
index 9e3d268902bb940581e8d70124f819d91ccfa0f5..111d6a30c9849450b43c108c8f53935606a2262a 100644 (file)
--- a/libsframe/Makefile.in
+++ b/libsframe/Makefile.in
@@ -126,6 +126,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \
        $(top_srcdir)/../config/depstand.m4 \
        $(top_srcdir)/../config/jobserver.m4 \
        $(top_srcdir)/../config/lead-dot.m4 \
+       $(top_srcdir)/../config/mmap.m4 \
        $(top_srcdir)/../config/override.m4 \
        $(top_srcdir)/../config/warnings.m4 \
        $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \

diff --git a/libsframe/aclocal.m4 b/libsframe/aclocal.m4
index b0cdd6b184da384e27cb483cb7646a2d56b64d88..8804d9fb42b8d9b3342ca34071a80e0f08949f63 100644 (file)
--- a/libsframe/aclocal.m4
+++ b/libsframe/aclocal.m4
@@ -1233,6 +1233,7 @@ m4_include([../config/dejagnu.m4])
 m4_include([../config/depstand.m4])
 m4_include([../config/jobserver.m4])
 m4_include([../config/lead-dot.m4])
+m4_include([../config/mmap.m4])
 m4_include([../config/override.m4])
 m4_include([../config/warnings.m4])
 m4_include([../libtool.m4])

diff --git a/libsframe/configure b/libsframe/configure
index 1d9e5e1069595e13dfd9bdb45d3def2ca264ce81..8a9018c493e5ef8bf8f10181d15dec5eaf500f5c 100755 (executable)
--- a/libsframe/configure
+++ b/libsframe/configure
@@ -12520,6 +12520,9 @@ done
 
 
 
+save_ASAN_OPTIONS="$ASAN_OPTIONS"
+  ASAN_OPTIONS=detect_leaks=0
+  export ASAN_OPTIONS
 
 for ac_func in getpagesize
 do :
@@ -12698,6 +12701,8 @@ $as_echo "#define HAVE_MMAP 1" >>confdefs.h
 fi
 rm -f conftest.mmap conftest.txt
 
+  ASAN_OPTIONS="$save_ASAN_OPTIONS"
+
 for ac_header in byteswap.h endian.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

diff --git a/libsframe/configure.ac b/libsframe/configure.ac
index 733517a978fbcc8a275c5aff9944fa2af3b7c494..d63f27070ebcc0a8e435d38352f94966252f7895 100644 (file)
--- a/libsframe/configure.ac
+++ b/libsframe/configure.ac
@@ -112,7 +112,7 @@ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 AM_MAINTAINER_MODE
 AM_INSTALL_LIBBFD
 
-AC_FUNC_MMAP
+GCC_AC_FUNC_MMAP
 AC_CHECK_HEADERS(byteswap.h endian.h)
 
 dnl Check for bswap_{16,32,64}