Date: Tuesday, April 10, 2018 @ 19:39:52 Author: bpiotrowski Revision: 321499
2.30-1 Modified: binutils/trunk/PKGBUILD Deleted: binutils/trunk/0001-x86-64_Dont_pass_output_bfd_to_info-callbacks-minfo.patch ----------------------------------------------------------------+ 0001-x86-64_Dont_pass_output_bfd_to_info-callbacks-minfo.patch | 29 ----- PKGBUILD | 50 ++++------ 2 files changed, 21 insertions(+), 58 deletions(-) Deleted: 0001-x86-64_Dont_pass_output_bfd_to_info-callbacks-minfo.patch =================================================================== --- 0001-x86-64_Dont_pass_output_bfd_to_info-callbacks-minfo.patch 2018-04-10 19:34:37 UTC (rev 321498) +++ 0001-x86-64_Dont_pass_output_bfd_to_info-callbacks-minfo.patch 2018-04-10 19:39:52 UTC (rev 321499) @@ -1,29 +0,0 @@ -From 7a7431ddc2332ddc3753330a8dd815bb5f7193c0 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" <[email protected]> -Date: Tue, 26 Sep 2017 14:41:22 -0700 -Subject: [PATCH] x86-64: Don't pass output_bfd to info->callbacks->minfo - -Don't pass output_bfd to info->callbacks->minfo when dumping local IFUNC -functions in the map file. - - PR ld/22199 - * elf64-x86-64.c (elf_x86_64_finish_dynamic_symbol): Don't pass - output_bfd to info->callbacks->minfo. - -(cherry picked from commit ac69a0d75bf472a140e5405c8a90420d5f63a998) - -diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c -index d9225ad..1f6dfb8 100644 ---- a/bfd/elf64-x86-64.c -+++ b/bfd/elf64-x86-64.c -@@ -6133,7 +6133,6 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd, - if (SYMBOL_REFERENCES_LOCAL (info, h)) - { - info->callbacks->minfo (_("Local IFUNC function `%s' in %B\n"), -- output_bfd, - h->root.root.string, - h->root.u.def.section->owner); - --- -2.9.3 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-04-10 19:34:37 UTC (rev 321498) +++ PKGBUILD 2018-04-10 19:39:52 UTC (rev 321499) @@ -1,34 +1,27 @@ # $Id$ -# Maintainer: Allan McRae <[email protected]> +# Maintainer: Bartłomiej Piotrowski <[email protected]> +# Contributor: Allan McRae <[email protected]> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils -pkgver=2.29.1 -pkgrel=3 +pkgver=2.30 +pkgrel=1 pkgdesc='A set of programs to assemble and manipulate binary and object files' arch=(x86_64) url='http://www.gnu.org/software/binutils/' license=(GPL) -groups=('base-devel') -depends=('glibc>=2.26' zlib) -makedepends=(git) +groups=(base-devel) +depends=(glibc zlib) checkdepends=(dejagnu bc) conflicts=(binutils-multilib) replaces=(binutils-multilib) options=(staticlibs !distcc !ccache) -#_commit=d1a6e7195b9bb0255fa77588985b969ad8aaacf5 -#source=(git+https://sourceware.org/git/binutils-gdb.git#commit=${_commit} source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz{,.sig} - 0001-x86-64_Dont_pass_output_bfd_to_info-callbacks-minfo.patch - 0001-PR22741-objcopy-segfault-on-fuzzed-COFF-object.patch - 0001-PR22829-objcopy-strip-removes-PT_GNU_RELRO-from-lld-.patch) + 0001-x86-64_Dont_pass_output_bfd_to_info-callbacks-minfo.patch) validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F) -md5sums=('acc9cd826edb9954ac7cecb81c727793' - 'SKIP' - 'e4be936139ef46122cb3841881c432b2' - '469164f3c93a0e92a697537b60c9806c' - '0c679b37e90fb23de60a4d28329b956a') +md5sums=('ffc476dd46c96f932875d1b2e27e929f' + 'SKIP') prepare() { mkdir -p binutils-build @@ -39,14 +32,11 @@ # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure - # https://bugs.archlinux.org/task/55741 - git apply ../0001-x86-64_Dont_pass_output_bfd_to_info-callbacks-minfo.patch - # https://sourceware.org/bugzilla/show_bug.cgi?id=22741 - git apply ../0001-PR22741-objcopy-segfault-on-fuzzed-COFF-object.patch + #git apply ../0001-PR22741-objcopy-segfault-on-fuzzed-COFF-object.patch # https://sourceware.org/bugzilla/show_bug.cgi?id=22829 - git apply ../0001-PR22829-objcopy-strip-removes-PT_GNU_RELRO-from-lld-.patch + #git apply ../0001-PR22829-objcopy-strip-removes-PT_GNU_RELRO-from-lld-.patch } build() { @@ -56,16 +46,18 @@ --prefix=/usr \ --with-lib-path=/usr/lib:/usr/local/lib \ --with-bugurl=https://bugs.archlinux.org/ \ - --enable-threads \ - --enable-shared \ + --enable-deterministic-archives \ + --enable-gold \ --enable-ld=default \ - --enable-gold \ + --enable-lto \ --enable-plugins \ --enable-relro \ - --enable-deterministic-archives \ + --enable-shared \ + --enable-targets=x86_64-pep \ + --enable-threads \ + --disable-gdb \ + --disable-werror \ --with-pic \ - --disable-werror \ - --disable-gdb \ --with-system-zlib make configure-host @@ -89,6 +81,6 @@ # No shared linking to these files outside binutils rm -f "$pkgdir"/usr/lib/lib{bfd,opcodes}.so - echo "INPUT( /usr/lib/libbfd.a -liberty -lz -ldl )" > "$pkgdir/usr/lib/libbfd.so" - echo "INPUT( /usr/lib/libopcodes.a -lbfd )" > "$pkgdir/usr/lib/libopcodes.so" + echo 'INPUT( /usr/lib/libbfd.a -liberty -lz -ldl )' > "$pkgdir/usr/lib/libbfd.so" + echo 'INPUT( /usr/lib/libopcodes.a -lbfd )' > "$pkgdir/usr/lib/libopcodes.so" }
