From 24d01a7231253ae32256829f330a796f15195557 Mon Sep 17 00:00:00 2001
Message-Id: <address@hidden>
In-Reply-To: <address@hidden>
References: <address@hidden>
From: John Ericson <address@hidden>
Date: Fri, 22 Jun 2018 17:40:14 -0400
Subject: [PATCH 2/6]     * config.sub: Make a few `basic_machine's short-hands
 only.
To: address@hidden

---
 ChangeLog  |   9 +++++
 config.sub | 100 +++++++++++++++++++++++++++++------------------------
 2 files changed, 64 insertions(+), 45 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e6bad15..ee1c4c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-08-08  John Ericson  <address@hidden>
+
+	* config.sub: Make a few `basic_machine's short-hands only.
+
+	These are all compant names or somilar. That makes them unsuitable
+	to be `basic_machine`a in their own right as the arch part is
+	blatantly missing. We keep them as single-component aliases only
+	for historical compatability.
+
 2018-08-08  John Ericson  <address@hidden>
 
 	* config.sub: Move manufacture-defaultint patterns to the top
diff --git a/config.sub b/config.sub
index 3a7b60c..4166796 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-07-25'
+timestamp='2018-07-30'
 
 # 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
@@ -190,6 +190,14 @@ case $1 in
 				basic_machine=m68010-adobe
 				os=scout
 				;;
+			alliant)
+				basic_machine=fx80-alliant
+				os=
+				;;
+			altos | altos3068)
+				basic_machine=m68k-altos
+				os=
+				;;
 			am29k)
 				basic_machine=a29k-none
 				os=bsd
@@ -234,6 +242,26 @@ case $1 in
 				basic_machine=arm-unknown
 				os=cegcc
 				;;
+			convex-c1)
+				basic_machine=c1-convex
+				os=bsd
+				;;
+			convex-c2)
+				basic_machine=c2-convex
+				os=bsd
+				;;
+			convex-c32)
+				basic_machine=c32-convex
+				os=bsd
+				;;
+			convex-c34)
+				basic_machine=c34-convex
+				os=bsd
+				;;
+			convex-c38)
+				basic_machine=c38-convex
+				os=bsd
+				;;
 			cray)
 				basic_machine=j90-cray
 				os=unicos
@@ -242,6 +270,9 @@ case $1 in
 				basic_machine=craynv-cray
 				os=unicosmp
 				;;
+			crds | unos)
+				basic_machine=m68k-crds
+				;;
 			delta88)
 				basic_machine=m88k-motorola
 				os=sysv3
@@ -458,10 +489,18 @@ case $1 in
 				basic_machine=m68k-bull
 				os=sysv2
 				;;
+			st2000)
+				basic_machine=m68k-tandem
+				os=
+				;;
 			stratus)
 				basic_machine=i860-stratus
 				os=sysv4
 				;;
+			sun2)
+				basic_machine=m68000-sun
+				os=
+				;;
 			sun2os3)
 				basic_machine=m68000-sun
 				os=sunos3
@@ -470,6 +509,10 @@ case $1 in
 				basic_machine=m68000-sun
 				os=sunos4
 				;;
+			sun3)
+				basic_machine=m68k-sun
+				os=
+				;;
 			sun3os3)
 				basic_machine=m68k-sun
 				os=sunos3
@@ -478,6 +521,10 @@ case $1 in
 				basic_machine=m68k-sun
 				os=sunos4
 				;;
+			sun4)
+				basic_machine=sparc-sun
+				os=
+				;;
 			sun4os3)
 				basic_machine=sparc-sun
 				os=sunos3
@@ -490,6 +537,10 @@ case $1 in
 				basic_machine=sparc-sun
 				os=solaris2
 				;;
+			sun386 | sun386i | roadrunner)
+				basic_machine=i386-sun
+				os=
+				;;
 			sv1)
 				basic_machine=sv1-cray
 				os=unicos
@@ -566,6 +617,9 @@ esac
 case $basic_machine in
 	# Here we handle the default manufacturer of certain CPU types.  It is in
 	# some cases the only manufacturer, in others, it is the most popular.
+	fx80)
+		basic_machine=fx80-alliant
+		;;
 	w89k)
 		basic_machine=hppa1.1-winbond
 		;;
@@ -851,12 +905,6 @@ case $basic_machine in
 	3b*)
 		basic_machine=we32k-att
 		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
 	amd64)
 		basic_machine=x86_64-pc
 		;;
@@ -887,33 +935,10 @@ case $basic_machine in
 		basic_machine=c90-cray
 		os=${os:-unicos}
 		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=bsd
-		;;
 	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=${os:-elf}
 		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
 	crisv32 | crisv32-* | etraxfs*)
 		basic_machine=crisv32-axis
 		;;
@@ -1219,24 +1244,9 @@ case $basic_machine in
 	spur)
 		basic_machine=spur-unknown
 		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
 	strongarm-* | thumb-*)
 		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
 	tile*-*)
 		;;
 	tile*)
-- 
2.17.1