From d7fd32078a45c1fc7ceed58528e0c6a193383104 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 26 Jan 2018 06:46:29 +0000 Subject: 5: Update to Newlib 3.0.0 and GCC 7.3 Epiphany target can now use the default build set. The or1k and m32c targets still need special GCC versions. --- rtems/config/5/rtems-default.bset | 2 +- rtems/config/5/rtems-epiphany.bset | 11 ++--------- rtems/config/5/rtems-m32c.bset | 2 +- rtems/config/5/rtems-or1k.bset | 2 +- rtems/config/5/rtems-riscv32.bset | 2 +- rtems/config/5/rtems-riscv64.bset | 2 +- rtems/config/tools/rtems-gcc-m32c.cfg | 7 +++++++ rtems/config/tools/rtems-gcc-or1k.cfg | 7 +++++++ rtems/config/tools/rtems-gcc.cfg | 29 +++++++++++++++++++++++++++++ 9 files changed, 50 insertions(+), 14 deletions(-) create mode 100644 rtems/config/tools/rtems-gcc-m32c.cfg create mode 100644 rtems/config/tools/rtems-gcc-or1k.cfg create mode 100644 rtems/config/tools/rtems-gcc.cfg diff --git a/rtems/config/5/rtems-default.bset b/rtems/config/5/rtems-default.bset index 6f70b7c..1056e2c 100644 --- a/rtems/config/5/rtems-default.bset +++ b/rtems/config/5/rtems-default.bset @@ -11,7 +11,7 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.29-1 -tools/rtems-gcc-7.2.0-newlib-2.5.0.20170922-1 +tools/rtems-gcc tools/rtems-gdb-8.0.1-1 tools/rtems-tools-5-1 tools/rtems-kernel-5 diff --git a/rtems/config/5/rtems-epiphany.bset b/rtems/config/5/rtems-epiphany.bset index 181c158..940e1d4 100644 --- a/rtems/config/5/rtems-epiphany.bset +++ b/rtems/config/5/rtems-epiphany.bset @@ -9,25 +9,18 @@ # # Get GNU tools from external repositories. # -%define binutils_external 1 -%define gcc_external 1 %define gdb_external 1 # # Expanded names of the GNU tools # -%define binutils_expand_name epiphany-binutils-gdb-b6c483b4a98424731e6e44558cb4b9863751fb1b -%define gcc_expand_name epiphany-gcc-f7051762470c42ce7f01baa7edeb113d51c7dd72 %define gdb_expand_name epiphany-binutils-gdb-f05996c7c42e6b2781946acbab153a481ce3fd0b # # Fetch GNU tools from external repos (temporarly). # -%source set binutils https://github.com/adapteva/epiphany-binutils-gdb/archive/b6c483b4a98424731e6e44558cb4b9863751fb1b.zip -%source set gcc https://github.com/adapteva/epiphany-gcc/archive/f7051762470c42ce7f01baa7edeb113d51c7dd72.zip %source set gdb https://github.com/adapteva/epiphany-binutils-gdb/archive/f05996c7c42e6b2781946acbab153a481ce3fd0b.zip -%hash sha512 f7051762470c42ce7f01baa7edeb113d51c7dd72.zip ae26ec61f90978dec724234a6c89d63a0a1437c0d9dcc2d81462199e96daa557feef0f3655b3782ea4be0b90957e677ba835e6c22166ff80e9e322307450ef3e %hash sha256 f05996c7c42e6b2781946acbab153a481ce3fd0b.zip 2b2034fd12f2fd5108205ade66400c175ede8cef8141a38ae03fc78bf2d65325 # @@ -40,7 +33,7 @@ # 5/rtems-autotools devel/expat-2.1.0-1 -tools/rtems-binutils-2.23.1-1 -tools/rtems-gcc-4.9.2-newlib-2.5.0.20170922-1.cfg +tools/rtems-binutils-2.29-1 +tools/rtems-gcc tools/rtems-gdb-7.8.1-1 tools/rtems-tools-5-1 diff --git a/rtems/config/5/rtems-m32c.bset b/rtems/config/5/rtems-m32c.bset index 34667fd..9141403 100644 --- a/rtems/config/5/rtems-m32c.bset +++ b/rtems/config/5/rtems-m32c.bset @@ -41,6 +41,6 @@ 5/rtems-autotools devel/expat-2.1.0-1 tools/rtems-binutils-2.29-1 -tools/rtems-gcc-4.8.3-newlib-2.5.0.20170922-1 +tools/rtems-gcc-m32c tools/rtems-gdb-8.0.1-1 tools/rtems-tools-5-1 diff --git a/rtems/config/5/rtems-or1k.bset b/rtems/config/5/rtems-or1k.bset index b4cbdec..8b20380 100644 --- a/rtems/config/5/rtems-or1k.bset +++ b/rtems/config/5/rtems-or1k.bset @@ -33,6 +33,6 @@ 5/rtems-autotools devel/expat-2.1.0-1 tools/rtems-binutils-2.29-1 -tools/rtems-gcc-4.9.3-newlib-2.5.0.20170922-1 +tools/rtems-gcc-or1k tools/rtems-tools-5-1 tools/rtems-gdb-7.11-2 diff --git a/rtems/config/5/rtems-riscv32.bset b/rtems/config/5/rtems-riscv32.bset index 3c11da1..6ec33e8 100644 --- a/rtems/config/5/rtems-riscv32.bset +++ b/rtems/config/5/rtems-riscv32.bset @@ -11,6 +11,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.29-1 -tools/rtems-gcc-7.2.0-newlib-2.5.0.20170922-1 +tools/rtems-gcc 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 index c599481..57176fe 100644 --- a/rtems/config/5/rtems-riscv64.bset +++ b/rtems/config/5/rtems-riscv64.bset @@ -11,6 +11,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.29-1 -tools/rtems-gcc-7.2.0-newlib-2.5.0.20170922-1 +tools/rtems-gcc tools/rtems-tools-5-1 tools/rtems-kernel-5 diff --git a/rtems/config/tools/rtems-gcc-m32c.cfg b/rtems/config/tools/rtems-gcc-m32c.cfg new file mode 100644 index 0000000..2af4509 --- /dev/null +++ b/rtems/config/tools/rtems-gcc-m32c.cfg @@ -0,0 +1,7 @@ +%define gcc_version 4.8.3 +%define newlib_version 3.0.0 + +%hash sha512 gcc-4.8.3.tar.bz2 2b40d231e8445f9c1654137df509f09ce1187b475138ca7f648f710d922a1718f740b2d8a37c26e16b5e27900c60358be98229ae884a6f1f70e9df44ad24d02b +%hash sha512 newlib-3.0.0.tar.gz d4730ce9a4fc4e62052e89d20d4a3855a103b3d1a2818e94c7a68626db285aa8db8e56a684103731916bfba3e581db88e3a93264034ea0f2880ee8976283c04f + +%include tools/rtems-gcc-4.8-newlib-2.2.0-1.cfg diff --git a/rtems/config/tools/rtems-gcc-or1k.cfg b/rtems/config/tools/rtems-gcc-or1k.cfg new file mode 100644 index 0000000..902e471 --- /dev/null +++ b/rtems/config/tools/rtems-gcc-or1k.cfg @@ -0,0 +1,7 @@ +%define gcc_version 4.9.3 +%define newlib_version 3.0.0 + +%hash sha512 gcc-4.9.3.tar.bz2 9ac57377a6975fc7adac704ec81355262b9f537def6955576753b87715470a20ee6a2a3144a79cc8fcba3443f7b44c7337d79d704b522d053f54f79aa6b442df +%hash sha512 newlib-3.0.0.tar.gz d4730ce9a4fc4e62052e89d20d4a3855a103b3d1a2818e94c7a68626db285aa8db8e56a684103731916bfba3e581db88e3a93264034ea0f2880ee8976283c04f + +%include tools/rtems-gcc-4.9-newlib-2.2.0-1.cfg diff --git a/rtems/config/tools/rtems-gcc.cfg b/rtems/config/tools/rtems-gcc.cfg new file mode 100644 index 0000000..4376a08 --- /dev/null +++ b/rtems/config/tools/rtems-gcc.cfg @@ -0,0 +1,29 @@ +%include %{_configdir}/checks.cfg +%include %{_configdir}/base.cfg + +%define gcc_version 7.3.0 +%define newlib_version 3.0.0 +%define mpfr_version 3.1.4 +%define mpc_version 1.0.3 +%define gmp_version 6.1.0 + +# +# FreeBSD specific fix for MIPS +# +%if %{_build_os} == freebsd || %{_build_os} == darwin + %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.3.0.tar.xz ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4 +%hash sha512 newlib-3.0.0.tar.gz d4730ce9a4fc4e62052e89d20d4a3855a103b3d1a2818e94c7a68626db285aa8db8e56a684103731916bfba3e581db88e3a93264034ea0f2880ee8976283c04f +%hash sha512 mpfr-3.1.4.tar.bz2 51066066ff2c12ed2198605ecf68846b0c96b548adafa5b80e0c786d0df488411a5e8973358fce7192dc977ad4e68414cf14500e3c39746de62465eb145bb819 +%hash sha512 mpc-1.0.3.tar.gz 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43 +%hash sha512 gmp-6.1.0.tar.bz2 3c82aeab9c1596d4da8afac2eec38e429e84f3211e1a572cf8fd2b546493c44c039b922a1133eaaa48bd7f3e11dbe795a384e21ed95cbe3ecc58d7ac02246117 + + +%define with_threads 1 +%define with_plugin 0 +%define with_iconv 1 + +%include %{_configdir}/gcc-7.2-1.cfg -- cgit v1.2.3