Skip to contentSkip to conversation

package/binutils: disable gprofng support for each known unsupported version

PATCH In review Romain Naour 3 participants 7 messages Jun 11, 2023 – Jul 16, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 package/binutils: disable gprofng support for each known unsupported version

While adding new binutils version, the gprofng support will no longer only available with one specific version.

Instead disable gprofng explicitely for each binutils version that are know too old to support it.

---
 package/binutils/Config.in.host | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/binutils/Config.in.host +3 -1
index 5dd2af2f9c..6e93b65c3e 100644
@@ -39,7 +39,9 @@ config BR2_BINUTILS_VERSION
 
 config BR2_BINUTILS_GPROFNG
 	bool "gprofng support"
-	depends on BR2_BINUTILS_VERSION_2_39_X
+	depends on !BR2_BINUTILS_VERSION_ARC
+	depends on !BR2_BINUTILS_VERSION_2_37_X
+	depends on !BR2_BINUTILS_VERSION_2_38_X
 	help
 	  This option enables support for gprofng, a new profiler.
 
Signature · 6 lines
2.40.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/5 package/{binutils, gdb}: switch to https urls for archives hashes

FTP urls doesn't work anymore with Firefox [1] and Google Chrome [2], switch to https urls.

[1] https://blog.mozilla.org/addons/2020/04/13/what-to-expect-for-the-upcoming-deprecation-of-ftp-in-firefox/
[2] https://chromestatus.com/feature/6246151319715840

---
 package/binutils/binutils.hash | 2 +-
 package/gdb/gdb.hash           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/binutils/binutils.hash +1 -1
index 1a8574de92..5d45813b5a 100644
@@ -1,4 +1,4 @@
-# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum
+# From https://gcc.gnu.org/pub/binutils/releases/sha512.sum
 sha512  5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7  binutils-2.37.tar.xz
 sha512  8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
 sha512  68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
package/gdb/gdb.hash +1 -1
index 04c7d02d2f..36e2685a25 100644
@@ -1,4 +1,4 @@
-# From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum
+# From https://gcc.gnu.org/pub/gdb/releases/sha512.sum
 sha512  3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa  gdb-10.2.tar.xz
 sha512  07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127  gdb-11.2.tar.xz
 sha512  425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d  gdb-12.1.tar.xz
Signature · 6 lines
2.40.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Re: [Buildroot] [PATCH 2/5] package/{binutils, gdb}: switch to https urls for archives hashes

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Romain" == Romain Naour <[email protected]> writes:

FTP urls doesn't work anymore with Firefox [1] and Google Chrome [2], switch to https urls.

[1] https://blog.mozilla.org/addons/2020/04/13/what-to-expect-for-the-upcoming-deprecation-of-ftp-in-firefox/
[2] https://chromestatus.com/feature/6246151319715840

Committed to 2023.02.x and 2023.05.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw

PATCH 3/5 package/binutils: add support for version 2.40

In reply to Romain Naour

See:
https://sourceware.org/pipermail/binutils/2023-January/125671.html

Disable zstd support to avoid adding a new dependency.

Add Upstream tag on each binutils patches:
0001-sh-conf.patch: Buildroot specific since we are carrying this patch for years. 0002-poison-system-directories.patch: Add the Buildroot Upstream tag

Remove 0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch since it was rejected by upstream [1] and actually only needed for binutils < 2.37. Binutils 2.37 replaced AC_PROG_CC with AC_PROG_CC_C99 in top level configure file [2].

[1] https://sourceware.org/pipermail/binutils/2021-June/116907.html
[2] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=a8d6316b67d52eaa1b7b311084ddff71a66f7cc0

Runtime tested:
https://gitlab.com/kubu93/buildroot/-/pipelines/895618463

Cc Giulio Benetti <[email protected]>
---
 package/binutils/2.40/0001-sh-conf.patch      |  50 +++
 .../2.40/0002-poison-system-directories.patch | 309 ++++++++++++++++++
 package/binutils/Config.in.host               |   4 +
 package/binutils/binutils.hash                |   1 +
 package/binutils/binutils.mk                  |   6 +-
 5 files changed, 368 insertions(+), 2 deletions(-)
 create mode 100644 package/binutils/2.40/0001-sh-conf.patch
 create mode 100644 package/binutils/2.40/0002-poison-system-directories.patch
package/binutils/2.40/0001-sh-conf.patch new file +50 -0
new file mode 100644
index 0000000000..ffa23a88a7
@@ -0,0 +1,50 @@
+From 87551ade276aa0db86c4567b3ac219c4f979b538 Mon Sep 17 00:00:00 2001
+From: Romain Naour <[email protected]>
+Date: Fri, 25 Dec 2015 11:38:13 +0100
+Subject: [PATCH] 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).
+
+Upstream: N/A [Buildroot specific]
+
+[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 417fc5a970c..fa8ba331796 100755
+--- a/configure
++++ b/configure
+@@ -4067,7 +4067,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 3a1eb0357e5..d700c14ddf5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1300,7 +1300,7 @@ case "${target}" in
+   nvptx*-*-*)
+     noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
+     ;;
+-  sh-*-*)
++  sh*-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+-- 
+2.40.1
+
package/binutils/2.40/0002-poison-system-directories.patch new file +309 -0

309 lines not on this page · raw message

package/binutils/Config.in.host +4 -0
index 6e93b65c3e..fe1755683c 100644
@@ -24,6 +24,9 @@ config BR2_BINUTILS_VERSION_2_38_X
 config BR2_BINUTILS_VERSION_2_39_X
 	bool "binutils 2.39"
 
+config BR2_BINUTILS_VERSION_2_40_X
+	bool "binutils 2.40"
+
 config BR2_BINUTILS_VERSION_ARC
 	bool "binutils arc (2.34.50)"
 	depends on BR2_arc
@@ -36,6 +39,7 @@ config BR2_BINUTILS_VERSION
 	default "2.37"		if BR2_BINUTILS_VERSION_2_37_X
 	default "2.38"		if BR2_BINUTILS_VERSION_2_38_X
 	default "2.39"		if BR2_BINUTILS_VERSION_2_39_X
+	default "2.40"		if BR2_BINUTILS_VERSION_2_40_X
 
 config BR2_BINUTILS_GPROFNG
 	bool "gprofng support"
package/binutils/binutils.hash +1 -0
index 5d45813b5a..e831d31b8a 100644
@@ -2,6 +2,7 @@
 sha512  5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7  binutils-2.37.tar.xz
 sha512  8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
 sha512  68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
+sha512  a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
 
 # Locally calculated (fetched from Github)
 sha512  76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238  binutils-gdb-arc-2020.09-release.tar.gz
package/binutils/binutils.mk +4 -2
index 1ef7ee57d2..e34dd79f6f 100644
@@ -54,7 +54,8 @@ BINUTILS_CONF_OPTS = \
 	--with-system-zlib \
 	--disable-gprofng \
 	$(BINUTILS_DISABLE_GDB_CONF_OPTS) \
-	$(BINUTILS_EXTRA_CONFIG_OPTIONS)
+	$(BINUTILS_EXTRA_CONFIG_OPTIONS) \
+	--without-zstd
 
 ifeq ($(BR2_STATIC_LIBS),y)
 BINUTILS_CONF_OPTS += --disable-plugins
@@ -90,7 +91,8 @@ HOST_BINUTILS_CONF_OPTS = \
 	--enable-plugins \
 	--enable-lto \
 	$(BINUTILS_DISABLE_GDB_CONF_OPTS) \
-	$(BINUTILS_EXTRA_CONFIG_OPTIONS)
+	$(BINUTILS_EXTRA_CONFIG_OPTIONS) \
+	--without-zstd
 
 ifeq ($(BR2_BINUTILS_GPROFNG),y)
 HOST_BINUTILS_DEPENDENCIES += host-bison
Signature · 6 lines
2.40.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw

PATCH 4/5 package/binutils: switch to 2.39.x as the default version

In reply to Romain Naour

Now that 2.40 has been released, let's use 2.39.x as the default binutils version.

---
 package/binutils/Config.in.host | 2 +-
 package/binutils/binutils.mk    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/binutils/Config.in.host +1 -1
index fe1755683c..a1800e49e2 100644
@@ -7,7 +7,7 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI
 
 choice
 	prompt "Binutils Version"
-	default BR2_BINUTILS_VERSION_2_38_X if !BR2_arc
+	default BR2_BINUTILS_VERSION_2_39_X if !BR2_arc
 	default BR2_BINUTILS_VERSION_ARC if BR2_arc
 	help
 	  Select the version of binutils you wish to use.
package/binutils/binutils.mk +1 -1
index e34dd79f6f..0dd8526b26 100644
@@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),)
 ifeq ($(BR2_arc),y)
 BINUTILS_VERSION = arc-2020.09-release
 else
-BINUTILS_VERSION = 2.38
+BINUTILS_VERSION = 2.39
 endif
 endif # BINUTILS_VERSION
 
Signature · 6 lines
2.40.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#5 lore raw

PATCH 5/5 package/binutils: drop 2.37.x series

In reply to Romain Naour

Now that 2.40.x has been added, that 2.39.x is the default version, drop support for 2.37.x.

---
 .checkpackageignore                           |   7 -
 Config.in.legacy                              |   8 +
 package/binutils/2.37/0001-sh-conf.patch      |  48 ---
 .../2.37/0002-poison-system-directories.patch | 306 ------------------
 ...or1k-fix-building-with-gcc-version-5.patch |  50 ---
 ...tive-relocation-against-dynamic-on-P.patch |  59 ----
 ...K_GOT16-signed-overflow-by-using-spe.patch |  75 -----
 ...le-descriptor-if-there-is-no-archive.patch | 236 --------------
 ...OT32-relocations-against-ABS-symbols.patch |  47 ---
 package/binutils/Config.in.host               |   8 -
 package/binutils/binutils.hash                |   1 -
 11 files changed, 8 insertions(+), 837 deletions(-)
 delete mode 100644 package/binutils/2.37/0001-sh-conf.patch
 delete mode 100644 package/binutils/2.37/0002-poison-system-directories.patch
 delete mode 100644 package/binutils/2.37/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch
 delete mode 100644 package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch
 delete mode 100644 package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch
 delete mode 100644 package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch
 delete mode 100644 package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch
