>From f8b614809cfabd6f98cfc02b7cf90bf2f68d30cf Mon Sep 17 00:00:00 2001
Message-Id: <address@hidden>
In-Reply-To: <address@hidden>
References: <address@hidden>
	<address@hidden>
From: John Ericson <address@hidden>
Date: Tue, 14 Aug 2018 14:52:46 -0400
Subject: [PATCH 3/3] Tenative fixes to issues arriving from previous commit
To: address@hidden

---
 config.sub                | 22 ++++++++++------------
 testsuite/config-sub.data | 13 +++++++------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/config.sub b/config.sub
index 7df77e0..562f38f 100755
--- a/config.sub
+++ b/config.sub
@@ -692,6 +692,9 @@ case $basic_machine in
 	mac | mpw | mac-mpw)
 		basic_machine=m68k-apple
 		;;
+	microblaze | microblazeel)
+		basic_machine=$basic_machine-xilinx
+		;;
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
@@ -706,10 +709,6 @@ case $basic_machine in
 	  basic_machine=$basic_machine-pc
 	  ;;
 
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
 	# 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)
@@ -755,6 +754,9 @@ case $basic_machine in
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx-*)
+		os=${os:-elf}
+		;;
 	crx)
 		basic_machine=crx-unknown
 		os=${os:-elf}
@@ -870,9 +872,6 @@ case $basic_machine in
 		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=linux
 		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -1063,9 +1062,8 @@ case $basic_machine in
 	vpp*|vx|vx-*)
 		basic_machine=f301-fujitsu
 		;;
-	w65*)
+	w65)
 		basic_machine=w65-wdc
-		os=none
 		;;
 	w89k-*)
 		basic_machine=hppa1.1-winbond
@@ -1206,7 +1204,7 @@ case $basic_machine in
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| maxq | mb | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -1254,7 +1252,7 @@ case $basic_machine in
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| visium \
 	| wasm32 \
-	| x86 | xc16x | xstormy16 | xgate | xtensa \
+	| x86 | xc16x | xstormy16 | xgate | xtensa* \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -1270,7 +1268,7 @@ case $basic_machine in
 	leon|leon[3-9])
 		basic_machine=sparc-$basic_machine
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70)
 		;;
 	m9s12z | m68hcs12z | hcs12z | s12z)
 		basic_machine=s12z-unknown
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 8323a6b..5603920 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -285,12 +285,13 @@ mep-elf						mep-unknown-elf
 mep						mep-unknown-elf
 metag-linux					metag-unknown-linux-gnu
 metag						metag-unknown-none
-microblazeel-elf				microblazeel-unknown-elf
-microblaze-elf					microblaze-unknown-elf
-microblazeel-linux				microblazeel-unknown-linux-gnu
-microblazeel					microblazeel-unknown-none
-microblaze-linux				microblaze-unknown-linux-gnu
-microblaze					microblaze-unknown-none
+microblazeel-elf				microblazeel-xilinx-elf
+microblazeel-foobar-elf				microblazeel-foobar-elf
+microblaze-elf					microblaze-xilinx-elf
+microblazeel-linux				microblazeel-xilinx-linux-gnu
+microblazeel					microblazeel-xilinx-none
+microblaze-linux				microblaze-xilinx-linux-gnu
+microblaze					microblaze-xilinx-none
 mingw32ce					arm-unknown-mingw32ce
 mingw32						i686-pc-mingw32
 mingw64						x86_64-pc-mingw64
-- 
2.18.0