From 9467110bae19116ba041118b7d26d675e87506ce Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 5 Nov 2013 09:54:03 -0700 Subject: [PATCH] gdb configure updates Now that the configury needed for the "common" and "target" directories is in common.m4, some code in gdb's configure.ac is redundant. I ran this script after making an "ID" file using mkid: sed -n 's/^.*\(HAVE_[A-Z0-9_]*\).*$/\1/p' config.in | while read x; do echo ===== $x gid $x | egrep -v '^(testsuite|gnulib|common|target|gdbserver)/' done This finds all the spots using HAVE_ defines, and, more importantly, makes it clear which defines aren't used in the main parts of gdb. From this I came up with this patch to remove all the unused bits. There are a few that are subtly used -- for example the configure script sometimes checks internal configure cache variables, meaning some checks cannot be removed. 2013-11-08 Tom Tromey * configure, config.in: Rebuild. * configure.ac: Remove unused configury. --- gdb/ChangeLog | 5 ++ gdb/config.in | 23 ------ gdb/configure | 206 ++--------------------------------------------- gdb/configure.ac | 40 +++------ 4 files changed, 22 insertions(+), 252 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 047196f1445..639c9120e89 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2013-11-08 Tom Tromey + + * configure, config.in: Rebuild. + * configure.ac: Remove unused configury. + 2013-11-08 Tom Tromey * m32c-tdep.c: Use gdb_string.h. diff --git a/gdb/config.in b/gdb/config.in index 7905468cbcb..ada9b3bade1 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -92,10 +92,6 @@ */ #undef HAVE_DECL_FREE -/* Define to 1 if you have the declaration of `getopt', and to 0 if you don't. - */ -#undef HAVE_DECL_GETOPT - /* Define to 1 if you have the declaration of `getthrds', and to 0 if you don't. */ #undef HAVE_DECL_GETTHRDS @@ -124,10 +120,6 @@ */ #undef HAVE_DECL_STRSTR -/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you - don't. */ -#undef HAVE_DECL_VSNPRINTF - /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_DIRENT_H @@ -291,9 +283,6 @@ /* Define to 1 if you have the `pread64' function. */ #undef HAVE_PREAD64 -/* Define if has prfpregset32_t. */ -#undef HAVE_PRFPREGSET32_T - /* Define if has prfpregset_t. */ #undef HAVE_PRFPREGSET_T @@ -303,15 +292,9 @@ /* Define if has prgregset_t. */ #undef HAVE_PRGREGSET_T -/* Define if ioctl argument PIOCSET is available. */ -#undef HAVE_PROCFS_PIOCSET - /* Define to 1 if you have the header file. */ #undef HAVE_PROC_SERVICE_H -/* Define if has prrun_t. */ -#undef HAVE_PRRUN_T - /* Define if has prsysent_t. */ #undef HAVE_PRSYSENT_T @@ -327,9 +310,6 @@ /* Define if has psaddr_t. */ #undef HAVE_PSADDR_T -/* Define if has pstatus_t. */ -#undef HAVE_PSTATUS_T - /* Define to 1 if you have the `ptrace64' function. */ #undef HAVE_PTRACE64 @@ -447,9 +427,6 @@ /* Define to 1 if `struct user_regs_struct' is a member of `gs_base'. */ #undef HAVE_STRUCT_USER_REGS_STRUCT_GS_BASE -/* Define to 1 if you have the `syscall' function. */ -#undef HAVE_SYSCALL - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_DEBUGREG_H diff --git a/gdb/configure b/gdb/configure index 8844c900314..1728d091a1d 100755 --- a/gdb/configure +++ b/gdb/configure @@ -8914,15 +8914,15 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # elf_hp.h is for HP/UX 64-bit shared library support. -for ac_header in nlist.h machine/reg.h poll.h sys/poll.h sys/socket.h proc_service.h \ - thread_db.h signal.h stddef.h \ - stdlib.h string.h memory.h strings.h sys/fault.h \ +for ac_header in nlist.h machine/reg.h poll.h sys/poll.h proc_service.h \ + thread_db.h stddef.h \ + stdlib.h sys/fault.h \ sys/file.h sys/filio.h sys/ioctl.h sys/param.h \ sys/resource.h sys/procfs.h sys/ptrace.h ptrace.h \ sys/reg.h sys/debugreg.h sys/select.h sys/syscall.h \ - sys/types.h sys/wait.h wait.h termios.h termio.h \ - sgtty.h unistd.h elf_hp.h locale.h \ - dlfcn.h sys/un.h linux/perf_event.h + termios.h termio.h \ + sgtty.h unistd.h elf_hp.h \ + dlfcn.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" @@ -9045,36 +9045,6 @@ fi cat >>confdefs.h <<_ACEOF #define HAVE_DECL_REALLOC $ac_have_decl _ACEOF -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 -else - ac_have_decl=0 -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" "getopt" "ac_cv_have_decl_getopt" "$ac_includes_default" -if test "x$ac_cv_have_decl_getopt" = x""yes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETOPT $ac_have_decl -_ACEOF ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default" if test "x$ac_cv_have_decl_snprintf" = x""yes; then : ac_have_decl=1 @@ -9084,16 +9054,6 @@ fi cat >>confdefs.h <<_ACEOF #define HAVE_DECL_SNPRINTF $ac_have_decl -_ACEOF -ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default" -if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_VSNPRINTF $ac_have_decl _ACEOF @@ -10159,10 +10119,10 @@ fi for ac_func in canonicalize_file_name realpath getrusage getuid getgid \ pipe poll pread pread64 pwrite readlink resize_term \ sbrk setpgid setpgrp setsid \ - sigaction sigprocmask sigsetmask socketpair syscall \ + sigaction sigprocmask sigsetmask socketpair \ ttrace wborder wresize setlocale iconvlist libiconvlist btowc \ setrlimit getrlimit posix_madvise waitpid lstat \ - fdwalk pipe2 ptrace64 + ptrace64 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" @@ -11396,80 +11356,6 @@ $as_echo "#define _KMEMUSER 1" >>confdefs.h fi if test "$ac_cv_header_sys_procfs_h" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pstatus_t in sys/procfs.h" >&5 -$as_echo_n "checking for pstatus_t in sys/procfs.h... " >&6; } - if test "${bfd_cv_have_sys_procfs_type_pstatus_t+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#define _SYSCALL32 -/* Needed for new procfs interface on sparc-solaris. */ -#define _STRUCTURED_PROC 1 -#include -int -main () -{ -pstatus_t avar - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - bfd_cv_have_sys_procfs_type_pstatus_t=yes -else - bfd_cv_have_sys_procfs_type_pstatus_t=no - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - - if test $bfd_cv_have_sys_procfs_type_pstatus_t = yes; then - -$as_echo "#define HAVE_PSTATUS_T 1" >>confdefs.h - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_pstatus_t" >&5 -$as_echo "$bfd_cv_have_sys_procfs_type_pstatus_t" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prrun_t in sys/procfs.h" >&5 -$as_echo_n "checking for prrun_t in sys/procfs.h... " >&6; } - if test "${bfd_cv_have_sys_procfs_type_prrun_t+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#define _SYSCALL32 -/* Needed for new procfs interface on sparc-solaris. */ -#define _STRUCTURED_PROC 1 -#include -int -main () -{ -prrun_t avar - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - bfd_cv_have_sys_procfs_type_prrun_t=yes -else - bfd_cv_have_sys_procfs_type_prrun_t=no - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - - if test $bfd_cv_have_sys_procfs_type_prrun_t = yes; then - -$as_echo "#define HAVE_PRRUN_T 1" >>confdefs.h - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_prrun_t" >&5 -$as_echo "$bfd_cv_have_sys_procfs_type_prrun_t" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gregset_t in sys/procfs.h" >&5 $as_echo_n "checking for gregset_t in sys/procfs.h... " >&6; } if test "${bfd_cv_have_sys_procfs_type_gregset_t+set}" = set; then : @@ -11655,43 +11541,6 @@ $as_echo "#define HAVE_PRGREGSET32_T 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_prgregset32_t" >&5 $as_echo "$bfd_cv_have_sys_procfs_type_prgregset32_t" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prfpregset32_t in sys/procfs.h" >&5 -$as_echo_n "checking for prfpregset32_t in sys/procfs.h... " >&6; } - if test "${bfd_cv_have_sys_procfs_type_prfpregset32_t+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#define _SYSCALL32 -/* Needed for new procfs interface on sparc-solaris. */ -#define _STRUCTURED_PROC 1 -#include -int -main () -{ -prfpregset32_t avar - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - bfd_cv_have_sys_procfs_type_prfpregset32_t=yes -else - bfd_cv_have_sys_procfs_type_prfpregset32_t=no - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - - if test $bfd_cv_have_sys_procfs_type_prfpregset32_t = yes; then - -$as_echo "#define HAVE_PRFPREGSET32_T 1" >>confdefs.h - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_prfpregset32_t" >&5 -$as_echo "$bfd_cv_have_sys_procfs_type_prfpregset32_t" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lwpid_t in sys/procfs.h" >&5 $as_echo_n "checking for lwpid_t in sys/procfs.h... " >&6; } if test "${bfd_cv_have_sys_procfs_type_lwpid_t+set}" = set; then : @@ -11956,45 +11805,6 @@ $as_echo "#define PRFPREGSET_T_BROKEN 1" >>confdefs.h fi fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PIOCSET ioctl entry in sys/procfs.h" >&5 -$as_echo_n "checking for PIOCSET ioctl entry in sys/procfs.h... " >&6; } - if test "${gdb_cv_have_procfs_piocset+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include - -int -main () -{ - - int dummy;; - dummy = ioctl(0, PIOCSET, &dummy); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gdb_cv_have_procfs_piocset=yes -else - gdb_cv_have_procfs_piocset=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_have_procfs_piocset" >&5 -$as_echo "$gdb_cv_have_procfs_piocset" >&6; } - if test $gdb_cv_have_procfs_piocset = yes; then - -$as_echo "#define HAVE_PROCFS_PIOCSET 1" >>confdefs.h - - fi fi # Check if the compiler supports the `long long' type. diff --git a/gdb/configure.ac b/gdb/configure.ac index 8f9e1e2f783..10fe947459e 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1075,15 +1075,15 @@ fi AC_HEADER_DIRENT AC_HEADER_STDC # elf_hp.h is for HP/UX 64-bit shared library support. -AC_CHECK_HEADERS([nlist.h machine/reg.h poll.h sys/poll.h sys/socket.h proc_service.h \ - thread_db.h signal.h stddef.h \ - stdlib.h string.h memory.h strings.h sys/fault.h \ +AC_CHECK_HEADERS([nlist.h machine/reg.h poll.h sys/poll.h proc_service.h \ + thread_db.h stddef.h \ + stdlib.h sys/fault.h \ sys/file.h sys/filio.h sys/ioctl.h sys/param.h \ sys/resource.h sys/procfs.h sys/ptrace.h ptrace.h \ sys/reg.h sys/debugreg.h sys/select.h sys/syscall.h \ - sys/types.h sys/wait.h wait.h termios.h termio.h \ - sgtty.h unistd.h elf_hp.h locale.h \ - dlfcn.h sys/un.h linux/perf_event.h]) + termios.h termio.h \ + sgtty.h unistd.h elf_hp.h \ + dlfcn.h]) AC_CHECK_HEADERS(sys/proc.h, [], [], [#if HAVE_SYS_PARAM_H # include @@ -1117,8 +1117,7 @@ AC_CHECK_HEADERS(term.h, [], [], # Checks for declarations. # # ------------------------- # -AC_CHECK_DECLS([free, malloc, realloc, strerror, strstr, getopt, - snprintf, vsnprintf]) +AC_CHECK_DECLS([free, malloc, realloc, snprintf]) AM_LC_MESSAGES # ----------------------- # @@ -1155,10 +1154,10 @@ AC_FUNC_VFORK AC_CHECK_FUNCS([canonicalize_file_name realpath getrusage getuid getgid \ pipe poll pread pread64 pwrite readlink resize_term \ sbrk setpgid setpgrp setsid \ - sigaction sigprocmask sigsetmask socketpair syscall \ + sigaction sigprocmask sigsetmask socketpair \ ttrace wborder wresize setlocale iconvlist libiconvlist btowc \ setrlimit getrlimit posix_madvise waitpid lstat \ - fdwalk pipe2 ptrace64]) + ptrace64]) AM_LANGINFO_CODESET GDB_AC_COMMON @@ -1408,14 +1407,11 @@ if test "${target}" = "${host}"; then fi if test "$ac_cv_header_sys_procfs_h" = yes; then - BFD_HAVE_SYS_PROCFS_TYPE(pstatus_t) - BFD_HAVE_SYS_PROCFS_TYPE(prrun_t) BFD_HAVE_SYS_PROCFS_TYPE(gregset_t) BFD_HAVE_SYS_PROCFS_TYPE(fpregset_t) BFD_HAVE_SYS_PROCFS_TYPE(prgregset_t) BFD_HAVE_SYS_PROCFS_TYPE(prfpregset_t) BFD_HAVE_SYS_PROCFS_TYPE(prgregset32_t) - BFD_HAVE_SYS_PROCFS_TYPE(prfpregset32_t) BFD_HAVE_SYS_PROCFS_TYPE(lwpid_t) BFD_HAVE_SYS_PROCFS_TYPE(psaddr_t) BFD_HAVE_SYS_PROCFS_TYPE(prsysent_t) @@ -1450,24 +1446,6 @@ if test "$ac_cv_header_sys_procfs_h" = yes; then [Define if the prfpregset_t type is broken.]) fi fi - - dnl Check for PIOCSET ioctl entry - - AC_MSG_CHECKING(for PIOCSET ioctl entry in sys/procfs.h) - AC_CACHE_VAL(gdb_cv_have_procfs_piocset, - [AC_TRY_COMPILE([#include -#include -#include -], [ - int dummy;; - dummy = ioctl(0, PIOCSET, &dummy); - ], - gdb_cv_have_procfs_piocset=yes, gdb_cv_have_procfs_piocset=no)]) - AC_MSG_RESULT($gdb_cv_have_procfs_piocset) - if test $gdb_cv_have_procfs_piocset = yes; then - AC_DEFINE(HAVE_PROCFS_PIOCSET, 1, - [Define if ioctl argument PIOCSET is available.]) - fi fi # Check if the compiler supports the `long long' type. -- 2.30.2