From 8c56e1125462717d270bcd47b3e2db4ae11fb719 Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@gnat.com>
Date: Tue, 7 May 2013 09:50:49 +0000
Subject: [PATCH] AIX: Change XML to use library-list-aix instead of
 library-list.

This is more consistent with what we do with other similar XML lists,
and avoids a potential confusion with the library-list XML list.

gdb/ChangeLog:

        * features/library-list-aix.dtd: Replace library-list by
        library-list-aix.
        * rs6000-nat.c: Replace library-list by library-list-aix
        throughout.
        * solib-aix.c: Likewise.
---
 gdb/features/library-list-aix.dtd | 4 ++--
 gdb/rs6000-nat.c                  | 4 ++--
 gdb/solib-aix.c                   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gdb/features/library-list-aix.dtd b/gdb/features/library-list-aix.dtd
index 5a24ce5e9b6..8bf0cc87dfd 100644
--- a/gdb/features/library-list-aix.dtd
+++ b/gdb/features/library-list-aix.dtd
@@ -5,8 +5,8 @@
      notice and this notice are preserved.  -->
 
 <!-- library-list: Root element with versioning -->
-<!ELEMENT library-list  (library)*>
-<!ATTLIST library-list  version CDATA   #FIXED  "1.0">
+<!ELEMENT library-list-aix  (library)*>
+<!ATTLIST library-list-aix  version CDATA   #FIXED  "1.0">
 
 <!ELEMENT library  (name, member, text_addr, text_size, data_addr, data_size)>
 <!ATTLIST library  name       CDATA   #REQUIRED>
diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c
index 2ac8b43d733..afaac5da319 100644
--- a/gdb/rs6000-nat.c
+++ b/gdb/rs6000-nat.c
@@ -841,7 +841,7 @@ rs6000_xfer_shared_libraries
   /* Convert the raw data into an XML representation.  */
 
   obstack_init (&obstack);
-  obstack_grow_str (&obstack, "<library-list version=\"1.0\">\n");
+  obstack_grow_str (&obstack, "<library-list-aix version=\"1.0\">\n");
 
   ldi = ldi_data;
   while (1)
@@ -860,7 +860,7 @@ rs6000_xfer_shared_libraries
 
   xfree (ldi_data);
 
-  obstack_grow_str0 (&obstack, "</library-list>\n");
+  obstack_grow_str0 (&obstack, "</library-list-aix>\n");
 
   buf = obstack_finish (&obstack);
   len_avail = strlen (buf);
diff --git a/gdb/solib-aix.c b/gdb/solib-aix.c
index f891af0293c..d9307694e33 100644
--- a/gdb/solib-aix.c
+++ b/gdb/solib-aix.c
@@ -179,7 +179,7 @@ library_list_start_library (struct gdb_xml_parser *parser,
   VEC_safe_push (lm_info_p, *list, item);
 }
 
-/* Handle the start of a <library-list> element.  */
+/* Handle the start of a <library-list-aix> element.  */
 
 static void
 library_list_start_list (struct gdb_xml_parser *parser,
@@ -213,7 +213,7 @@ solib_aix_free_library_list (void *p)
 }
 
 /* The allowed elements and attributes for an AIX library list
-   described in XML format.  The root element is a <library-list>.  */
+   described in XML format.  The root element is a <library-list-aix>.  */
 
 static const struct gdb_xml_attribute library_attributes[] =
 {
@@ -242,7 +242,7 @@ static const struct gdb_xml_attribute library_list_attributes[] =
 
 static const struct gdb_xml_element library_list_elements[] =
 {
-  { "library-list", library_list_attributes, library_list_children,
+  { "library-list-aix", library_list_attributes, library_list_children,
     GDB_XML_EF_NONE, library_list_start_list, NULL },
   { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
 };
-- 
2.30.2