From 63fe500bb89efc51db28415dd1e8d8dfabadc443 Mon Sep 17 00:00:00 2001
From: John Ericson <john.ericson@obsidian.systems>
Date: Wed, 23 May 2018 11:33:44 +1000
Subject: [PATCH] 	* config.sub: Simplify *-wrs handling.

"wrs" is just a vendor that can be handled with all the other vendor
exceptions for two-component cases. `wrs) os=vxworks` can instead be
put with the other OS defaults down below.

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

diff --git a/ChangeLog b/ChangeLog
index 7a5d4fc..1fd9cdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-05-23  John Ericson  <john.ericson@obsidian.systems>
+
+	* config.sub: Simplify *-wrs handling.
+
 2018-05-23  John Ericson  <john.ericson@obsidian.systems>
 
 	* config.sub: Cordon off two-component aliases.
diff --git a/config.sub b/config.sub
index bf8e94a..5f6dfb5 100755
--- a/config.sub
+++ b/config.sub
@@ -164,7 +164,7 @@ case $1 in
 			| 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 | winbond)
+			| sim | cisco | oki | wec | wrs | winbond)
 				basic_machine=$field1-$field2
 				os=
 				;;
@@ -572,10 +572,6 @@ case $os in
 		;;
 	scout)
 		;;
-	wrs)
-		os=vxworks
-		basic_machine=$1
-		;;
 	chorusos*)
 		os=chorusos
 		basic_machine=$1
@@ -1749,6 +1745,9 @@ case $basic_machine in
 	*-atari*)
 		os=mint
 		;;
+	*-wrs)
+		os=vxworks
+		;;
 	*)
 		os=none
 		;;