[PATCH 2/2] gdb: remove workarounds for old expat versions

[Simon Marchi <simon.marchi@efficios.com>]

gdb_expat.h provides fallback definitions of XML_STATUS_OK,
XML_STATUS_ERROR and XMLCALL for versions that lack them.  xml-support.c
only calls XML_StopParser if configure found it.  These workarounds were
relevant for the Expat 1.95.x versions, which is not relevant anymore
(Expat 2 was released 20 years ago).

Remove AC_CHECK_FUNCS(XML_StopParser) and the conditional in
xml-support.c.

Remove the fallback definitions from gdb_expat.h.

Change-Id: Ia0d0dd692518c190dfb97644be3bb2f3b4082b05
---
 gdb/config.in     |  3 ---
 gdb/configure     | 15 ---------------
 gdb/configure.ac  |  5 -----
 gdb/gdb_expat.h   | 13 -------------
 gdb/xml-support.c |  2 --
 5 files changed, 38 deletions(-)

diff --git a/gdb/config.in b/gdb/config.in
index 0e5a6637c2b1..8afa32f83e7f 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -628,9 +628,6 @@
 /* Define to 1 if you have the <ws2tcpip.h> header file. */
 #undef HAVE_WS2TCPIP_H
 
-/* Define to 1 if you have the `XML_StopParser' function. */
-#undef HAVE_XML_STOPPARSER
-
 /* Define to 1 if zstd is enabled. */
 #undef HAVE_ZSTD
 
diff --git a/gdb/configure b/gdb/configure
index 810e9ed7a378..9487c2c55001 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -28249,21 +28249,6 @@ $as_echo "$LIBEXPAT" >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: expat is missing or unusable; some features may be unavailable." >&5
 $as_echo "$as_me: WARNING: expat is missing or unusable; some features may be unavailable." >&2;}
     fi
-  else
-    save_LIBS=$LIBS
-    LIBS="$LIBS $LIBEXPAT"
-    for ac_func in XML_StopParser
-do :
-  ac_fn_c_check_func "$LINENO" "XML_StopParser" "ac_cv_func_XML_StopParser"
-if test "x$ac_cv_func_XML_StopParser" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_XML_STOPPARSER 1
-_ACEOF
-
-fi
-done
-
-    LIBS=$save_LIBS
   fi
 fi
 
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 0d88a280b163..b1f19cb80ee0 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -796,11 +796,6 @@ else
     else
       AC_MSG_WARN([expat is missing or unusable; some features may be unavailable.])
     fi
-  else
-    save_LIBS=$LIBS
-    LIBS="$LIBS $LIBEXPAT"
-    AC_CHECK_FUNCS(XML_StopParser)
-    LIBS=$save_LIBS
   fi
 fi
 
diff --git a/gdb/gdb_expat.h b/gdb/gdb_expat.h
index 756cf81be95c..4b9ed1ac1381 100644
--- a/gdb/gdb_expat.h
+++ b/gdb/gdb_expat.h
@@ -22,19 +22,6 @@
 
 #include <expat.h>
 
-/* Expat 1.95.x does not define these; this is the definition
-   recommended by the expat 2.0 headers.  */
-#ifndef XML_STATUS_OK
-# define XML_STATUS_OK    1
-# define XML_STATUS_ERROR 0
-#endif
-
-/* Old versions of expat do not define this macro, so define it
-   as void.  */
-#ifndef XMLCALL
-#define XMLCALL
-#endif
-
 /* Return the line number of PARSER's current position.
 
    Expat 2.9.0 deprecates XML_GetCurrentLineNumber in favor of
diff --git a/gdb/xml-support.c b/gdb/xml-support.c
index 7d86dbb8c698..0e33ce54d12e 100644
--- a/gdb/xml-support.c
+++ b/gdb/xml-support.c
@@ -117,9 +117,7 @@ struct gdb_xml_parser
   void set_error (gdb_exception &&error)
   {
     m_error = std::move (error);
-#ifdef HAVE_XML_STOPPARSER
     XML_StopParser (m_expat_parser, XML_FALSE);
-#endif
   }
 
   /* Return the underlying expat parser.  */
-- 
2.56.0