From 29d17e4773334ae60ffac7ea7f92d507c23b70f6 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 22 Jul 2018 09:34:42 -0600 Subject: [PATCH] Remove some unnecessary declarations and configury configure checks for declarations of free, malloc, and realloc; but the results are only used in a single spot: utils.c. I think these checks are long since obsolete, so this patch removes them. Grepping the entire tree for these HAVE_DECL_ symbols, the only uses of possible interest to gdb come from bfd/sysdep.h; but this is not (nor should be) included by gdb. (And furthermore I think the code there is probably also obsolete.) gdb/ChangeLog 2018-07-24 Tom Tromey * utils.c (malloc, realloc, free): Don't declare. * configure, config.in: Rebuild. * configure.ac: Don't check for declarations of free, malloc, or realloc. --- gdb/ChangeLog | 7 +++++++ gdb/config.in | 12 ------------ gdb/configure | 30 ------------------------------ gdb/configure.ac | 2 +- gdb/utils.c | 10 ---------- 5 files changed, 8 insertions(+), 53 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index efa6a5a..11f78c5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2018-07-24 Tom Tromey + + * utils.c (malloc, realloc, free): Don't declare. + * configure, config.in: Rebuild. + * configure.ac: Don't check for declarations of free, malloc, or + realloc. + 2018-07-22 Simon Marchi * aarch64-linux-nat.c diff --git a/gdb/config.in b/gdb/config.in index 5272902..01acda1 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -102,26 +102,14 @@ /* Define to 1 if you have the declaration of `ffs', and to 0 if you don't. */ #undef HAVE_DECL_FFS -/* Define to 1 if you have the declaration of `free', and to 0 if you don't. - */ -#undef HAVE_DECL_FREE - /* Define to 1 if you have the declaration of `getthrds', and to 0 if you don't. */ #undef HAVE_DECL_GETTHRDS -/* Define to 1 if you have the declaration of `malloc', and to 0 if you don't. - */ -#undef HAVE_DECL_MALLOC - /* Define to 1 if you have the declaration of `ptrace', and to 0 if you don't. */ #undef HAVE_DECL_PTRACE -/* Define to 1 if you have the declaration of `realloc', and to 0 if you - don't. */ -#undef HAVE_DECL_REALLOC - /* Define to 1 if you have the declaration of `snprintf', and to 0 if you don't. */ #undef HAVE_DECL_SNPRINTF diff --git a/gdb/configure b/gdb/configure index 3ee88e4..9cd0036 100755 --- a/gdb/configure +++ b/gdb/configure @@ -12394,36 +12394,6 @@ _ACEOF -ac_fn_c_check_decl "$LINENO" "free" "ac_cv_have_decl_free" "$ac_includes_default" -if test "x$ac_cv_have_decl_free" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_FREE $ac_have_decl -_ACEOF -ac_fn_c_check_decl "$LINENO" "malloc" "ac_cv_have_decl_malloc" "$ac_includes_default" -if test "x$ac_cv_have_decl_malloc" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_MALLOC $ac_have_decl -_ACEOF -ac_fn_c_check_decl "$LINENO" "realloc" "ac_cv_have_decl_realloc" "$ac_includes_default" -if test "x$ac_cv_have_decl_realloc" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_REALLOC $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" = xyes; then : ac_have_decl=1 diff --git a/gdb/configure.ac b/gdb/configure.ac index dfd38a7..13bc5f9 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1317,7 +1317,7 @@ AC_CHECK_HEADERS(term.h, [], [], libiberty_INIT -AC_CHECK_DECLS([free, malloc, realloc, snprintf]) +AC_CHECK_DECLS([snprintf]) AM_LC_MESSAGES # ----------------------- # diff --git a/gdb/utils.c b/gdb/utils.c index bfcb45b..7a8c80c 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -72,16 +72,6 @@ #include #include "common/pathstuff.h" -#if !HAVE_DECL_MALLOC -extern PTR malloc (); /* ARI: PTR */ -#endif -#if !HAVE_DECL_REALLOC -extern PTR realloc (); /* ARI: PTR */ -#endif -#if !HAVE_DECL_FREE -extern void free (); -#endif - void (*deprecated_error_begin_hook) (void); /* Prototypes for local functions */ -- 2.7.4