From 696cd4a4eab1ee9fefbb7e38dbab291d741d0c5a Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar@linux.ibm.com>
Date: Sun, 21 Jun 2020 10:49:49 +1000
Subject: [PATCH] 	* config.sub (s390, s390x): Don't set manufacturer. 
 * testsuite/config-sub.data: Add test cases.

Signed-off-by: Ben Elliston <bje@gnu.org>
---
 ChangeLog                 |  6 ++++++
 config.sub                | 11 ++---------
 testsuite/config-sub.data |  4 ++++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 13ab735..a6451d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-06-21  Alexander Egorenkov  <egorenar@linux.ibm.com>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.sub (s390, s390x): Don't set manufacturer.
+	* testsuite/config-sub.data: Add test cases.
+
 2020-06-18  Carsten Teibes <dev@f4ke.de>
 
 	* config.sub (psp): Recognize.
diff --git a/config.sub b/config.sub
index 0820805..fcd21a1 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2020-06-18'
+timestamp='2020-06-20'
 
 # 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
@@ -1146,14 +1146,6 @@ case $cpu-$vendor in
 		cpu=mipsallegrexel
 		vendor=sony
 		;;
-	s390-*)
-		cpu=s390
-		vendor=ibm
-		;;
-	s390x-*)
-		cpu=s390x
-		vendor=ibm
-		;;
 	tile*-*)
 		os=${os:-linux-gnu}
 		;;
@@ -1237,6 +1229,7 @@ case $cpu-$vendor in
 			| pyramid \
 			| riscv | riscv32 | riscv64 \
 			| rl78 | romp | rs6000 | rx \
+			| s390 | s390x \
 			| score \
 			| sh | shl \
 			| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 8aedd3f..c4fe79d 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -581,6 +581,10 @@ rs6000						rs6000-ibm-aix
 rx-linux					rx-unknown-linux-gnu
 rx						rx-unknown-none
 s12z						s12z-unknown-none
+s390						s390-unknown-none
+s390x						s390x-unknown-none
+s390-linux					s390-unknown-linux-gnu
+s390x-linux					s390x-unknown-linux-gnu
 s390-ibm-zvmoe					s390-ibm-zvmoe
 s390x-ibm-zvmoe					s390x-ibm-zvmoe
 sa29200						a29k-amd-udi