.checkpackageignore +0 -7
index c2316d1d4e..1cbf664bcf 100644
@@ -214,13 +214,6 @@ package/berkeleydb/0001-cwd-db_config.patch Upstream
 package/berkeleydb/0002-atomic_compare_exchange.patch Upstream
 package/bind/0001-cross.patch Upstream
 package/bind/S81named Indent Shellcheck Variables
-package/binutils/2.37/0001-sh-conf.patch Upstream
-package/binutils/2.37/0002-poison-system-directories.patch Upstream
-package/binutils/2.37/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch Upstream
-package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch Upstream
-package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch Upstream
-package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch Upstream
-package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch Upstream
 package/binutils/2.38/0001-sh-conf.patch Upstream
 package/binutils/2.38/0002-poison-system-directories.patch Upstream
 package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch Upstream
Config.in.legacy +8 -0
index ac2e302a6b..d3a67aba83 100644
@@ -144,6 +144,14 @@ endif
 
 ###############################################################################
 
+comment "Legacy options removed in 2023.08"
+
+config BR2_BINUTILS_VERSION_2_37_X
+	bool "binutils 2.37.x has been removed"
+	select BR2_LEGACY
+	help
+	  binutils 2.37 has been removed, use a newer version.
+
 comment "Legacy options removed in 2023.05"
 
 config BR2_KERNEL_HEADERS_6_2
package/binutils/2.37/0001-sh-conf.patch deleted +0 -48

48 lines not on this page · raw message

package/binutils/2.37/0002-poison-system-directories.patch deleted +0 -306

306 lines not on this page · raw message

package/binutils/2.37/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch deleted +0 -50

50 lines not on this page · raw message

package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch deleted +0 -59

59 lines not on this page · raw message

package/binutils/2.37/0005-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch deleted +0 -75

75 lines not on this page · raw message

package/binutils/2.37/0006-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch deleted +0 -236

236 lines not on this page · raw message

package/binutils/2.37/0007-i386-Allow-GOT32-relocations-against-ABS-symbols.patch deleted +0 -47

47 lines not on this page · raw message

package/binutils/Config.in.host +0 -8
index a1800e49e2..de5ca866e5 100644
@@ -12,12 +12,6 @@ choice
 	help
 	  Select the version of binutils you wish to use.
 
-config BR2_BINUTILS_VERSION_2_37_X
-	bool "binutils 2.37"
-	# AVX512FP16 instructions were not supported before binutils
-	# 2.38
-	depends on !BR2_X86_CPU_HAS_AVX512
-
 config BR2_BINUTILS_VERSION_2_38_X
 	bool "binutils 2.38"
 
@@ -36,7 +30,6 @@ endchoice
 config BR2_BINUTILS_VERSION
 	string
 	default "arc-2020.09-release"	if BR2_BINUTILS_VERSION_ARC
-	default "2.37"		if BR2_BINUTILS_VERSION_2_37_X
 	default "2.38"		if BR2_BINUTILS_VERSION_2_38_X
 	default "2.39"		if BR2_BINUTILS_VERSION_2_39_X
 	default "2.40"		if BR2_BINUTILS_VERSION_2_40_X
@@ -44,7 +37,6 @@ config BR2_BINUTILS_VERSION
 config BR2_BINUTILS_GPROFNG
 	bool "gprofng support"
 	depends on !BR2_BINUTILS_VERSION_ARC
-	depends on !BR2_BINUTILS_VERSION_2_37_X
 	depends on !BR2_BINUTILS_VERSION_2_38_X
 	help
 	  This option enables support for gprofng, a new profiler.
package/binutils/binutils.hash +0 -1
index e831d31b8a..1a24c2f4bd 100644
@@ -1,5 +1,4 @@
 # From https://gcc.gnu.org/pub/binutils/releases/sha512.sum
-sha512  5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7  binutils-2.37.tar.xz
 sha512  8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
 sha512  68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
 sha512  a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
Signature · 7 lines
2.40.1


_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#6 lore raw
In reply to Romain Naour
Quoted 10 lines · On Sun, 11 Jun 2023 15:16:27 +0200 Romain Naour <[email protected]> wrote:

While adding new binutils version, the gprofng support will no longer only available with one specific version.

Instead disable gprofng explicitely for each binutils version that are know too old to support it.

---
 package/binutils/Config.in.host | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Series applied, thanks!

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot