From dd5d5dd697df579a5ebd119a88475b446c07c6b0 Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gnu.org>
Date: Tue, 3 Jul 2018 21:18:29 +1000
Subject: [PATCH] 	* config.sub: Do not rewrite riscv -> riscv32. 	*
 testsuite/config-sub.data: Adjust tests.

---
 ChangeLog                 |  6 ++++++
 config.sub                | 12 +++---------
 testsuite/config-sub.data | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dc19a4b..db7a24b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-03  Liviu Ionescu <ilg@livius.net>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.sub: Do not rewrite riscv -> riscv32.
+	* testsuite/config-sub.data: Adjust tests.
+
 2018-06-26  Sevan Janiyan  <venture37@geeklan.co.uk>
 	    Ben Elliston  <bje@gnu.org>
 
diff --git a/config.sub b/config.sub
index 072700f..c95acc6 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-07-02'
+timestamp='2018-07-03'
 
 # 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
@@ -625,7 +625,7 @@ case $basic_machine in
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pru \
 	| pyramid \
-	| riscv32 | riscv64 \
+	| riscv | riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -752,7 +752,7 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pru-* \
 	| pyramid-* \
-	| riscv32-* | riscv64-* \
+	| riscv-* | riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
@@ -1125,12 +1125,6 @@ case $basic_machine in
 	ps2)
 		basic_machine=i386-ibm
 		;;
-	riscv)
-		basic_machine=riscv32-unknown
-		;;
-	riscv-*)
-		basic_machine=`echo "$basic_machine" | sed 's/^riscv/riscv32/'`
-		;;
 	rm[46]00)
 		basic_machine=mips-siemens
 		;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 7ad1f76..5ab1807 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -422,11 +422,11 @@ riscv64-elf					riscv64-unknown-elf
 riscv64-hcos					riscv64-unknown-hcos
 riscv64-linux					riscv64-unknown-linux-gnu
 riscv64						riscv64-unknown-none
-riscv-company-elf				riscv32-company-elf
-riscv-company-hcos				riscv32-company-hcos
-riscv-elf					riscv32-unknown-elf
-riscv-linux					riscv32-unknown-linux-gnu
-riscv						riscv32-unknown-none
+riscv-company-elf				riscv-company-elf
+riscv-company-hcos				riscv-company-hcos
+riscv-elf					riscv-unknown-elf
+riscv-linux					riscv-unknown-linux-gnu
+riscv						riscv-unknown-none
 rl78-linux					rl78-unknown-linux-gnu
 rl78						rl78-unknown-none
 rx-linux					rx-unknown-linux-gnu