diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/features/Makefile | 2 | ||||
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/server.c | 9 | ||||
| -rw-r--r-- | gdb/regformats/rs6000/powerpc-32.dat | 2 | ||||
| -rw-r--r-- | gdb/regformats/rs6000/powerpc-64.dat | 2 | ||||
| -rw-r--r-- | gdb/regformats/rs6000/powerpc-e500.dat | 2 |
7 files changed, 23 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index df42bb0..5728382 100644 --- 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 0b7dd9c..cedc57a 100644 --- 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 e25f236..af733d9 100644 --- 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 634bf80..8f74711 100644 --- 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 3518b84..840d68e 100644 --- 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 ddd72ba..1f2a68f 100644 --- 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 d609146..a8e06d0 100644 --- 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 |