From cf0f58b6e63ef520e7ea5e240df43b46f51a1458 Mon Sep 17 00:00:00 2001
Message-Id: <address@hidden>
In-Reply-To: <address@hidden>
References: <address@hidden>
	<address@hidden>
	<address@hidden>
From: John Ericson <address@hidden>
Date: Mon, 30 Jul 2018 13:08:12 -0400
Subject: [PATCH 4/6]     * config.sub: Move some erroneous `foo-*` to be
 1-comp aliases
To: address@hidden

---
 ChangeLog  | 30 ++++++++++++++++++++++++++++++
 config.sub | 25 +++++++++++++------------
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 99f9824..6873193 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2018-08-08  John Ericson  <address@hidden>
+
+	* config.sub: Move some erroneous `foo-*` to be 1-comp aliases
+
+	The `foo-*` versions were introduced in
+	5347fada50a3a3e689c2654515145457af92965e
+	1bf0fb0812846ace88f93937e90162e2835c6b11
+	ab3a1065d559246c2c0422513e04369f49639c62, and then right after
+	augmented with the `foo` versions in
+	1d62957bb23205508ea3eb7c790e431646fad6ae right after.
+
+	I think that commit didn't go far enough, in in that the original
+	`foo-*` verions should have also been removed:
+
+	 - "foo" is closer to a company name than arch name, so they are
+	   in no way a proper 2-component basic name. That would mean
+	   there's one companny name in the original `basic_machine`
+	   that's ignored, and the other that is defaulted with some arch.
+	   That seems arbitrary.
+
+	 - "foo-*" being radically normalized, but "foo" not being, is
+	   just inconsistent.
+
+	In addition, I also move the rest to be single component aliases
+	as they are company names or product lines.
+
+	This is a breaking change, but not one I'd expect to matter since
+	all these machines are ancient and the tests still pass without
+	modification.
+
 2018-08-08  John Ericson  <address@hidden>
 
 	* config.sub: Move back craynv as a `basic_machine` pattern
diff --git a/config.sub b/config.sub
index 3d3f3f7..e858b5f 100755
--- a/config.sub
+++ b/config.sub
@@ -206,6 +206,10 @@ case $1 in
 				basic_machine=580-amdahl
 				os=sysv
 				;;
+			amiga)
+				basic_machine=m68k-unknown
+				os=
+				;;
 			amigaos | amigados)
 				basic_machine=m68k-unknown
 				os=amigaos
@@ -269,6 +273,12 @@ case $1 in
 			crds | unos)
 				basic_machine=m68k-crds
 				;;
+			da3)
+				basic_machine=m68k-da30
+				;;
+			decstation | decstation-3100 | pmax | pmin | dec3100 | decstatn)
+				basic_machine=mips-dec
+				;;
 			delta88)
 				basic_machine=m88k-motorola
 				os=sysv3
@@ -313,6 +323,9 @@ case $1 in
 				basic_machine=m88k-harris
 				os=sysv3
 				;;
+			hp300)
+				basic_machine=m68k-hp
+				;;
 			hp300bsd)
 				basic_machine=m68k-hp
 				os=bsd
@@ -911,9 +924,6 @@ case $basic_machine in
 	amd64-*)
 		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
 	blackfin-*)
 		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=linux
@@ -949,12 +959,6 @@ case $basic_machine in
 		basic_machine=crx-unknown
 		os=${os:-elf}
 		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
 	decsystem10* | dec10*)
 		basic_machine=pdp10-dec
 		os=tops10
@@ -1000,9 +1004,6 @@ case $basic_machine in
 		basic_machine=hppa1.1-hitachi
 		os=hiuxwe2
 		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
 	hp3k9[0-9][0-9] | hp9[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
-- 
2.17.1