From 8ecdc3a8782fec9bd71758e7f4e0a5363f6dd227 Mon Sep 17 00:00:00 2001
From: John Ericson <john.ericson@obsidian.systems>
Date: Fri, 24 Aug 2018 20:41:12 +1000
Subject: [PATCH] 	* config.sub: Consolidate *-pc handling.

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

diff --git a/ChangeLog b/ChangeLog
index c3d9a17..61c111b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-24  John Ericson  <john.ericson@obsidian.systems>
+
+	* config.sub: Consolidate *-pc handling.
+
 2018-08-24  John Ericson  <john.ericson@obsidian.systems>
 
 	* config.sub (cr16-*): Do not clobber vendor.
diff --git a/config.sub b/config.sub
index 7ab164f..b369220 100755
--- a/config.sub
+++ b/config.sub
@@ -702,13 +702,6 @@ case $basic_machine in
 		basic_machine=xps100-honeywell
 		;;
 
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -717,9 +710,6 @@ case $basic_machine in
 	3b*)
 		basic_machine=we32k-att
 		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
 	blackfin-*)
 		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=linux
@@ -912,9 +902,6 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
 	pc98-*)
 		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
@@ -1022,9 +1009,6 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=proelf
 		;;
-	x64)
-		basic_machine=x86_64-pc
-		;;
 	xscale-* | xscalee[bl]-*)
 		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
 		;;
@@ -1060,6 +1044,21 @@ case $basic_machine in
 		basic_machine=armel-unknown
 		;;
 
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+		basic_machine=$basic_machine-pc
+		;;
+	# These rules are duplicated from below for sake of the special case above;
+	# i.e. things that normalized to x86 arches should also default to "pc"
+	pc98)
+		basic_machine=i386-pc
+		;;
+	x64 | amd64)
+		basic_machine=x86_64-pc
+		;;
+
 	# Recognize the cannonical CPU Types that limit and/or modify the
 	# company names they are paired with.
 	amd64-*)