From 6a0440391da7a99ffab94ccc66264af9b5f3ce34 Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Mon, 31 Jul 2017 14:54:24 +0100
Subject: New upstream release.

---
 config/config.guess |  2 +-
 config/config.sub   | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/config.guess b/config/config.guess
index eab94e23..b9da8803 100755
--- a/config/config.guess
+++ b/config/config.guess
@@ -1013,7 +1013,7 @@ EOF
 	echo powerpcle-${VENDOR}-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
 	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
diff --git a/config/config.sub b/config/config.sub
index 7ffe3737..a93c4879 100755
--- a/config/config.sub
+++ b/config/config.sub
@@ -1058,12 +1058,18 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
-	s390 | s390-*)
+	s390)
 		basic_machine=s390-ibm
 		;;
-	s390x | s390x-*)
+	s390-*)
+		basic_machine=s390-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	s390x)
 		basic_machine=s390x-ibm
 		;;
+	s390x-*)
+		basic_machine=s390x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
-- 
cgit v1.2.3