mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-19 00:21:40 +00:00
core/binutils to 2.38-3
This commit is contained in:
Kevin Mihelich
parent
aea14ea84a
commit
da101faff8
2 changed files with 144 additions and 15 deletions
|
|
@ -1,30 +1,32 @@
|
|||
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
|
||||
# Contributor: Allan McRae <allan@archlinux.org>
|
||||
|
||||
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
|
||||
# toolchain build order: linux-api-headers->glibc->binutils->gcc->glibc->binutils->gcc
|
||||
|
||||
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
# - Added a CONFIGFLAG for ARM, defining our build hosts
|
||||
# - --disable-sim, files provided by gdb
|
||||
|
||||
noautobuild=1
|
||||
|
||||
pkgname=binutils
|
||||
pkgver=2.36.1
|
||||
pkgver=2.38
|
||||
pkgrel=3
|
||||
pkgdesc='A set of programs to assemble and manipulate binary and object files'
|
||||
arch=(x86_64)
|
||||
url='https://www.gnu.org/software/binutils/'
|
||||
license=(GPL)
|
||||
groups=(base-devel)
|
||||
depends=(glibc zlib elfutils)
|
||||
makedepends=(elfutils git)
|
||||
options=(staticlibs !distcc !ccache)
|
||||
depends=(glibc zlib libelf)
|
||||
checkdepends=(dejagnu debuginfod bc)
|
||||
optdepends=('debuginfod: for debuginfod server/client functionality')
|
||||
options=(staticlibs !distcc !ccache debug)
|
||||
#_commit=cb5f6a3e146cc70bc2d864989386df80acec5d3e
|
||||
#source=(git+https://sourceware.org/git/binutils-gdb.git#commit=$_commit)
|
||||
source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz{,.sig})
|
||||
sha256sums=('e81d9edf373f193af428a0f256674aea62a9d74dfe93f65192d4eae030b0f3b0'
|
||||
'SKIP')
|
||||
source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz{,.sig}
|
||||
fix-incorrect-undefined-symbol.patch)
|
||||
sha256sums=('e316477a914f567eccc34d5d29785b8b0f5a10208d36bbacedcc39048ecfe024'
|
||||
'SKIP'
|
||||
'fd33b2f8cac7561cecf3fdbb5a50fd2f2dfa6420516cbe57c47784a06fa16bf6')
|
||||
validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F)
|
||||
|
||||
prepare() {
|
||||
|
|
@ -38,6 +40,10 @@ prepare() {
|
|||
|
||||
# hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
|
||||
sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
|
||||
|
||||
# fix incorrect "undefined reference" errors
|
||||
# https://sourceware.org/bugzilla/show_bug.cgi?id=28879
|
||||
patch -Np1 -i "${srcdir}"/fix-incorrect-undefined-symbol.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -53,29 +59,38 @@ build() {
|
|||
--with-bugurl=https://github.com/archlinuxarm/PKGBUILDs/issues \
|
||||
--enable-deterministic-archives \
|
||||
--enable-gold \
|
||||
--enable-install-libiberty \
|
||||
--enable-ld=default \
|
||||
--enable-lto \
|
||||
--enable-plugins \
|
||||
--enable-relro \
|
||||
--enable-shared \
|
||||
--enable-threads \
|
||||
--disable-gdb \
|
||||
--disable-gdbserver \
|
||||
--disable-libdecnumber \
|
||||
--disable-readline \
|
||||
--disable-sim \
|
||||
--disable-werror \
|
||||
--with-debuginfod \
|
||||
--with-pic \
|
||||
--with-system-zlib \
|
||||
--disable-sim \
|
||||
$CONFIGFLAG
|
||||
|
||||
make configure-host
|
||||
make tooldir=/usr
|
||||
make -O tooldir=/usr
|
||||
}
|
||||
|
||||
check() {
|
||||
cd binutils-build
|
||||
|
||||
# unset LDFLAGS as testsuite makes assumptions about which ones are active
|
||||
# ignore failures in gold testsuite...
|
||||
make -k LDFLAGS="" check || true
|
||||
# Use minimal flags for testsuite
|
||||
# ld testsuite uses CFLAGS_FOR_TARGET and requires -g
|
||||
# gold testsuite requires CXXFLAGS/CFLAGS with default PIE/PIC disabled
|
||||
make -O CFLAGS_FOR_TARGET="-O2 -g" \
|
||||
CXXFLAGS="-O2 -no-pie -fno-PIC" \
|
||||
CFLAGS="-O2 -no-pie" \
|
||||
LDFLAGS="" \
|
||||
check
|
||||
}
|
||||
|
||||
package() {
|
||||
|
|
|
|||
114
core/binutils/fix-incorrect-undefined-symbol.patch
Normal file
114
core/binutils/fix-incorrect-undefined-symbol.patch
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
From 20ea3acc727f3be6322dfbd881e506873535231d Mon Sep 17 00:00:00 2001
|
||||
From: "H.J. Lu" <hjl.tools@gmail.com>
|
||||
Date: Fri, 11 Feb 2022 15:13:19 -0800
|
||||
Subject: [PATCH] ld: Keep indirect symbol from IR if referenced from shared
|
||||
object
|
||||
|
||||
Don't change indirect symbol defined in IR to undefined if it is
|
||||
referenced from shared object.
|
||||
|
||||
bfd/
|
||||
|
||||
PR ld/28879
|
||||
* elflink.c (_bfd_elf_merge_symbol): Don't change indirect
|
||||
symbol defined in IR to undefined if it is referenced from
|
||||
shared object.
|
||||
|
||||
ld/
|
||||
|
||||
PR ld/28879
|
||||
* testsuite/ld-plugin/lto.exp: Run PR ld/28879 tests.
|
||||
* testsuite/ld-plugin/pr28879a.cc: New file.
|
||||
* testsuite/ld-plugin/pr28879b.cc: Likewise.
|
||||
---
|
||||
bfd/elflink.c | 5 ++---
|
||||
ld/testsuite/ld-plugin/lto.exp | 26 ++++++++++++++++++++++++++
|
||||
ld/testsuite/ld-plugin/pr28879a.cc | 7 +++++++
|
||||
ld/testsuite/ld-plugin/pr28879b.cc | 8 ++++++++
|
||||
4 files changed, 43 insertions(+), 3 deletions(-)
|
||||
create mode 100644 ld/testsuite/ld-plugin/pr28879a.cc
|
||||
create mode 100644 ld/testsuite/ld-plugin/pr28879b.cc
|
||||
|
||||
diff --git a/bfd/elflink.c b/bfd/elflink.c
|
||||
index 6fa18d92007..f8521426cad 100644
|
||||
--- a/bfd/elflink.c
|
||||
+++ b/bfd/elflink.c
|
||||
@@ -1294,9 +1294,8 @@ _bfd_elf_merge_symbol (bfd *abfd,
|
||||
h->root.non_ir_ref_dynamic = true;
|
||||
hi->root.non_ir_ref_dynamic = true;
|
||||
}
|
||||
-
|
||||
- if ((oldbfd->flags & BFD_PLUGIN) != 0
|
||||
- && hi->root.type == bfd_link_hash_indirect)
|
||||
+ else if ((oldbfd->flags & BFD_PLUGIN) != 0
|
||||
+ && hi->root.type == bfd_link_hash_indirect)
|
||||
{
|
||||
/* Change indirect symbol from IR to undefined. */
|
||||
hi->root.type = bfd_link_hash_undefined;
|
||||
diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
|
||||
index a70a84562b8..64b880265ee 100644
|
||||
--- a/ld/testsuite/ld-plugin/lto.exp
|
||||
+++ b/ld/testsuite/ld-plugin/lto.exp
|
||||
@@ -471,6 +471,32 @@ set lto_link_elf_tests [list \
|
||||
[list {pr27441c.so} \
|
||||
{-shared -fPIC -Wl,--as-needed tmpdir/pr27441c.o tmpdir/pr27441b.so tmpdir/pr27441a.so} {-fPIC} \
|
||||
{dummy.c} {{readelf {-dW} pr27441c.d}} {pr27441c.so}] \
|
||||
+ [list \
|
||||
+ "Build libpr28879a.so" \
|
||||
+ "-shared" \
|
||||
+ "-O0 -fpic" \
|
||||
+ {pr28879a.cc} \
|
||||
+ {} \
|
||||
+ "libpr28879a.so" \
|
||||
+ "c++" \
|
||||
+ ] \
|
||||
+ [list \
|
||||
+ "Build libpr28879b.so" \
|
||||
+ "-shared -Wl,--no-as-needed tmpdir/libpr28879a.so" \
|
||||
+ "-O2 -fpic" \
|
||||
+ {dummy.c} \
|
||||
+ {} \
|
||||
+ "libpr28879b.so" \
|
||||
+ ] \
|
||||
+ [list \
|
||||
+ "Build pr28879" \
|
||||
+ "-Wl,--no-as-needed tmpdir/libpr28879b.so -Wl,-rpath-link,." \
|
||||
+ "-O0 -flto -D_GLIBCXX_ASSERTIONS" \
|
||||
+ {pr28879b.cc} \
|
||||
+ {} \
|
||||
+ "pr28879" \
|
||||
+ "c++" \
|
||||
+ ] \
|
||||
]
|
||||
|
||||
# PR 14918 checks that libgcc is not spuriously included in a shared link of
|
||||
diff --git a/ld/testsuite/ld-plugin/pr28879a.cc b/ld/testsuite/ld-plugin/pr28879a.cc
|
||||
new file mode 100644
|
||||
index 00000000000..8307a42e2fb
|
||||
--- /dev/null
|
||||
+++ b/ld/testsuite/ld-plugin/pr28879a.cc
|
||||
@@ -0,0 +1,7 @@
|
||||
+#include <string>
|
||||
+
|
||||
+void
|
||||
+func (std::string *s)
|
||||
+{
|
||||
+ delete s;
|
||||
+}
|
||||
diff --git a/ld/testsuite/ld-plugin/pr28879b.cc b/ld/testsuite/ld-plugin/pr28879b.cc
|
||||
new file mode 100644
|
||||
index 00000000000..02fc351366c
|
||||
--- /dev/null
|
||||
+++ b/ld/testsuite/ld-plugin/pr28879b.cc
|
||||
@@ -0,0 +1,8 @@
|
||||
+#include <string>
|
||||
+
|
||||
+int
|
||||
+main (void)
|
||||
+{
|
||||
+ std::string header;
|
||||
+ return 0;
|
||||
+}
|
||||
--
|
||||
2.35.1
|
||||
|
||||
Loading…
Reference in a new issue