From 3b20124b3d6df31b5bde0f6bcd718cc40de8d49b Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Sun, 8 Jul 2018 20:31:58 -0600
Subject: [PATCH] Conditionally define xmltarget_${name} variable in regdat.sh

This changes regdat.sh to emit the xmltarget_${name} variable inside
the #ifndef IN_PROCESS_AGENT block.  This avoids a -Wunused-variable
warning for some builds.  Thanks to Pedro for investigating this one.

gdb/ChangeLog
2018-07-22  Tom Tromey  <tom@tromey.com>

	* regformats/regdat.sh: Define xmltarget_${name} inside
	#ifndef IN_PROCESS_AGENT.
---
 gdb/ChangeLog            | 5 +++++
 gdb/regformats/regdat.sh | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 511ac9fabdd..972184dc997 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-22  Tom Tromey  <tom@tromey.com>
+
+	* regformats/regdat.sh: Define xmltarget_${name} inside
+	#ifndef IN_PROCESS_AGENT.
+
 2018-07-22  Tom Tromey  <tom@tromey.com>
 
 	* value.c (value_fetch_lazy_bitfield): Remove unused variable.
diff --git a/gdb/regformats/regdat.sh b/gdb/regformats/regdat.sh
index 5a8564ac50c..06f1ffc4305 100755
--- a/gdb/regformats/regdat.sh
+++ b/gdb/regformats/regdat.sh
@@ -163,6 +163,8 @@ done
 
 echo
 echo "static const char *expedite_regs_${name}[] = { \"`echo ${expedite} | sed 's/,/", "/g'`\", 0 };"
+
+echo "#ifndef IN_PROCESS_AGENT"
 if test "${feature}" != x; then
   echo "static const char *xmltarget_${name} = 0;"
 elif test "${xmltarget}" = x; then
@@ -184,7 +186,6 @@ fi
 echo
 
 cat <<EOF
-#ifndef IN_PROCESS_AGENT
   result->xmltarget = xmltarget_${name};
 #endif
 
-- 
2.30.2