From: Simon Marchi Date: Fri, 20 Mar 2020 15:57:49 +0000 (-0400) Subject: gdb: remove HAVE_DECL_PTRACE X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c884cc46193c98fd0b90ce8a79c081f6a1c18cc6;p=binutils-gdb.git gdb: remove HAVE_DECL_PTRACE I stumbled on this snippet in nat/gdb_ptrace.h: /* Some systems, in particular DEC OSF/1, Digital Unix, Compaq Tru64 or whatever it's called these days, don't provide a prototype for ptrace. Provide one to silence compiler warnings. */ #ifndef HAVE_DECL_PTRACE extern PTRACE_TYPE_RET ptrace(); #endif I believe this is unnecessary today and should be removed. First, the comment only mentions OSes we don't support (and to be honest, I had never even heard of). But most importantly, in C++, a declaration with empty parenthesis declares a function that accepts no arguments, unlike in C. So if this declaration was really used, GDB wouldn't build, since all ptrace call sites pass some arguments. Since we haven't heard anything about this causing some build failures since we have transitioned to C++, I conclude that it's not used. This patch removes it as well as the corresponding configure check. gdb/ChangeLog: * ptrace.m4: Don't check for ptrace declaration. * config.in: Re-generate. * configure: Re-generate. * nat/gdb_ptrace.h: Don't declare ptrace if HAVE_DECL_PTRACE is not defined. gdbserver/ChangeLog: * config.in: Re-generate. * configure: Re-generate. gdbsupport/ChangeLog: * config.in: Re-generate. * configure: Re-generate. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 650b74bae4a..393b0d278d9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2020-03-20 Simon Marchi + + * ptrace.m4: Don't check for ptrace declaration. + * config.in: Re-generate. + * configure: Re-generate. + * nat/gdb_ptrace.h: Don't declare ptrace if HAVE_DECL_PTRACE is + not defined. + 2020-03-20 Kamil Rytarowski * amd64-bsd-nat.c (gdb_ptrace): Change return type from `int' to diff --git a/gdb/config.in b/gdb/config.in index 7a34b85e575..118e424580e 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -109,10 +109,6 @@ don't. */ #undef HAVE_DECL_GETTHRDS -/* 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 `snprintf', and to 0 if you don't. */ #undef HAVE_DECL_SNPRINTF diff --git a/gdb/configure b/gdb/configure index 614f3402c3d..afafc2c8d18 100755 --- a/gdb/configure +++ b/gdb/configure @@ -15000,26 +15000,6 @@ gdb_ptrace_headers=' # include #endif ' -# There is no point in checking if we don't have a prototype. -ac_fn_c_check_decl "$LINENO" "ptrace" "ac_cv_have_decl_ptrace" "$gdb_ptrace_headers -" -if test "x$ac_cv_have_decl_ptrace" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_PTRACE $ac_have_decl -_ACEOF -if test $ac_have_decl = 1; then : - -else - - : ${gdb_cv_func_ptrace_ret='int'} - : ${gdb_cv_func_ptrace_args='int,int,long,long'} - -fi # Check return type. Varargs (used on GNU/Linux) conflict with the # empty argument list, so check for that explicitly. diff --git a/gdb/nat/gdb_ptrace.h b/gdb/nat/gdb_ptrace.h index 9c2587f2e82..1278246559c 100644 --- a/gdb/nat/gdb_ptrace.h +++ b/gdb/nat/gdb_ptrace.h @@ -121,14 +121,6 @@ # endif #endif -/* Some systems, in particular DEC OSF/1, Digital Unix, Compaq Tru64 - or whatever it's called these days, don't provide a prototype for - ptrace. Provide one to silence compiler warnings. */ - -#ifndef HAVE_DECL_PTRACE -extern PTRACE_TYPE_RET ptrace(); -#endif - /* Some systems, at least AIX and HP-UX have a ptrace with five arguments. Since we never use the fifth argument, define a ptrace macro that calls the real ptrace with the last argument set to diff --git a/gdb/ptrace.m4 b/gdb/ptrace.m4 index 4cd7652718a..0fcd855aa8f 100644 --- a/gdb/ptrace.m4 +++ b/gdb/ptrace.m4 @@ -31,11 +31,7 @@ gdb_ptrace_headers=' # include #endif ' -# There is no point in checking if we don't have a prototype. -AC_CHECK_DECLS(ptrace, [], [ - : ${gdb_cv_func_ptrace_ret='int'} - : ${gdb_cv_func_ptrace_args='int,int,long,long'} -], $gdb_ptrace_headers) + # Check return type. Varargs (used on GNU/Linux) conflict with the # empty argument list, so check for that explicitly. AC_CACHE_CHECK([return type of ptrace], gdb_cv_func_ptrace_ret, diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index ea8a079fbf2..37e38611d5d 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2020-03-20 Simon Marchi + + * config.in: Re-generate. + * configure: Re-generate. + 2020-03-17 Kamil Rytarowski * regcache.cc (find_register_by_number): Update. diff --git a/gdbserver/config.in b/gdbserver/config.in index e62795072f2..da1bdbe3d94 100644 --- a/gdbserver/config.in +++ b/gdbserver/config.in @@ -50,10 +50,6 @@ */ #undef HAVE_DECL_PERROR -/* 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 `snprintf', and to 0 if you don't. */ #undef HAVE_DECL_SNPRINTF diff --git a/gdbserver/configure b/gdbserver/configure index 55cf2416b56..0de11f7ee61 100755 --- a/gdbserver/configure +++ b/gdbserver/configure @@ -9413,26 +9413,6 @@ gdb_ptrace_headers=' # include #endif ' -# There is no point in checking if we don't have a prototype. -ac_fn_c_check_decl "$LINENO" "ptrace" "ac_cv_have_decl_ptrace" "$gdb_ptrace_headers -" -if test "x$ac_cv_have_decl_ptrace" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_PTRACE $ac_have_decl -_ACEOF -if test $ac_have_decl = 1; then : - -else - - : ${gdb_cv_func_ptrace_ret='int'} - : ${gdb_cv_func_ptrace_args='int,int,long,long'} - -fi # Check return type. Varargs (used on GNU/Linux) conflict with the # empty argument list, so check for that explicitly. diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog index f62e440af7f..7631b2d1e8e 100644 --- a/gdbsupport/ChangeLog +++ b/gdbsupport/ChangeLog @@ -1,3 +1,8 @@ +2020-03-20 Simon Marchi + + * config.in: Re-generate. + * configure: Re-generate. + 2020-03-17 Kamil Rytarowski * common-defs.h: Include alloca.h if HAVE_ALLOCA_H is defined. diff --git a/gdbsupport/config.in b/gdbsupport/config.in index 6a6b0bc74f0..94e90ecc545 100644 --- a/gdbsupport/config.in +++ b/gdbsupport/config.in @@ -43,10 +43,6 @@ /* 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 `ptrace', and to 0 if you don't. - */ -#undef HAVE_DECL_PTRACE - /* Define to 1 if you have the declaration of `snprintf', and to 0 if you don't. */ #undef HAVE_DECL_SNPRINTF diff --git a/gdbsupport/configure b/gdbsupport/configure index 2ffe539eb09..186cac6d574 100755 --- a/gdbsupport/configure +++ b/gdbsupport/configure @@ -10666,26 +10666,6 @@ gdb_ptrace_headers=' # include #endif ' -# There is no point in checking if we don't have a prototype. -ac_fn_c_check_decl "$LINENO" "ptrace" "ac_cv_have_decl_ptrace" "$gdb_ptrace_headers -" -if test "x$ac_cv_have_decl_ptrace" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_PTRACE $ac_have_decl -_ACEOF -if test $ac_have_decl = 1; then : - -else - - : ${gdb_cv_func_ptrace_ret='int'} - : ${gdb_cv_func_ptrace_args='int,int,long,long'} - -fi # Check return type. Varargs (used on GNU/Linux) conflict with the # empty argument list, so check for that explicitly.