aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2022-07-22 12:11:24 +0930
committerAlan Modra <amodra@gmail.com>2022-07-22 12:38:53 +0930
commit6577f365ebdee7dda71cb996efa29d3714cbccd0 (patch)
treec32ad75f7c51c1c9100a18ce3e7883c2dacd434a
parent4686f81068433540a8dcf1104548389922e2bfef (diff)
downloadgdb-6577f365ebdee7dda71cb996efa29d3714cbccd0.zip
gdb-6577f365ebdee7dda71cb996efa29d3714cbccd0.tar.gz
gdb-6577f365ebdee7dda71cb996efa29d3714cbccd0.tar.bz2
PR17122, OSX 10.9 build failure
sbrk hasn't been used in binutils/ or ld/ for quite some time (so the PR was fixed a while ago). Tidy up configury. PR 17122 binutils/ * configure.ac: Don't check for sbrk. * sysdep.h (sbrk): Don't supply fallback declaration. * config.in: Regenerate. * configure: Regenerate. ld/ * configure.ac: Don't check for sbrk. * config.in: Regenerate. * configure: Regenerate.
-rw-r--r--binutils/config.in7
-rwxr-xr-xbinutils/configure12
-rw-r--r--binutils/configure.ac4
-rw-r--r--binutils/sysdep.h6
-rw-r--r--ld/config.in7
-rwxr-xr-xld/configure12
-rw-r--r--ld/configure.ac4
7 files changed, 6 insertions, 46 deletions
diff --git a/binutils/config.in b/binutils/config.in
index 81bd143..131f09b 100644
--- a/binutils/config.in
+++ b/binutils/config.in
@@ -47,10 +47,6 @@
/* Is the prototype for getopt in <unistd.h> in the expected format? */
#undef HAVE_DECL_GETOPT
-/* Define to 1 if you have the declaration of `sbrk', and to 0 if you don't.
- */
-#undef HAVE_DECL_SBRK
-
/* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't.
*/
#undef HAVE_DECL_STPCPY
@@ -107,9 +103,6 @@
/* Define to 1 if msgpack is available. */
#undef HAVE_MSGPACK
-/* Define to 1 if you have the `sbrk' function. */
-#undef HAVE_SBRK
-
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
diff --git a/binutils/configure b/binutils/configure
index dffb75c..ddb3020 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -13352,7 +13352,7 @@ $as_echo "#define HAVE_MMAP 1" >>confdefs.h
fi
rm -f conftest.mmap conftest.txt
-for ac_func in getc_unlocked mkdtemp mkstemp sbrk utimensat utimes
+for ac_func in getc_unlocked mkdtemp mkstemp utimensat utimes
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -13678,16 +13678,6 @@ fi
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
_ACEOF
-ac_fn_c_check_decl "$LINENO" "sbrk" "ac_cv_have_decl_sbrk" "$ac_includes_default"
-if test "x$ac_cv_have_decl_sbrk" = xyes; then :
- ac_have_decl=1
-else
- ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SBRK $ac_have_decl
-_ACEOF
ac_fn_c_check_decl "$LINENO" "stpcpy" "ac_cv_have_decl_stpcpy" "$ac_includes_default"
if test "x$ac_cv_have_decl_stpcpy" = xyes; then :
ac_have_decl=1
diff --git a/binutils/configure.ac b/binutils/configure.ac
index e204a20..50dac4e 100644
--- a/binutils/configure.ac
+++ b/binutils/configure.ac
@@ -186,7 +186,7 @@ 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
-AC_CHECK_FUNCS(getc_unlocked mkdtemp mkstemp sbrk utimensat utimes)
+AC_CHECK_FUNCS(getc_unlocked mkdtemp mkstemp utimensat utimes)
AC_MSG_CHECKING([for mbstate_t])
AC_TRY_COMPILE([#include <wchar.h>],
@@ -266,7 +266,7 @@ if test $bu_cv_header_utime_h = yes; then
AC_DEFINE(HAVE_GOOD_UTIME_H, 1, [Does <utime.h> define struct utimbuf?])
fi
-AC_CHECK_DECLS([asprintf, environ, getc_unlocked, sbrk, stpcpy, strnlen])
+AC_CHECK_DECLS([asprintf, environ, getc_unlocked, stpcpy, strnlen])
# Link in zlib if we can. This allows us to read compressed debug
# sections. This is used only by readelf.c (objdump uses bfd for
diff --git a/binutils/sysdep.h b/binutils/sysdep.h
index ef3093ee..f2991c7 100644
--- a/binutils/sysdep.h
+++ b/binutils/sysdep.h
@@ -58,12 +58,6 @@
extern char *stpcpy (char *, const char *);
#endif
-#ifdef HAVE_SBRK
-#if !HAVE_DECL_SBRK
-extern char *sbrk ();
-#endif
-#endif
-
#if !HAVE_DECL_ENVIRON
extern char **environ;
#endif
diff --git a/ld/config.in b/ld/config.in
index d4c1fc4..0ccd79d 100644
--- a/ld/config.in
+++ b/ld/config.in
@@ -75,10 +75,6 @@
/* Is the prototype for getopt in <unistd.h> in the expected format? */
#undef HAVE_DECL_GETOPT
-/* Define to 1 if you have the declaration of `sbrk', and to 0 if you don't.
- */
-#undef HAVE_DECL_SBRK
-
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -127,9 +123,6 @@
/* Define to 1 if you have the `realpath' function. */
#undef HAVE_REALPATH
-/* Define to 1 if you have the `sbrk' function. */
-#undef HAVE_SBRK
-
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
diff --git a/ld/configure b/ld/configure
index fbbcb52..1c2b648 100755
--- a/ld/configure
+++ b/ld/configure
@@ -16700,7 +16700,7 @@ fi
done
-for ac_func in close glob lseek mkstemp open realpath sbrk waitpid
+for ac_func in close glob lseek mkstemp open realpath waitpid
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -16741,16 +16741,6 @@ fi
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_ENVIRON $ac_have_decl
_ACEOF
-ac_fn_c_check_decl "$LINENO" "sbrk" "ac_cv_have_decl_sbrk" "$ac_includes_default"
-if test "x$ac_cv_have_decl_sbrk" = xyes; then :
- ac_have_decl=1
-else
- ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SBRK $ac_have_decl
-_ACEOF
diff --git a/ld/configure.ac b/ld/configure.ac
index 4331d6b..eb55904 100644
--- a/ld/configure.ac
+++ b/ld/configure.ac
@@ -366,11 +366,11 @@ AC_SUBST(NATIVE_LIB_DIRS)
AC_CHECK_HEADERS(fcntl.h elf-hints.h limits.h inttypes.h stdint.h \
sys/file.h sys/mman.h sys/param.h sys/stat.h sys/time.h \
sys/types.h unistd.h)
-AC_CHECK_FUNCS(close glob lseek mkstemp open realpath sbrk waitpid)
+AC_CHECK_FUNCS(close glob lseek mkstemp open realpath waitpid)
BFD_BINARY_FOPEN
-AC_CHECK_DECLS([asprintf, environ, sbrk])
+AC_CHECK_DECLS([asprintf, environ])
AC_FUNC_MMAP