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

---
 ChangeLog  | 30 +++++++++++++++++++++
 config.sub | 79 +++++++++++++++++++++++++++++++-----------------------
 2 files changed, 76 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 366ffff..125ca35 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-13  Ben Elliston  <address@hidden>
 
 	* testsuite/config-sub.data: Add legacy test cases for cydra,
diff --git a/config.sub b/config.sub
index c19e671..be1d6cc 100755
--- a/config.sub
+++ b/config.sub
@@ -149,29 +149,39 @@ case $1 in
 		esac
 		;;
 	*-*)
-		# Second component is usually, but not always the OS
-		case $field2 in
-			# Prevent following clause from handling this valid os
-			sun*os*)
-				basic_machine=$field1
-				os=$field2
-				;;
-			# Manufacturers
-			dec* | mips* | sequent* | encore* | pc532* | sgi* | sony* \
-			| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
-			| unicom* | ibm* | next | hp | isi* | apollo | altos* \
-			| convergent* | ncr* | news | 32* | 3600* | 3100* | hitachi* \
-			| c[123]* | convex* | sun | crds | omron* | dg | ultra | tti* \
-			| harris | dolphin | highlevel | gould | cbm | ns | masscomp \
-			| apple | axis | knuth | cray | microblaze* \
-			| sim | cisco | oki | wec | wrs | winbond)
-				basic_machine=$field1-$field2
+		# A lone config we happen to match not fitting any patern
+		case $field1-$field2 in
+			decstation-3100)
+				basic_machine=mips-dec
 				os=
 				;;
-			*)
-				basic_machine=$field1
-				os=$field2
-				;;
+			*-*)
+				# Second component is usually, but not always the OS
+				case $field2 in
+					# Prevent following clause from handling this valid os
+					sun*os*)
+						basic_machine=$field1
+						os=$field2
+						;;
+					# Manufacturers
+					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
+					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
+					| convergent* | ncr* | news | 32* | 3600* | 3100* \
+					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
+					| ultra | tti* | harris | dolphin | highlevel | gould \
+					| cbm | ns | masscomp | apple | axis | knuth | cray \
+					| microblaze* | sim | cisco \
+					| oki | wec | wrs | winbond)
+						basic_machine=$field1-$field2
+						os=
+						;;
+					*)
+						basic_machine=$field1
+						os=$field2
+						;;
+				esac
+			;;
 		esac
 		;;
 	*)
@@ -206,6 +216,10 @@ case $1 in
 				basic_machine=580-amdahl
 				os=sysv
 				;;
+			amiga)
+				basic_machine=m68k-unknown
+				os=
+				;;
 			amigaos | amigados)
 				basic_machine=m68k-unknown
 				os=amigaos
@@ -270,6 +284,14 @@ case $1 in
 				basic_machine=m68k-crds
 				os=
 				;;
+			da30)
+				basic_machine=m68k-da30
+				os=
+				;;
+			decstation | pmax | pmin | dec3100 | decstatn)
+				basic_machine=mips-dec
+				os=
+				;;
 			delta88)
 				basic_machine=m88k-motorola
 				os=sysv3
@@ -314,6 +336,9 @@ case $1 in
 				basic_machine=m88k-harris
 				os=sysv3
 				;;
+			hp300)
+				basic_machine=m68k-hp
+				;;
 			hp300bsd)
 				basic_machine=m68k-hp
 				os=bsd
@@ -904,9 +929,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
@@ -942,12 +964,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
@@ -993,9 +1009,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