From e1044e6adca7d48674d70a860b3a5939fe44323f Mon Sep 17 00:00:00 2001 From: Michael Mullin Date: Mon, 14 Sep 2020 20:39:54 -0400 Subject: [PATCH] gdb: fix compile break when HAVE_LIBEXPAT is not defined Fixes: CXX xml-tdesc.o /home/smarchi/src/binutils-gdb/gdb/xml-tdesc.c: In function const target_desc* file_read_description_xml(const char*): /home/smarchi/src/binutils-gdb/gdb/xml-tdesc.c:681:60: error: too few arguments to function target_desc* tdesc_parse_xml(const char*, xml_fetch_another, void*) 681 | return tdesc_parse_xml (tdesc_str->data (), fetch_another); | ^ /home/smarchi/src/binutils-gdb/gdb/xml-tdesc.c:44:1: note: declared here 44 | tdesc_parse_xml (const char *document, xml_fetch_another fetcher, | ^~~~~~~~~~~~~~~ Commit 8400a90d19c5 ("gdb: change xml_fetch_another a function_view") removed the `baton` parameter of `tdesc_parse_xml`, but didn't update the version of the function used when GDB is built with no libexpat support. Remove the parameter in that definition too. gdb/ChangeLog: * xml-tdesc.c [!defined(HAVE_LIBEXPAT)] (tdesc_parse_xml): Remove baton parameter. Change-Id: I4ad29fbb7c3323f30ce5204c2976eaea16151a2e --- gdb/ChangeLog | 5 +++++ gdb/xml-tdesc.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 45c71252267..0e6dec38b2a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-09-14 Michael Mullin + + * xml-tdesc.c [!defined(HAVE_LIBEXPAT)] (tdesc_parse_xml): + Remove baton parameter. + 2020-09-14 Pedro Alves * Makefile.in (SELFTESTS_SRCS): Add diff --git a/gdb/xml-tdesc.c b/gdb/xml-tdesc.c index 6e21ff42daf..234a08cd654 100644 --- a/gdb/xml-tdesc.c +++ b/gdb/xml-tdesc.c @@ -41,8 +41,7 @@ an XML parser. */ static struct target_desc * -tdesc_parse_xml (const char *document, xml_fetch_another fetcher, - void *fetcher_baton) +tdesc_parse_xml (const char *document, xml_fetch_another fetcher) { static int have_warned; -- 2.30.2