From db3d470c3126e9cddbd301d70876f78a16789f69 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Thu, 8 Sep 2022 14:46:54 +1000
Subject: sb/getsources: Fixes to configurations

Updates #4715
---
 bare/config/devel/binutils-2.22-1.cfg        | 17 ++++++++++
 bare/config/devel/gcc-4.6-newlib-1.20-1.cfg  | 30 ++++++++++++++++++
 bare/config/devel/gcc-4.8.2-newlib-cvs-1.cfg | 47 ++++++++++++++++++++++++++++
 bare/config/gnu-tools-4.6.bset               |  8 ++---
 bare/config/gnu-tools-4.8.2.bset             |  2 +-
 rtems/config/5/rtems-tier-4.bset             |  2 +-
 6 files changed, 100 insertions(+), 6 deletions(-)
 create mode 100644 bare/config/devel/binutils-2.22-1.cfg
 create mode 100644 bare/config/devel/gcc-4.6-newlib-1.20-1.cfg
 create mode 100644 bare/config/devel/gcc-4.8.2-newlib-cvs-1.cfg

diff --git a/bare/config/devel/binutils-2.22-1.cfg b/bare/config/devel/binutils-2.22-1.cfg
new file mode 100644
index 0000000..e585483
--- /dev/null
+++ b/bare/config/devel/binutils-2.22-1.cfg
@@ -0,0 +1,17 @@
+#
+# Binutils 2.22.
+#
+
+%if %{release} == %{nil}
+%define release 1
+%endif
+
+%include %{_configdir}/checks.cfg
+%include %{_configdir}/base.cfg
+
+%define binutils_version 2.22
+
+#
+# The binutils build instructions. We use 2.xx Release 1.
+#
+%include %{_configdir}/binutils-2-1.cfg
diff --git a/bare/config/devel/gcc-4.6-newlib-1.20-1.cfg b/bare/config/devel/gcc-4.6-newlib-1.20-1.cfg
new file mode 100644
index 0000000..659752f
--- /dev/null
+++ b/bare/config/devel/gcc-4.6-newlib-1.20-1.cfg
@@ -0,0 +1,30 @@
+#
+# GCC 2.6, Newlib 1.20
+#
+
+%if %{release} == %{nil}
+%define release 1
+%endif
+
+%include %{_configdir}/checks.cfg
+%include %{_configdir}/base.cfg
+
+%define gcc_version    4.6.3
+%define newlib_version 1.20.0
+%define mpfr_version   3.0.1
+%define mpc_version    0.8.2
+%define gmp_version    5.0.5
+
+%define mpc_url  https://www.multiprecision.org/downloads
+%define gmp_url  https://ftp.gnu.org/gnu/gmp
+%define mpfr_url https://ftp.gnu.org/gnu/mpfr
+
+#
+# Project custom message
+#
+%define gcc_version_message GCC %{release}-RSB(%{_sbgit_id}),gcc-%{gcc_version}/newlib-%{newlib_version}
+
+#
+# The gcc/newlib build instructions. We use 4.6 Release 1.
+#
+%include %{_configdir}/gcc-4.6-1.cfg
diff --git a/bare/config/devel/gcc-4.8.2-newlib-cvs-1.cfg b/bare/config/devel/gcc-4.8.2-newlib-cvs-1.cfg
new file mode 100644
index 0000000..7312673
--- /dev/null
+++ b/bare/config/devel/gcc-4.8.2-newlib-cvs-1.cfg
@@ -0,0 +1,47 @@
+#
+# GCC 4.8.2., Newlib CVS
+#
+
+%include %{_configdir}/bare-config.cfg
+
+%include %{_configdir}/checks.cfg
+%include %{_configdir}/base.cfg
+%include %{_configdir}/versions.cfg
+
+%define gcc_version    4.8.2
+%define newlib_version 1-Nov-2013
+%define mpfr_version   3.0.1
+%define mpc_version    0.8.2
+%define gmp_version    5.0.5
+
+#
+# Project custom message
+#
+%define gcc_version_message RSB-%{_sbgit_id})-%{release},gcc-%{gcc_version}/newlib-%{newlib_version}
+
+%define with_threads 0
+%define with_plugin  0
+
+%ifn %{defined with_iconv}
+%define with_iconv 1
+%endif
+
+# Incompatible with Texinfo 5
+%if %{__makeinfo_ver} >= 5.0
+ %error Incomaptible version of makeinfo found!
+%endif
+
+#
+# Newlib is from CVS.
+#
+%source set newlib cvs://pserver:anoncvs@sourceware.org/cvs/src?module=newlib?src-prefix=src?date=%{newlib_version}?reset
+
+#
+# Joel's stack_t patch.
+#
+%patch add newlib -p0 %{bare_newlib_patches}/newlib-sys-signal-20130532.diff
+
+#
+# The gcc/newlib build instructions. We use 4.8 Release 1.
+#
+%include %{_configdir}/gcc-4.8-1.cfg
diff --git a/bare/config/gnu-tools-4.6.bset b/bare/config/gnu-tools-4.6.bset
index fa3ced8..6317d10 100644
--- a/bare/config/gnu-tools-4.6.bset
+++ b/bare/config/gnu-tools-4.6.bset
@@ -19,7 +19,7 @@ package: gnu-tool-%{_target}-%{_host}-%{release}
 #
 # Tool configuration.
 #
-binutils-2.22-1
-gcc-4.6-newlib-1.20-1
-expat-2.1.0-1
-gdb-7.5-1
+devel/binutils-2.22-1
+devel/gcc-4.6-newlib-1.20-1
+devel/expat-2.1.0-1
+devel/gdb-7.7-1
diff --git a/bare/config/gnu-tools-4.8.2.bset b/bare/config/gnu-tools-4.8.2.bset
index 9dd4b8a..9a75c35 100644
--- a/bare/config/gnu-tools-4.8.2.bset
+++ b/bare/config/gnu-tools-4.8.2.bset
@@ -22,4 +22,4 @@ package: gnu-tools-%{_target}-%{_host}-%{release}
 devel/expat-2.1.0-1
 devel/binutils-2.23.2-1
 devel/gcc-4.8.2-newlib-cvs-1
-devel/gdb-7.6.1-1
+devel/gdb-7.7-1
diff --git a/rtems/config/5/rtems-tier-4.bset b/rtems/config/5/rtems-tier-4.bset
index 2820fda..24d392d 100644
--- a/rtems/config/5/rtems-tier-4.bset
+++ b/rtems/config/5/rtems-tier-4.bset
@@ -6,5 +6,5 @@
 #
 5/rtems-epiphany
 5/rtems-microblaze
-5/rtems-riscv32
+5/rtems-riscv
 5/rtems-x86_64
-- 
cgit v1.2.3