[glibc] - Resync with upstream sources. - Drop local stap patch now obsolete. - Drop local s390 patch
Jeffrey Law
law at fedoraproject.org
Fri Oct 5 18:25:02 UTC 2012
commit 665e71fb895ea085783de1bebca451966c09287f
Author: Jeff Law <law at redhat.com>
Date: Fri Oct 5 12:24:19 2012 -0600
- Resync with upstream sources.
- Drop local stap patch now obsolete.
- Drop local s390 patch which avoided problems with old assemblers
- Drop old fortify source patch to deal with old compilers
glibc-fedora-s390-rh711330.patch | 80 ----
glibc-fedora-test-debug-gnuc-compat.patch | 31 --
glibc-rh552960-2.patch | 85 ++--
glibc-rh552960.patch | 717 -----------------------------
glibc-stap.patch | 12 -
glibc.spec | 31 +-
6 files changed, 53 insertions(+), 903 deletions(-)
---
diff --git a/glibc-rh552960-2.patch b/glibc-rh552960-2.patch
index 79842d5..c541073 100644
--- a/glibc-rh552960-2.patch
+++ b/glibc-rh552960-2.patch
@@ -1,18 +1,16 @@
-diff --git a/nptl/Makefile b/nptl/Makefile
-index f21276c..de324fa 100644
---- a/nptl/Makefile
-+++ b/nptl/Makefile
-@@ -206,7 +206,8 @@ tests = tst-typesizes \
+diff -Nrup a/nptl/Makefile b/nptl/Makefile
+--- a/nptl/Makefile 2012-10-05 07:42:57.935825028 -0600
++++ b/nptl/Makefile 2012-10-05 07:44:08.989533264 -0600
+@@ -206,7 +206,7 @@ tests = tst-typesizes \
tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \
tst-cond8 tst-cond9 tst-cond10 tst-cond11 tst-cond12 tst-cond13 \
tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18 tst-cond19 \
-- tst-cond20 tst-cond21 tst-cond22 tst-cond23 tst-cond24 tst-cond-except \
+- tst-cond20 tst-cond21 tst-cond22 tst-cond23 tst-cond24 \
+ tst-cond20 tst-cond21 tst-cond22 tst-cond23 tst-cond24 tst-cond25 \
-+ tst-cond-except \
+ tst-cond-except \
tst-robust1 tst-robust2 tst-robust3 tst-robust4 tst-robust5 \
tst-robust6 tst-robust7 tst-robust8 tst-robust9 \
- tst-robustpi1 tst-robustpi2 tst-robustpi3 tst-robustpi4 tst-robustpi5 \
-@@ -276,6 +276,7 @@ gen-as-const-headers = pthread-errnos.sym
+@@ -276,6 +276,7 @@ gen-as-const-headers = pthread-errnos.sy
LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
LDFLAGS-tst-cond24 = -lrt
@@ -20,10 +18,9 @@ index f21276c..de324fa 100644
include ../Makeconfig
-diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
-index 6761c13..884987c 100644
---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+diff -Nrup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S 2012-10-05 07:22:36.000000000 -0600
++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S 2012-10-05 07:43:27.448703838 -0600
@@ -649,10 +649,24 @@ __condvar_tw_cleanup:
movl $0x7fffffff, %edx
ENTER_KERNEL
@@ -38,23 +35,22 @@ index 6761c13..884987c 100644
+ andl $(ROBUST_BIT|PI_BIT), %ebx
+ cmpl $PI_BIT, %ebx
+ jne 8f
-+
+
+- movl %esi, (%esp)
+ movl (%eax), %ebx
+ andl $TID_MASK, %ebx
+ cmpl %ebx, %gs:TID
+ je 9f
+
+8: call __pthread_mutex_cond_lock
-
-- movl %esi, (%esp)
++
+9: movl %esi, (%esp)
.LcallUR:
call _Unwind_Resume
hlt
-diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
-index 0af06ac..bf1e5fe 100644
---- 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-10-05 07:22:36.000000000 -0600
++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2012-10-05 07:43:27.449703835 -0600
@@ -566,10 +566,24 @@ __condvar_w_cleanup:
movl $0x7fffffff, %edx
ENTER_KERNEL
@@ -69,32 +65,30 @@ index 0af06ac..bf1e5fe 100644
+ andl $(ROBUST_BIT|PI_BIT), %ebx
+ cmpl $PI_BIT, %ebx
+ jne 8f
-+
+
+- movl %esi, (%esp)
+ movl (%eax), %ebx
+ andl $TID_MASK, %ebx
+ cmpl %ebx, %gs:TID
+ je 9f
+
+8: call __pthread_mutex_cond_lock
-
-- movl %esi, (%esp)
++
+9: movl %esi, (%esp)
.LcallUR:
call _Unwind_Resume
hlt
-diff --git a/nptl/sysdeps/unix/sysv/linux/pthread-pi-defines.sym b/nptl/sysdeps/unix/sysv/linux/pthread-pi-defines.sym
-index 46fbd0d..0ac51db 100644
---- a/nptl/sysdeps/unix/sysv/linux/pthread-pi-defines.sym
-+++ b/nptl/sysdeps/unix/sysv/linux/pthread-pi-defines.sym
-@@ -6,3 +6,4 @@ MUTEX_KIND offsetof (pthread_mutex_t, __data.__kind)
+diff -Nrup a/nptl/sysdeps/unix/sysv/linux/pthread-pi-defines.sym b/nptl/sysdeps/unix/sysv/linux/pthread-pi-defines.sym
+--- a/nptl/sysdeps/unix/sysv/linux/pthread-pi-defines.sym 2012-10-05 07:22:36.000000000 -0600
++++ b/nptl/sysdeps/unix/sysv/linux/pthread-pi-defines.sym 2012-10-05 07:43:27.487703680 -0600
+@@ -6,3 +6,4 @@ MUTEX_KIND offsetof (pthread_mutex_t, __
ROBUST_BIT PTHREAD_MUTEX_ROBUST_NORMAL_NP
PI_BIT PTHREAD_MUTEX_PRIO_INHERIT_NP
PS_BIT PTHREAD_MUTEX_PSHARED_BIT
+TID_MASK FUTEX_TID_MASK
-diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
-index b669abb..eb13326 100644
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
-+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+diff -Nrup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S 2012-10-05 07:22:36.000000000 -0600
++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S 2012-10-05 07:43:27.489703672 -0600
@@ -771,10 +771,24 @@ __condvar_cleanup2:
movl $SYS_futex, %eax
syscall
@@ -109,23 +103,22 @@ index b669abb..eb13326 100644
+ andl $(ROBUST_BIT|PI_BIT), %eax
+ cmpl $PI_BIT, %eax
+ jne 7f
-+
+
+- movq 24(%rsp), %rdi
+ movl (%rdi), %eax
+ andl $TID_MASK, %eax
+ cmpl %eax, %fs:TID
+ je 8f
+
+7: callq __pthread_mutex_cond_lock
-
-- movq 24(%rsp), %rdi
++
+8: movq 24(%rsp), %rdi
movq FRAME_SIZE(%rsp), %r15
movq FRAME_SIZE+8(%rsp), %r14
movq FRAME_SIZE+16(%rsp), %r13
-diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
-index ec403cd..6c6dc0e 100644
---- 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-10-05 07:22:36.000000000 -0600
++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2012-10-05 07:43:27.490703667 -0600
@@ -495,10 +495,24 @@ __condvar_cleanup1:
movl $SYS_futex, %eax
syscall
@@ -140,24 +133,22 @@ index ec403cd..6c6dc0e 100644
+ andl $(ROBUST_BIT|PI_BIT), %eax
+ cmpl $PI_BIT, %eax
+ jne 7f
-+
+
+- movq 24(%rsp), %rdi
+ movl (%rdi), %eax
+ andl $TID_MASK, %eax
+ cmpl %eax, %fs:TID
+ je 8f
+
+7: callq __pthread_mutex_cond_lock
-
-- movq 24(%rsp), %rdi
++
+8: movq 24(%rsp), %rdi
.LcallUR:
call _Unwind_Resume at PLT
hlt
-diff --git a/nptl/tst-cond25.c b/nptl/tst-cond25.c
-new file mode 100644
-index 0000000..4488e74
---- /dev/null
-+++ b/nptl/tst-cond25.c
+diff -Nrup a/nptl/tst-cond25.c b/nptl/tst-cond25.c
+--- a/nptl/tst-cond25.c 1969-12-31 17:00:00.000000000 -0700
++++ b/nptl/tst-cond25.c 2012-10-05 07:43:27.491703663 -0600
@@ -0,0 +1,282 @@
+/* Verify that condition variables synchronized by PI mutexes don't hang on
+ on cancellation.
diff --git a/glibc.spec b/glibc.spec
index 46921cc..75d6fb8 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.16.90-05699367
+%define glibcsrcdir glibc-2.16.90-c30e8edf
%define glibcversion 2.16.90
### glibc.spec.in follows:
%define run_glibc_tests 1
@@ -27,7 +27,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
-Release: 21%{?dist}
+Release: 22%{?dist}
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -56,10 +56,12 @@ Source1: %{glibcsrcdir}-fedora.tar.gz
#
-# Patches that are highly unlikely to ever be accepated upstream.
+# Patches that are highly unlikely to ever be accepted upstream.
#
-# Is this still necessary, if so, it needs to go upstream
-Patch0001: %{name}-stap.patch
+
+# Configuration twiddle, not sure there's a good case to get upstream to
+# change this.
+Patch0001: %{name}-fedora-nscd.patch
# Reverting an upstream patch. Once upstream fixes the problem
# Remove this patch and resync.
@@ -110,7 +112,6 @@ Patch0037: %{name}-fedora-test-debug-gnuc-hack.patch
Patch0038: %{name}-fedora-getconf.patch
Patch0039: %{name}-fedora-getrlimit-PLT.patch
Patch0040: %{name}-fedora-i386-tls-direct-seg-refs.patch
-Patch0041: %{name}-fedora-test-debug-gnuc-compat.patch
Patch0042: %{name}-fedora-include-bits-ldbl.patch
Patch0043: %{name}-fedora-ldd.patch
Patch0044: %{name}-fedora-linux-tcsetattr.patch
@@ -123,9 +124,7 @@ Patch0050: %{name}-fedora-locarchive.patch
Patch0051: %{name}-fedora-manual-dircategory.patch
Patch0052: %{name}-fedora-nis-rh188246.patch
Patch0053: %{name}-fedora-nptl-linklibc.patch
-Patch0054: %{name}-fedora-nscd.patch
Patch0055: %{name}-fedora-nss-files-overflow-fix.patch
-Patch0056: %{name}-fedora-s390-rh711330.patch
Patch0057: %{name}-fedora-ppc-unwind.patch
Patch0058: %{name}-fedora-pt_chown.patch
Patch0059: %{name}-fedora-regcomp-sw11561.patch
@@ -185,9 +184,6 @@ Patch2027: %{name}-rh819430.patch
# See http://sourceware.org/ml/libc-alpha/2012-06/msg00074.html
Patch2028: %{name}-rh767693-2.patch
-# Upstream BZ 14417
-Patch2061: %{name}-rh552960.patch
-
# Upstream BZ 14652
Patch2062: %{name}-rh552960-2.patch
@@ -414,7 +410,7 @@ package or when debugging this package.
%prep
%setup -q -n %{glibcsrcdir} -b1
-%patch0001 -E -p1
+%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
%patch0004 -p1
@@ -454,7 +450,6 @@ package or when debugging this package.
%patch0038 -p1
%patch0039 -p1
%patch0040 -p1
-%patch0041 -p1
%patch0042 -p1
%patch0043 -p1
%patch0044 -p1
@@ -467,14 +462,11 @@ package or when debugging this package.
%patch0051 -p1
%patch0052 -p1
%patch0053 -p1
-%patch0054 -p1
%patch0055 -p1
-%patch0056 -p1
%patch0057 -p1
%patch0058 -p1
%patch0059 -p1
%patch0060 -p1
-%patch2061 -p1
%patch2062 -p1
# On powerpc32, hp timing is only available in power4/power6
@@ -1270,6 +1262,13 @@ rm -f *.filelist*
%endif
%changelog
+* Fri Oct 5 2012 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.16.90-22
+ - Resync with upstream sources
+ - Drop local 552960 patch now that it's upstream
+ - Drop local stap patch now obsolete
+ - Drop local s390 patch which avoided problems with old assemblers
+ - Drop old fortify source patch to deal with old compilers
+
* Thu Oct 4 2012 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.16.90-21
- Take mutex in cleanup only if it is not already taken.
More information about the scm-commits
mailing list