Re: [Buildroot] [PATCH v2 3/3] toolchain: remove binutils bug 21464

Hi Arnout,

On 8/17/21 11:11 PM, Arnout Vandecappelle wrote:

On 27/07/2021 00:34, Giulio Benetti wrote:

quoted

This bug has been fixed upstream and backported to buildroot binutils
package. So let's remove it from toolchain/Config.in and from packages
that are affected by it:
- libgeos
- postgis
- protobuf

  It's not clear to me if all the external toolchains that we use also have this
patch already. Basically that boils down to the stable and bleeding edge bootlin
toolchains.

  Well, I'm pretty sure they're not yet updated, since they're still  2020.08-1...

For this patch we have to wait until all or1k patches have been applied 
to Bootlin toolchain and they got rebuilt and bumped.
Then we can apply it since Buildroot will become OpenRisc bug free. But 
this depends on external OpenRisc toolchains that only Bootlin provide

Kind regards
-- 
Giulio Benetti
Benetti Engineering sas

  Regards,
  Arnout

quoted

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Reviewed-by: Maxim Kochetkov <redacted>
---
  package/libgeos/Config.in  | 4 +---
  package/postgis/Config.in  | 4 +---
  package/protobuf/Config.in | 1 -
  toolchain/Config.in        | 6 ------
  4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in
index 86a1cddcf3..124e2da661 100644
--- a/package/libgeos/Config.in
+++ b/package/libgeos/Config.in

@@ -2,7 +2,6 @@ config BR2_PACKAGE_LIBGEOS
  	bool "libgeos"
  	depends on BR2_INSTALL_LIBSTDCPP
  	depends on BR2_USE_WCHAR
-	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464
  	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597
  	help
  	  GEOS (Geometry Engine - Open Source) is a C++ port of the

@@ -13,7 +12,6 @@ config BR2_PACKAGE_LIBGEOS
  
  	  https://trac.osgeo.org/geos
  
-comment "libgeos needs a toolchain w/ C++, wchar, not binutils bug 21464, 27597"
+comment "libgeos needs a toolchain w/ C++, wchar, not binutils bug 27597"
  	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
-		   BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \
  		   BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597

diff --git a/package/postgis/Config.in b/package/postgis/Config.in
index 04705f7e16..78c52ea7b2 100644
--- a/package/postgis/Config.in
+++ b/package/postgis/Config.in

@@ -6,7 +6,6 @@ config BR2_PACKAGE_POSTGIS
  	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj
  	depends on BR2_TOOLCHAIN_HAS_THREADS # proj
  	depends on BR2_USE_WCHAR # libgeos, proj
-	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 # libgeos
  	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos
  	select BR2_PACKAGE_LIBGEOS
  	select BR2_PACKAGE_PROJ

@@ -20,9 +19,8 @@ config BR2_PACKAGE_POSTGIS
  
  	  https://postgis.net/
  
-comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7, not binutils bug 21464, 27597"
+comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7, not binutils bug 27597"
  	depends on !BR2_microblazeel && !BR2_microblazebe # ICE
  	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
  		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
-		BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \
  		BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597

diff --git a/package/protobuf/Config.in b/package/protobuf/Config.in
index 30050950aa..46c820b9cf 100644
--- a/package/protobuf/Config.in
+++ b/package/protobuf/Config.in

@@ -24,7 +24,6 @@ config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
  	default y if BR2_TOOLCHAIN_HAS_ATOMIC
  	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
  	depends on BR2_USE_MMU # fork()
-	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464
  
  config BR2_PACKAGE_PROTOBUF
  	bool "protobuf"

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 8603e2aaff..3598307b20 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in

@@ -71,12 +71,6 @@ source "package/gdb/Config.in.host"
  
  comment "Toolchain Generic Options"
  
-# https://sourceware.org/bugzilla/show_bug.cgi?id=21464
-# Affect toolchains built with binutils 2.31.1, still not fixed.
-config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464
-	bool
-	default y if BR2_or1k
-
  # https://sourceware.org/bugzilla/show_bug.cgi?id=27597
  # Affect toolchains built with binutils 2.36.1, still not fixed.
  config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot