summaryrefslogtreecommitdiff
path: root/multilib-testing/lib32-glibc/glibc-2.13-futex.patch
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-10-28 11:35:50 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-10-28 11:35:50 -0300
commit8856e6fe26ce35b4caf6beeac324f583ec1b6133 (patch)
treec42a03e2b7610a39d167af36357607399aa40045 /multilib-testing/lib32-glibc/glibc-2.13-futex.patch
parent5100458465d1ed420073c3213349bf430075ddbc (diff)
parent0424b5fc47f106db6498c4cda3476e1d49fe0f82 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/esmtp/PKGBUILD community/geany-plugins/PKGBUILD community/giggle/PKGBUILD community/guichan/PKGBUILD community/mxml/PKGBUILD community/ruby-gtk2/PKGBUILD core/libtool/PKGBUILD core/mkinitcpio-busybox/PKGBUILD core/udev/PKGBUILD extra/audacious/PKGBUILD extra/conky/PKGBUILD extra/gnome-control-center/PKGBUILD extra/gtk2/PKGBUILD extra/gtk3/PKGBUILD extra/gvfs/PKGBUILD extra/kdeutils/PKGBUILD extra/kino/PKGBUILD extra/mkvtoolnix/PKGBUILD extra/poppler/PKGBUILD extra/postfix/PKGBUILD extra/pulseaudio/PKGBUILD extra/qtcurve-gtk2/PKGBUILD extra/transmission/PKGBUILD extra/xfburn/PKGBUILD extra/xfce4-xkb-plugin/PKGBUILD extra/xorg-server/PKGBUILD extra/yelp/PKGBUILD kde-unstable/calligra/PKGBUILD multilib/lib32-gtk2/PKGBUILD multilib/lib32-libpulse/PKGBUILD multilib/libtool-multilib/PKGBUILD multilib/wine/PKGBUILD multilib/wine/wine.install
Diffstat (limited to 'multilib-testing/lib32-glibc/glibc-2.13-futex.patch')
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.13-futex.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch b/multilib-testing/lib32-glibc/glibc-2.13-futex.patch
new file mode 100644
index 000000000..9b9c3ac45
--- /dev/null
+++ b/multilib-testing/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)