This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] gdb: Fix build failure in xml-tdesc.c without expat.
- From: Marcin KoÅcielnicki <koriakin at 0x04 dot net>
- To: palves at redhat dot com
- Cc: simon dot marchi at ericsson dot com, gdb-patches at sourceware dot org, sergiodj at redhat dot com, Marcin KoÅcielnicki <koriakin at 0x04 dot net>
- Date: Fri, 12 Feb 2016 11:09:59 +0100
- Subject: [PATCH] gdb: Fix build failure in xml-tdesc.c without expat.
- Authentication-results: sourceware.org; auth=none
- References: <56BDAEA4 dot 1030500 at redhat dot com>
Introduced by 18d3cec54e1b4fce278dba436484846f8048d7d6.
gdb/ChangeLog:
* xml-tdesc.c (target_fetch_description_xml): Warn and return NULL
when built without expat.
---
How about that?
gdb/ChangeLog | 5 +++++
gdb/xml-tdesc.c | 13 +++++++++++++
2 files changed, 18 insertions(+)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e06fc3c..7e59266 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-12 Marcin KoÅcielnicki <koriakin@0x04.net>
+
+ * xml-tdesc.c (target_fetch_description_xml): Return NULL when
+ built without expat.
+
2016-02-12 Markus Metzger <markus.t.metzger@intel.com>
* frame.h (skip_tailcall_frames): Update comment.
diff --git a/gdb/xml-tdesc.c b/gdb/xml-tdesc.c
index 4625b60..b5439e5 100644
--- a/gdb/xml-tdesc.c
+++ b/gdb/xml-tdesc.c
@@ -638,6 +638,18 @@ target_read_description_xml (struct target_ops *ops)
char *
target_fetch_description_xml (struct target_ops *ops)
{
+#if !defined(HAVE_LIBEXPAT)
+ static int have_warned;
+
+ if (!have_warned)
+ {
+ have_warned = 1;
+ warning (_("Can not fetch XML target description; XML support was "
+ "disabled at compile time"));
+ }
+
+ return NULL;
+#else
struct target_desc *tdesc;
char *tdesc_str;
char *expanded_text;
@@ -659,4 +671,5 @@ target_fetch_description_xml (struct target_ops *ops)
}
return expanded_text;
+#endif
}
--
2.7.0