From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Fri, 22 Jan 2021 17:39:08 +0000 (-0500)
Subject: gdb: move remote_debug to remote.{h,c}
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cda09ec9f9cbebef06345a5fb768f347267b3d73;p=binutils-gdb.git

gdb: move remote_debug to remote.{h,c}

remote_debug is currently declared in target.h and defined in top.c.
Move them to remote.h and remote.c.

Include remote.h in remote-sim.c, as it uses remote_debug.

gdb/ChangeLog:

	* target.h (remote_debug): Move to...
	* remote.h (remote_debug): ... here.
	* top.c (remote_debug): Move to...
	* remote.c (remote_debug): ... here.
	* remote-sim.c: Include remote.h.

Change-Id: Iae632d12ff8900b23eee6b2529d6a3cd339a8caa
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0eee5b51724..ceb6b103f30 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2021-01-22  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* target.h (remote_debug): Move to...
+	* remote.h (remote_debug): ... here.
+	* top.c (remote_debug): Move to...
+	* remote.c (remote_debug): ... here.
+	* remote-sim.c: Include remote.h.
+
 2021-01-22  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* cli/cli-cmds.c (show_remote_debug): Remove.
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index b21a4e80ee6..d51130562fb 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -43,6 +43,7 @@
 #include "gdbthread.h"
 #include "gdbsupport/byte-vector.h"
 #include "memory-map.h"
+#include "remote.h"
 
 /* Prototypes */
 
diff --git a/gdb/remote.c b/gdb/remote.c
index 3793128a866..79ce6a34463 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -87,6 +87,10 @@ Use a remote computer via a serial line, using a gdb-specific protocol.\n\
 Specify the serial device it is connected to\n\
 (e.g. /dev/ttyS0, /dev/ttya, COM1, etc.).");
 
+/* See remote.h  */
+
+int remote_debug = 0;
+
 #define OPAQUETHREADBYTES 8
 
 /* a 64 bit opaque identifier */
diff --git a/gdb/remote.h b/gdb/remote.h
index 51cdbcccc04..de582a2dd4c 100644
--- a/gdb/remote.h
+++ b/gdb/remote.h
@@ -24,6 +24,10 @@
 struct target_desc;
 struct remote_target;
 
+/* Debugging level.  0 is off, and non-zero values mean to print some debug
+   information (higher values, more information).  */
+extern int remote_debug;
+
 /* Read a packet from the remote machine, with error checking, and
    store it in *BUF.  Resize *BUF using xrealloc if necessary to hold
    the result, and update *SIZEOF_BUF.  If FOREVER, wait forever
diff --git a/gdb/target.h b/gdb/target.h
index 40bf416cd67..917476d16ab 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -2473,9 +2473,6 @@ extern gdb::optional<gdb::char_vector> target_get_osdata (const char *type);
 
 /* Stuff that should be shared among the various remote targets.  */
 
-/* Debugging level.  0 is off, and non-zero values mean to print some debug
-   information (higher values, more information).  */
-extern int remote_debug;
 
 /* Timeout limit for response from target.  */
 extern int remote_timeout;
diff --git a/gdb/top.c b/gdb/top.c
index 4b0defd58fc..15fbd6d27e6 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -198,10 +198,6 @@ bool server_command;
 
 int remote_timeout = 2;
 
-/* Non-zero tells remote* modules to output debugging info.  */
-
-int remote_debug = 0;
-
 /* Sbrk location on entry to main.  Used for statistics only.  */
 #ifdef HAVE_USEFUL_SBRK
 char *lim_at_start;