rpms/glibc/devel glibc-fedora.patch, 1.308, 1.309 glibc.spec, 1.400, 1.401

Jakub Jelinek jakub at fedoraproject.org
Thu Jul 23 23:57:27 UTC 2009


Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22950

Modified Files:
	glibc-fedora.patch glibc.spec 
Log Message:
2.10.90-7.1

glibc-fedora.patch:
 ChangeLog                                                         |   35 +
 ChangeLog.15                                                      |   37 +
 ChangeLog.16                                                      |  101 ++
 Makeconfig                                                        |    6 
 csu/Makefile                                                      |    3 
 csu/elf-init.c                                                    |   17 
 debug/tst-chk1.c                                                  |    7 
 elf/ldconfig.c                                                    |   25 
 elf/tst-stackguard1.c                                             |    8 
 include/bits/stdlib-ldbl.h                                        |    1 
 include/bits/wchar-ldbl.h                                         |    1 
 include/features.h                                                |    9 
 intl/locale.alias                                                 |    2 
 libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S |    4 
 libio/stdio.h                                                     |    2 
 locale/iso-4217.def                                               |   13 
 locale/programs/locarchive.c                                      |   10 
 localedata/Makefile                                               |    1 
 localedata/SUPPORTED                                              |    6 
 localedata/locales/cy_GB                                          |    7 
 localedata/locales/en_GB                                          |    4 
 localedata/locales/no_NO                                          |   69 +
 localedata/locales/zh_TW                                          |    6 
 malloc/mcheck.c                                                   |   30 
 manual/libc.texinfo                                               |    2 
 misc/sys/cdefs.h                                                  |   20 
 nis/nss                                                           |    2 
 nptl/ChangeLog                                                    |   19 
 nptl/Makefile                                                     |   11 
 nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h                     |    3 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h                    |    6 
 nptl/tst-stackguard1.c                                            |    8 
 nscd/nscd.conf                                                    |    2 
 nscd/nscd.init                                                    |   28 
 posix/Makefile                                                    |   15 
 posix/getconf.speclist.h                                          |   39 +
 streams/Makefile                                                  |    2 
 sysdeps/generic/dl-cache.h                                        |    8 
 sysdeps/i386/Makefile                                             |   10 
 sysdeps/ia64/Makefile                                             |    4 
 sysdeps/ia64/ia64libgcc.S                                         |  350 ----------
 sysdeps/ia64/libgcc-compat.c                                      |   84 ++
 sysdeps/powerpc/powerpc32/____longjmp_chk.S                       |    8 
 sysdeps/powerpc/powerpc64/Makefile                                |    1 
 sysdeps/powerpc/powerpc64/____longjmp_chk.S                       |    8 
 sysdeps/unix/nice.c                                               |    7 
 sysdeps/unix/sysv/linux/check_pf.c                                |    5 
 sysdeps/unix/sysv/linux/dl-osinfo.h                               |   29 
 sysdeps/unix/sysv/linux/futimesat.c                               |   23 
 sysdeps/unix/sysv/linux/i386/clone.S                              |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                           |   59 +
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                           |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                        |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                        |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                      |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h                           |   18 
 sysdeps/unix/sysv/linux/paths.h                                   |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                               |   32 
 sysdeps/unix/sysv/linux/x86_64/clone.S                            |    4 
 timezone/zic.c                                                    |    2 
 60 files changed, 789 insertions(+), 469 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -p -r1.308 -r1.309
--- glibc-fedora.patch	23 Jul 2009 16:45:23 -0000	1.308
+++ glibc-fedora.patch	23 Jul 2009 23:57:26 -0000	1.309
@@ -2195,3 +2195,25 @@
  		return;
  	abbrvar = (stdrp == NULL) ? "" : stdrp->r_abbrvar;
  	doabbr(result, zp->z_format, abbrvar, FALSE, TRUE);
+2009-07-23  Ulrich Drepper  <drepper at redhat.com>
+
+	* sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: Fix error
+	path when not using absolute timeout futex.
+
+--- libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
++++ libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+@@ -551,12 +551,12 @@ __pthread_cond_timedwait:
+ 	jne	53b
+ 
+ 	cmpq	24(%rsp), %r9
+-	jbe	45b
++	jbe	15f
+ 
+ 	cmpq	%rax, %r9
+ 	ja	39b
+ 
+-	cmpq	$-ETIMEDOUT, %r14
++15:	cmpq	$-ETIMEDOUT, %r14
+ 	jne	8b
+ 
+ 	jmp	99b


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -p -r1.400 -r1.401
--- glibc.spec	23 Jul 2009 16:45:24 -0000	1.400
+++ glibc.spec	23 Jul 2009 23:57:27 -0000	1.401
@@ -24,7 +24,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 7
+Release: 7.1
 # 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
@@ -1037,6 +1037,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Jul 24 2009 Jakub Jelinek <jakub at redhat.com> - 2.10.90-7.1
+- Fix up pthread_cond_timedwait on x86_64 with old kernels.
+
 * Thu Jul 23 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-7
 - Update from master.
 - Build with -DNDEBUG unless using a prerelease.




More information about the fedora-extras-commits mailing list