--- src.orig/config.sub	Thu Mar 22 12:09:20 2001
+++ src.new/config.sub	Fri Aug 24 19:42:11 2001
@@ -742,6 +742,12 @@
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-* )
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-* )
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
--- src.orig/gdb/configure.host	Tue Jul 10 22:41:54 2001
+++ src.new/gdb/configure.host	Fri Aug 24 19:42:11 2001
@@ -162,5 +162,10 @@
 vax-*-bsd*)		gdb_host=vaxbsd ;;
 vax-*-ultrix2*)		gdb_host=vaxult2 ;;
 vax-*-ultrix*)		gdb_host=vaxult ;;
-
+s390*-*-*)               gdb_host=s390 ;;
 esac
+
+
+
+
+
--- src.orig/gdb/configure.tgt	Sun Aug 12 05:39:11 2001
+++ src.new/gdb/configure.tgt	Mon Aug 27 19:29:52 2001
@@ -27,6 +27,7 @@
 strongarm*)		gdb_target_cpu=arm ;;
 xscale*)		gdb_target_cpu=arm ;;
 v850*)			gdb_target_cpu=v850 ;;
+s390*)                  gdb_target_cpu=s390 ;;
 *)			gdb_target_cpu=$target_cpu ;;
 
 esac
@@ -261,9 +262,6 @@
 rs6000-*-aix4*)		gdb_target=aix4 ;;
 rs6000-*-*)		gdb_target=rs6000 ;;
 
-s390-*-*)		gdb_target=s390 ;;
-s390x-*-*)		gdb_target=s390x ;;
-
 sh*-*-pe)		gdb_target=wince ;;
 sh-*-hms)		gdb_target=embed ;;
 sh-*-coff*)		gdb_target=embed ;;
@@ -315,6 +313,7 @@
 
 z8k-*-coff*)		gdb_target=z8k ;;
 
+s390*-*-*)               gdb_target=s390 ;;
 esac