diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-28 22:36:26 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-28 22:36:26 +0200 |
| commit | 92116b44c20c9b8e3ee49b794084d08d22e87cd3 (patch) | |
| tree | ebfcd9f003924e328dd0ccdb16197c7e38c61dcf /core/binutils | |
| parent | c89124d6a88f4cfffaba4492922c86091f2c8516 (diff) | |
| parent | 00f77ef3b2b7856520daba393370f67b773c2184 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/gnustep-base/PKGBUILD
community-testing/gtranslator/PKGBUILD
community-testing/parrot/PKGBUILD
community/chmsee/PKGBUILD
core/lvm2/PKGBUILD
extra/php/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-openssl/PKGBUILD
staging/php/PKGBUILD
staging/php/php-fpm.conf.in.patch
staging/php/php.ini.patch
testing/cairo/PKGBUILD
testing/eog-plugins/PKGBUILD
testing/eog/PKGBUILD
testing/gedit/PKGBUILD
testing/gjs/PKGBUILD
testing/glib2/PKGBUILD
testing/gnome-documents/PKGBUILD
testing/gnome-shell/PKGBUILD
testing/gobject-introspection/PKGBUILD
testing/libpeas/PKGBUILD
testing/mutter/PKGBUILD
testing/openssl/PKGBUILD
testing/pygobject/PKGBUILD
testing/python/PKGBUILD
testing/rhythmbox/PKGBUILD
testing/ruby/PKGBUILD
testing/ruby/ruby.install
testing/sushi/PKGBUILD
testing/totem/PKGBUILD
Diffstat (limited to 'core/binutils')
| -rw-r--r-- | core/binutils/PKGBUILD | 14 | ||||
| -rw-r--r-- | core/binutils/binutils-2.22-ld-13621.patch | 27 |
2 files changed, 37 insertions, 4 deletions
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index 41df57604..718f8b6de 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155399 2012-04-03 11:09:56Z allan $ +# $Id: PKGBUILD 157323 2012-04-27 00:50:16Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils pkgver=2.22 -pkgrel=5 +pkgrel=6 _date=20120323 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,10 @@ depends=('glibc>=2.15' 'zlib') checkdepends=('dejagnu') options=('!libtool' '!distcc' '!ccache') install=binutils.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -md5sums=('de2ac4298732827f8af706fc24020330') +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2 + binutils-2.22-ld-13621.patch) +md5sums=('de2ac4298732827f8af706fc24020330' + '86d9445914c9d51bfe575ecbac265be0') mksource() { mkdir ${pkgname}-${_date} @@ -30,6 +32,10 @@ mksource() { } build() { + cd ${srcdir}/binutils + # http://sourceware.org/bugzilla/show_bug.cgi?id=13621 + patch -p1 -i $srcdir/binutils-2.22-ld-13621.patch + cd ${srcdir} mkdir binutils-build && cd binutils-build diff --git a/core/binutils/binutils-2.22-ld-13621.patch b/core/binutils/binutils-2.22-ld-13621.patch new file mode 100644 index 000000000..ffb2ab825 --- /dev/null +++ b/core/binutils/binutils-2.22-ld-13621.patch @@ -0,0 +1,27 @@ +diff --git a/bfd/linker.c b/bfd/linker.c +index c51c5df..0404474 100644 +--- a/bfd/linker.c ++++ b/bfd/linker.c +@@ -3208,6 +3208,12 @@ fix_syms (struct bfd_link_hash_entry *h, void *data) + op = op1; + } + ++ /* Refuse to choose a section for which we are out of bounds. */ ++ /* ??? This may make most of the above moot. */ ++ if (h->u.def.value < op->vma ++ || h->u.def.value > op->vma + op->size) ++ op = bfd_abs_section_ptr; ++ + h->u.def.value -= op->vma; + h->u.def.section = op; + } +index 95b7ef4..a9c05f9 100644 +--- a/ld/testsuite/ld-elf/warn2.d ++++ b/ld/testsuite/ld-elf/warn2.d +@@ -13,5 +13,5 @@ + # construct and that the symbol still appears as expected. + + #... +- +[0-9]+: +[0-9a-f]+ +20 +OBJECT +GLOBAL +DEFAULT +[1-9] Foo ++ +[0-9]+: +[0-9a-f]+ +20 +OBJECT +GLOBAL +DEFAULT +ABS Foo + #pass |