diff options
| author | Michael Mullin <masmullin@gmail.com> | 2020-09-14 20:39:54 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2020-09-14 20:42:56 -0400 |
| commit | e1044e6adca7d48674d70a860b3a5939fe44323f (patch) | |
| tree | 0372f1df05c6742911dec11fb17ad464dc0b93b3 | |
| parent | aea44f64c827932a2c67aeb2ee35a332696df8e8 (diff) | |
| download | gdb-e1044e6adca7d48674d70a860b3a5939fe44323f.zip gdb-e1044e6adca7d48674d70a860b3a5939fe44323f.tar.gz gdb-e1044e6adca7d48674d70a860b3a5939fe44323f.tar.bz2 | |
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
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/xml-tdesc.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 45c7125..0e6dec3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-09-14 Michael Mullin <masmullin@gmail.com> + + * xml-tdesc.c [!defined(HAVE_LIBEXPAT)] (tdesc_parse_xml): + Remove baton parameter. + 2020-09-14 Pedro Alves <pedro@palves.net> * Makefile.in (SELFTESTS_SRCS): Add diff --git a/gdb/xml-tdesc.c b/gdb/xml-tdesc.c index 6e21ff4..234a08c 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; |