diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-08-23 15:20:41 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-08-23 15:20:41 +0000 |
| commit | ce9cf8dafd59b97b8d3ac0ebe3cdd759ff581db9 (patch) | |
| tree | fe3e75c910c7e3132ef90914f658d486648c592c /src/patchsets/glibc/2.14 | |
| parent | add fix from upstream for ssp typo (diff) | |
| download | gentoo-ce9cf8dafd59b97b8d3ac0ebe3cdd759ff581db9.tar.gz gentoo-ce9cf8dafd59b97b8d3ac0ebe3cdd759ff581db9.tar.bz2 gentoo-ce9cf8dafd59b97b8d3ac0ebe3cdd759ff581db9.zip | |
add fix from upstream tracker for building against newer kernels
Diffstat (limited to 'src/patchsets/glibc/2.14')
| -rw-r--r-- | src/patchsets/glibc/2.14/1008_all_glibc-rwlock-assume.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/src/patchsets/glibc/2.14/1008_all_glibc-rwlock-assume.patch b/src/patchsets/glibc/2.14/1008_all_glibc-rwlock-assume.patch new file mode 100644 index 0000000000..49106e861b --- /dev/null +++ b/src/patchsets/glibc/2.14/1008_all_glibc-rwlock-assume.patch @@ -0,0 +1,35 @@ +http://sourceware.org/bugzilla/show_bug.cgi?id=12403 + +fix behavior with newer --enable-kernel values + +--- 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) |