From 4d79fdecdd5b87ea44a111e3984ffab912b05edf Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gnu.org>
Date: Tue, 15 Feb 2000 10:22:49 +0000
Subject: [PATCH] 2000-02-15  Ben Elliston  <bje@redhat.com>

	* config.guess: Detect GNU/Linux on IBM S/390 machines.
	* config.sub: Handle s390-*. From Adam J. Thornton
	<adam@phoenix.princeton.edu>.
---
 ChangeLog    | 4 ++++
 config.guess | 2 ++
 config.sub   | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fbca356..76b8be3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-02-15  Ben Elliston  <bje@redhat.com>
 
+	* config.guess: Detect GNU/Linux on IBM S/390 machines.
+	* config.sub: Handle s390-*. From Adam J. Thornton
+	<adam@phoenix.princeton.edu>.
+
 	* config.guess: Detect MacOS X on PowerPC and other machines.
 	From Stephen G. Johnson <stephenj@gil-galad.mit.edu>.
 
diff --git a/config.guess b/config.guess
index b91aba4..c083bde 100755
--- a/config.guess
+++ b/config.guess
@@ -772,6 +772,8 @@ EOF
 EOF
 	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
 	  rm -f $dummy.c $dummy
+	elif test "${UNAME_MACHINE}" = "s390"; then
+	  echo s390-ibm-linux && exit 0
 	else
 	  # Either a pre-BFD a.out linker (linux-gnuoldld)
 	  # or one that does not give us useful --help.
diff --git a/config.sub b/config.sub
index cc264d4..e44d6fc 100755
--- a/config.sub
+++ b/config.sub
@@ -215,7 +215,7 @@ case $basic_machine in
 	      | mips64el-* | mips64orion-* | mips64orionel-* \
 	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
 	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f301-* | armv*-* | sv1-* | t3e-* \
+	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
 	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
 	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
 		;;