From f9d949fb7b85323e3f307884a4a3cef6ba52607b Mon Sep 17 00:00:00 2001 From: Christian Biesinger Date: Fri, 20 Sep 2019 11:40:09 +0900 Subject: [PATCH] Move declarations of debug_threads and using_threads to header Instead of declaring debug_threads and using_threads in several .c files, declare them in debug.h. gdb/gdbserver/ChangeLog: 2019-09-20 Christian Biesinger * debug.c (debug_threads): Remove comment in favor of the header. * debug.h (using_threads): Add declaration. (debug_threads): Add comment. * linux-aarch64-low.c: Include debug.h and remove declaration of debug_threads. * nto-low.c: Likewise. * remote-utils.c: Likewise. * thread-db.c: Likewise. --- gdb/gdbserver/ChangeLog | 11 +++++++++++ gdb/gdbserver/debug.c | 3 +-- gdb/gdbserver/debug.h | 6 ++++++ gdb/gdbserver/linux-aarch64-low.c | 5 +---- gdb/gdbserver/nto-low.c | 2 +- gdb/gdbserver/remote-utils.c | 5 +---- gdb/gdbserver/thread-db.c | 3 +-- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 5c76167014..c0c6f51a06 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,14 @@ +2019-09-20 Christian Biesinger + + * debug.c (debug_threads): Remove comment in favor of the header. + * debug.h (using_threads): Add declaration. + (debug_threads): Add comment. + * linux-aarch64-low.c: Include debug.h and remove declaration of + debug_threads. + * nto-low.c: Likewise. + * remote-utils.c: Likewise. + * thread-db.c: Likewise. + 2019-09-20 Ulrich Weigand * configure.srv (ipa_ppc_linux_regobj): Remove powerpc-cell32l-ipa.o diff --git a/gdb/gdbserver/debug.c b/gdb/gdbserver/debug.c index 19f11fc17c..a764df7688 100644 --- a/gdb/gdbserver/debug.c +++ b/gdb/gdbserver/debug.c @@ -26,8 +26,7 @@ int remote_debug = 0; /* Output file for debugging. Default to standard error. */ FILE *debug_file = stderr; -/* Enable miscellaneous debugging output. The name is historical - it - was originally used to debug LinuxThreads support. */ +/* See debug.h. */ int debug_threads; /* Include timestamps in debugging output. */ diff --git a/gdb/gdbserver/debug.h b/gdb/gdbserver/debug.h index 07e94eac6e..c136b9c224 100644 --- a/gdb/gdbserver/debug.h +++ b/gdb/gdbserver/debug.h @@ -28,7 +28,13 @@ extern int remote_debug; void debug_set_output (const char *debug_file); #endif +extern int using_threads; + +/* Enable miscellaneous debugging output. The name is historical - it + was originally used to debug LinuxThreads support. */ + extern int debug_threads; + extern int debug_timestamp; void debug_flush (void); diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c index 33095ea752..ad04817145 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -28,6 +28,7 @@ #include "elf/common.h" #include "ax.h" #include "tracepoint.h" +#include "debug.h" #include #include @@ -153,10 +154,6 @@ aarch64_store_pauthregset (struct regcache *regcache, const void *buf) &pauth_regset[1]); } -/* Enable miscellaneous debugging output. The name is historical - it - was originally used to debug LinuxThreads support. */ -extern int debug_threads; - /* Implementation of linux_target_ops method "get_pc". */ static CORE_ADDR diff --git a/gdb/gdbserver/nto-low.c b/gdb/gdbserver/nto-low.c index 3c1130680f..d77fda54b8 100644 --- a/gdb/gdbserver/nto-low.c +++ b/gdb/gdbserver/nto-low.c @@ -22,6 +22,7 @@ #include "gdbthread.h" #include "nto-low.h" #include "hostio.h" +#include "debug.h" #include #include @@ -32,7 +33,6 @@ #include -extern int using_threads; int using_threads = 1; const struct target_desc *nto_tdesc; diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index 665fc66c53..d7da4b7aed 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -23,6 +23,7 @@ #include "target.h" #include "gdbthread.h" #include "tdesc.h" +#include "debug.h" #include "dll.h" #include "gdbsupport/rsp-low.h" #include "gdbsupport/netstuff.h" @@ -109,10 +110,6 @@ static int remote_is_stdio = 0; static gdb_fildes_t remote_desc = INVALID_DESCRIPTOR; static gdb_fildes_t listen_desc = INVALID_DESCRIPTOR; -/* FIXME headerize? */ -extern int using_threads; -extern int debug_threads; - #ifdef USE_WIN32API # define read(fd, buf, len) recv (fd, (char *) buf, len, 0) # define write(fd, buf, len) send (fd, (char *) buf, len, 0) diff --git a/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c index b2791b0513..c6b43a06cc 100644 --- a/gdb/gdbserver/thread-db.c +++ b/gdb/gdbserver/thread-db.c @@ -22,8 +22,7 @@ #include "linux-low.h" -extern int debug_threads; - +#include "debug.h" #include "gdb_proc_service.h" #include "nat/gdb_thread_db.h" #include "gdbsupport/gdb_vecs.h" -- 2.34.1