From 62db2b6bd65984bec0c20212bce7e61d7e2861be Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 28 Jun 2020 11:26:24 +1000 Subject: [PATCH] * config.sub (s390, s390x): Use 'ibm' vendor default, but allow overrides. Previously, 'ibm' was forced, which caused problems when someone wanted to use 'busybox' as a vendor and cross-compile with a slightly different toolchain. The fix changed behaviour such that without any vendor, it would use to 'unknown' rather than 'ibm' as before. This patch aims to compromise between the old and new behaviour by making 'ibm' a default for those CPUs when no vendor is specified, but if the user explicitly provides a vendor that is used instead. This sort of "vendor defaulting" has plenty of precedent in config.sub, so it seemed like a good approach. Signed-off-by: Ben Elliston --- ChangeLog | 5 +++++ config.sub | 3 +++ testsuite/config-sub.data | 10 ++++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e33f9d..c003d4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2020-06-28 John Ericson + + * config.sub (s390, s390x): Use 'ibm' vendor default, but allow + overrides. + 2020-06-27 John Ericson * config.sub: Allow CPU to influence vendor defaulting too. diff --git a/config.sub b/config.sub index b2c4a19..9ab201a 100755 --- a/config.sub +++ b/config.sub @@ -1763,6 +1763,9 @@ case $vendor in *-os400*) vendor=ibm ;; + s390-* | s390x-*) + vendor=ibm + ;; *-ptx*) vendor=sequent ;; diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data index c4fe79d..d9639bc 100644 --- a/testsuite/config-sub.data +++ b/testsuite/config-sub.data @@ -581,10 +581,12 @@ 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 s390-ibm-none +s390x s390x-ibm-none +s390-linux s390-ibm-linux-gnu +s390x-linux s390x-ibm-linux-gnu +s390-busybox-linux s390-busybox-linux-gnu +s390x-busybox-linux s390x-busybox-linux-gnu s390-ibm-zvmoe s390-ibm-zvmoe s390x-ibm-zvmoe s390x-ibm-zvmoe sa29200 a29k-amd-udi