Skip to contentSkip to conversation

package/binutils: add binutils 2.33.1

PATCH New Romain Naour 2 participants 6 messages Nov 30, 2019 – Dec 2, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/binutils: add binutils 2.33.1

Keep sh-conf and poison-system-directories patches. Remove xtensa patches already in this version [1] [2] [3].

Revert an upstream patch since it prevent booting a sh4 system under Qemu as reported on the Binutils mailing list [5] [6]. This commit is not related to sh4, it's weird that it is the only affected architecture.

[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=2487ef07c28b961c6e2b8c51161f88f93b181d07
[2] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=403b0b61f6d4358aee8493cb1d11814e368942c9
[3] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=548791769dc737f05cb12e5ee4190b7e853beac9
[4] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e
[5] https://sourceware.org/ml/binutils/2019-10/msg00105.html
[6] https://sourceware.org/ml/binutils/2019-11/msg00407.html

See:
https://www.sourceware.org/ml/binutils/2019-10/msg00103.html

---
 package/binutils/2.33.1/0001-sh-conf.patch    |  48 +++
 .../0002-poison-system-directories.patch      | 306 ++++++++++++++++++
 ...311-FAIL-S-records-with-constructors.patch | 148 +++++++++
 package/binutils/Config.in.host               |   5 +
 package/binutils/binutils.hash                |   1 +
 5 files changed, 508 insertions(+)
 create mode 100644 package/binutils/2.33.1/0001-sh-conf.patch
 create mode 100644 package/binutils/2.33.1/0002-poison-system-directories.patch
 create mode 100644 package/binutils/2.33.1/0003-Revert-PR24311-FAIL-S-records-with-constructors.patch
package/binutils/2.33.1/0001-sh-conf.patch new file +48 -0
new file mode 100644
index 0000000000..035100db82
@@ -0,0 +1,48 @@
+From 3220c7e65ccfe41eceaaa6f1707f7f5775d9a4b0 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).
+
+[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 6a9719f6091..796641b6aa3 100755
+--- a/configure
++++ b/configure
+@@ -3865,7 +3865,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 7433badc217..dce082fb58e 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.23.0
+
package/binutils/2.33.1/0002-poison-system-directories.patch new file +306 -0

306 lines not on this page · raw message

package/binutils/2.33.1/0003-Revert-PR24311-FAIL-S-records-with-constructors.patch new file +148 -0

148 lines not on this page · raw message

package/binutils/Config.in.host +5 -0
index 9def812dc1..8a7869faa6 100644
@@ -25,6 +25,10 @@ config BR2_BINUTILS_VERSION_2_32_X
 	bool "binutils 2.32"
 	depends on !BR2_csky
 
+config BR2_BINUTILS_VERSION_2_33_X
+	bool "binutils 2.33.1"
+	depends on !BR2_csky
+
 config BR2_BINUTILS_VERSION_ARC
 	bool "binutils arc (2.31)"
 	depends on BR2_arc
@@ -42,6 +46,7 @@ config BR2_BINUTILS_VERSION
 	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
+	default "2.33.1"	if BR2_BINUTILS_VERSION_2_33_X
 
 config BR2_BINUTILS_ENABLE_LTO
 	bool
package/binutils/binutils.hash +1 -0
index 4aea049d3a..172d29886d 100644
@@ -2,6 +2,7 @@
 sha512  e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839  binutils-2.30.tar.xz
 sha512  0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30  binutils-2.31.1.tar.xz
 sha512  d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a  binutils-2.32.tar.xz
+sha512  b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac  binutils-2.33.1.tar.xz
 
 # Locally calculated (fetched from Github)
 sha512  db6a0a855733a79ec71127b94981e6be63c4852dee5aed2bc9738da7d3c3796d88974e86ae9dc20cf28ea5e31897ddf8d68f695fcadfbdec1a8406b437d73df6  binutils-gdb-arc-2019.09-eng002.tar.gz
Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/3 package/binutils: switch to use 2.32 as the default version

Now that binutils 2.33.1 has been released, it is time to move to binutils 2.32 as the default binutils version, instead of 2.31.1.

---
 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 8a7869faa6..dbecf74606 100644
@@ -7,7 +7,7 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI
 
 choice
 	prompt "Binutils Version"
-	default BR2_BINUTILS_VERSION_2_31_X if !BR2_arc && !BR2_csky
+	default BR2_BINUTILS_VERSION_2_32_X if !BR2_arc && !BR2_csky
 	default BR2_BINUTILS_VERSION_ARC if BR2_arc
 	default BR2_BINUTILS_VERSION_CSKY if BR2_csky
 	help
package/binutils/binutils.mk +1 -1
index a4ed1a8f76..19e807f11c 100644
@@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),)
 ifeq ($(BR2_arc),y)
 BINUTILS_VERSION = arc-2019.09-eng002
 else
