r4498 - in glibc-package/branches/eglibc-2.13/debian: . patches patches/amd64
Author: aurel32
Date: 2011-02-07 18:08:04 +0000 (Mon, 07 Feb 2011)
New Revision: 4498
Added:
glibc-package/branches/eglibc-2.13/debian/patches/amd64/submitted-rwlock-stack-imbalance.diff
Modified:
glibc-package/branches/eglibc-2.13/debian/changelog
glibc-package/branches/eglibc-2.13/debian/patches/series
Log:
* Add patches/submitted-rwlock-stack-imbalance.diff to fix regression
in pthread_rwlock_timedrdlock() and pthread_rwlock_timedwrlock().
Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-07 17:24:08 UTC (rev 4497)
+++ glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-07 18:08:04 UTC (rev 4498)
@@ -104,8 +104,10 @@
* Add patches/localedata/locale-C.diff to create a C locale.
* Build and install the C locales in libc-bin. Closes: #609306.
* Bump to Standards-Version 3.9.1 (no changes).
+ * Add patches/submitted-rwlock-stack-imbalance.diff to fix regression
+ in pthread_rwlock_timedrdlock() and pthread_rwlock_timedwrlock().
- -- Aurelien Jarno <aurel32@debian.org> Sun, 06 Feb 2011 16:52:51 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 07 Feb 2011 19:06:28 +0100
eglibc (2.11.2-11) unstable; urgency=low
Added: glibc-package/branches/eglibc-2.13/debian/patches/amd64/submitted-rwlock-stack-imbalance.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/amd64/submitted-rwlock-stack-imbalance.diff (rev 0)
+++ glibc-package/branches/eglibc-2.13/debian/patches/amd64/submitted-rwlock-stack-imbalance.diff 2011-02-07 18:08:04 UTC (rev 4498)
@@ -0,0 +1,37 @@
+http://sourceware.org/bugzilla/show_bug.cgi?id=12403
+
+diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
+index f5d055c..8f3c68c 100644
+--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
++++ b/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)
+diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
+index 6ed8b49..9aaaeba 100644
+--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
++++ b/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)
Modified: glibc-package/branches/eglibc-2.13/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/series 2011-02-07 17:24:08 UTC (rev 4497)
+++ glibc-package/branches/eglibc-2.13/debian/patches/series 2011-02-07 18:08:04 UTC (rev 4498)
@@ -53,6 +53,7 @@
amd64/local-clone.diff
amd64/local-linuxthreads-gscope.diff
amd64/submitted-tst-audit6-avx.diff
+amd64/submitted-rwlock-stack-imbalance.diff
arm/local-atomic.diff
arm/local-eabi-wchar.diff
Reply to: