From 1bd2f0baf15dfb05a884228cee1f9964768e1a27 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 5 Nov 2013 10:06:21 -0700 Subject: [PATCH] remove unused gdbserver configury This updates gdbserver's configure.ac to remove checks that aren't directly needed by gdbserver. 2013-11-08 Tom Tromey * configure, config.in: Rebuild. * configure.ac: Remove unused configury. --- gdb/gdbserver/ChangeLog | 5 +++ gdb/gdbserver/config.in | 6 ---- gdb/gdbserver/configure | 69 ++------------------------------------ gdb/gdbserver/configure.ac | 25 +++----------- 4 files changed, 11 insertions(+), 94 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 639a2ba8195..e1ae98548ed 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2013-11-08 Tom Tromey + + * configure, config.in: Rebuild. + * configure.ac: Remove unused configury. + 2013-11-08 Tom Tromey * acinclude.m4: Include common.m4, codeset.m4. diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in index bd5c586961a..d0976c1c330 100644 --- a/gdb/gdbserver/config.in +++ b/gdb/gdbserver/config.in @@ -58,9 +58,6 @@ /* Define if has elf_fpregset_t. */ #undef HAVE_ELF_FPREGSET_T -/* Define if errno is available */ -#undef HAVE_ERRNO - /* Define to 1 if you have the header file. */ #undef HAVE_ERRNO_H @@ -256,9 +253,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_WAIT_H -/* Checking if errno must be defined */ -#undef MUST_DEFINE_ERRNO - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index a4ea2cad91f..6bef97c1d47 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -4873,7 +4873,7 @@ $as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cach cd "$ac_popdir" -for ac_header in sgtty.h termio.h termios.h sys/reg.h string.h proc_service.h sys/procfs.h thread_db.h linux/elf.h stdlib.h errno.h fcntl.h signal.h sys/file.h malloc.h sys/ioctl.h netinet/in.h sys/socket.h netdb.h netinet/tcp.h arpa/inet.h sys/wait.h wait.h sys/un.h linux/perf_event.h sys/syscall.h +for ac_header in sgtty.h termio.h termios.h sys/reg.h string.h proc_service.h sys/procfs.h linux/elf.h stdlib.h errno.h fcntl.h signal.h sys/file.h malloc.h sys/ioctl.h netinet/in.h sys/socket.h netdb.h netinet/tcp.h arpa/inet.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -4887,7 +4887,7 @@ fi done -for ac_func in pread pwrite pread64 readlink fdwalk pipe2 +for ac_func in pread pwrite pread64 readlink 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" @@ -5627,61 +5627,6 @@ done LIBS="$old_LIBS" -have_errno=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno" >&5 -$as_echo_n "checking for errno... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#if HAVE_ERRNO_H -#include -#endif -int -main () -{ -static int x; x = errno; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - in errno.h" >&5 -$as_echo "yes - in errno.h" >&6; }; -$as_echo "#define HAVE_ERRNO 1" >>confdefs.h - have_errno=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test $have_errno = no; then -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#if HAVE_ERRNO_H -#include -#endif -int -main () -{ -extern int errno; static int x; x = errno; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - must define" >&5 -$as_echo "yes - must define" >&6; }; -$as_echo "#define HAVE_ERRNO 1" >>confdefs.h - -$as_echo "#define MUST_DEFINE_ERRNO 1" >>confdefs.h - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi - ac_fn_c_check_decl "$LINENO" "strerror" "ac_cv_have_decl_strerror" "$ac_includes_default" if test "x$ac_cv_have_decl_strerror" = x""yes; then : ac_have_decl=1 @@ -5692,16 +5637,6 @@ fi cat >>confdefs.h <<_ACEOF #define HAVE_DECL_STRERROR $ac_have_decl _ACEOF -ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" -if test "x$ac_cv_have_decl_strstr" = x""yes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRSTR $ac_have_decl -_ACEOF ac_fn_c_check_decl "$LINENO" "perror" "ac_cv_have_decl_perror" "$ac_includes_default" if test "x$ac_cv_have_decl_perror" = x""yes; then : ac_have_decl=1 diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index 086457ca7bd..3bed8760e27 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -79,13 +79,12 @@ AC_PROG_MAKE_SET ACX_CONFIGURE_DIR(["../gnulib"], ["build-gnulib-gdbserver"]) AC_CHECK_HEADERS(sgtty.h termio.h termios.h sys/reg.h string.h dnl - proc_service.h sys/procfs.h thread_db.h linux/elf.h dnl + proc_service.h sys/procfs.h linux/elf.h dnl stdlib.h dnl errno.h fcntl.h signal.h sys/file.h malloc.h dnl sys/ioctl.h netinet/in.h sys/socket.h netdb.h dnl - netinet/tcp.h arpa/inet.h sys/wait.h wait.h sys/un.h dnl - linux/perf_event.h sys/syscall.h) -AC_CHECK_FUNCS(pread pwrite pread64 readlink fdwalk pipe2) + netinet/tcp.h arpa/inet.h) +AC_CHECK_FUNCS(pread pwrite pread64 readlink) AC_REPLACE_FUNCS(vasprintf vsnprintf) GDB_AC_COMMON @@ -189,23 +188,7 @@ LIBS="$LIBS -ldl" AC_CHECK_FUNCS(dladdr) LIBS="$old_LIBS" -have_errno=no -AC_MSG_CHECKING(for errno) -AC_TRY_LINK([ -#if HAVE_ERRNO_H -#include -#endif], [static int x; x = errno;], - [AC_MSG_RESULT(yes - in errno.h); AC_DEFINE(HAVE_ERRNO, 1, [Define if errno is available]) have_errno=yes]) -if test $have_errno = no; then -AC_TRY_LINK([ -#if HAVE_ERRNO_H -#include -#endif], [extern int errno; static int x; x = errno;], - [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_ERRNO, 1, [Define if errno is available]) AC_DEFINE(MUST_DEFINE_ERRNO, 1, [Checking if errno must be defined])], - [AC_MSG_RESULT(no)]) -fi - -AC_CHECK_DECLS([strerror, strstr, perror, vasprintf, vsnprintf]) +AC_CHECK_DECLS([strerror, perror, vasprintf, vsnprintf]) AC_CHECK_TYPES(socklen_t, [], [], [#include -- 2.30.2