From f638ed73010c667c86714b3435a5e1f3a06521cd Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Mon, 29 Jun 2020 12:14:10 +0200 Subject: [PATCH] [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 * ax.h: Include gdbsupport/debug_agent.h. --- gdbserver/ChangeLog | 4 ++++ gdbserver/ax.h | 1 + 2 files changed, 5 insertions(+) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 43b8bc895d..4ed5d61016 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2020-06-29 Tom de Vries + + * ax.h: Include gdbsupport/debug_agent.h. + 2020-06-23 Andrew Burgess * tdesc.cc (struct tdesc_compatible_info): New struct. diff --git a/gdbserver/ax.h b/gdbserver/ax.h index 1fba69e7ad..b7ff7d8910 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