metalefty/glibc
1
0
Fork 0
forked from rpms/glibc
Code Pull Requests Activity

Update from master (a316c1f)

Browse Source
This commit is contained in:
Jeff Law 2012-01-01 18:33:52 -07:00
parent 25912eaa88
commit 71ecd3cdb4
5 changed files with 8977 additions and 4207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -8,3 +8,6 @@ glibc-2.14-394-g8f3b1ff
/glibc-2.14-16c6f99-fedora.tar.gz /glibc-2.14-16c6f99-fedora.tar.gz
/glibc-2.14-16c6f99.tar.gz /glibc-2.14-16c6f99.tar.gz
/glibc-ports-2.14-c2aeee1.tar.gz /glibc-ports-2.14-c2aeee1.tar.gz
/glibc-2.15-a316c1f-fedora.tar.gz
/glibc-2.15-a316c1f.tar.gz
/glibc-ports-2.15-8a70b2d.tar.gz

13125
glibc-fedora.patch
View File

File diff suppressed because it is too large Load Diff

37
glibc-rh769421.patch
View File

@ -1,7 +1,7 @@
diff -rup 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 -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
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:12.937212834 +0000 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2012-01-01 05:16:32.000000000 -0700
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:42.104222278 +0000 +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2012-01-01 13:11:35.782727180 -0700
@@ -137,7 +137,6 @@ __pthread_cond_wait: @@ -134,7 +134,6 @@ __pthread_cond_wait:
cmpl $PI_BIT, %eax cmpl $PI_BIT, %eax
jne 18f jne 18f
@ -9,7 +9,7 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sy
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
@@ -151,9 +150,6 @@ __pthread_cond_wait: @@ -148,9 +147,6 @@ __pthread_cond_wait:
sete 16(%esp) sete 16(%esp)
je 19f je 19f
@ -19,7 +19,7 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sy
/* 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
@@ -398,78 +394,6 @@ __pthread_cond_wait: @@ -395,78 +391,6 @@ __pthread_cond_wait:
#endif #endif
call __lll_unlock_wake call __lll_unlock_wake
jmp 11b jmp 11b
@ -98,7 +98,7 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sy
.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)
@@ -642,10 +566,6 @@ __condvar_w_cleanup: @@ -639,10 +563,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,19 +109,18 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sy
.long .LcallUR-.LSTARTCODE .long .LcallUR-.LSTARTCODE
.long .LENDCODE-.LcallUR .long .LENDCODE-.LcallUR
.long 0 .long 0
Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig 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 -rup 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 2011-12-22 18:04:12.941212837 +0000 +++ 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 2011-12-22 18:05:05.155229737 +0000 @@ -24,6 +24,7 @@
@@ -23,7 +23,6 @@
#include <lowlevelcond.h>
#include <tcb-offsets.h> #include <tcb-offsets.h>
#include <pthread-pi-defines.h> #include <pthread-pi-defines.h>
-#include <pthread-errnos.h> #include <pthread-errnos.h>
#include <stap-probe.h> +#include <stap-probe.h>
#include <kernel-features.h> #include <kernel-features.h>
@@ -137,14 +136,11 @@ __pthread_cond_wait:
@@ -134,14 +135,11 @@ __pthread_cond_wait:
cmpl $PI_BIT, %eax cmpl $PI_BIT, %eax
jne 61f jne 61f
@ -136,7 +135,7 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde
#ifdef __ASSUME_REQUEUE_PI #ifdef __ASSUME_REQUEUE_PI
jmp 62f jmp 62f
#else #else
@@ -331,70 +327,6 @@ __pthread_cond_wait: @@ -328,70 +326,6 @@ __pthread_cond_wait:
13: movq %r10, %rax 13: movq %r10, %rax
jmp 14b jmp 14b
@ -207,7 +206,7 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde
.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)
@@ -547,15 +479,11 @@ __condvar_cleanup1: @@ -544,15 +478,11 @@ __condvar_cleanup1:
.uleb128 .LcleanupSTART-.LSTARTCODE .uleb128 .LcleanupSTART-.LSTARTCODE
.uleb128 .LcleanupEND-.LcleanupSTART .uleb128 .LcleanupEND-.LcleanupSTART
.uleb128 __condvar_cleanup1-.LSTARTCODE .uleb128 __condvar_cleanup1-.LSTARTCODE
@ -225,5 +224,3 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde
.Lcstend: .Lcstend:
Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig
Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej

13
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.14-16c6f99 %define glibcsrcdir glibc-2.15-a316c1f
%define glibcversion 2.14.90 %define glibcversion 2.15
%define glibcportsdir glibc-ports-2.14-c2aeee1 %define glibcportsdir glibc-ports-2.15-8a70b2d
### glibc.spec.in follows: ### glibc.spec.in follows:
%define run_glibc_tests 1 %define run_glibc_tests 1
%define auxarches athlon alphaev6 %define auxarches athlon alphaev6
@ -28,7 +28,7 @@
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 26%{?dist} Release: 1%{?dist}
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs # Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@ -269,7 +269,7 @@ rm -rf %{glibcportsdir}
%patch0 -E -p1 %patch0 -E -p1
%ifarch ia64 %ifarch ia64
%if "%{_lib}" == "lib64" %if "%{_lib}" == "lib64"
#%patch1 -p1 %patch1 -p1
%endif %endif
%endif %endif
%patch2 -p1 %patch2 -p1
@ -1128,6 +1128,9 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Sun Jan 1 2012 Jeff Law <law@redhat.com> - 2.15-1.fc17
- Update from master (a316c1f)
* Thu Dec 22 2011 Jeff Law <law@redhat.com> - 2.14.90-26.fc17 * Thu Dec 22 2011 Jeff Law <law@redhat.com> - 2.14.90-26.fc17
- Update from master (16c6f99) - Update from master (16c6f99)
- Fix typo in recent tzfile change (#769476) - Fix typo in recent tzfile change (#769476)

6
sources
View File

@ -1,3 +1,3 @@
5d434a88a92c4957d415748cbf10b532 glibc-2.14-16c6f99-fedora.tar.gz 9c0e2b4d8cd47eac34850a4172be2aed glibc-2.15-a316c1f-fedora.tar.gz
5376ee70edca1e31fba32dabd777e9db glibc-2.14-16c6f99.tar.gz 3d33246687a96d5dd7ca0e6f2660eabe glibc-2.15-a316c1f.tar.gz
a83cba20b4ef453e85335a400b1e137b glibc-ports-2.14-c2aeee1.tar.gz 3f86e957fb42b7fe8bb631ce10f37ed4 glibc-ports-2.15-8a70b2d.tar.gz