* configure.srv (powerpc64-*-linux*, powerpc-*-linux*): Merge into single

	powerpc*-*-linux* case.
	(s390-*-linux*, s390x-*-linux*): Merge into single s390*-*-linux* case.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index ef070c0..0fde4b9 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-21  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * configure.srv (powerpc64-*-linux*, powerpc-*-linux*): Merge into single
+       powerpc*-*-linux* case.
+       (s390-*-linux*, s390x-*-linux*): Merge into single s390*-*-linux* case.
+
 2008-04-17  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * configure.srv [powerpc64-*-linux*]: Remove powerpc-e500.o from

diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv
index 9a44d42..c97e11e 100644 (file)
--- a/gdb/gdbserver/configure.srv
+++ b/gdb/gdbserver/configure.srv
@@ -106,38 +106,22 @@ case "${target}" in
                        srv_linux_usrregs=yes
                        srv_linux_thread_db=yes
                        ;;
-  powerpc64-*-linux*)  srv_regobj="reg-ppc.o powerpc-32.o"
+  powerpc*-*-linux*)   srv_regobj="reg-ppc.o powerpc-32.o powerpc-e500.o"
                        srv_regobj="${srv_regobj} reg-ppc64.o powerpc-64.o"
                        srv_tgtobj="linux-low.o linux-ppc-low.o"
                        srv_xmlfiles="rs6000/powerpc-32.xml"
                        srv_xmlfiles="${srv_xmlfiles} rs6000/power-altivec.xml"
                        srv_xmlfiles="${srv_xmlfiles} rs6000/power-core.xml"
                        srv_xmlfiles="${srv_xmlfiles} rs6000/power-fpu.xml"
-                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-64.xml"
-                       srv_xmlfiles="${srv_xmlfiles} rs6000/power64-core.xml"
-                       srv_linux_usrregs=yes
-                       srv_linux_regsets=yes
-                       srv_linux_thread_db=yes
-                       ;;
-  powerpc-*-linux*)    srv_regobj="reg-ppc.o powerpc-32.o powerpc-e500.o"
-                       srv_tgtobj="linux-low.o linux-ppc-low.o"
-                       srv_xmlfiles="rs6000/powerpc-32.xml"
-                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-altivec.xml"
-                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-core.xml"
-                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-fpu.xml"
                        srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-e500.xml"
                        srv_xmlfiles="${srv_xmlfiles} rs6000/power-spe.xml"
+                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-64.xml"
+                       srv_xmlfiles="${srv_xmlfiles} rs6000/power64-core.xml"
                        srv_linux_usrregs=yes
                        srv_linux_regsets=yes
                        srv_linux_thread_db=yes
                        ;;
-  s390-*-linux*)       srv_regobj=reg-s390.o
-                       srv_tgtobj="linux-low.o linux-s390-low.o"
-                       srv_linux_usrregs=yes
-                       srv_linux_regsets=yes
-                       srv_linux_thread_db=yes
-                       ;;
-  s390x-*-linux*)      srv_regobj="reg-s390.o reg-s390x.o"
+  s390*-*-linux*)      srv_regobj="reg-s390.o reg-s390x.o"
                        srv_tgtobj="linux-low.o linux-s390-low.o"
                        srv_linux_usrregs=yes
                        srv_linux_regsets=yes