Better recognize s390 and s390x.gdb_5_1_1-2002-01-24-releasegdb_5_1_0_1-2002-01-03-releasegdb_5_1_0_1-2002-01-03-branchpointgdb_5_1-2001-11-21-releasegdb_5_1_0_1-2002-01-03-branchgdb_5_1-2001-07-29-branch

2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c3264a248..673f66eae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-11  Andrew Cagney  <ac131313@redhat.com>
+
+	From Denis Joseph Barrow:
+	* config.sub: Map s390 and s390x onto s390-ibm and s390x-ibm.
+
 2001-10-03  Alan Modra  <amodra@bigpond.net.au>
 
 	* gettext.m4: Test po/POTFILES.in exists before trying to read.
diff --git a/config.sub b/config.sub
index 7146a2ffc..84b4d664e 100755
--- a/config.sub
+++ b/config.sub
@@ -230,7 +230,7 @@ case $basic_machine in
 		| mips16 | mips64 | mipsel | mips64el \
 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
 		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
+		| mips64vr5000 | miprs64vr5000el | mcore \
 		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
 		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
 		| pj | pjl | h8500)
@@ -275,7 +275,7 @@ case $basic_machine in
 	      | mips64el-* | mips64orion-* | mips64orionel-* \
 	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
 	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
+	      | f30[01]-* | f700-* | sv1-* | t3e-* \
 	      | [cjt]90-* \
 	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
 	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
@@ -742,6 +742,12 @@ case $basic_machine in
 	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