aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/gdbserver/ChangeLog10
-rw-r--r--gdb/gdbserver/debug.c4
-rw-r--r--gdb/gdbserver/debug.h11
-rw-r--r--gdb/gdbserver/hostio.c2
-rw-r--r--gdb/gdbserver/remote-utils.c3
-rw-r--r--gdb/gdbserver/remote-utils.h2
-rw-r--r--gdb/gdbserver/server.c2
7 files changed, 18 insertions, 16 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 2a5233b..0581f59 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,13 @@
+2019-04-17 Alan Hayward <alan.hayward@arm.com>
+
+ * debug.c (remote_debug): Add definition.
+ * debug.h (remote_debug): Add declaration.
+ * hostio.c (remote_debug): Remove declaration.
+ * remote-utils.c (struct ui_file): Likewise.
+ (remote_debug): Likewise.
+ * remote-utils.h (remote_debug): Likewise,
+ * server.c (remote_debug): Remove definition.
+
2019-04-10 Kevin Buettner <kevinb@redhat.com>
* linux-x86-low.c (x86_fill_gregset): Sign extend EAX value
diff --git a/gdb/gdbserver/debug.c b/gdb/gdbserver/debug.c
index a5b791b..7c4c77a 100644
--- a/gdb/gdbserver/debug.c
+++ b/gdb/gdbserver/debug.c
@@ -19,6 +19,10 @@
#include "server.h"
#include <chrono>
+#if !defined (IN_PROCESS_AGENT)
+int remote_debug = 0;
+#endif
+
/* Enable miscellaneous debugging output. The name is historical - it
was originally used to debug LinuxThreads support. */
int debug_threads;
diff --git a/gdb/gdbserver/debug.h b/gdb/gdbserver/debug.h
index e40f28c..c8d5e33 100644
--- a/gdb/gdbserver/debug.h
+++ b/gdb/gdbserver/debug.h
@@ -19,13 +19,10 @@
#ifndef GDBSERVER_DEBUG_H
#define GDBSERVER_DEBUG_H
-/* We declare debug format variables here, and debug_threads but no other
- debug content variables (e.g., not remote_debug) because while this file
- is not currently used by IPA it may be some day, and IPA may have its own
- set of debug content variables. It's ok to declare debug_threads here
- because it is misnamed - a better name is debug_basic or some such,
- which can work for any program, gdbserver or IPA. If/when this file is
- used with IPA it is recommended to fix debug_thread's name. */
+#if !defined (IN_PROCESS_AGENT)
+extern int remote_debug;
+#endif
+
extern int debug_threads;
extern int debug_timestamp;
diff --git a/gdb/gdbserver/hostio.c b/gdb/gdbserver/hostio.c
index cf75de0..eedf6d9 100644
--- a/gdb/gdbserver/hostio.c
+++ b/gdb/gdbserver/hostio.c
@@ -29,8 +29,6 @@
#include <sys/stat.h>
#include "common/fileio.h"
-extern int remote_debug;
-
struct fd_list
{
int fd;
diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index 4e6f9c6..903d773 100644
--- a/gdb/gdbserver/remote-utils.c
+++ b/gdb/gdbserver/remote-utils.c
@@ -108,9 +108,6 @@ struct sym_cache
struct sym_cache *next;
};
-int remote_debug = 0;
-struct ui_file *gdb_stdlog;
-
static int remote_is_stdio = 0;
static gdb_fildes_t remote_desc = INVALID_DESCRIPTOR;
diff --git a/gdb/gdbserver/remote-utils.h b/gdb/gdbserver/remote-utils.h
index 587afdb..4ca5d94 100644
--- a/gdb/gdbserver/remote-utils.h
+++ b/gdb/gdbserver/remote-utils.h
@@ -19,8 +19,6 @@
#ifndef GDBSERVER_REMOTE_UTILS_H
#define GDBSERVER_REMOTE_UTILS_H
-extern int remote_debug;
-
int gdb_connected (void);
#define STDIO_CONNECTION_NAME "stdio"
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index f2c8f15..3f6c849 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -328,8 +328,6 @@ attach_inferior (int pid)
return 0;
}
-extern int remote_debug;
-
/* Decode a qXfer read request. Return 0 if everything looks OK,
or -1 otherwise. */