From 87eb9bb67780d82318d0578d391797ef395a185a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Aug 2016 01:03:15 -0300 Subject: update cross-binutils --- cross/cross-binutils/PKGBUILD | 30 ++++------- cross/cross-binutils/binutils-e9c1bdad.patch | 78 ---------------------------- cross/cross-binutils/binutils.install | 17 ------ 3 files changed, 11 insertions(+), 114 deletions(-) delete mode 100644 cross/cross-binutils/binutils-e9c1bdad.patch delete mode 100644 cross/cross-binutils/binutils.install (limited to 'cross') diff --git a/cross/cross-binutils/PKGBUILD b/cross/cross-binutils/PKGBUILD index 795ce23e6..a49d55587 100644 --- a/cross/cross-binutils/PKGBUILD +++ b/cross/cross-binutils/PKGBUILD @@ -11,8 +11,6 @@ # ->binutils(target system)->gcc(target system)->binutils(target system) # ->glibc(target system) -# build from head of release branch as bug fix releases are rare - #-------------------------------------------------------------------------------- # cross-compile table #-------------------------------------------------------------------------------- @@ -108,34 +106,27 @@ fi _pkgname=binutils pkgname=$_target-$_pkgname -pkgver=2.25.1 -pkgrel=1 -_commit=2bd25930 +pkgver=2.26.1 +pkgrel=2 +_commit=c29838e7 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64' 'armv7h' 'aarch64' 'mips64el') url="http://www.gnu.org/software/$_pkgname/" license=('GPL') groups=('cross-devel') -depends=('glibc>=2.22' 'zlib') +depends=('glibc>=2.24' 'zlib') makedepends=('git') checkdepends=('dejagnu' 'bc') options=('staticlibs' '!distcc' '!ccache') -install=$_pkgname.install #source=(ftp://ftp.gnu.org/gnu/$_pkgname/$_pkgname-${pkgver}.tar.bz2{,.sig}) source=(git://sourceware.org/git/$_pkgname-gdb.git#commit=${_commit} - $_pkgname-e9c1bdad.patch $_pkgname-xtensa.patch::https://raw.githubusercontent.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/$_pkgname.patch) md5sums=('SKIP' - 'eb3aceaab8ed26e06d505f82beb30f8f' '7077126d96e9a755a0eaddb5505efe68') #validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93') prepare() { - #cd ${srcdir}/$_pkgname-${pkgver} - cd ${srcdir}/$_pkgname-gdb - - # https://sourceware.org/bugzilla/show_bug.cgi?id=16992 - patch -p1 -i ${srcdir}/$_pkgname-e9c1bdad.patch + cd $_pkgname-gdb # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure @@ -147,10 +138,9 @@ prepare() { } build() { - cd ${srcdir}/$_pkgname-build + cd $_pkgname-build - #${srcdir}/$_pkgname-${pkgver}/configure --prefix=/usr \ - ${srcdir}/$_pkgname-gdb/configure --prefix=/usr \ + ../$_pkgname-gdb/configure --prefix=/usr \ --with-lib-path=/usr/lib:/usr/local/lib \ --with-bugurl=https://labs.parabola.nu/ \ --enable-threads --with-pic \ @@ -166,7 +156,7 @@ build() { } check() { - cd ${srcdir}/$_pkgname-build + cd $_pkgname-build # unset LDFLAGS as testsuite makes assumptions about which ones are active # ignore failures in gold testsuite... @@ -174,9 +164,11 @@ check() { } package() { - cd ${srcdir}/$_pkgname-build + cd $_pkgname-build make prefix=${pkgdir}/usr install # Remove info documents that conflict with host version rm -rf ${pkgdir}/usr/share/info + 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 } diff --git a/cross/cross-binutils/binutils-e9c1bdad.patch b/cross/cross-binutils/binutils-e9c1bdad.patch deleted file mode 100644 index 6ef9f520f..000000000 --- a/cross/cross-binutils/binutils-e9c1bdad.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/gold/layout.cc b/gold/layout.cc -index bcdaac8..7836640 100644 ---- a/gold/layout.cc -+++ b/gold/layout.cc -@@ -4873,7 +4873,8 @@ Layout::finish_dynamic_section(const Input_objects* input_objects, - flags |= elfcpp::DF_STATIC_TLS; - if (parameters->options().origin()) - flags |= elfcpp::DF_ORIGIN; -- if (parameters->options().Bsymbolic()) -+ if (parameters->options().Bsymbolic() -+ && !parameters->options().have_dynamic_list()) - { - flags |= elfcpp::DF_SYMBOLIC; - // Add DT_SYMBOLIC for compatibility with older loaders. -diff --git a/gold/options.cc b/gold/options.cc -index 7eb8f27..7f1f69e 100644 ---- a/gold/options.cc -+++ b/gold/options.cc -@@ -1200,13 +1200,6 @@ General_options::finalize() - // in the path, as appropriate. - this->add_sysroot(); - -- // --dynamic-list overrides -Bsymbolic and -Bsymbolic-functions. -- if (this->have_dynamic_list()) -- { -- this->set_Bsymbolic(false); -- this->set_Bsymbolic_functions(false); -- } -- - // Now that we've normalized the options, check for contradictory ones. - if (this->shared() && this->is_static()) - gold_fatal(_("-shared and -static are incompatible")); -diff --git a/gold/symtab.h b/gold/symtab.h -index aa0cb68..9413360 100644 ---- a/gold/symtab.h -+++ b/gold/symtab.h -@@ -604,10 +604,8 @@ class Symbol - if (parameters->options().in_dynamic_list(this->name())) - return true; - -- // If the user used -Bsymbolic or provided a --dynamic-list script, -- // then nothing (else) is preemptible. -- if (parameters->options().Bsymbolic() -- || parameters->options().have_dynamic_list()) -+ // If the user used -Bsymbolic, then nothing (else) is preemptible. -+ if (parameters->options().Bsymbolic()) - return false; - - // If the user used -Bsymbolic-functions, then functions are not -diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am -index f767c21..7b73f9d 100644 ---- a/gold/testsuite/Makefile.am -+++ b/gold/testsuite/Makefile.am -@@ -1518,7 +1518,7 @@ dynamic_list_lib1.o: dynamic_list_lib1.cc - $(CXXCOMPILE) -c -fpic -o $@ $< - - dynamic_list_lib2.so: gcctestdir/ld dynamic_list_lib2.o $(srcdir)/dynamic_list_2.t -- $(CXXLINK) -Bgcctestdir/ -shared -Wl,--dynamic-list,$(srcdir)/dynamic_list_2.t dynamic_list_lib2.o -+ $(CXXLINK) -Bgcctestdir/ -shared -Wl,-Bsymbolic-functions -Wl,--dynamic-list,$(srcdir)/dynamic_list_2.t dynamic_list_lib2.o - dynamic_list_lib2.o: dynamic_list_lib2.cc - $(CXXCOMPILE) -c -fpic -o $@ $< - -diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in -index 217e472..b4ae3fd 100644 ---- a/gold/testsuite/Makefile.in -+++ b/gold/testsuite/Makefile.in -@@ -5319,7 +5319,7 @@ uninstall-am: - @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -fpic -o $@ $< - - @GCC_TRUE@@NATIVE_LINKER_TRUE@dynamic_list_lib2.so: gcctestdir/ld dynamic_list_lib2.o $(srcdir)/dynamic_list_2.t --@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXLINK) -Bgcctestdir/ -shared -Wl,--dynamic-list,$(srcdir)/dynamic_list_2.t dynamic_list_lib2.o -+@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXLINK) -Bgcctestdir/ -shared -Wl,-Bsymbolic-functions -Wl,--dynamic-list,$(srcdir)/dynamic_list_2.t dynamic_list_lib2.o - @GCC_TRUE@@NATIVE_LINKER_TRUE@dynamic_list_lib2.o: dynamic_list_lib2.cc - @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -fpic -o $@ $< - --- -1.9.4 - diff --git a/cross/cross-binutils/binutils.install b/cross/cross-binutils/binutils.install deleted file mode 100644 index 9de0533ee..000000000 --- a/cross/cross-binutils/binutils.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(as.info bfd.info binutils.info gprof.info ld.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -- cgit v1.2.3