[binutils-gdb] Remove unused variables from gdbserver

[Tom Tromey <tromey at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=b0a7723d29ddd39345a4af30c130ebc89c623d21

commit b0a7723d29ddd39345a4af30c130ebc89c623d21
Author: Tom Tromey <tom@tromey.com>
Date:   Sun Jul 8 12:09:22 2018 -0600

    Remove unused variables from gdbserver
    
    This removes a few unused variables from gdbserver.
    
    The x86-tdesc.h change is a bit unusual for this series.  This file
    was not defining the multiple-include guard symbol, so I've added that
    here.  Also, it is hard to determine when i386_expedite_regs will be
    needed, so this patch simply marks it ATTRIBUTE_UNUSED.
    
    gdb/gdbserver/ChangeLog
    2018-07-22  Tom Tromey  <tom@tromey.com>
    
    	* win32-low.c (win32_create_inferior): Remove unused variables.
    	* gdbreplay.c (remote_open): Remove unused variable.
    	* remote-utils.c (remote_prepare): Remove unused variable.
    	* x86-tdesc.h (X86_TDESC_H): Define.
    	(amd64_expedite_regs): Define conditionally.
    	(i386_expedite_regs): Mark ATTRIBUTE_UNUSED.
    	* linux-x86-tdesc.c (i386_tdescs): Move inside #if.
    	* remote-utils.c (readchar): Remove unused variable.

Diff:
---
 gdb/gdbserver/ChangeLog         | 11 +++++++++++
 gdb/gdbserver/gdbreplay.c       |  1 -
 gdb/gdbserver/linux-x86-tdesc.c |  4 ++--
 gdb/gdbserver/remote-utils.c    |  2 --
 gdb/gdbserver/win32-low.c       |  2 --
 gdb/gdbserver/x86-tdesc.h       | 10 ++++++++--
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index be26645..eccf556 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,14 @@
+2018-07-22  Tom Tromey  <tom@tromey.com>
+
+	* win32-low.c (win32_create_inferior): Remove unused variables.
+	* gdbreplay.c (remote_open): Remove unused variable.
+	* remote-utils.c (remote_prepare): Remove unused variable.
+	* x86-tdesc.h (X86_TDESC_H): Define.
+	(amd64_expedite_regs): Define conditionally.
+	(i386_expedite_regs): Mark ATTRIBUTE_UNUSED.
+	* linux-x86-tdesc.c (i386_tdescs): Move inside #if.
+	* remote-utils.c (readchar): Remove unused variable.
+
 2018-07-13  Pedro Alves  <palves@redhat.com>
 
 	* linux-low.c (linux_kill): Change parameter to process_info
diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c
index 026bbfc..b05209c 100644
--- a/gdb/gdbserver/gdbreplay.c
+++ b/gdb/gdbserver/gdbreplay.c
@@ -157,7 +157,6 @@ remote_open (char *name)
 #ifdef USE_WIN32API
   static int winsock_initialized;
 #endif
-  char *port_str;
   int tmp;
   int tmp_desc;
   struct addrinfo hint;
diff --git a/gdb/gdbserver/linux-x86-tdesc.c b/gdb/gdbserver/linux-x86-tdesc.c
index c3aa20c..93122bf 100644
--- a/gdb/gdbserver/linux-x86-tdesc.c
+++ b/gdb/gdbserver/linux-x86-tdesc.c
@@ -69,10 +69,10 @@ xcr0_to_tdesc_idx (uint64_t xcr0, bool is_x32)
     return X86_TDESC_LAST;
 }
 
-static struct target_desc *i386_tdescs[X86_TDESC_LAST] = { };
-
 #if defined __i386__ || !defined IN_PROCESS_AGENT
 
+static struct target_desc *i386_tdescs[X86_TDESC_LAST] = { };
+
 /* Return the target description according to XCR0.  */
 
 const struct target_desc *
diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index 1734c54..38c9032 100644
--- a/gdb/gdbserver/remote-utils.c
+++ b/gdb/gdbserver/remote-utils.c
@@ -231,7 +231,6 @@ void
 remote_prepare (const char *name)
 {
   client_state &cs = get_client_state ();
-  const char *port_str;
 #ifdef USE_WIN32API
   static int winsock_initialized;
 #endif
@@ -902,7 +901,6 @@ static unsigned char *readchar_bufp;
 static int
 readchar (void)
 {
-  client_state &cs = get_client_state ();
   int ch;
 
   if (readchar_bufcnt == 0)
diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c
index 765391d..4aed58d 100644
--- a/gdb/gdbserver/win32-low.c
+++ b/gdb/gdbserver/win32-low.c
@@ -634,8 +634,6 @@ win32_create_inferior (const char *program,
 #endif
   BOOL ret;
   DWORD flags;
-  int argslen;
-  int argc;
   PROCESS_INFORMATION pi;
   DWORD err;
   std::string str_program_args = stringify_argv (program_args);
diff --git a/gdb/gdbserver/x86-tdesc.h b/gdb/gdbserver/x86-tdesc.h
index c1641b2..d0920b0 100644
--- a/gdb/gdbserver/x86-tdesc.h
+++ b/gdb/gdbserver/x86-tdesc.h
@@ -16,11 +16,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef X86_TDESC_H
+#define X86_TDESC_H
 
-/* The "expedite" registers for x86 targets.  */
-static const char *i386_expedite_regs[] = {"ebp", "esp", "eip", NULL};
+/* The "expedite" registers for x86 targets.  Since whether the
+   variable is used depends on host/configuration, we mark it
+   ATTRIBUTE_UNUSED to keep it simple here.  */
+static const char *i386_expedite_regs[] ATTRIBUTE_UNUSED
+    = {"ebp", "esp", "eip", NULL};
 
+#ifdef __x86_64__
 /* The "expedite" registers for x86_64 targets.  */
 static const char *amd64_expedite_regs[] = {"rbp", "rsp", "rip", NULL};
+#endif
 
 #endif /* X86_TDESC_H */