rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Fix after update from upstream glibc-2.15

Browse Source
This commit is contained in:
Jeff Law 2012-01-01 21:02:29 -07:00
parent 71ecd3cdb4
commit b37e2e87ad
2 changed files with 4160 additions and 8935 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13061
glibc-fedora.patch
View File

File diff suppressed because it is too large Load Diff

34
glibc-rh769421.patch
View File

@ -1,7 +1,7 @@
diff -rNup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S diff -Nrup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2012-01-01 05:16:32.000000000 -0700 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2012-01-01 20:52:51.546347249 -0700
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2012-01-01 13:11:35.782727180 -0700 +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2012-01-01 20:57:21.880320786 -0700
@@ -134,7 +134,6 @@ __pthread_cond_wait: @@ -137,7 +137,6 @@ __pthread_cond_wait:
cmpl $PI_BIT, %eax cmpl $PI_BIT, %eax
jne 18f jne 18f
@ -9,7 +9,7 @@ diff -rNup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/s
movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
movl %ebp, %edx movl %ebp, %edx
xorl %esi, %esi xorl %esi, %esi
@@ -148,9 +147,6 @@ __pthread_cond_wait: @@ -151,9 +150,6 @@ __pthread_cond_wait:
sete 16(%esp) sete 16(%esp)
je 19f je 19f
@ -19,7 +19,7 @@ diff -rNup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/s
/* Normal and PI futexes dont mix. Use normal futex functions only /* Normal and PI futexes dont mix. Use normal futex functions only
if the kernel does not support the PI futex functions. */ if the kernel does not support the PI futex functions. */
cmpl $-ENOSYS, %eax cmpl $-ENOSYS, %eax
@@ -395,78 +391,6 @@ __pthread_cond_wait: @@ -398,78 +394,6 @@ __pthread_cond_wait:
#endif #endif
call __lll_unlock_wake call __lll_unlock_wake
jmp 11b jmp 11b
@ -98,7 +98,7 @@ diff -rNup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/s
.size __pthread_cond_wait, .-__pthread_cond_wait .size __pthread_cond_wait, .-__pthread_cond_wait
versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
GLIBC_2_3_2) GLIBC_2_3_2)
@@ -639,10 +563,6 @@ __condvar_w_cleanup: @@ -642,10 +566,6 @@ __condvar_w_cleanup:
.long .LcleanupEND-.Lsub_cond_futex .long .LcleanupEND-.Lsub_cond_futex
.long __condvar_w_cleanup-.LSTARTCODE .long __condvar_w_cleanup-.LSTARTCODE
.uleb128 0 .uleb128 0
@ -109,18 +109,10 @@ diff -rNup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/s
.long .LcallUR-.LSTARTCODE .long .LcallUR-.LSTARTCODE
.long .LENDCODE-.LcallUR .long .LENDCODE-.LcallUR
.long 0 .long 0
diff -rNup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S diff -Nrup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2012-01-01 05:16:32.000000000 -0700 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2012-01-01 20:52:51.550347247 -0700
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2012-01-01 13:12:04.609729109 -0700 +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2012-01-01 20:57:21.883320786 -0700
@@ -24,6 +24,7 @@ @@ -137,14 +137,11 @@ __pthread_cond_wait:
#include <tcb-offsets.h>
#include <pthread-pi-defines.h>
#include <pthread-errnos.h>
+#include <stap-probe.h>
#include <kernel-features.h>
@@ -134,14 +135,11 @@ __pthread_cond_wait:
cmpl $PI_BIT, %eax cmpl $PI_BIT, %eax
jne 61f jne 61f
@ -135,7 +127,7 @@ diff -rNup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysd
#ifdef __ASSUME_REQUEUE_PI #ifdef __ASSUME_REQUEUE_PI
jmp 62f jmp 62f
#else #else
@@ -328,70 +326,6 @@ __pthread_cond_wait: @@ -331,70 +328,6 @@ __pthread_cond_wait:
13: movq %r10, %rax 13: movq %r10, %rax
jmp 14b jmp 14b
@ -206,7 +198,7 @@ diff -rNup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysd
.size __pthread_cond_wait, .-__pthread_cond_wait .size __pthread_cond_wait, .-__pthread_cond_wait
versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
GLIBC_2_3_2) GLIBC_2_3_2)
@@ -544,15 +478,11 @@ __condvar_cleanup1: @@ -547,15 +480,11 @@ __condvar_cleanup1:
.uleb128 .LcleanupSTART-.LSTARTCODE .uleb128 .LcleanupSTART-.LSTARTCODE
.uleb128 .LcleanupEND-.LcleanupSTART .uleb128 .LcleanupEND-.LcleanupSTART
.uleb128 __condvar_cleanup1-.LSTARTCODE .uleb128 __condvar_cleanup1-.LSTARTCODE