From b006a80e5f41125c876a60a143ad421113533efc Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Fri, 12 Sep 2014 10:57:46 +0100 Subject: [PATCH] Clarify GDBSERVER use in linux-waitpid.c This commit makes linux-waitpid.c include common-defs.h. GDB's inclusion of defs.h is removed, but gdbserver's inclusion of server.h remains to support some gdbserver-specific debug code that cannot presently be merged. A new FIXME documents this. gdb/ChangeLog: * nat/linux-waitpid.c: Include common-defs.h. [GDBSERVER]: Add FIXME comment. [!GDBSERVER]: Don't include defs.h or signal.h. (linux_debug) [!GDBSERVER]: Remove empty block. --- gdb/ChangeLog | 7 +++++++ gdb/nat/linux-waitpid.c | 11 ++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e2f3335..56f676d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2014-09-12 Gary Benson + * nat/linux-waitpid.c: Include common-defs.h. + [GDBSERVER]: Add FIXME comment. + [!GDBSERVER]: Don't include defs.h or signal.h. + (linux_debug) [!GDBSERVER]: Remove empty block. + +2014-09-12 Gary Benson + * nat/x86-dregs.c: Include common-defs.h and break-common.h. Don't include defs.h or server.h. diff --git a/gdb/nat/linux-waitpid.c b/gdb/nat/linux-waitpid.c index 53847ac..04cdc3d 100644 --- a/gdb/nat/linux-waitpid.c +++ b/gdb/nat/linux-waitpid.c @@ -17,11 +17,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#include "common-defs.h" + #ifdef GDBSERVER +/* FIXME: server.h is required for the definition of debug_threads + which is used in the gdbserver-specific debug printing in + linux_debug. This code should be made available to GDB also, + but the lack of a suitable flag to enable it prevents this. */ #include "server.h" -#else -#include "defs.h" -#include "signal.h" #endif #include "linux-nat.h" @@ -42,8 +45,6 @@ linux_debug (const char *format, ...) vfprintf (stderr, format, args); va_end (args); } -#else - /* GDB-specific debugging output. */ #endif } -- 2.7.4