From d21b5f15d92bc1902b9e57198f67550326c887d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marcin=20Ko=C5=9Bcielnicki?= Date: Thu, 11 Feb 2016 23:52:44 +0100 Subject: [PATCH] gdb: Fix build failure in xml-tdesc.c without expat. Introduced by 18d3cec54e1b4fce278dba436484846f8048d7d6. gdb/ChangeLog: * xml-tdesc.c (target_fetch_description_xml) [!HAVE_LIBEXPAT]: Warn and return NULL. --- gdb/ChangeLog | 5 +++++ gdb/xml-tdesc.c | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e06fc3cc681..4e8dfb54f6c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-02-12 Marcin Kościelnicki + + * xml-tdesc.c (target_fetch_description_xml) [!HAVE_LIBEXPAT]: Warn + and return NULL. + 2016-02-12 Markus Metzger * frame.h (skip_tailcall_frames): Update comment. diff --git a/gdb/xml-tdesc.c b/gdb/xml-tdesc.c index 4625b60311b..b5439e567bb 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.30.2