From d33c1519f2502db9ff6c9ce87ed9aba7d6c8467f Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 23 Jul 2018 07:13:50 +0200
Subject: [PATCH] 5: Merge riscv32 and riscv64 into riscv

After several upstream updates in Binutils, GCC, Newlib, and GDB it is
now possible to use a common riscv tool chain for the 32-bit and 64-bit
RISC-V.

Update GDB to ce73f310150418a9a1625ab60a527d959096a9e2 Git commit.

Close #3452.
---
 .../5/{rtems-riscv32.bset => rtems-riscv.bset}  |  6 +++---
 rtems/config/5/rtems-riscv64.bset               | 17 -----------------
 ...ce73f310150418a9a1625ab60a527d959096a9e2.cfg | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 20 deletions(-)
 rename rtems/config/5/{rtems-riscv32.bset => rtems-riscv.bset} (69%)
 delete mode 100644 rtems/config/5/rtems-riscv64.bset
 create mode 100644 rtems/config/tools/rtems-gdb-ce73f310150418a9a1625ab60a527d959096a9e2.cfg

diff --git a/rtems/config/5/rtems-riscv32.bset b/rtems/config/5/rtems-riscv.bset
similarity index 69%
rename from rtems/config/5/rtems-riscv32.bset
rename to rtems/config/5/rtems-riscv.bset
index 9013e30..1622fee 100644
--- a/rtems/config/5/rtems-riscv32.bset
+++ b/rtems/config/5/rtems-riscv.bset
@@ -1,8 +1,8 @@
 #
-# RISC-V 32-bit architecture
+# RISC-V architecture
 #
 %define release 1
-%define rtems_arch riscv32
+%define rtems_arch riscv
 %define with_libgomp
 
 %include rtems-base.bset
@@ -12,6 +12,6 @@
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.31.1
 tools/rtems-gcc-62cab5089882f91865e9040672f7932ae8d09db1-newlib-3.0.0.20180720
-tools/rtems-gdb-160d1b3d74593bf42155da24569f54a6e7140f65
+tools/rtems-gdb-ce73f310150418a9a1625ab60a527d959096a9e2
 tools/rtems-tools-5-1
 tools/rtems-kernel-5
diff --git a/rtems/config/5/rtems-riscv64.bset b/rtems/config/5/rtems-riscv64.bset
deleted file mode 100644
index afd61d1..0000000
--- a/rtems/config/5/rtems-riscv64.bset
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# RISC-V 64-bit architecture
-#
-%define release 1
-%define rtems_arch riscv64
-%define with_libgomp
-
-%include rtems-base.bset
-
-5/rtems-autotools
-
-devel/expat-2.1.0-1
-tools/rtems-binutils-2.31.1
-tools/rtems-gcc-62cab5089882f91865e9040672f7932ae8d09db1-newlib-3.0.0.20180720
-tools/rtems-gdb-160d1b3d74593bf42155da24569f54a6e7140f65
-tools/rtems-tools-5-1
-tools/rtems-kernel-5
diff --git a/rtems/config/tools/rtems-gdb-ce73f310150418a9a1625ab60a527d959096a9e2.cfg b/rtems/config/tools/rtems-gdb-ce73f310150418a9a1625ab60a527d959096a9e2.cfg
new file mode 100644
index 0000000..7cf79b2
--- /dev/null
+++ b/rtems/config/tools/rtems-gdb-ce73f310150418a9a1625ab60a527d959096a9e2.cfg
@@ -0,0 +1,14 @@
+#
+# GDB
+#
+
+%include %{_configdir}/checks.cfg
+%include %{_configdir}/base.cfg
+
+%define gdb_version ce73f310150418a9a1625ab60a527d959096a9e2
+%define gdb_external 1
+%define gdb_expand_name sourceware-mirror-binutils-gdb-%{gdb_version}
+%source set gdb --rsb-file=%{gdb_expand_name}.tar.gz https://codeload.github.com/RTEMS/sourceware-mirror-binutils-gdb/tar.gz/%{gdb_version}
+%hash sha512 %{gdb_expand_name}.tar.gz a646330c5b21b978109ec21b3c1b58ef2f54d861086821e6b83c8762aec4c08fb2542f114d34052fe2713efd21bade79133a31b4a5313ab0b650234a8f3ec359
+
+%include %{_configdir}/gdb-7-1.cfg