-BINUTILS_VERSION = 2.31.1
+BINUTILS_VERSION = 2.32
 endif
 endif # BINUTILS_VERSION
 
Signature · 1 line
2.23.0
#2 lore raw

PATCH 2/3 package/binutils: switch to use 2.32 as the default version

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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

Now that binutils 2.33.1 has been released, it is time to move to binutils 2.32 as the default binutils version, instead of 2.31.1.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 3/3 package/binutils: remove version 2.30

In reply to Romain Naour

Now that binutils 2.33.1 has been introduced, and we have moved to 2.32 as the default version, it is time to drop support for binutils 2.30.

---
 Config.in.legacy                              |  10 +
 linux/Config.in                               |   5 -
 package/binutils/2.30/0001-sh-conf.patch      |  48 ---
 package/binutils/2.30/0002-ld-makefile.patch  |  41 ---
 .../2.30/0003-check-ldrunpath-length.patch    |  36 ---
 .../0004-add-sysroot-fix-from-bug-3049.patch  |  51 ---
 .../2.30/0005-poison-system-directories.patch | 306 ------------------
 ...ocation-where-GOT-information-is-col.patch | 197 -----------
 ...ustness.-Return-FALSE-in-case-of-NUL.patch |  34 --
 ...obal-symbol-is-not-an-indirect-or-wa.patch |  42 ---
 ...ion-was-still-being-generated-when-s.patch |  35 --
 ...s-const16-for-xtensa-loop-relaxation.patch | 294 -----------------
 package/binutils/Config.in.host               |   5 -
 package/binutils/binutils.hash                |   1 -
 package/gcc/Config.in.host                    |   3 +-
 15 files changed, 11 insertions(+), 1097 deletions(-)
 delete mode 100644 package/binutils/2.30/0001-sh-conf.patch
 delete mode 100644 package/binutils/2.30/0002-ld-makefile.patch
 delete mode 100644 package/binutils/2.30/0003-check-ldrunpath-length.patch
 delete mode 100644 package/binutils/2.30/0004-add-sysroot-fix-from-bug-3049.patch
 delete mode 100644 package/binutils/2.30/0005-poison-system-directories.patch
 delete mode 100644 package/binutils/2.30/0006-ARC-Refactored-location-where-GOT-information-is-col.patch
 delete mode 100644 package/binutils/2.30/0007-ARC-Improved-robustness.-Return-FALSE-in-case-of-NUL.patch
 delete mode 100644 package/binutils/2.30/0008-ARC-Make-sure-global-symbol-is-not-an-indirect-or-wa.patch
 delete mode 100644 package/binutils/2.30/0009-ARC-PLT-information-was-still-being-generated-when-s.patch
 delete mode 100644 package/binutils/2.30/0010-gas-use-literals-const16-for-xtensa-loop-relaxation.patch
Config.in.legacy +10 -0
index 7167b1d60c..88febed684 100644
@@ -144,6 +144,16 @@ endif
 
 ###############################################################################
 
+comment "Legacy options removed in 2020.02"
+
+config BR2_BINUTILS_VERSION_2_30_X
+	bool "binutils version 2.30 support removed"
+	select BR2_LEGACY
+	help
+	  Support for binutils version 2.30 has been removed. The
+	  current default version (2.31 or later) has been selected
+	  instead.
+
 comment "Legacy options removed in 2019.11"
 
 config BR2_PACKAGE_RPI_USERLAND_START_VCFILED
linux/Config.in +0 -5
index eacd53dafb..2ae850e77b 100644
@@ -9,11 +9,6 @@ config BR2_LINUX_KERNEL
 
 if BR2_LINUX_KERNEL
 
