Skip to content

Commit

Permalink
binutils: update to 3.38
Browse files Browse the repository at this point in the history
  • Loading branch information
oreo639 committed Aug 12, 2022
1 parent 0a87c67 commit 4a91111
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 113 deletions.

This file was deleted.

66 changes: 17 additions & 49 deletions srcpkgs/binutils/patches/ppc64-revert-gnu-attributes.patch
Original file line number Diff line number Diff line change
@@ -1,39 +1,24 @@
From b1faf99f3e546df2cd302bb1ad36a2078224fe8b Mon Sep 17 00:00:00 2001
From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <[email protected]>
Date: Fri, 30 Oct 2020 16:59:48 -0600
Date: Tue, 21 Sep 2021 14:53:13 +0000
Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
libraries"

This revert is needed to avoid wrongly tagging objects with the incompatible
IBM long double ABI, which is not supported by musl and will result in
linking errors if used.

This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
---
bfd/ChangeLog | 6 ------
bfd/elf32-tic6x.c | 3 ---
ld/ChangeLog | 6 ------
ld/ldlang.c | 9 ++++-----
4 files changed, 4 insertions(+), 20 deletions(-)
bfd/elf32-tic6x.c | 3 ---
ld/ldlang.c | 10 ++++------
2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9fac12538a..b5461494e8 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1422,12 +1422,6 @@
accessing root.u.def of symbols. Also check root.u.def.section
is non-NULL. Reverse tests so as to make the logic positive.

-2020-05-01 Alan Modra <[email protected]>
-
- PR 25882
- * elf32-tic6x.c (elf32_tic6x_merge_attributes): Don't transfer
- Tag_ABI_PIC or Tag_ABI_PID from dynamic objects to the output.
-
2020-05-01 Alan Modra <[email protected]>

PR 25882
diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index b8b916bfd3..91bb6a10b1 100644
index 5754f3cb860..3ad1d612749 100644
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
@@ -3748,9 +3748,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)

case Tag_ABI_PIC:
case Tag_ABI_PID:
Expand All @@ -43,36 +28,20 @@ index b8b916bfd3..91bb6a10b1 100644
if (out_attr[i].i > in_attr[i].i)
out_attr[i].i = in_attr[i].i;
break;
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 4eec7d2977..b93452f70c 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1319,12 +1319,6 @@
* testsuite/ld-aarch64/farcall-group.d: New test driver.
* testsuite/ld-aarch64/aarch64-elf.exp: Run the new test.

-2020-05-01 Alan Modra <[email protected]>
-
- PR 25882
- * ldlang.c (lang_check): Call bfd_merge_private_bfd_data for
- shared libraries.
-
2020-05-01 Alan Modra <[email protected]>

* po/BLD-POTFILES.in: Regenerate.
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 9977195074..173d8ec349 100644
index 37b64c89ee1..f13beaef9d9 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -6972,12 +6972,11 @@ lang_check (void)
@@ -7071,13 +7071,11 @@ lang_check (void)
bfd_printable_name (input_bfd), input_bfd,
bfd_printable_name (link_info.output_bfd));
}
-
- /* If the input bfd has no contents, it shouldn't set the
- private data of the output bfd. */
- else if ((input_bfd->flags & DYNAMIC) != 0
- || bfd_count_sections (input_bfd) != 0)
- else if (!file->flags.just_syms
- && ((input_bfd->flags & DYNAMIC) != 0
- || bfd_count_sections (input_bfd) != 0))
+ else if (bfd_count_sections (input_bfd))
{
+ /* If the input bfd has no contents, it shouldn't set the
Expand All @@ -82,5 +51,4 @@ index 9977195074..173d8ec349 100644

/* If we aren't supposed to warn about mismatched input
--
2.29.2

2.33.0
9 changes: 5 additions & 4 deletions srcpkgs/binutils/template
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
# Template file for 'binutils'
pkgname=binutils
version=2.35.1
revision=4
version=2.38
revision=1
bootstrap=yes
hostmakedepends="pkg-config"
makedepends="zlib-devel"
short_desc="GNU binary utilities"
maintainer="Enno Boland <[email protected]>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/binutils/"
distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
checksum=3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
checksum=e316477a914f567eccc34d5d29785b8b0f5a10208d36bbacedcc39048ecfe024

subpackages="binutils-doc"
if [ "$CHROOT_READY" ]; then
hostmakedepends="flex perl texinfo"
hostmakedepends+=" flex perl texinfo"
makedepends+=" elfutils-devel"
checkdepends="bc"
depends="binutils-doc"
Expand Down

0 comments on commit 4a91111

Please sign in to comment.