From d4516da077009cd7fd071afc7115b0fa3a93065b Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gnu.org>
Date: Sat, 13 Nov 2004 21:10:40 +0000
Subject: [PATCH] 	* config.guess (*:z/VM:*:*): Add new case. 	*
 config.sub (os): Add case for -zvmoe. 	* testsuite/config-guess.data: Add a
 test case. 	* testsuite/config-sub.data: Likewise.

---
 ChangeLog                   | 7 +++++++
 config.guess                | 5 ++++-
 config.sub                  | 3 +++
 testsuite/config-guess.data | 1 +
 testsuite/config-sub.data   | 1 +
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fb2bb39..db74590 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-12  Ben Elliston  <bje@gnu.org>
+
+	* config.guess (*:z/VM:*:*): Add new case.
+	* config.sub (os): Add case for -zvmoe.
+	* testsuite/config-guess.data: Add a test case.
+	* testsuite/config-sub.data: Likewise.
+
 2004-11-12  Ben Elliston  <bje@gnu.org>
 
 	* testsuite/config-guess.sh: Use , and not / as the sed delimiter.
diff --git a/config.guess b/config.guess
index c28419d..8229471 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2004-10-25'
+timestamp='2004-11-12'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -319,6 +319,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit 0 ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
 	exit 0 ;;
diff --git a/config.sub b/config.sub
index 8309fb5..ab72d85 100755
--- a/config.sub
+++ b/config.sub
@@ -1301,6 +1301,9 @@ case $os in
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
 	-none)
 		;;
 	*)
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 46c5e90..2c20a5c 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -2,3 +2,4 @@ i386	1.6		NetBSD	GENERIC	i386-unknown-netbsdelf1.6
 crisv32	2.6.6		Linux	ignored	crisv32-axis-linux-gnu
 frv	2.4.24		Linux	ignored	frv-unknown-linux-gnu
 3	2.3.3		XENIX	SysV	i386-pc-xenix
+2064	ignored		z/VM	ignored	s390-ibm-zvmoe
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index b365c47..f7d7637 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -21,3 +21,4 @@ cris-linux			cris-axis-linux-gnu
 crisv32-linux			crisv32-axis-linux-gnu
 frv-linux			frv-unknown-linux-gnu
 djgpp				i586-pc-msdosdjgpp
+s390-ibm-zvmoe			s390-ibm-zvmoe