diff options
| author | root <root@rshg047.dnsready.net> | 2011-04-27 22:24:53 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-04-27 22:24:53 +0000 |
| commit | 18d6577d511b9a1ac36eaae50060133a401e42a3 (patch) | |
| tree | f681f9444a7a0a95916de40af82d3b805d5fb8d3 /multilib/lib32-glibc | |
| parent | 69e1fada8bdc9588d0a3d8bc3403fa809d809a84 (diff) | |
Wed Apr 27 22:24:53 UTC 2011
Diffstat (limited to 'multilib/lib32-glibc')
| -rw-r--r-- | multilib/lib32-glibc/PKGBUILD | 10 | ||||
| -rw-r--r-- | multilib/lib32-glibc/glibc-2.13-futex.patch | 31 |
2 files changed, 39 insertions, 2 deletions
diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD index 2308cb13a..36c6c00a9 100644 --- a/multilib/lib32-glibc/PKGBUILD +++ b/multilib/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 39932 2011-02-18 23:00:49Z heftig $ +# $Id: PKGBUILD 43540 2011-03-27 14:07:50Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.13 -pkgrel=4 +pkgrel=5 _glibcdate=20110117 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -25,6 +25,7 @@ source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver glibc-2.12.1-static-shared-getpagesize.patch glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-prelink.patch + glibc-2.13-futex.patch lib32-glibc.conf) md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190' '4dadb9203b69a3210d53514bb46f41c3' @@ -33,6 +34,7 @@ md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190' 'a3ac6f318d680347bb6e2805d42b73b2' 'b042647ea7d6f22ad319e12e796bd13e' '24dfab6fd244f3773523412588ecc52c' + '7d0154b7e17ea218c9fa953599d24cc4' '6e052f1cb693d5d3203f50f9d4e8c33b') build() { @@ -59,6 +61,10 @@ build() { # http://sourceware.org/bugzilla/show_bug.cgi?id=12489 # http://sourceware.org/git/?p=glibc.git;a=commit;h=25b3aada (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.13-prelink.patch + + # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 + patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch + cd ${srcdir} mkdir glibc-build cd glibc-build diff --git a/multilib/lib32-glibc/glibc-2.13-futex.patch b/multilib/lib32-glibc/glibc-2.13-futex.patch new file mode 100644 index 000000000..9b9c3ac45 --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.13-futex.patch @@ -0,0 +1,31 @@ +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S +@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S +@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: + + 7: movq %rdx, %rax + +-#ifndef __ASSUME_PRIVATE_FUTEX ++#ifndef __ASSUME_FUTEX_CLOCK_REALTIME + addq $16, %rsp + cfi_adjust_cfa_offset(-16) + popq %r14 +@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) |