From: Tom de Vries <tdevries@suse.de>
Date: Mon, 29 Jun 2020 10:14:10 +0000 (+0200)
Subject: [gdbserver] Add missing include of gdbsupport/agent.h
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f638ed73010c667c86714b3435a5e1f3a06521cd;p=binutils-gdb.git

[gdbserver] Add missing include of gdbsupport/agent.h

The file gdbserver/ax.h contains:
...
 #ifdef IN_PROCESS_AGENT
 #define debug_threads debug_agent
 #endif
...
but does not declare debug_agent.

Fix this by adding an include of gdbsupport/agent.h.

[ If this fix would have been in place before commit 8118159c69 "[gdbserver] Fix
Wlto-type-mismatch for debug_agent", we would have simply run into this build
breaker with a regular, non-lto build:
...
src/gdbserver/ax.cc:28:5: error: conflicting declaration 'int debug_agent'
 int debug_agent = 0;
     ^~~~~~~~~~~
In file included from src/gdbserver/ax.h:25:0,
                 from src/gdbserver/ax.cc:20:
src/gdbsupport/agent.h:47:13: note: previous declaration as 'bool debug_agent'
 extern bool debug_agent;
             ^~~~~~~~~~~
... ]

Tested on x86_64-linux.

gdbserver/ChangeLog:

2020-06-29  Tom de Vries  <tdevries@suse.de>

	* ax.h: Include gdbsupport/debug_agent.h.
---

diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog
index 43b8bc895db..4ed5d610161 100644
--- a/gdbserver/ChangeLog
+++ b/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2020-06-29  Tom de Vries  <tdevries@suse.de>
+
+	* ax.h: Include gdbsupport/debug_agent.h.
+
 2020-06-23  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* tdesc.cc (struct tdesc_compatible_info): New struct.
diff --git a/gdbserver/ax.h b/gdbserver/ax.h
index 1fba69e7ad1..b7ff7d8910e 100644
--- a/gdbserver/ax.h
+++ b/gdbserver/ax.h
@@ -22,6 +22,7 @@
 #include "regcache.h"
 
 #ifdef IN_PROCESS_AGENT
+#include "gdbsupport/agent.h"
 #define debug_threads debug_agent
 #endif