2022-04-18 23:44:18 +08:00
|
|
|
# malloc.m4 serial 28
|
|
|
|
dnl Copyright (C) 2007, 2009-2022 Free Software Foundation, Inc.
|
2014-11-23 22:19:49 +08:00
|
|
|
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.
|
|
|
|
|
Update gnulib to current upstream master
I tried building gdb with G++ 4.7 and CXX="g++ -std=gnu+11", and that
tripped on a build error:
In file included from build-gnulib/import/stdio.h:53:0,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/common/common-defs.h:31,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/defs.h:28,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/armobsd-tdep.c:20:
build-gnulib/import/stddef.h:104:3: error: conflicting declaration ‘typedef union max_align_t max_align_t’
In file included from build-gnulib/import/stddef.h:55:0,
from build-gnulib/import/stdio.h:53,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/common/common-defs.h:31,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/defs.h:28,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/armobsd-tdep.c:20:
/opt/gcc-4.7/lib/gcc/x86_64-unknown-linux-gnu/4.7.4/include/stddef.h:426:3: error: ‘max_align_t’ has a previous declaration as ‘typedef struct max_align_t max_align_t’
Updating gnulib to current master fixes it, since it brings in this
fix:
http://lists.gnu.org/archive/html/bug-gnulib/2016-04/msg00000.html
Our last update was in August 2015. This doesn't bring in much added
baggage, it's mostly bug fixes. It pulled in the "limits-h" module as
automatic dependency, and given that looks potentially useful I added
it to the set of modules we require.
Tested on x86_64 Fedora 23, with g++ 4.7 and g++ 5.3, native and gdbserver.
gdb/ChangeLog:
2016-10-18 Pedro Alves <palves@redhat.com>
* gnulib/update-gnulib.sh (GNULIB_COMMIT_SHA1): Set to
2692e23a48e21f6daa029e8af9f1a143b7532f47.
* gnulib/configure, gnulib/config.in, gnulib/aclocal.m4:
Regenerate.
* gnulib/import/Makefile: Update.
* gnulib/import/alloca: Update.
* gnulib/import/basename-lgpl: Update.
* gnulib/import/canonicalize-lgpl: Update.
* gnulib/import/config: Update.
* gnulib/import/dirent: Update.
* gnulib/import/dirfd: Update.
* gnulib/import/dirname-lgpl: Update.
* gnulib/import/dirname.h: Update.
* gnulib/import/dosname.h: Update.
* gnulib/import/errno: Update.
* gnulib/import/extra/snippet/arg-nonnull.h: Update.
* gnulib/import/extra/snippet/c++defs.h: Update.
* gnulib/import/extra/snippet/warn-on-use.h: Update.
* gnulib/import/extra/update-copyright: Update.
* gnulib/import/flexmember.h: Update.
* gnulib/import/float+.h: Update.
* gnulib/import/float: Update.
* gnulib/import/float: Update.
* gnulib/import/fnmatch: Update.
* gnulib/import/fnmatch: Update.
* gnulib/import/fnmatch_loop: Update.
* gnulib/import/fpucw.h: Update.
* gnulib/import/frexp: Update.
* gnulib/import/frexpl: Update.
* gnulib/import/gettimeofday: Update.
* gnulib/import/hard-locale: Update.
* gnulib/import/hard-locale.h: Update.
* gnulib/import/inttypes: Update.
* gnulib/import/isnan: Update.
* gnulib/import/isnand-nolibm.h: Update.
* gnulib/import/isnand: Update.
* gnulib/import/isnanl-nolibm.h: Update.
* gnulib/import/isnanl: Update.
* gnulib/import/itold: Update.
* gnulib/import/limits: Update.
* gnulib/import/localcharset: Update.
* gnulib/import/localcharset.h: Update.
* gnulib/import/lstat: Update.
* gnulib/import/m4/00gnulib: Update.
* gnulib/import/m4/absolute-header: Update.
* gnulib/import/m4/alloca: Update.
* gnulib/import/m4/canonicalize: Update.
* gnulib/import/m4/codeset: Update.
* gnulib/import/m4/configmake: Update.
* gnulib/import/m4/dirent_h: Update.
* gnulib/import/m4/dirfd: Update.
* gnulib/import/m4/dirname: Update.
* gnulib/import/m4/double-slash-root: Update.
* gnulib/import/m4/eealloc: Update.
* gnulib/import/m4/errno_h: Update.
* gnulib/import/m4/exponentd: Update.
* gnulib/import/m4/exponentl: Update.
* gnulib/import/m4/extensions: Update.
* gnulib/import/m4/extern-inline: Update.
* gnulib/import/m4/fcntl-o: Update.
* gnulib/import/m4/flexmember: Update.
* gnulib/import/m4/float_h: Update.
* gnulib/import/m4/fnmatch: Update.
* gnulib/import/m4/fpieee: Update.
* gnulib/import/m4/frexp: Update.
* gnulib/import/m4/frexpl: Update.
* gnulib/import/m4/gettimeofday: Update.
* gnulib/import/m4/glibc21: Update.
* gnulib/import/m4/gnulib-cache: Update.
* gnulib/import/m4/gnulib-common: Update.
* gnulib/import/m4/gnulib-comp: Update.
* gnulib/import/m4/gnulib-tool: Update.
* gnulib/import/m4/hard-locale: Update.
* gnulib/import/m4/include_next: Update.
* gnulib/import/m4/inttypes-pri: Update.
* gnulib/import/m4/inttypes: Update.
* gnulib/import/m4/isnand: Update.
* gnulib/import/m4/isnanl: Update.
* gnulib/import/m4/largefile: Update.
* gnulib/import/m4/limits-h: Update.
* gnulib/import/m4/localcharset: Update.
* gnulib/import/m4/locale-fr: Update.
* gnulib/import/m4/locale-ja: Update.
* gnulib/import/m4/locale-zh: Update.
* gnulib/import/m4/longlong: Update.
* gnulib/import/m4/lstat: Update.
* gnulib/import/m4/malloc: Update.
* gnulib/import/m4/malloca: Update.
* gnulib/import/m4/math_h: Update.
* gnulib/import/m4/mbrtowc: Update.
* gnulib/import/m4/mbsinit: Update.
* gnulib/import/m4/mbsrtowcs: Update.
* gnulib/import/m4/mbstate_t: Update.
* gnulib/import/m4/memchr: Update.
* gnulib/import/m4/memmem: Update.
* gnulib/import/m4/mmap-anon: Update.
* gnulib/import/m4/multiarch: Update.
* gnulib/import/m4/nocrash: Update.
* gnulib/import/m4/off_t: Update.
* gnulib/import/m4/pathmax: Update.
* gnulib/import/m4/rawmemchr: Update.
* gnulib/import/m4/readlink: Update.
* gnulib/import/m4/rename: Update.
* gnulib/import/m4/rmdir: Update.
* gnulib/import/m4/signal_h: Update.
* gnulib/import/m4/ssize_t: Update.
* gnulib/import/m4/stat: Update.
* gnulib/import/m4/stdbool: Update.
* gnulib/import/m4/stddef_h: Update.
* gnulib/import/m4/stdint: Update.
* gnulib/import/m4/stdio_h: Update.
* gnulib/import/m4/stdlib_h: Update.
* gnulib/import/m4/strchrnul: Update.
* gnulib/import/m4/string_h: Update.
* gnulib/import/m4/strstr: Update.
* gnulib/import/m4/strtok_r: Update.
* gnulib/import/m4/sys_socket_h: Update.
* gnulib/import/m4/sys_stat_h: Update.
* gnulib/import/m4/sys_time_h: Update.
* gnulib/import/m4/sys_types_h: Update.
* gnulib/import/m4/time_h: Update.
* gnulib/import/m4/unistd_h: Update.
* gnulib/import/m4/warn-on-use: Update.
* gnulib/import/m4/wchar_h: Update.
* gnulib/import/m4/wchar_t: Update.
* gnulib/import/m4/wctype_h: Update.
* gnulib/import/m4/wint_t: Update.
* gnulib/import/malloc: Update.
* gnulib/import/malloca: Update.
* gnulib/import/malloca.h: Update.
* gnulib/import/math: Update.
* gnulib/import/math: Update.
* gnulib/import/mbrtowc: Update.
* gnulib/import/mbsinit: Update.
* gnulib/import/mbsrtowcs-impl.h: Update.
* gnulib/import/mbsrtowcs-state: Update.
* gnulib/import/mbsrtowcs: Update.
* gnulib/import/memchr: Update.
* gnulib/import/memmem: Update.
* gnulib/import/pathmax.h: Update.
* gnulib/import/rawmemchr: Update.
* gnulib/import/readlink: Update.
* gnulib/import/ref-add.sin: Update.
* gnulib/import/ref-del.sin: Update.
* gnulib/import/rename: Update.
* gnulib/import/rmdir: Update.
* gnulib/import/same-inode.h: Update.
* gnulib/import/signal: Update.
* gnulib/import/stat: Update.
* gnulib/import/stdbool: Update.
* gnulib/import/stddef: Update.
* gnulib/import/stdint: Update.
* gnulib/import/stdio: Update.
* gnulib/import/stdlib: Update.
* gnulib/import/str-two-way.h: Update.
* gnulib/import/strchrnul: Update.
* gnulib/import/streq.h: Update.
* gnulib/import/string: Update.
* gnulib/import/stripslash: Update.
* gnulib/import/strnlen1: Update.
* gnulib/import/strnlen1.h: Update.
* gnulib/import/strstr: Update.
* gnulib/import/strtok_r: Update.
* gnulib/import/sys_stat: Update.
* gnulib/import/sys_time: Update.
* gnulib/import/sys_types: Update.
* gnulib/import/time: Update.
* gnulib/import/unistd: Update.
* gnulib/import/unistd: Update.
* gnulib/import/verify.h: Update.
* gnulib/import/wchar: Update.
* gnulib/import/wctype: Update.
* gnulib/import/flexmember.h: New file.
* gnulib/import/hard-locale.c: New file.
* gnulib/import/hard-locale.h: New file.
* gnulib/import/limits.in.h: New file.
* gnulib/import/m4/flexmember.m4: New file.
* gnulib/import/m4/hard-locale.m4: New file.
* gnulib/import/m4/limits-h.m4: New file.
2016-10-19 00:18:29 +08:00
|
|
|
# This is adapted with modifications from upstream Autoconf here:
|
2022-04-18 23:44:18 +08:00
|
|
|
# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n949
|
2014-11-23 22:19:49 +08:00
|
|
|
AC_DEFUN([_AC_FUNC_MALLOC_IF],
|
|
|
|
[
|
|
|
|
AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
|
2022-04-18 23:44:18 +08:00
|
|
|
AC_CACHE_CHECK([whether malloc (0) returns nonnull],
|
2014-11-23 22:19:49 +08:00
|
|
|
[ac_cv_func_malloc_0_nonnull],
|
|
|
|
[AC_RUN_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM(
|
2021-01-23 03:55:45 +08:00
|
|
|
[[#include <stdlib.h>
|
2014-11-23 22:19:49 +08:00
|
|
|
]],
|
2022-04-18 23:44:18 +08:00
|
|
|
[[void *p = malloc (0);
|
Update gnulib to current upstream master
I tried building gdb with G++ 4.7 and CXX="g++ -std=gnu+11", and that
tripped on a build error:
In file included from build-gnulib/import/stdio.h:53:0,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/common/common-defs.h:31,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/defs.h:28,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/armobsd-tdep.c:20:
build-gnulib/import/stddef.h:104:3: error: conflicting declaration ‘typedef union max_align_t max_align_t’
In file included from build-gnulib/import/stddef.h:55:0,
from build-gnulib/import/stdio.h:53,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/common/common-defs.h:31,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/defs.h:28,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/armobsd-tdep.c:20:
/opt/gcc-4.7/lib/gcc/x86_64-unknown-linux-gnu/4.7.4/include/stddef.h:426:3: error: ‘max_align_t’ has a previous declaration as ‘typedef struct max_align_t max_align_t’
Updating gnulib to current master fixes it, since it brings in this
fix:
http://lists.gnu.org/archive/html/bug-gnulib/2016-04/msg00000.html
Our last update was in August 2015. This doesn't bring in much added
baggage, it's mostly bug fixes. It pulled in the "limits-h" module as
automatic dependency, and given that looks potentially useful I added
it to the set of modules we require.
Tested on x86_64 Fedora 23, with g++ 4.7 and g++ 5.3, native and gdbserver.
gdb/ChangeLog:
2016-10-18 Pedro Alves <palves@redhat.com>
* gnulib/update-gnulib.sh (GNULIB_COMMIT_SHA1): Set to
2692e23a48e21f6daa029e8af9f1a143b7532f47.
* gnulib/configure, gnulib/config.in, gnulib/aclocal.m4:
Regenerate.
* gnulib/import/Makefile: Update.
* gnulib/import/alloca: Update.
* gnulib/import/basename-lgpl: Update.
* gnulib/import/canonicalize-lgpl: Update.
* gnulib/import/config: Update.
* gnulib/import/dirent: Update.
* gnulib/import/dirfd: Update.
* gnulib/import/dirname-lgpl: Update.
* gnulib/import/dirname.h: Update.
* gnulib/import/dosname.h: Update.
* gnulib/import/errno: Update.
* gnulib/import/extra/snippet/arg-nonnull.h: Update.
* gnulib/import/extra/snippet/c++defs.h: Update.
* gnulib/import/extra/snippet/warn-on-use.h: Update.
* gnulib/import/extra/update-copyright: Update.
* gnulib/import/flexmember.h: Update.
* gnulib/import/float+.h: Update.
* gnulib/import/float: Update.
* gnulib/import/float: Update.
* gnulib/import/fnmatch: Update.
* gnulib/import/fnmatch: Update.
* gnulib/import/fnmatch_loop: Update.
* gnulib/import/fpucw.h: Update.
* gnulib/import/frexp: Update.
* gnulib/import/frexpl: Update.
* gnulib/import/gettimeofday: Update.
* gnulib/import/hard-locale: Update.
* gnulib/import/hard-locale.h: Update.
* gnulib/import/inttypes: Update.
* gnulib/import/isnan: Update.
* gnulib/import/isnand-nolibm.h: Update.
* gnulib/import/isnand: Update.
* gnulib/import/isnanl-nolibm.h: Update.
* gnulib/import/isnanl: Update.
* gnulib/import/itold: Update.
* gnulib/import/limits: Update.
* gnulib/import/localcharset: Update.
* gnulib/import/localcharset.h: Update.
* gnulib/import/lstat: Update.
* gnulib/import/m4/00gnulib: Update.
* gnulib/import/m4/absolute-header: Update.
* gnulib/import/m4/alloca: Update.
* gnulib/import/m4/canonicalize: Update.
* gnulib/import/m4/codeset: Update.
* gnulib/import/m4/configmake: Update.
* gnulib/import/m4/dirent_h: Update.
* gnulib/import/m4/dirfd: Update.
* gnulib/import/m4/dirname: Update.
* gnulib/import/m4/double-slash-root: Update.
* gnulib/import/m4/eealloc: Update.
* gnulib/import/m4/errno_h: Update.
* gnulib/import/m4/exponentd: Update.
* gnulib/import/m4/exponentl: Update.
* gnulib/import/m4/extensions: Update.
* gnulib/import/m4/extern-inline: Update.
* gnulib/import/m4/fcntl-o: Update.
* gnulib/import/m4/flexmember: Update.
* gnulib/import/m4/float_h: Update.
* gnulib/import/m4/fnmatch: Update.
* gnulib/import/m4/fpieee: Update.
* gnulib/import/m4/frexp: Update.
* gnulib/import/m4/frexpl: Update.
* gnulib/import/m4/gettimeofday: Update.
* gnulib/import/m4/glibc21: Update.
* gnulib/import/m4/gnulib-cache: Update.
* gnulib/import/m4/gnulib-common: Update.
* gnulib/import/m4/gnulib-comp: Update.
* gnulib/import/m4/gnulib-tool: Update.
* gnulib/import/m4/hard-locale: Update.
* gnulib/import/m4/include_next: Update.
* gnulib/import/m4/inttypes-pri: Update.
* gnulib/import/m4/inttypes: Update.
* gnulib/import/m4/isnand: Update.
* gnulib/import/m4/isnanl: Update.
* gnulib/import/m4/largefile: Update.
* gnulib/import/m4/limits-h: Update.
* gnulib/import/m4/localcharset: Update.
* gnulib/import/m4/locale-fr: Update.
* gnulib/import/m4/locale-ja: Update.
* gnulib/import/m4/locale-zh: Update.
* gnulib/import/m4/longlong: Update.
* gnulib/import/m4/lstat: Update.
* gnulib/import/m4/malloc: Update.
* gnulib/import/m4/malloca: Update.
* gnulib/import/m4/math_h: Update.
* gnulib/import/m4/mbrtowc: Update.
* gnulib/import/m4/mbsinit: Update.
* gnulib/import/m4/mbsrtowcs: Update.
* gnulib/import/m4/mbstate_t: Update.
* gnulib/import/m4/memchr: Update.
* gnulib/import/m4/memmem: Update.
* gnulib/import/m4/mmap-anon: Update.
* gnulib/import/m4/multiarch: Update.
* gnulib/import/m4/nocrash: Update.
* gnulib/import/m4/off_t: Update.
* gnulib/import/m4/pathmax: Update.
* gnulib/import/m4/rawmemchr: Update.
* gnulib/import/m4/readlink: Update.
* gnulib/import/m4/rename: Update.
* gnulib/import/m4/rmdir: Update.
* gnulib/import/m4/signal_h: Update.
* gnulib/import/m4/ssize_t: Update.
* gnulib/import/m4/stat: Update.
* gnulib/import/m4/stdbool: Update.
* gnulib/import/m4/stddef_h: Update.
* gnulib/import/m4/stdint: Update.
* gnulib/import/m4/stdio_h: Update.
* gnulib/import/m4/stdlib_h: Update.
* gnulib/import/m4/strchrnul: Update.
* gnulib/import/m4/string_h: Update.
* gnulib/import/m4/strstr: Update.
* gnulib/import/m4/strtok_r: Update.
* gnulib/import/m4/sys_socket_h: Update.
* gnulib/import/m4/sys_stat_h: Update.
* gnulib/import/m4/sys_time_h: Update.
* gnulib/import/m4/sys_types_h: Update.
* gnulib/import/m4/time_h: Update.
* gnulib/import/m4/unistd_h: Update.
* gnulib/import/m4/warn-on-use: Update.
* gnulib/import/m4/wchar_h: Update.
* gnulib/import/m4/wchar_t: Update.
* gnulib/import/m4/wctype_h: Update.
* gnulib/import/m4/wint_t: Update.
* gnulib/import/malloc: Update.
* gnulib/import/malloca: Update.
* gnulib/import/malloca.h: Update.
* gnulib/import/math: Update.
* gnulib/import/math: Update.
* gnulib/import/mbrtowc: Update.
* gnulib/import/mbsinit: Update.
* gnulib/import/mbsrtowcs-impl.h: Update.
* gnulib/import/mbsrtowcs-state: Update.
* gnulib/import/mbsrtowcs: Update.
* gnulib/import/memchr: Update.
* gnulib/import/memmem: Update.
* gnulib/import/pathmax.h: Update.
* gnulib/import/rawmemchr: Update.
* gnulib/import/readlink: Update.
* gnulib/import/ref-add.sin: Update.
* gnulib/import/ref-del.sin: Update.
* gnulib/import/rename: Update.
* gnulib/import/rmdir: Update.
* gnulib/import/same-inode.h: Update.
* gnulib/import/signal: Update.
* gnulib/import/stat: Update.
* gnulib/import/stdbool: Update.
* gnulib/import/stddef: Update.
* gnulib/import/stdint: Update.
* gnulib/import/stdio: Update.
* gnulib/import/stdlib: Update.
* gnulib/import/str-two-way.h: Update.
* gnulib/import/strchrnul: Update.
* gnulib/import/streq.h: Update.
* gnulib/import/string: Update.
* gnulib/import/stripslash: Update.
* gnulib/import/strnlen1: Update.
* gnulib/import/strnlen1.h: Update.
* gnulib/import/strstr: Update.
* gnulib/import/strtok_r: Update.
* gnulib/import/sys_stat: Update.
* gnulib/import/sys_time: Update.
* gnulib/import/sys_types: Update.
* gnulib/import/time: Update.
* gnulib/import/unistd: Update.
* gnulib/import/unistd: Update.
* gnulib/import/verify.h: Update.
* gnulib/import/wchar: Update.
* gnulib/import/wctype: Update.
* gnulib/import/flexmember.h: New file.
* gnulib/import/hard-locale.c: New file.
* gnulib/import/hard-locale.h: New file.
* gnulib/import/limits.in.h: New file.
* gnulib/import/m4/flexmember.m4: New file.
* gnulib/import/m4/hard-locale.m4: New file.
* gnulib/import/m4/limits-h.m4: New file.
2016-10-19 00:18:29 +08:00
|
|
|
int result = !p;
|
|
|
|
free (p);
|
|
|
|
return result;]])
|
2014-11-23 22:19:49 +08:00
|
|
|
],
|
|
|
|
[ac_cv_func_malloc_0_nonnull=yes],
|
|
|
|
[ac_cv_func_malloc_0_nonnull=no],
|
|
|
|
[case "$host_os" in
|
|
|
|
# Guess yes on platforms where we know the result.
|
2022-04-18 23:44:18 +08:00
|
|
|
*-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
|
|
|
|
| gnu* | *-musl* | midnightbsd* \
|
|
|
|
| hpux* | solaris* | cygwin* | mingw* | msys* )
|
2019-11-17 13:37:06 +08:00
|
|
|
ac_cv_func_malloc_0_nonnull="guessing yes" ;;
|
|
|
|
# If we don't know, obey --enable-cross-guesses.
|
|
|
|
*) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;;
|
2014-11-23 22:19:49 +08:00
|
|
|
esac
|
|
|
|
])
|
|
|
|
])
|
2022-04-18 23:44:18 +08:00
|
|
|
AS_CASE([$ac_cv_func_malloc_0_nonnull], [*yes], [$1], [$2])
|
2014-11-23 22:19:49 +08:00
|
|
|
])# _AC_FUNC_MALLOC_IF
|
|
|
|
|
|
|
|
# gl_FUNC_MALLOC_GNU
|
|
|
|
# ------------------
|
2022-04-18 23:44:18 +08:00
|
|
|
# Replace malloc if it is not compatible with GNU libc.
|
2014-11-23 22:19:49 +08:00
|
|
|
AC_DEFUN([gl_FUNC_MALLOC_GNU],
|
|
|
|
[
|
|
|
|
AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
|
2022-04-18 23:44:18 +08:00
|
|
|
AC_REQUIRE([gl_FUNC_MALLOC_POSIX])
|
|
|
|
REPLACE_MALLOC_FOR_MALLOC_GNU="$REPLACE_MALLOC_FOR_MALLOC_POSIX"
|
|
|
|
if test $REPLACE_MALLOC_FOR_MALLOC_GNU = 0; then
|
|
|
|
_AC_FUNC_MALLOC_IF([], [REPLACE_MALLOC_FOR_MALLOC_GNU=1])
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
|
|
|
# gl_FUNC_MALLOC_PTRDIFF
|
|
|
|
# ----------------------
|
|
|
|
# Test whether malloc (N) reliably fails when N exceeds PTRDIFF_MAX,
|
|
|
|
# and replace malloc otherwise.
|
|
|
|
AC_DEFUN([gl_FUNC_MALLOC_PTRDIFF],
|
|
|
|
[
|
|
|
|
AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
|
|
|
|
AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF])
|
|
|
|
test "$gl_cv_malloc_ptrdiff" = yes || REPLACE_MALLOC_FOR_MALLOC_POSIX=1
|
|
|
|
])
|
|
|
|
|
|
|
|
# Test whether malloc, realloc, calloc refuse to create objects
|
|
|
|
# larger than what can be expressed in ptrdiff_t.
|
|
|
|
# Set gl_cv_func_malloc_gnu to yes or no accordingly.
|
|
|
|
AC_DEFUN([gl_CHECK_MALLOC_PTRDIFF],
|
|
|
|
[
|
|
|
|
AC_CACHE_CHECK([whether malloc is ptrdiff_t safe],
|
|
|
|
[gl_cv_malloc_ptrdiff],
|
|
|
|
[AC_COMPILE_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM(
|
|
|
|
[[#include <stdint.h>
|
|
|
|
]],
|
|
|
|
[[/* 64-bit ptrdiff_t is so wide that no practical platform
|
|
|
|
can exceed it. */
|
|
|
|
#define WIDE_PTRDIFF (PTRDIFF_MAX >> 31 >> 31 != 0)
|
|
|
|
|
|
|
|
/* On rare machines where size_t fits in ptrdiff_t there
|
|
|
|
is no problem. */
|
|
|
|
#define NARROW_SIZE (SIZE_MAX <= PTRDIFF_MAX)
|
|
|
|
|
|
|
|
/* glibc 2.30 and later malloc refuses to exceed ptrdiff_t
|
|
|
|
bounds even on 32-bit platforms. We don't know which
|
|
|
|
non-glibc systems are safe. */
|
|
|
|
#define KNOWN_SAFE (2 < __GLIBC__ + (30 <= __GLIBC_MINOR__))
|
|
|
|
|
|
|
|
#if WIDE_PTRDIFF || NARROW_SIZE || KNOWN_SAFE
|
|
|
|
return 0;
|
|
|
|
#else
|
|
|
|
#error "malloc might not be ptrdiff_t safe"
|
|
|
|
syntax error
|
|
|
|
#endif
|
|
|
|
]])],
|
|
|
|
[gl_cv_malloc_ptrdiff=yes],
|
|
|
|
[gl_cv_malloc_ptrdiff=no])
|
2014-11-23 22:19:49 +08:00
|
|
|
])
|
|
|
|
])
|
|
|
|
|
|
|
|
# gl_FUNC_MALLOC_POSIX
|
|
|
|
# --------------------
|
|
|
|
# Test whether 'malloc' is POSIX compliant (sets errno to ENOMEM when it
|
2022-04-18 23:44:18 +08:00
|
|
|
# fails, and doesn't mess up with ptrdiff_t overflow), and replace
|
|
|
|
# malloc if it is not.
|
2014-11-23 22:19:49 +08:00
|
|
|
AC_DEFUN([gl_FUNC_MALLOC_POSIX],
|
|
|
|
[
|
|
|
|
AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
|
2022-04-18 23:44:18 +08:00
|
|
|
AC_REQUIRE([gl_FUNC_MALLOC_PTRDIFF])
|
2014-11-23 22:19:49 +08:00
|
|
|
AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
|
2022-04-18 23:44:18 +08:00
|
|
|
if test "$gl_cv_func_malloc_posix" = yes; then
|
2014-11-23 22:19:49 +08:00
|
|
|
AC_DEFINE([HAVE_MALLOC_POSIX], [1],
|
2022-04-18 23:44:18 +08:00
|
|
|
[Define if malloc, realloc, and calloc set errno on allocation failure.])
|
2014-11-23 22:19:49 +08:00
|
|
|
else
|
2022-04-18 23:44:18 +08:00
|
|
|
REPLACE_MALLOC_FOR_MALLOC_POSIX=1
|
2014-11-23 22:19:49 +08:00
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
2022-04-18 23:44:18 +08:00
|
|
|
# Test whether malloc, realloc, calloc set errno to ENOMEM on failure.
|
2014-11-23 22:19:49 +08:00
|
|
|
# Set gl_cv_func_malloc_posix to yes or no accordingly.
|
|
|
|
AC_DEFUN([gl_CHECK_MALLOC_POSIX],
|
|
|
|
[
|
2022-04-18 23:44:18 +08:00
|
|
|
AC_REQUIRE([AC_CANONICAL_HOST])
|
|
|
|
AC_CACHE_CHECK([whether malloc, realloc, calloc set errno on failure],
|
2014-11-23 22:19:49 +08:00
|
|
|
[gl_cv_func_malloc_posix],
|
|
|
|
[
|
|
|
|
dnl It is too dangerous to try to allocate a large amount of memory:
|
|
|
|
dnl some systems go to their knees when you do that. So assume that
|
2022-04-18 23:44:18 +08:00
|
|
|
dnl all Unix implementations of the function set errno on failure,
|
|
|
|
dnl except on those platforms where we have seen 'test-malloc-gnu',
|
|
|
|
dnl 'test-realloc-gnu', 'test-calloc-gnu' fail.
|
|
|
|
case "$host_os" in
|
|
|
|
mingw*)
|
|
|
|
gl_cv_func_malloc_posix=no ;;
|
|
|
|
irix* | solaris*)
|
|
|
|
dnl On IRIX 6.5, the three functions return NULL with errno unset
|
|
|
|
dnl when the argument is larger than PTRDIFF_MAX.
|
|
|
|
dnl On Solaris 11.3, the three functions return NULL with errno set
|
|
|
|
dnl to EAGAIN, not ENOMEM, when the argument is larger than
|
|
|
|
dnl PTRDIFF_MAX.
|
|
|
|
dnl Here is a test program:
|
|
|
|
m4_divert_push([KILL])
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#define ptrdiff_t long
|
|
|
|
#ifndef PTRDIFF_MAX
|
|
|
|
# define PTRDIFF_MAX ((ptrdiff_t) ((1UL << (8 * sizeof (ptrdiff_t) - 1)) - 1))
|
|
|
|
#endif
|
|
|
|
|
|
|
|
int main ()
|
|
|
|
{
|
|
|
|
void *p;
|
|
|
|
|
|
|
|
fprintf (stderr, "PTRDIFF_MAX = %lu\n", (unsigned long) PTRDIFF_MAX);
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
p = malloc ((unsigned long) PTRDIFF_MAX + 1);
|
|
|
|
fprintf (stderr, "p=%p errno=%d\n", p, errno);
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
p = calloc (PTRDIFF_MAX / 2 + 1, 2);
|
|
|
|
fprintf (stderr, "p=%p errno=%d\n", p, errno);
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
p = realloc (NULL, (unsigned long) PTRDIFF_MAX + 1);
|
|
|
|
fprintf (stderr, "p=%p errno=%d\n", p, errno);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
m4_divert_pop([KILL])
|
|
|
|
gl_cv_func_malloc_posix=no ;;
|
|
|
|
*)
|
|
|
|
gl_cv_func_malloc_posix=yes ;;
|
|
|
|
esac
|
2014-11-23 22:19:49 +08:00
|
|
|
])
|
|
|
|
])
|