ChangeLog:

	* features/Makefile (%.dat): Set xmltarget to the base filename
	of the XML source, without subdirectory.
	* regformats/rs6000/powerpc-32.dat: Regenerate.
	* regformats/rs6000/powerpc-64.dat: Regenerate.
	* regformats/rs6000/powerpc-e500.dat: Regenerate.

gdbserver/ChangeLog:

	* server.c (get_features_xml): Fix inverted condition.
	(handle_query): Always support qXfer:feature:read.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index df42bb01cbea707c2fe08e1e012b5053a450b01e..57283828ea046604241035a5aba3d71351a594d7 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-27  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * features/Makefile (%.dat): Set xmltarget to the base filename
+       of the XML source, without subdirectory.
+       * regformats/rs6000/powerpc-32.dat: Regenerate.
+       * regformats/rs6000/powerpc-64.dat: Regenerate.
+       * regformats/rs6000/powerpc-e500.dat: Regenerate.
+
 2008-03-27  Markus Deuling  <deuling@de.ibm.com>
 
        * xcoffread.c (scan_xcoff_symtab): Replace current_gdbarch by

diff --git a/gdb/features/Makefile b/gdb/features/Makefile
index 0b7dd9c01a8b519c186389930a1e9b20bce35b2a..cedc57a11317a2a830c827587c97e1ebb5a8446b 100644 (file)
--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -55,7 +55,7 @@ all: $(OUTPUTS)
 $(outdir)/%.dat: %.xml number-regs.xsl sort-regs.xsl gdbserver-regs.xsl
        echo "# DO NOT EDIT: generated from $<" > $(outdir)/$*.tmp
        echo "name:`echo $(notdir $*) | sed 's/-/_/g'`" >> $(outdir)/$*.tmp
-       echo "xmltarget:$<" >> $(outdir)/$*.tmp
+       echo "xmltarget:$(<F)" >> $(outdir)/$*.tmp
        echo "expedite:$($*-expedite)" >> $(outdir)/$*.tmp
        $(XSLTPROC) --path "$(PWD)" --xinclude number-regs.xsl $< | \
          $(XSLTPROC) sort-regs.xsl - | \

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index e25f236089d0bc34d9b87bdefe2c349d69d4b525..af733d90669aa4ed9069e48f6abea79ebc3833ef 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-27  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * server.c (get_features_xml): Fix inverted condition.
+       (handle_query): Always support qXfer:feature:read.
+
 2008-03-10  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * server.c (wrapper_argv): New.

diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 634bf806e4e057607426d05ccbd68d1a0b7704e9..8f74711c22350b491812f6b934086912d9377709 100644 (file)
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -276,7 +276,7 @@ get_features_xml (const char *annex)
      init_registers_... routine for the current target.  */
 
   if (gdbserver_xmltarget
-      && strcmp (annex, "target.xml") != 0)
+      && strcmp (annex, "target.xml") == 0)
     {
       if (*gdbserver_xmltarget == '@')
        return gdbserver_xmltarget + 1;
@@ -618,8 +618,11 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
       if (the_target->qxfer_spu != NULL)
        strcat (own_buf, ";qXfer:spu:read+;qXfer:spu:write+");
 
-      if (get_features_xml ("target.xml") != NULL)
-       strcat (own_buf, ";qXfer:features:read+");
+      /* We always report qXfer:features:read, as targets may
+        install XML files on a subsequent call to arch_setup.
+        If we reported to GDB on startup that we don't support
+        qXfer:feature:read at all, we will never be re-queried.  */
+      strcat (own_buf, ";qXfer:features:read+");
 
       return;
     }

diff --git a/gdb/regformats/rs6000/powerpc-32.dat b/gdb/regformats/rs6000/powerpc-32.dat
index 3518b841061fb22c98488287bb79a6b2b8d70a78..840d68e568da2c3a16c3c7313098d2ae12b48440 100644 (file)
--- a/gdb/regformats/rs6000/powerpc-32.dat
+++ b/gdb/regformats/rs6000/powerpc-32.dat
@@ -1,6 +1,6 @@
 # DO NOT EDIT: generated from rs6000/powerpc-32.xml
 name:powerpc_32
-xmltarget:rs6000/powerpc-32.xml
+xmltarget:powerpc-32.xml
 expedite:r1,pc
 32:r0
 32:r1

diff --git a/gdb/regformats/rs6000/powerpc-64.dat b/gdb/regformats/rs6000/powerpc-64.dat
index ddd72ba86bc06fdbecde4efe49841889c2f99f86..1f2a68f76b4f031676129dda787dfefb828cc94c 100644 (file)
--- a/gdb/regformats/rs6000/powerpc-64.dat
+++ b/gdb/regformats/rs6000/powerpc-64.dat
@@ -1,6 +1,6 @@
 # DO NOT EDIT: generated from rs6000/powerpc-64.xml
 name:powerpc_64
-xmltarget:rs6000/powerpc-64.xml
+xmltarget:powerpc-64.xml
 expedite:r1,pc
 64:r0
 64:r1

diff --git a/gdb/regformats/rs6000/powerpc-e500.dat b/gdb/regformats/rs6000/powerpc-e500.dat
index d6091463169b9207c908ca802a725bfd39c38237..a8e06d05ba47de7b5b4c141f737f664f8c6a9a5d 100644 (file)
--- a/gdb/regformats/rs6000/powerpc-e500.dat
+++ b/gdb/regformats/rs6000/powerpc-e500.dat
@@ -1,6 +1,6 @@
 # DO NOT EDIT: generated from rs6000/powerpc-e500.xml
 name:powerpc_e500
-xmltarget:rs6000/powerpc-e500.xml
+xmltarget:powerpc-e500.xml
 expedite:r1,pc
 32:r0
 32:r1