[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.13-futex.patch)

[Allan McRae]

    Date: Sunday, March 27, 2011 @ 02:35:25
  Author: allan
Revision: 116984

upgpkg: glibc 2.13-5
gcc-4.6 toolchain rebuild, patch to fix futex issue rather than disabling it

Added:
  glibc/trunk/glibc-2.13-futex.patch
Modified:
  glibc/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   12 ++++++++----
 glibc-2.13-futex.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-27 06:34:44 UTC (rev 116983)
+++ PKGBUILD	2011-03-27 06:35:25 UTC (rev 116984)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.13
-pkgrel=4
+pkgrel=5
 _glibcdate=20110117
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
@@ -26,6 +26,7 @@
         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
         nscd
         locale.gen.txt
         locale-gen)
@@ -36,6 +37,7 @@
          'a3ac6f318d680347bb6e2805d42b73b2'
          'b042647ea7d6f22ad319e12e796bd13e'
          '24dfab6fd244f3773523412588ecc52c'
+         '7d0154b7e17ea218c9fa953599d24cc4'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
@@ -74,9 +76,7 @@
   patch -Np1 -i ${srcdir}/glibc-2.13-prelink.patch
 
   # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
-  if [[ $CARCH == "x86_64" ]]; then
-    sed -i '/__ASSUME_PRIVATE_FUTEX/d'  $srcdir/glibc/sysdeps/unix/sysv/linux/kernel-features.h
-  fi
+  patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
 
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
@@ -103,7 +103,11 @@
       --disable-multi-arch
         
   make
+}
 
+check() {
+  cd ${srcdir}/glibc-build
+
   # some errors are expected - manually check log files
   make -k check || true
 }

Added: glibc-2.13-futex.patch
===================================================================
--- glibc-2.13-futex.patch	                        (rev 0)
+++ glibc-2.13-futex.patch	2011-03-27 06:35:25 UTC (rev 116984)
@@ -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)