package/elf2flt: bump version to fix build with Binutils >= 2.32
PATCH v2 1/2 package/elf2flt: bump version to fix build with Binutils >= 2.32
From: Romain Naour <[email protected]>
Binutils added bfd_stdint.h to bfd.h [1], so elf2flt must create a symlink for this header.
Bump the elf2flt version that include the upstream fix [2].
Keep our local patch 0001-ld-elf2flt-behave-properly-when-called-with-a-name-d.patch that was not integrated with the recent project activity [3].
Fixes:
[armv7m-uclibc]
https://gitlab.com/kubu93/toolchains-builder/-/jobs/148356410
[m68k-coldfire-uclibc]
https://gitlab.com/kubu93/toolchains-builder/-/jobs/148356412
[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=2d5d5a8f0a8b5a03454bf168b7fa7024bb1ebbd8
[2] https://github.com/uclinux-dev/elf2flt/commit/429521f695c6f4212d809a141bfa4417b733f395
[3] https://github.com/uclinux-dev/elf2flt/pull/8
---
v2: bump the version instead of adding a new local patch (Arnout).
--- ...002-Makefile-fix-build-with-Binutils-2.31.patch | 34 ---------------------- package/elf2flt/elf2flt.hash | 2 +- package/elf2flt/elf2flt.mk | 2 +- 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 package/elf2flt/0002-Makefile-fix-build-with-Binutils-2.31.patch
package/elf2flt/0002-Makefile-fix-build-with-Binutils-2.31.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From faf1a1646093fbc5ed279bae1c7250c7dfea56f8 Mon Sep 17 00:00:00 2001 -From: Romain Naour <[email protected]> -Date: Tue, 17 Jul 2018 16:36:16 +0200 -Subject: [PATCH] Makefile: fix build with Binutils 2.31 - -Binutils added diagnostics.h to bfd.h [1], so elf2flt must create a symlink -for this header. - -Fixes: -https://gitlab.com/free-electrons/toolchains-builder/-/jobs/82284139 - -[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=95da9854466ada2572b42f5528711a06a2d42db1 - -Signed-off-by: Romain Naour <[email protected]> ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index cfad06c..164e306 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -127,7 +127,7 @@ bfd-headers/.stamp: - rm -rf bfd-headers - mkdir bfd-headers - ln -sf $(BFD_INCLUDE_DIR)/bfd.h bfd-headers/bfd.h -- for f in ansidecl filenames hashtab libiberty symcat; do \ -+ for f in ansidecl diagnostics filenames hashtab libiberty symcat; do \ - ln -sf $(BINUTILS_INCLUDE_DIR)/$$f.h bfd-headers/$$f.h || exit 1; \ - done - ln -sf $(BINUTILS_INCLUDE_DIR)/elf bfd-headers/elf --- -2.7.4 -
package/elf2flt/elf2flt.hash +1 -1
@@ -1,2 +1,2 @@ # Locally calculated -sha256 7713bd1debd24a94b795b7fc698dc97e306e7cbcc1d0580856c79fe70aac9c45 elf2flt-6d80ab6c93409e796f85da404bde84b841231531.tar.gz +sha256 d63baae6fe0d7fcc50a635be151a6f9e1e83dba30568046a869a395c15bf6284 elf2flt-7e33f28df198c46764021ed14408bd262751e148.tar.gz
package/elf2flt/elf2flt.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -ELF2FLT_VERSION = 6d80ab6c93409e796f85da404bde84b841231531 +ELF2FLT_VERSION = 7e33f28df198c46764021ed14408bd262751e148 ELF2FLT_SITE = $(call github,uclinux-dev,elf2flt,$(ELF2FLT_VERSION)) ELF2FLT_LICENSE = GPL-2.0+ ELF2FLT_LICENSE_FILES = LICENSE.TXT
Signature · 1 line
2.14.5
PATCH v2 2/2 package/binutils: add support for Binutils 2.32
From: Romain Naour <[email protected]>
Remove upstream ARC and Xtensa patches.
Keep all other patches from binutils 2.31.1.
See the release note:
https://sourceware.org/ml/binutils/2019-02/msg00010.html
While testing the Binutils 2.32 version bump, the Qemu xtensa defconfig (that was using a kernel 4.16) needed to be updated with a patch [1] from kernel 4.19 otherwise the kernel doesn't boot with Binutils 2.32 [2].
Since then, all Qemu defconfig has been updated by commit [3] to use a kernel 4.19.
All other architecutres has been tested using toolchain-builder [4].
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4119ba211bc4f1bf638f41e50b7a0f329f58aa16
[2] https://www.sourceware.org/ml/binutils/2019-02/msg00015.html
[3] fd8a02fd75d652b85f64c1cd7e9adf1ee2329261
[4] https://gitlab.com/kubu93/toolchains-builder/pipelines/45896638
---
v2: update after Qemu defconfig update.
--- package/binutils/2.32/0001-sh-conf.patch | 48 ++++ .../2.32/0002-poison-system-directories.patch | 306 +++++++++++++++++++++ package/binutils/Config.in.host | 4 + package/binutils/binutils.hash | 1 + 4 files changed, 359 insertions(+) create mode 100644 package/binutils/2.32/0001-sh-conf.patch create mode 100644 package/binutils/2.32/0002-poison-system-directories.patch
package/binutils/2.32/0001-sh-conf.patch new file +48 -0
@@ -0,0 +1,48 @@ +From 98b2acf2bd3a527d114a9f8931083c2617a2daa9 Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH 1/2] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour <[email protected]> +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni <[email protected]> +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 37476459612..66fbc19f9ff 100755 +--- a/configure ++++ b/configure +@@ -3861,7 +3861,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 46501c28826..6c731930884 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1158,7 +1158,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.14.5 +
package/binutils/2.32/0002-poison-system-directories.patch new file +306 -0
306 lines not on this page · raw message
package/binutils/Config.in.host +4 -0
@@ -30,6 +30,9 @@ config BR2_BINUTILS_VERSION_2_30_X config BR2_BINUTILS_VERSION_2_31_X bool "binutils 2.31.1" +config BR2_BINUTILS_VERSION_2_32_X + bool "binutils 2.32" + config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.31)" depends on BR2_arc
@@ -42,6 +45,7 @@ config BR2_BINUTILS_VERSION default "2.29.1" if BR2_BINUTILS_VERSION_2_29_X default "2.30" if BR2_BINUTILS_VERSION_2_30_X default "2.31.1" if BR2_BINUTILS_VERSION_2_31_X + default "2.32" if BR2_BINUTILS_VERSION_2_32_X config BR2_BINUTILS_ENABLE_LTO bool
package/binutils/binutils.hash +1 -0
@@ -3,6 +3,7 @@ sha512 dc5b6872ae01c07c12d38f3bb7ead06effc6da3265ac872e2d9c6104304f89f85f2645b02 sha512 d748d22306477d60d921078804d21943248c23fca0707aac9b016a352c01c75ca69e82624ae37fb0bbd03af3b17088a94f60dfe1a86a7ff82e18ece3c24f0fd0 binutils-2.29.1.tar.xz sha512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839 binutils-2.30.tar.xz sha512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30 binutils-2.31.1.tar.xz +sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz # Locally calculated (fetched from Github) sha512 a96dfcea6064fcd1aac1333ac0d631491bed8b0be9bdcf62f1447909c8f30d2cb8d9323ffeb7c9ad6b326ecddb72e3d28281684e73343189d0a4a37a11aef62f binutils-gdb-arc-2018.09-release.tar.gz
Signature · 1 line
2.14.5
PATCH v2 1/2 package/elf2flt: bump version to fix build with Binutils >= 2.32
In reply to Romain NaourHello Romain,
Quoted 14 lines · On Sun, 10 Mar 2019 11:44:27 +0100 Romain Naour <[email protected]> wrote:
From: Romain Naour <[email protected]>
Binutils added
bfd_stdint.htobfd.h[1], so elf2flt must create a symlink for this header.Bump the elf2flt version that include the upstream fix [2].
Keep our local patch 0001-ld-elf2flt-behave-properly-when-called-with-a-name-d.patch that was not integrated with the recent project activity [3].
Fixes:
[armv7m-uclibc]
https://gitlab.com/kubu93/toolchains-builder/-/jobs/148356410
Quoted 8 lines
[m68k-coldfire-uclibc]
https://gitlab.com/kubu93/toolchains-builder/-/jobs/148356412[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=2d5d5a8f0a8b5a03454bf168b7fa7024bb1ebbd8
[2] https://github.com/uclinux-dev/elf2flt/commit/429521f695c6f4212d809a141bfa4417b733f395
[3] https://github.com/uclinux-dev/elf2flt/pull/8Signed-off-by Romain Naour <[email protected]>
I've applied both patches. I have pinged on the elf2flt pull request as well.
Regarding binutils, we now support 5 versions, which is not good, we should get back to just 3 versions, and move to binutils 2.31 as the default. Do you think you could send patches doing that ?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/2 package/elf2flt: bump version to fix build with Binutils >= 2.32
Hi Thomas,
Le 12/03/2019 ? 22:56, Thomas Petazzoni a ?crit?:
Quoted 22 lines
Hello Romain,
Quoted 17 lines · On Sun, 10 Mar 2019 11:44:27 +0100 Romain Naour <[email protected]> wrote:
From: Romain Naour <[email protected]>
Binutils added
bfd_stdint.htobfd.h[1], so elf2flt must create a symlink for this header.Bump the elf2flt version that include the upstream fix [2].
Keep our local patch 0001-ld-elf2flt-behave-properly-when-called-with-a-name-d.patch that was not integrated with the recent project activity [3].
Fixes:
[armv7m-uclibc]
https://gitlab.com/kubu93/toolchains-builder/-/jobs/148356410[m68k-coldfire-uclibc]
https://gitlab.com/kubu93/toolchains-builder/-/jobs/148356412
Quoted 8 lines
Quoted 5 lines
[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=2d5d5a8f0a8b5a03454bf168b7fa7024bb1ebbd8
[2] https://github.com/uclinux-dev/elf2flt/commit/429521f695c6f4212d809a141bfa4417b733f395
[3] https://github.com/uclinux-dev/elf2flt/pull/8Signed-off-by Romain Naour <[email protected]>I've applied both patches. I have pinged on the elf2flt pull request as well.
Thanks!
Quoted 4 lines
Regarding binutils, we now support 5 versions, which is not good, we should get back to just 3 versions, and move to binutils 2.31 as the default. Do you think you could send patches doing that ?
Done.
We postponed the removal of binutils 2.28 due to ARM thumb bug IIRC [1]. binutils 2.30 is the only remaining one with this bug, I updated the comment in linux/Config.in accordingly.
Now binutils 2.31 and 2.32 are out we can remove binutils 2.28 and 2.29.
[1] https://sourceware.org/bugzilla/show_bug.cgi?id=21458
Best regards,
Romain
Quoted 5 lines
Thanks!
Thomas