From ddf4d5ca18b6112ee803a692eba3cd651f355624 Mon Sep 17 00:00:00 2001
From: John Ericson <john.ericson@obsidian.systems>
Date: Fri, 24 Aug 2018 20:32:50 +1000
Subject: [PATCH] 	* config.sub: Consolidate some *-* patterns above big
 patterns.

Signed-off-by: Ben Elliston <bje@gnu.org>
---
 ChangeLog  |   4 ++
 config.sub | 115 ++++++++++++++++++++++++++++-------------------------
 2 files changed, 64 insertions(+), 55 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 35bce77..b0cf632 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-24  John Ericson  <john.ericson@obsidian.systems>
+
+	* config.sub: Consolidate some *-* patterns above big patterns.
+
 2018-08-24  Ben Elliston  <bje@gnu.org>
 
 	* testsuite/config-sub.data: Add more tests.
diff --git a/config.sub b/config.sub
index 11351f5..532a5dd 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-08-23'
+timestamp='2018-08-24'
 
 # 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
@@ -720,9 +720,6 @@ case $basic_machine in
 	amd64)
 		basic_machine=x86_64-pc
 		;;
-	amd64-*)
-		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
 	blackfin-*)
 		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=linux
@@ -744,23 +741,6 @@ case $basic_machine in
 		basic_machine=c90-cray
 		os=${os:-unicos}
 		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=${os:-elf}
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx-*)
-		os=${os:-elf}
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=${os:-elf}
-		;;
 	decsystem10* | dec10*)
 		basic_machine=pdp10-dec
 		os=tops10
@@ -908,21 +888,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	nsv-tandem)
-		basic_machine=nsv-tandem
-		;;
-	nsx-tandem)
-		basic_machine=nsx-tandem
-		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=proelf
@@ -1012,12 +977,6 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
 	sb1)
 		basic_machine=mipsisa64sb1-unknown
 		;;
@@ -1044,12 +1003,6 @@ case $basic_machine in
 	strongarm-* | thumb-*)
 		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
-	tile*-*)
-		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=${os:-linux-gnu}
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1093,12 +1046,6 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70)
 		;;
-	m9s12z | m68hcs12z | hcs12z | s12z)
-		basic_machine=s12z-unknown
-		;;
-	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
-		basic_machine=s12z-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
 	ms1)
 		basic_machine=mt-unknown
 		;;
@@ -1113,7 +1060,65 @@ case $basic_machine in
 		basic_machine=armel-unknown
 		;;
 
-	# Recognize the basic CPU types with company name.
+	# Recognize the cannonical CPU Types that limit and/or modify the
+	# company names they are paired with.
+	amd64-*)
+		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=${os:-elf}
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx-*)
+		os=${os:-elf}
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=${os:-elf}
+		;;
+	m9s12z | m68hcs12z | hcs12z | s12z)
+		basic_machine=s12z-unknown
+		;;
+	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+		basic_machine=s12z-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	nsv-tandem)
+		basic_machine=nsv-tandem
+		;;
+	nsx-tandem)
+		basic_machine=nsx-tandem
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	tile*-*)
+		os=${os:-linux-gnu}
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=${os:-linux-gnu}
+		;;
+
+	# Recognize the cannonical CPU types that are allowed with any
+	# company name.
 	1750a-* | 580-* \
 	| a29k-* \
 	| aarch64-* | aarch64_be-* \