[PATCH 2/2] Fixes to get a clean build with gcc-7.1.0/binutils-2.28.

Chris Johns chrisj at rtems.org
Wed May 31 10:26:04 UTC 2017


- SH has not been moved to gcc-7.1.0 because of an ICE on FreebSD.
- PowerPC is still on binutils-2.27.
---
 rtems/config/4.12/rtems-default.bset                   |  2 +-
 rtems/config/4.12/rtems-powerpc.bset                   | 18 +++++++++++++++++-
 rtems/config/4.12/rtems-sh.bset                        | 18 +++++++++++++++++-
 .../tools/rtems-gcc-7.1.0-newlib-2.5.0.20170323-1.cfg  | 17 ++++++++++++-----
 4 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/rtems/config/4.12/rtems-default.bset b/rtems/config/4.12/rtems-default.bset
index b12d5ab..1c54de7 100644
--- a/rtems/config/4.12/rtems-default.bset
+++ b/rtems/config/4.12/rtems-default.bset
@@ -10,7 +10,7 @@
 4.12/rtems-autotools
 
 devel/expat-2.1.0-1
-tools/rtems-binutils-2.26-1
+tools/rtems-binutils-2.28-1
 tools/rtems-gcc-7.1.0-newlib-2.5.0.20170323-1
 tools/rtems-gdb-7.12-1
 tools/rtems-tools-4.12-1
diff --git a/rtems/config/4.12/rtems-powerpc.bset b/rtems/config/4.12/rtems-powerpc.bset
index 1000cff..b5b38c7 100644
--- a/rtems/config/4.12/rtems-powerpc.bset
+++ b/rtems/config/4.12/rtems-powerpc.bset
@@ -1,4 +1,20 @@
+#
+# KSH architecture
+#
 %define release 1
 %define rtems_arch powerpc
 %define with_libgomp
-%include 4.12/rtems-default.bset
+
+#
+# The RTEMS base defines
+#
+%include rtems-base.bset
+
+4.12/rtems-autotools
+
+devel/expat-2.1.0-1
+tools/rtems-binutils-2.27-1
+tools/rtems-gcc-7.1.0-newlib-2.5.0.20170323-1
+tools/rtems-gdb-7.12-1
+tools/rtems-tools-4.12-1
+tools/rtems-kernel-4.12
diff --git a/rtems/config/4.12/rtems-sh.bset b/rtems/config/4.12/rtems-sh.bset
index 87a581b..8526bf4 100644
--- a/rtems/config/4.12/rtems-sh.bset
+++ b/rtems/config/4.12/rtems-sh.bset
@@ -1,3 +1,19 @@
+#
+# KSH architecture
+#
 %define release 1
 %define rtems_arch sh
-%include 4.12/rtems-default.bset
+
+#
+# The RTEMS base defines
+#
+%include rtems-base.bset
+
+4.12/rtems-autotools
+
+devel/expat-2.1.0-1
+tools/rtems-binutils-2.28-1
+tools/rtems-gcc-6.3.0-newlib-2.5.0.20170323-1
+tools/rtems-gdb-7.12-1
+tools/rtems-tools-4.12-1
+tools/rtems-kernel-4.12
diff --git a/rtems/config/tools/rtems-gcc-7.1.0-newlib-2.5.0.20170323-1.cfg b/rtems/config/tools/rtems-gcc-7.1.0-newlib-2.5.0.20170323-1.cfg
index b79dd12..ffadf0b 100644
--- a/rtems/config/tools/rtems-gcc-7.1.0-newlib-2.5.0.20170323-1.cfg
+++ b/rtems/config/tools/rtems-gcc-7.1.0-newlib-2.5.0.20170323-1.cfg
@@ -1,3 +1,7 @@
+#
+# GCC 7.2
+#
+
 %include %{_configdir}/checks.cfg
 %include %{_configdir}/base.cfg
 
@@ -5,17 +9,20 @@
 %define newlib_version 2.5.0.20170323
 %define mpfr_version   3.1.5
 %define mpc_version    1.0.3
-# %define gmp_version    6.1.2
-# %define mpfr_version   2.4.2
-#%define mpc_version    0.8.1
 %define gmp_version    4.3.2
 
+#
+# FreeBSD specific fix for MIPS
+#
+%if %{_build_os} == freebsd
+ %patch add gcc --rsb-file=freebsd-libgcc-sed-fix.patch -p0 https://gcc.gnu.org/bugzilla/attachment.cgi?id=41380
+ %hash  sha256 freebsd-libgcc-sed-fix.patch 8a11bd619c2e55466688e328da00b387d02395c1e8ff4a99225152387a1e60a4
+%endif
+
 %hash sha512 gcc-7.1.0.tar.bz2 b5d952be9a10f0e0926bb2868877d10544039d6d2f35ba0a08f51231dd622a007650764a03e173194701467547789ad7d2d9cbc10adcdf118d619cdedbd14aec
 %hash sha512 newlib-2.5.0.20170323.tar.gz 323992603f994e82d1b8117da39ce08f8a6584330606e2d053ccefc62fce5682ac47f983aa3bc526c85bcabbcfce85cf607b08f87c5435d00cec6727c006f6b7
 %hash sha512 mpfr-3.1.5.tar.bz2 ebf94f49e1f850db6304eec8bf3cbf592b9fb06b743e0a99a660edae3c086aa47cdd089ea958fd4631ff02a444ec034b5e45d7e9701704d74c2e2d49021e49a7
 %hash sha512 mpc-1.0.3.tar.gz 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43
-# %hash sha512 gmp-6.1.2.tar.bz2 268db88447174617f5746d9a6ba2b105940cc1a5e73155eb23b6eedf55f8e7724eda05d161b2de19aca9e794956d226ba9ed6f23124c7c82f7e1872e32b003cf
-# %hash sha512 mpfr-2.4.2.tar.bz2 c004b3dbf86c04960e4a1f8db37a409a7cc4cb76135e76e98dcc5ad93aaa8deb62334ee13ff84447a7c12a5e8cb57f25c62ac908c24920f1fb1a38d79d4a4c5e
 %hash sha512 mpc-0.8.1.tar.gz 14cb9ae3d33caed24d5ae648eed28b2e00ad047a8baeff25981129af88245b4def2948573d7a00d65c5bd34e53524aa6a7351b76703c9f888b41830c1a1daae2
 %hash sha512 gmp-4.3.2.tar.bz2 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf
 
-- 
2.12.1



More information about the devel mailing list