-# https://sourceware.org/bugzilla/show_bug.cgi?id=21458
-comment "Linux kernel in thumb mode may be broken with binutils 2.30"
-	depends on BR2_arm || BR2_armeb
-	depends on BR2_BINUTILS_VERSION_2_30_X
-
 # Packages that need to have a kernel with support for loadable modules,
 # but do not use the kernel-modules infrastructure, should select that
 # option.
package/binutils/2.30/0001-sh-conf.patch deleted +0 -48

48 lines not on this page · raw message

package/binutils/2.30/0002-ld-makefile.patch deleted +0 -41

41 lines not on this page · raw message

package/binutils/2.30/0003-check-ldrunpath-length.patch deleted +0 -36
deleted file mode 100644
index 7af98749da..0000000000
@@ -1,36 +0,0 @@
-From c18554e56d2534cbb37d2d065d3782ce4ef2533c Mon Sep 17 00:00:00 2001
-From: Romain Naour <[email protected]>
-Date: Fri, 25 Dec 2015 11:41:47 +0100
-Subject: [PATCH] check-ldrunpath-length
-
-[Romain: rebase on top of 2.26]
-Signed-off-by: Romain Naour <[email protected]>
----
- ld/emultempl/elf32.em | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index c0925fc9b9..0ce16d73a5 100644
---- a/ld/emultempl/elf32.em
-+++ b/ld/emultempl/elf32.em
-@@ -1470,6 +1470,8 @@ fragment <<EOF
- 	      && command_line.rpath == NULL)
- 	    {
- 	      path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((path) && (strlen (path) == 0))
-+	        path = NULL;
- 	      if (path
- 		  && gld${EMULATION_NAME}_search_needed (path, &n, force))
- 		break;
-@@ -1750,6 +1752,8 @@ gld${EMULATION_NAME}_before_allocation (void)
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+    rpath = NULL;
- 
-   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
-     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
--- 
-2.14.3
-
package/binutils/2.30/0004-add-sysroot-fix-from-bug-3049.patch deleted +0 -51

51 lines not on this page · raw message

package/binutils/2.30/0005-poison-system-directories.patch deleted +0 -306

306 lines not on this page · raw message

package/binutils/2.30/0006-ARC-Refactored-location-where-GOT-information-is-col.patch deleted +0 -197

197 lines not on this page · raw message

package/binutils/2.30/0007-ARC-Improved-robustness.-Return-FALSE-in-case-of-NUL.patch deleted +0 -34
deleted file mode 100644
index 0633692cac..0000000000
@@ -1,34 +0,0 @@
-From 4bac50c2c94023cb1b5bf947abfb1c72eeeb12d5 Mon Sep 17 00:00:00 2001
-From: Cupertino Miranda <[email protected]>
-Date: Fri, 2 Mar 2018 17:33:48 +0100
-Subject: [PATCH] [ARC] Improved robustness. Return FALSE in case of NULL
- pointer.
-
-bfd/
-2018-03-01  Cupertino Miranda <[email protected]>
-
-	* elf32-arc.c (elf_arc_finish_dynamic_symbol) Return FALSE in case
-	arc_htab is NULL.
-
-Signed-off-by: Alexey Brodkin <[email protected]>
----
- bfd/elf32-arc.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
-index 166a5ef604ff..72b808b99127 100644
---- a/bfd/elf32-arc.c
-+++ b/bfd/elf32-arc.c
-@@ -2403,6 +2403,9 @@ elf_arc_finish_dynamic_symbol (bfd * output_bfd,
-     {
-       struct elf_arc_link_hash_table *arc_htab = elf_arc_hash_table (info);
- 
-+      if(arc_htab == NULL)
-+	return FALSE;
-+
-       if (h->dynindx == -1
- 	  || (h->root.type != bfd_link_hash_defined
- 	      && h->root.type != bfd_link_hash_defweak)
--- 
-2.17.1
-
package/binutils/2.30/0008-ARC-Make-sure-global-symbol-is-not-an-indirect-or-wa.patch deleted +0 -42

42 lines not on this page · raw message

package/binutils/2.30/0009-ARC-PLT-information-was-still-being-generated-when-s.patch deleted +0 -35
deleted file mode 100644
index a5bcb94d11..0000000000
@@ -1,35 +0,0 @@
-From e2f2d7f939435280003983ef822acd0844648643 Mon Sep 17 00:00:00 2001
-From: Cupertino Miranda <[email protected]>
-Date: Fri, 2 Mar 2018 17:44:29 +0100
-Subject: [PATCH] [ARC] PLT information was still being generated when
- symbol was forced_local.
-
-A change upstream reveiled this issue, triggering an assert when linking glibc.
-
-bfd/
-2018-03-01  Cupertino Miranda <[email protected]>
-
-	* elf32-arc.c (elf_arc_check_relocs): Changed.
-
-Signed-off-by: Alexey Brodkin <[email protected]>
----
- bfd/elf32-arc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
-index 6f6470f6f202..184957c7d750 100644
---- a/bfd/elf32-arc.c
-+++ b/bfd/elf32-arc.c
-@@ -2024,7 +2024,8 @@ elf_arc_check_relocs (bfd *			 abfd,
- 	  if (h == NULL)
- 	    continue;
- 	  else
--	    h->needs_plt = 1;
-+	    if(h->forced_local == 0)
-+	      h->needs_plt = 1;
- 	}
- 
-       /* Add info to the symbol got_entry_list.  */
--- 
-2.17.1
-
package/binutils/2.30/0010-gas-use-literals-const16-for-xtensa-loop-relaxation.patch deleted +0 -294

294 lines not on this page · raw message

package/binutils/Config.in.host +0 -5
index dbecf74606..e4530a4bb2 100644
@@ -13,10 +13,6 @@ choice
 	help
 	  Select the version of binutils you wish to use.
 
-config BR2_BINUTILS_VERSION_2_30_X
-	bool "binutils 2.30"
-	depends on !BR2_csky
-
 config BR2_BINUTILS_VERSION_2_31_X
 	bool "binutils 2.31.1"
 	depends on !BR2_csky
@@ -43,7 +39,6 @@ config BR2_BINUTILS_VERSION
 	string
 	default "arc-2019.09-eng002"	if BR2_BINUTILS_VERSION_ARC
 	default "c66d8bbcebfddf713b2b436e1b135e6b125a55a5" if BR2_BINUTILS_VERSION_CSKY
-	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
 	default "2.33.1"	if BR2_BINUTILS_VERSION_2_33_X
package/binutils/binutils.hash +0 -1
index 172d29886d..eceedfa502 100644
@@ -1,5 +1,4 @@
 # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum
-sha512  e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839  binutils-2.30.tar.xz
 sha512  0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30  binutils-2.31.1.tar.xz
 sha512  d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a  binutils-2.32.tar.xz
 sha512  b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac  binutils-2.33.1.tar.xz
package/gcc/Config.in.host +1 -2
index e2a4032c90..b55f8e5cb4 100644
@@ -60,8 +60,7 @@ config BR2_GCC_VERSION_8_X
 config BR2_GCC_VERSION_9_X
 	bool "gcc 9.x"
 	# or1k needs binutils >= 2.32
-	depends on !(BR2_or1k && \
-		(BR2_BINUTILS_VERSION_2_30_X || BR2_BINUTILS_VERSION_2_31_X))
+	depends on !(BR2_or1k && BR2_BINUTILS_VERSION_2_31_X)
 	# powerpc spe support has been deprecated since gcc 8.x.
 	# https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html
 	depends on !BR2_powerpc_SPE
Signature · 1 line
2.23.0
#4 lore raw

PATCH 3/3 package/binutils: remove version 2.30

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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

Now that binutils 2.33.1 has been introduced, and we have moved to 2.32 as the default version, it is time to drop support for binutils 2.30.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 1/3 package/binutils: add binutils 2.33.1

In reply to Romain Naour
Quoted 17 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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

Keep sh-conf and poison-system-directories patches. Remove xtensa patches already in this version [1] [2] [3].

Revert an upstream patch since it prevent booting a sh4 system under Qemu as reported on the Binutils mailing list [5] [6]. This commit is not related to sh4, it's weird that it is the only affected architecture.

[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=2487ef07c28b961c6e2b8c51161f88f93b181d07
[2] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=403b0b61f6d4358aee8493cb1d11814e368942c9
[3] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=548791769dc737f05cb12e5ee4190b7e853beac9
[4] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e
[5] https://sourceware.org/ml/binutils/2019-10/msg00105.html
[6] https://sourceware.org/ml/binutils/2019-11/msg00407.html

Quoted 5 lines

See:
https://www.sourceware.org/ml/binutils/2019-10/msg00103.html

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard