yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdb: fix compile break when HAVE_LIBEXPAT is not defined

Browse Source 
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
This commit is contained in:
Michael Mullin 2020-09-14 20:39:54 -04:00 committed by Simon Marchi
parent aea44f64c8
commit e1044e6adc
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -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> 2020-09-14 Pedro Alves <pedro@palves.net>
* Makefile.in (SELFTESTS_SRCS): Add * Makefile.in (SELFTESTS_SRCS): Add

3
gdb/xml-tdesc.c
View File

@ -41,8 +41,7 @@
an XML parser. */ an XML parser. */
static struct target_desc * static struct target_desc *
tdesc_parse_xml (const char *document, xml_fetch_another fetcher, tdesc_parse_xml (const char *document, xml_fetch_another fetcher)
void *fetcher_baton)
{ {
static int have_warned; static int have_warned;