diff --git a/.cvsignore b/.cvsignore index 11ce915..268475d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20050627T0850.tar.bz2 -glibc-fedora-20050627T0850.tar.bz2 +glibc-20050708T0811.tar.bz2 +glibc-fedora-20050708T0811.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index cf9d6b6..098ac05 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,6 @@ ---- glibc-20050627T0850/ChangeLog 26 Jun 2005 19:06:12 -0000 1.9398 -+++ glibc-20050627T0850-fedora/ChangeLog 27 Jun 2005 13:04:06 -0000 1.8782.2.111 -@@ -2508,6 +2508,18 @@ +--- glibc-20050708T0811/ChangeLog 8 Jul 2005 06:50:06 -0000 1.9414 ++++ glibc-20050708T0811-fedora/ChangeLog 8 Jul 2005 09:09:32 -0000 1.8782.2.112 +@@ -2632,6 +2632,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -19,8 +19,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20050627T0850/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20050627T0850-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050708T0811/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20050708T0811-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -1352,6 +1352,11 @@ * sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the end of inline assembler code. @@ -70,8 +70,8 @@ * sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add __extension__ to hexadecimal floating constant notation. * sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): ---- glibc-20050627T0850/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20050627T0850-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050708T0811/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20050708T0811-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -7729,6 +7729,13 @@ * Versions.def [ld]: Add GLIBC_2.2.1. @@ -98,8 +98,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20050627T0850/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20050627T0850-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20050708T0811/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20050708T0811-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -180,10 +180,10 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20050627T0850/csu/elf-init.c 14 Feb 2005 21:21:36 -0000 1.5 -+++ glibc-20050627T0850-fedora/csu/elf-init.c 3 Mar 2005 13:33:53 -0000 1.3.2.3 -@@ -44,6 +44,24 @@ extern void (*__init_array_start []) (vo - extern void (*__init_array_end []) (void) attribute_hidden; +--- glibc-20050708T0811/csu/elf-init.c 7 Jul 2005 22:56:11 -0000 1.7 ++++ glibc-20050708T0811-fedora/csu/elf-init.c 8 Jul 2005 09:09:45 -0000 1.3.2.4 +@@ -48,6 +48,24 @@ extern void (*__init_array_end []) (int, + attribute_hidden; extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; + @@ -207,8 +207,8 @@ #endif /* These function symbols are provided for the .init/.fini section entry ---- glibc-20050627T0850/debug/tst-chk1.c 19 Mar 2005 00:09:08 -0000 1.7 -+++ glibc-20050627T0850-fedora/debug/tst-chk1.c 27 Jun 2005 13:04:11 -0000 1.1.2.11 +--- glibc-20050708T0811/debug/tst-chk1.c 19 Mar 2005 00:09:08 -0000 1.7 ++++ glibc-20050708T0811-fedora/debug/tst-chk1.c 27 Jun 2005 13:04:11 -0000 1.1.2.11 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -237,8 +237,8 @@ # define O 0 #else # define O 1 ---- glibc-20050627T0850/elf/ldconfig.c 7 Apr 2005 20:56:56 -0000 1.49 -+++ glibc-20050627T0850-fedora/elf/ldconfig.c 15 Apr 2005 09:32:44 -0000 1.47.2.3 +--- glibc-20050708T0811/elf/ldconfig.c 7 Apr 2005 20:56:56 -0000 1.49 ++++ glibc-20050708T0811-fedora/elf/ldconfig.c 15 Apr 2005 09:32:44 -0000 1.47.2.3 @@ -953,17 +953,19 @@ search_dirs (void) @@ -320,8 +320,8 @@ } search_dirs (); ---- glibc-20050627T0850/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 -+++ glibc-20050627T0850-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 +--- glibc-20050708T0811/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 ++++ glibc-20050708T0811-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 @@ -1013,6 +1013,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -398,8 +398,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20050627T0850/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 -+++ glibc-20050627T0850-fedora/include/features.h 27 Jun 2005 13:04:16 -0000 1.35.2.8 +--- glibc-20050708T0811/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 ++++ glibc-20050708T0811-fedora/include/features.h 27 Jun 2005 13:04:16 -0000 1.35.2.8 @@ -262,7 +262,13 @@ # define __USE_REENTRANT 1 #endif @@ -415,8 +415,8 @@ # if _FORTIFY_SOURCE == 1 # define __USE_FORTIFY_LEVEL 1 # elif _FORTIFY_SOURCE > 1 ---- glibc-20050627T0850/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20050627T0850-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20050708T0811/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20050708T0811-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 @@ -58,8 +58,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -426,8 +426,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20050627T0850/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 -+++ glibc-20050627T0850-fedora/libio/stdio.h 8 Feb 2005 10:04:09 -0000 1.78.2.4 +--- glibc-20050708T0811/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 ++++ glibc-20050708T0811-fedora/libio/stdio.h 8 Feb 2005 10:04:09 -0000 1.78.2.4 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -441,8 +441,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20050627T0850/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20050627T0850-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20050708T0811/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20050708T0811-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -473,510 +473,8 @@ #endif ---- glibc-20050627T0850/linuxthreads/ChangeLog 17 Jun 2005 22:52:53 -0000 1.852 -+++ glibc-20050627T0850-fedora/linuxthreads/ChangeLog 20 Jun 2005 15:57:54 -0000 1.817.2.29 -@@ -7,6 +7,16 @@ - * sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S (__vfork): Avoid - bl into the GOT when HAVE_ASM_PPC_REL16. - -+2005-05-30 Jakub Jelinek -+ -+ * man/Makefile (SOURCES): Remove all man pages but -+ pthread_cleanup_push.man, pthread_kill_other_threads_np.man -+ and pthread_mutexattr_setkind_np.man. -+ * man/pthread_cleanup_push.man: Replace (3) with (3p) where man page -+ was not kept. -+ * man/pthread_kill_other_threads_np.man: Likewise. -+ * man/pthread_mutexattr_setkind_np.man: Likewise. -+ - 2005-05-23 Roland McGrath - - * sysdeps/arm, sysdeps/unix/sysv/linux/arm: Subdirectories moved to -@@ -850,6 +860,12 @@ - (pthread_barrierattr_setpshared): Return EINVAL if pshared - is neither PTHREAD_PROCESS_PRIVATE nor PTHREAD_PROCESS_SHARED. - -+2003-09-02 Jakub Jelinek -+ -+ * sysdeps/sparc/tls.h (TLS_TCB_SIZE): If in ld.so and NPTL struct -+ pthread is bigger than struct _pthread_descr_struct, use NPTL struct -+ pthread size. -+ - 2003-09-02 Ulrich Drepper - - * sysdeps/unix/sysv/linux/i386/dl-sysdep.h -@@ -982,6 +998,34 @@ - - 2003-07-22 Jakub Jelinek - -+ * sysdeps/alpha/tls.h (TLS_INIT_TCB_SIZE, TLS_TCB_SIZE): Change to 0. -+ (TLS_INIT_TCB_ALIGN, TLS_TCB_ALIGN): Alignment of struct -+ _pthread_descr_struct. -+ (TLS_PRE_TCB_SIZE): Add sizeof (tcbhead_t) and pad to align. -+ If in ld.so and NPTL struct pthread is bigger than struct -+ _pthread_descr_struct, use NPTL struct pthread size. -+ (TLS_TCB_OFFSET): Define. -+ (INSTALL_DTV, INSTALL_NEW_DTV, GET_DTV, TLS_INIT_TP, THREAD_DTV, -+ THREAD_SELF, INIT_THREAD_SELF): Changed to match NPTL tls.h -+ definitions. -+ * sysdeps/i386/tls.h (TLS_TCB_SIZE): If in ld.so and NPTL struct -+ pthread is bigger than struct _pthread_descr_struct, use NPTL struct -+ pthread size. -+ * sysdeps/ia64/tls.h (TLS_PRE_TCB_SIZE): Likewise. -+ * sysdeps/powerpc/tls.h (TLS_PRE_TCB_SIZE): Likewise. -+ * sysdeps/s390/tls.h (TLS_TCB_SIZE): Likewise. -+ * sysdeps/sh/tls.h (TLS_PRE_TCB_SIZE): Likewise. -+ * sysdeps/x86_64/tls.h (TLS_TCB_SIZE): Likewise. -+ * sysdeps/pthread/Makefile (gen-as-const-headers): Add -+ nptl-struct-pthread.sym if nptl tree is present. -+ (before-compile): Add $(common-objpfx)nptl-struct-pthread.h -+ if nptl tree is not present. -+ (common-generated): Add nptl-struct-pthread.h. -+ ($(common-objpfx)nptl-struct-pthread.h): New rule. -+ * sysdeps/pthread/nptl-struct-pthread.sym: New file. -+ -+2003-07-22 Jakub Jelinek -+ - * descr.h (struct _pthread_descr_struct): Provide p_res member - even if USE_TLS && HAVE___THREAD. - * sysdeps/pthread/res-state.c (__res_state): Return __resp ---- glibc-20050627T0850/linuxthreads/Makefile 7 Feb 2005 19:30:03 -0000 1.98 -+++ glibc-20050627T0850-fedora/linuxthreads/Makefile 8 Feb 2005 10:04:10 -0000 1.94.2.5 -@@ -245,15 +245,18 @@ $(addprefix $(objpfx), \ - $(filter-out $(tests-static) $(tests-reverse) unload, \ - $(tests) $(test-srcs))): $(objpfx)libpthread.so \ - $(objpfx)libpthread_nonshared.a --# $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so, -+# $(objpfx)linklibc.so is used instead of $(common-objpfx)libc.so, - # since otherwise libpthread.so comes before libc.so when linking. - $(addprefix $(objpfx), $(tests-reverse)): \ -- $(objpfx)../libc.so $(objpfx)libpthread.so \ -+ $(objpfx)linklibc.so $(objpfx)libpthread.so \ - $(objpfx)libpthread_nonshared.a - $(objpfx)../libc.so: $(common-objpfx)libc.so ; - $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.so - $(objpfx)unload: $(common-objpfx)dlfcn/libdl.so - $(objpfx)unload.out: $(objpfx)libpthread.so $(objpfx)libpthread_nonshared.a -+$(objpfx)linklibc.so: $(common-objpfx)libc.so -+ ln -s ../libc.so $@ -+generated += libclink.so - else - $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a - $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a ---- glibc-20050627T0850/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 -+++ glibc-20050627T0850-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 -@@ -230,5 +230,6 @@ void __pthread_perform_cleanup(char *cur - } - - /* And the TSD which needs special help. */ -+ THREAD_SETMEM (self, p_cancelstate, PTHREAD_CANCEL_DISABLE); - __libc_thread_freeres (); - } ---- glibc-20050627T0850/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 -+++ glibc-20050627T0850-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 -@@ -74,7 +74,11 @@ __fresetlockfiles (void) - __pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP); - - for (i = _IO_iter_begin(); i != _IO_iter_end(); i = _IO_iter_next(i)) -- __pthread_mutex_init (_IO_iter_file(i)->_lock, &attr); -+ { -+ _IO_lock_t *_lock = _IO_iter_file(i)->_lock; -+ if (_lock) -+ __pthread_mutex_init (_lock, &attr); -+ } - - __pthread_mutexattr_destroy (&attr); - ---- glibc-20050627T0850/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 -+++ glibc-20050627T0850-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 -@@ -21,6 +21,7 @@ - # define __need_timespec - # include - #endif -+#include - - #ifndef _PTHREAD_DESCR_DEFINED - /* Thread descriptors. Needed for `sem_t' definition. */ ---- glibc-20050627T0850/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 -+++ glibc-20050627T0850-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 -@@ -2,7 +2,7 @@ - #include - #include - --#if USE_TLS && HAVE___THREAD -+#if USE_TLS && (0 || HAVE___THREAD) - - struct tls_obj - { ---- glibc-20050627T0850/linuxthreads/man/Makefile 6 Apr 2002 01:04:38 -0000 1.2 -+++ glibc-20050627T0850-fedora/linuxthreads/man/Makefile 30 May 2005 09:15:07 -0000 1.2.2.1 -@@ -1,10 +1,4 @@ --SOURCES=pthread_atfork.man pthread_attr_init.man pthread_cancel.man \ -- pthread_cleanup_push.man pthread_cond_init.man \ -- pthread_condattr_init.man pthread_create.man pthread_detach.man \ -- pthread_equal.man pthread_exit.man pthread_join.man \ -- pthread_key_create.man pthread_mutex_init.man \ -- pthread_mutexattr_init.man pthread_once.man pthread_self.man \ -- pthread_setschedparam.man pthread_sigmask.man sem_init.man \ -+SOURCES= pthread_cleanup_push.man \ - pthread_kill_other_threads_np.man pthread_mutexattr_setkind_np.man - - MANPAGES=$(SOURCES:.man=.3thr) ---- glibc-20050627T0850/linuxthreads/man/pthread_cleanup_push.man 11 Mar 1998 12:42:23 -0000 1.1 -+++ glibc-20050627T0850-fedora/linuxthreads/man/pthread_cleanup_push.man 30 May 2005 09:15:07 -0000 1.1.6.1 -@@ -21,7 +21,7 @@ void pthread_cleanup_pop_restore_np(int - .SH DESCRIPTION - - Cleanup handlers are functions that get called when a thread --terminates, either by calling !pthread_exit!(3) or because of -+terminates, either by calling !pthread_exit!(3p) or because of - cancellation. Cleanup handlers are installed and removed following a - stack-like discipline. - -@@ -37,7 +37,7 @@ with !malloc!(3) or close file descripto - !pthread_cleanup_push! installs the |routine| function with argument - |arg| as a cleanup handler. From this point on to the matching - !pthread_cleanup_pop!, the function |routine| will be called with --arguments |arg| when the thread terminates, either through !pthread_exit!(3) -+arguments |arg| when the thread terminates, either through !pthread_exit!(3p) - or by cancellation. If several cleanup handlers are active at that - point, they are called in LIFO order: the most recently installed - handler is called first. -@@ -56,7 +56,7 @@ with the matching closing brace !}! bein - of the matching !pthread_cleanup_pop!. - - !pthread_cleanup_push_defer_np! is a non-portable extension that --combines !pthread_cleanup_push! and !pthread_setcanceltype!(3). -+combines !pthread_cleanup_push! and !pthread_setcanceltype!(3p). - It pushes a cleanup handler just as !pthread_cleanup_push! does, but - also saves the current cancellation type and sets it to deferred - cancellation. This ensures that the cleanup mechanism is effective -@@ -113,9 +113,9 @@ None. - Xavier Leroy - - .SH "SEE ALSO" --!pthread_exit!(3), --!pthread_cancel!(3), --!pthread_setcanceltype!(3). -+!pthread_exit!(3p), -+!pthread_cancel!(3p), -+!pthread_setcanceltype!(3p). - - .SH EXAMPLE - -@@ -149,7 +149,7 @@ pthread_cleanup_pop(1); - .fi - - Notice that the code above is safe only in deferred cancellation mode --(see !pthread_setcanceltype!(3)). In asynchronous cancellation mode, -+(see !pthread_setcanceltype!(3p)). In asynchronous cancellation mode, - a cancellation can occur between !pthread_cleanup_push! and - !pthread_mutex_lock!, or between !pthread_mutex_unlock! and - !pthread_cleanup_pop!, resulting in both cases in the thread trying to ---- glibc-20050627T0850/linuxthreads/man/pthread_kill_other_threads_np.man 11 Mar 1998 12:42:23 -0000 1.1 -+++ glibc-20050627T0850-fedora/linuxthreads/man/pthread_kill_other_threads_np.man 30 May 2005 09:15:07 -0000 1.1.6.1 -@@ -16,7 +16,7 @@ called just before a thread calls one of - e.g. !execve!(2). - - Termination of the other threads is not performed through --!pthread_cancel!(3) and completely bypasses the cancellation -+!pthread_cancel!(3p) and completely bypasses the cancellation - mechanism. Hence, the current settings for cancellation state and - cancellation type are ignored, and the cleanup handlers are not - executed in the terminated threads. -@@ -26,9 +26,9 @@ Xavier Leroy - - .SH "SEE ALSO" - !execve!(2), --!pthread_setcancelstate!(3), --!pthread_setcanceltype!(3), --!pthread_cancel!(3). -+!pthread_setcancelstate!(3p), -+!pthread_setcanceltype!(3p), -+!pthread_cancel!(3p). - - .SH BUGS - ---- glibc-20050627T0850/linuxthreads/man/pthread_mutexattr_setkind_np.man 6 Apr 2002 01:05:27 -0000 1.1 -+++ glibc-20050627T0850-fedora/linuxthreads/man/pthread_mutexattr_setkind_np.man 30 May 2005 09:15:07 -0000 1.1.2.1 -@@ -14,8 +14,8 @@ int pthread_mutexattr_getkind_np(const p - - .SH DESCRIPTION - --These functions are deprecated, use !pthread_mutexattr_settype!(3) --and !pthread_mutexattr_gettype!(3) instead. -+These functions are deprecated, use !pthread_mutexattr_settype!(3p) -+and !pthread_mutexattr_gettype!(3p) instead. - - .SH "RETURN VALUE" - !pthread_mutexattr_getkind_np! always returns 0. -@@ -35,5 +35,5 @@ nor !PTHREAD_MUTEX_ERRORCHECK_NP! - Xavier Leroy - - .SH "SEE ALSO" --!pthread_mutexattr_settype!(3), --!pthread_mutexattr_gettype!(3). -+!pthread_mutexattr_settype!(3p), -+!pthread_mutexattr_gettype!(3p). ---- glibc-20050627T0850/linuxthreads/sysdeps/alpha/tls.h 9 Jan 2005 20:01:12 -0000 1.6 -+++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/alpha/tls.h 8 Feb 2005 10:04:11 -0000 1.5.2.2 -@@ -58,54 +58,76 @@ typedef struct - # include - - /* This is the size of the initial TCB. */ --# define TLS_INIT_TCB_SIZE sizeof (tcbhead_t) -+# define TLS_INIT_TCB_SIZE 0 - - /* Alignment requirements for the initial TCB. */ --# define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) -+# define TLS_INIT_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) - - /* This is the size of the TCB. */ --# define TLS_TCB_SIZE sizeof (tcbhead_t) -+# define TLS_TCB_SIZE 0 - - /* Alignment requirements for the TCB. */ --# define TLS_TCB_ALIGN __alignof__ (tcbhead_t) -+# define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) - - /* This is the size we need before TCB. */ --# define TLS_PRE_TCB_SIZE sizeof (struct _pthread_descr_struct) -+# ifndef IS_IN_rtld -+# define TLS_PRE_TCB_SIZE \ -+ (sizeof (struct _pthread_descr_struct) \ -+ + ((sizeof (tcbhead_t) + TLS_TCB_ALIGN - 1) & ~(TLS_TCB_ALIGN - 1))) -+# else -+# include -+# define TLS_PRE_TCB_SIZE \ -+ ((sizeof (struct _pthread_descr_struct) > NPTL_STRUCT_PTHREAD_SIZE \ -+ ? sizeof (struct _pthread_descr_struct) : NPTL_STRUCT_PTHREAD_SIZE) \ -+ + ((sizeof (tcbhead_t) + TLS_TCB_ALIGN - 1) & ~(TLS_TCB_ALIGN - 1))) -+# endif - - /* The DTV is allocated at the TP; the TCB is placed elsewhere. */ - # define TLS_DTV_AT_TP 1 - -+/* The following assumes that TP (R2 or R13) points to the end of the -+ TCB + 0x7000 (per the ABI). This implies that TCB address is -+ TP - 0x7000. As we define TLS_DTV_AT_TP we can -+ assume that the pthread struct is allocated immediately ahead of the -+ TCB. This implies that the pthread_descr address is -+ TP - (TLS_PRE_TCB_SIZE + 0x7000). */ -+/* ??? PPC uses offset 0x7000; seems like a good idea for alpha too, -+ but binutils not yet changed to match. */ -+# define TLS_TCB_OFFSET 0 -+ - /* Install the dtv pointer. The pointer passed is to the element with - index -1 which contain the length. */ - # define INSTALL_DTV(TCBP, DTVP) \ -- (((tcbhead_t *) (TCBP))->dtv = (DTVP) + 1) -+ (((tcbhead_t *) (TCBP))[-1].dtv = (DTVP) + 1) - - /* Install new dtv for current thread. */ - # define INSTALL_NEW_DTV(DTV) \ -- (((tcbhead_t *)__builtin_thread_pointer ())->dtv = (DTV)) -+ (THREAD_DTV() = (DTV)) - - /* Return dtv of given thread descriptor. */ - # define GET_DTV(TCBP) \ -- (((tcbhead_t *) (TCBP))->dtv) -+ (((tcbhead_t *) (TCBP))[-1].dtv) - - /* Code to initially initialize the thread pointer. This might need - special attention since 'errno' is not yet available and if the - operation can cause a failure 'errno' must not be touched. */ - # define TLS_INIT_TP(TCBP, SECONDCALL) \ -- (__builtin_set_thread_pointer (TCBP), 0) -+ (__builtin_set_thread_pointer ((void *) (TCBP) + TLS_TCB_OFFSET), NULL) - - /* Return the address of the dtv for the current thread. */ - # define THREAD_DTV() \ -- (((tcbhead_t *)__builtin_thread_pointer ())->dtv) -+ (((tcbhead_t *) (__builtin_thread_pointer () - TLS_TCB_OFFSET))[-1].dtv) - - /* Return the thread descriptor for the current thread. */ - # undef THREAD_SELF - # define THREAD_SELF \ -- ((pthread_descr)__builtin_thread_pointer () - 1) -+ ((pthread_descr) (__builtin_thread_pointer () \ -+ - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE)) - - # undef INIT_THREAD_SELF - # define INIT_THREAD_SELF(DESCR, NR) \ -- __builtin_set_thread_pointer ((struct _pthread_descr_struct *)(DESCR) + 1) -+ __builtin_set_thread_pointer ((char *)(DESCR) \ -+ + TLS_TCB_OFFSET + TLS_PRE_TCB_SIZE) - - /* Get the thread descriptor definition. */ - # include ---- glibc-20050627T0850/linuxthreads/sysdeps/i386/tls.h 9 Jan 2005 20:01:13 -0000 1.38 -+++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/i386/tls.h 8 Feb 2005 10:04:12 -0000 1.35.2.5 -@@ -86,7 +86,14 @@ typedef struct - # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) - - /* This is the size of the TCB. */ --# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct) -+# ifndef IS_IN_rtld -+# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct) -+# else -+# include -+# define TLS_TCB_SIZE \ -+ (sizeof (struct _pthread_descr_struct) > NPTL_STRUCT_PTHREAD_SIZE \ -+ ? sizeof (struct _pthread_descr_struct) : NPTL_STRUCT_PTHREAD_SIZE) -+# endif - - /* Alignment requirements for the TCB. */ - # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050627T0850/linuxthreads/sysdeps/ia64/tls.h 9 Jan 2005 20:01:13 -0000 1.10 -+++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/ia64/tls.h 8 Feb 2005 10:04:14 -0000 1.9.2.2 -@@ -65,7 +65,14 @@ typedef struct - # define TLS_TCB_SIZE sizeof (tcbhead_t) - - /* This is the size we need before TCB. */ --# define TLS_PRE_TCB_SIZE sizeof (struct _pthread_descr_struct) -+# ifndef IS_IN_rtld -+# define TLS_PRE_TCB_SIZE sizeof (struct _pthread_descr_struct) -+# else -+# include -+# define TLS_PRE_TCB_SIZE \ -+ (sizeof (struct _pthread_descr_struct) > NPTL_STRUCT_PTHREAD_SIZE \ -+ ? sizeof (struct _pthread_descr_struct) : NPTL_STRUCT_PTHREAD_SIZE) -+# endif - - /* Alignment requirements for the TCB. */ - # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050627T0850/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 -+++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/powerpc/tls.h 8 Feb 2005 10:04:14 -0000 1.8.2.2 -@@ -69,11 +69,19 @@ typedef struct - # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) - - /* This is the size we need before TCB. */ --# define TLS_PRE_TCB_SIZE \ -+# ifndef IS_IN_rtld -+# define TLS_PRE_TCB_SIZE \ - (sizeof (struct _pthread_descr_struct) \ - + ((sizeof (tcbhead_t) + TLS_TCB_ALIGN - 1) & ~(TLS_TCB_ALIGN - 1))) -+# else -+# include -+# define TLS_PRE_TCB_SIZE \ -+ ((sizeof (struct _pthread_descr_struct) > NPTL_STRUCT_PTHREAD_SIZE \ -+ ? sizeof (struct _pthread_descr_struct) : NPTL_STRUCT_PTHREAD_SIZE) \ -+ + ((sizeof (tcbhead_t) + TLS_TCB_ALIGN - 1) & ~(TLS_TCB_ALIGN - 1))) -+# endif - --/* The following assumes that TP (R2 or R13) is points to the end of the -+/* The following assumes that TP (R2 or R13) points to the end of the - TCB + 0x7000 (per the ABI). This implies that TCB address is - TP - 0x7000. As we define TLS_DTV_AT_TP we can - assume that the pthread_descr is allocated immediately ahead of the ---- glibc-20050627T0850/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 -+++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 -@@ -12,3 +12,15 @@ endif - ifeq ($(subdir),posix) - CFLAGS-confstr.c += -DLIBPTHREAD_VERSION="\"$(shell sed 's/\(.*\) by .*/\1/' ../linuxthreads/Banner)\"" - endif -+ -+ifeq ($(subdir),csu) -+# Find out the size of NPTL struct pthread -+ifneq (,$(wildcard $(..)nptl/descr.h)) -+gen-as-const-headers += nptl-struct-pthread.sym -+else -+before-compile += $(common-objpfx)nptl-struct-pthread.h -+common-generated += nptl-struct-pthread.h -+$(common-objpfx)nptl-struct-pthread.h: -+ @echo '#define NPTL_STRUCT_PTHREAD_SIZE 0' > $@ -+endif -+endif ---- glibc-20050627T0850/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 -@@ -0,0 +1,13 @@ -+#ifdef HAVE_TLS_SUPPORT -+# ifndef HAVE_FORCED_UNWIND -+# define HAVE_FORCED_UNWIND 1 -+# endif -+# define __need_struct_pthread_size -+# include -+#endif -+ -+-- -+ -+#ifdef HAVE_TLS_SUPPORT -+NPTL_STRUCT_PTHREAD_SIZE sizeof (struct pthread) -+#endif ---- glibc-20050627T0850/linuxthreads/sysdeps/s390/tls.h 9 Jan 2005 20:01:14 -0000 1.4 -+++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/s390/tls.h 8 Feb 2005 10:04:15 -0000 1.3.2.2 -@@ -77,7 +77,14 @@ typedef struct - # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) - - /* This is the size of the TCB. */ --# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct) -+# ifndef IS_IN_rtld -+# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct) -+# else -+# include -+# define TLS_TCB_SIZE \ -+ (sizeof (struct _pthread_descr_struct) > NPTL_STRUCT_PTHREAD_SIZE \ -+ ? sizeof (struct _pthread_descr_struct) : NPTL_STRUCT_PTHREAD_SIZE) -+# endif - - /* Alignment requirements for the TCB. */ - # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050627T0850/linuxthreads/sysdeps/sh/tls.h 9 Jan 2005 20:01:15 -0000 1.10 -+++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/sh/tls.h 8 Feb 2005 10:04:15 -0000 1.9.2.2 -@@ -69,7 +69,14 @@ typedef struct - # define TLS_TCB_SIZE sizeof (tcbhead_t) - - /* This is the size we need before TCB. */ --# define TLS_PRE_TCB_SIZE sizeof (struct _pthread_descr_struct) -+# ifndef IS_IN_rtld -+# define TLS_PRE_TCB_SIZE sizeof (struct _pthread_descr_struct) -+# else -+# include -+# define TLS_PRE_TCB_SIZE \ -+ (sizeof (struct _pthread_descr_struct) > NPTL_STRUCT_PTHREAD_SIZE \ -+ ? sizeof (struct _pthread_descr_struct) : NPTL_STRUCT_PTHREAD_SIZE) -+# endif - - /* Alignment requirements for the TCB. */ - # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050627T0850/linuxthreads/sysdeps/sparc/tls.h 9 Jan 2005 20:01:15 -0000 1.4 -+++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/sparc/tls.h 8 Feb 2005 10:04:16 -0000 1.3.2.2 -@@ -69,7 +69,14 @@ typedef struct - # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) - - /* This is the size of the TCB. */ --# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct) -+# ifndef IS_IN_rtld -+# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct) -+# else -+# include -+# define TLS_TCB_SIZE \ -+ (sizeof (struct _pthread_descr_struct) > NPTL_STRUCT_PTHREAD_SIZE \ -+ ? sizeof (struct _pthread_descr_struct) : NPTL_STRUCT_PTHREAD_SIZE) -+# endif - - /* Alignment requirements for the TCB. */ - # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050627T0850/linuxthreads/sysdeps/x86_64/tls.h 9 Jan 2005 20:01:15 -0000 1.7 -+++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/x86_64/tls.h 8 Feb 2005 10:04:16 -0000 1.6.2.2 -@@ -71,7 +71,14 @@ typedef struct - # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) - - /* This is the size of the TCB. */ --# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct) -+# ifndef IS_IN_rtld -+# define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct) -+# else -+# include -+# define TLS_TCB_SIZE \ -+ (sizeof (struct _pthread_descr_struct) > NPTL_STRUCT_PTHREAD_SIZE \ -+ ? sizeof (struct _pthread_descr_struct) : NPTL_STRUCT_PTHREAD_SIZE) -+# endif - - /* Alignment requirements for the TCB. */ - # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050627T0850/locale/iso-4217.def 20 Mar 2005 04:14:36 -0000 1.16 -+++ glibc-20050627T0850-fedora/locale/iso-4217.def 24 Mar 2005 08:19:03 -0000 1.15.2.2 +--- glibc-20050708T0811/locale/iso-4217.def 20 Mar 2005 04:14:36 -0000 1.16 ++++ glibc-20050708T0811-fedora/locale/iso-4217.def 24 Mar 2005 08:19:03 -0000 1.15.2.2 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1068,8 +566,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20050627T0850/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 -+++ glibc-20050627T0850-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 +--- glibc-20050708T0811/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 ++++ glibc-20050708T0811-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 @@ -204,6 +204,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -1113,8 +611,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20050627T0850/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 -+++ glibc-20050627T0850-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 +--- glibc-20050708T0811/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 ++++ glibc-20050708T0811-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1123,8 +621,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20050627T0850/localedata/SUPPORTED 28 Apr 2005 14:21:30 -0000 1.75 -+++ glibc-20050627T0850-fedora/localedata/SUPPORTED 3 May 2005 09:28:25 -0000 1.71.2.5 +--- glibc-20050708T0811/localedata/SUPPORTED 28 Apr 2005 14:21:30 -0000 1.75 ++++ glibc-20050708T0811-fedora/localedata/SUPPORTED 3 May 2005 09:28:25 -0000 1.71.2.5 @@ -68,6 +68,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1166,8 +664,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20050627T0850/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20050627T0850-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20050708T0811/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20050708T0811-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -1182,8 +680,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20050627T0850/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20050627T0850-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20050708T0811/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20050708T0811-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -1195,18 +693,8 @@ date_fmt "/ / " ---- glibc-20050627T0850/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 -+++ glibc-20050627T0850-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 -@@ -100,7 +100,6 @@ mon " - "";/ - "";/ - "" --am_pm "";"" - % Appropriate date and time representation (%c) - % "%a %d %b %Y %r %Z" - d_t_fmt "" ---- glibc-20050627T0850/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050627T0850-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20050708T0811/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050708T0811-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1277,8 +765,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20050627T0850/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20050627T0850-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20050708T0811/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20050708T0811-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1306,9 +794,9 @@ revision "0.2" date "2000-08-02" % ---- glibc-20050627T0850/nptl/ChangeLog 26 Jun 2005 17:47:05 -0000 1.785 -+++ glibc-20050627T0850-fedora/nptl/ChangeLog 27 Jun 2005 09:15:50 -0000 1.706.2.50 -@@ -693,6 +693,11 @@ +--- glibc-20050708T0811/nptl/ChangeLog 7 Jul 2005 23:20:03 -0000 1.787 ++++ glibc-20050708T0811-fedora/nptl/ChangeLog 8 Jul 2005 09:10:30 -0000 1.706.2.51 +@@ -710,6 +710,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1320,7 +808,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -2767,6 +2772,11 @@ +@@ -2784,6 +2789,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1332,8 +820,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20050627T0850/nptl/Makefile 26 Jun 2005 17:46:19 -0000 1.168 -+++ glibc-20050627T0850-fedora/nptl/Makefile 27 Jun 2005 09:15:50 -0000 1.157.2.11 +--- glibc-20050708T0811/nptl/Makefile 26 Jun 2005 17:46:19 -0000 1.168 ++++ glibc-20050708T0811-fedora/nptl/Makefile 27 Jun 2005 09:15:50 -0000 1.157.2.11 @@ -501,15 +501,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1356,8 +844,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20050627T0850/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 -+++ glibc-20050627T0850-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 +--- glibc-20050708T0811/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 ++++ glibc-20050708T0811-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 @@ -44,15 +44,35 @@ __pthread_cond_destroy (cond) broadcasted, but still are using the pthread_cond_t structure, pthread_cond_destroy needs to wait for them. */ @@ -1399,8 +887,8 @@ } return 0; ---- glibc-20050627T0850/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050627T0850-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20050708T0811/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050708T0811-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1408,8 +896,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20050627T0850/nscd/connections.c 20 Jun 2005 15:46:11 -0000 1.68 -+++ glibc-20050627T0850-fedora/nscd/connections.c 27 Jun 2005 13:04:17 -0000 1.55.2.10 +--- glibc-20050708T0811/nscd/connections.c 20 Jun 2005 15:46:11 -0000 1.68 ++++ glibc-20050708T0811-fedora/nscd/connections.c 27 Jun 2005 13:04:17 -0000 1.55.2.10 @@ -1617,3 +1617,18 @@ finish_drop_privileges (void) exit (4); } @@ -1429,8 +917,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20050627T0850/nscd/nscd.c 20 Jun 2005 15:46:51 -0000 1.45 -+++ glibc-20050627T0850-fedora/nscd/nscd.c 27 Jun 2005 13:04:17 -0000 1.38.2.7 +--- glibc-20050708T0811/nscd/nscd.c 20 Jun 2005 15:46:51 -0000 1.45 ++++ glibc-20050708T0811-fedora/nscd/nscd.c 27 Jun 2005 13:04:17 -0000 1.38.2.7 @@ -122,6 +122,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1449,8 +937,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20050627T0850/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 -+++ glibc-20050627T0850-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 +--- glibc-20050708T0811/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 ++++ glibc-20050708T0811-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 @@ -31,8 +31,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1462,8 +950,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20050627T0850/posix/Makefile 14 Apr 2005 21:19:34 -0000 1.184 -+++ glibc-20050627T0850-fedora/posix/Makefile 15 Apr 2005 09:32:51 -0000 1.171.2.12 +--- glibc-20050708T0811/posix/Makefile 14 Apr 2005 21:19:34 -0000 1.184 ++++ glibc-20050708T0811-fedora/posix/Makefile 15 Apr 2005 09:32:51 -0000 1.171.2.12 @@ -106,7 +106,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1497,8 +985,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20050627T0850/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050627T0850-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20050708T0811/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050708T0811-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -1515,8 +1003,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20050627T0850/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20050627T0850-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20050708T0811/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20050708T0811-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1532,8 +1020,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20050627T0850/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20050627T0850-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20050708T0811/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20050708T0811-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1545,8 +1033,8 @@ endif endif ---- glibc-20050627T0850/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20050627T0850-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20050708T0811/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20050708T0811-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1898,8 +1386,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20050627T0850/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050627T0850-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050708T0811/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050708T0811-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1985,8 +1473,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20050627T0850/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20050627T0850-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20050708T0811/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20050708T0811-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) __set_errno (save); } @@ -2001,8 +1489,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20050627T0850/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20050708T0811/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20050708T0811-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2012,8 +1500,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20050627T0850/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 -+++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 +--- glibc-20050708T0811/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 ++++ glibc-20050708T0811-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 @@ -33,7 +33,10 @@ __readonly_area (const char *ptr, size_t FILE *fp = fopen ("/proc/self/maps", "rc"); @@ -2026,8 +1514,8 @@ /* We need no locking. */ __fsetlocking (fp, FSETLOCKING_BYCALLER); ---- glibc-20050627T0850/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20050708T0811/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20050708T0811-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -2073,8 +1561,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20050627T0850/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050708T0811/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050708T0811-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -2135,8 +1623,8 @@ + } while (0) + +#include_next ---- glibc-20050627T0850/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20050708T0811/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20050708T0811-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2169,24 +1657,24 @@ + } while (0) + #include_next ---- glibc-20050627T0850/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050708T0811/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050708T0811-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20050627T0850/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050708T0811/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050708T0811-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20050627T0850/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20050708T0811/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20050708T0811-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ diff --git a/glibc.spec b/glibc.spec index 6e9e26c..31e8a3e 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,9 +1,9 @@ -%define glibcdate 20050627T0850 +%define glibcdate 20050708T0811 %define glibcname glibc -%define glibcsrcdir glibc-20050627T0850 +%define glibcsrcdir glibc-20050708T0811 %define glibc_release_tarballs 0 %define glibcversion 2.3.90 -%define glibcrelease 1 +%define glibcrelease 2 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -477,13 +477,13 @@ if gcc -v 2>&1 | grep -q 'gcc version 3.[0123]'; then BuildFlags="$BuildFlags -finline-limit=2000" fi EnableKernel="--enable-kernel=%{enablekernel}" -echo "$BuildFlags" > BuildFlags -echo "$GCC" > Gcc -AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d'` +echo "$BuildFlags" > ../BuildFlags +echo "$GCC" > ../Gcc +AddOns=`cd .. && echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d'` %ifarch %{rtkaioarches} AddOns=,rtkaio$AddOns %endif -echo "$AddOns" > AddOns +echo "$AddOns" > ../AddOns build_nptl() { @@ -569,6 +569,10 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/locale/ru_RU/LC_MESSAGES rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libNoVersion* rm -f $RPM_BUILD_ROOT/%{_lib}/libNoVersion* +# NPTL is not usable outside of glibc, so include +# the generic one (#162634) +cp -a ../sysdeps/generic/bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h + if [ -d $RPM_BUILD_ROOT%{_prefix}/info -a "%{_infodir}" != "%{_prefix}/info" ]; then mkdir -p $RPM_BUILD_ROOT%{_infodir} mv -f $RPM_BUILD_ROOT%{_prefix}/info/* $RPM_BUILD_ROOT%{_infodir} @@ -652,7 +656,7 @@ find $RPM_BUILD_ROOT -type f -or -type l | for n in %{_prefix}/share %{_prefix}/include %{_prefix}/lib/locale; do find ${RPM_BUILD_ROOT}${n} -type d | \ grep -v '%{_prefix}/share$' | \ - grep -v '%{_infodir}' | \ + grep -v '\(%{_mandir}\|%{_infodir}\)' | \ sed "s/^/%dir /" >> rpm.filelist.in done @@ -693,12 +697,14 @@ grep -v '%{_prefix}/%{_lib}/lib.*_p.a' rpm.filelist.full | grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist >> devel.filelist grep '%{_prefix}/%{_lib}/.*\.o' < rpm.filelist >> devel.filelist grep '%{_prefix}/%{_lib}/lib.*\.so' < rpm.filelist >> devel.filelist +grep '%{_mandir}' < rpm.filelist >> devel.filelist mv rpm.filelist rpm.filelist.full grep -v '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist.full | grep -v '%{_prefix}/%{_lib}/.*\.o' | grep -v '%{_prefix}/%{_lib}/lib.*\.so'| grep -v '%{_prefix}/%{_lib}/linuxthreads' | + grep -v '%{_mandir}' | grep -v 'nscd' > rpm.filelist grep '%{_prefix}/bin' < rpm.filelist >> common.filelist @@ -775,7 +781,7 @@ ln -sf /%{_lib}/ld-linux-ia64.so.2 $RPM_BUILD_ROOT/lib/ld-linux-ia64.so.2 # Increase timeouts export TIMEOUTFACTOR=16 echo ====================TESTING========================= -cd build-%{nptl_target_cpu}-linuxnptl +cd build-%{_target_cpu}-linuxnptl make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || : cd .. %if %{buildxen} @@ -1075,6 +1081,19 @@ rm -f *.filelist* %endif %changelog +* Fri Jul 8 2005 Jakub Jelinek 2.3.90-2 +- update from CVS + - ia64 stack protector support + - handle DNS referral results as server errors (#162625) + - ctan{,h}{,f,l} fixes (#160759) + - pass argc, argv and envp also to executable's *ni_array + functions (BZ#974) + - add ellipsis to clone prototype (#161593) + - fix glibc-profile (#162601) + - nss_compat fixes +- use sysdeps/generic version of in installed + headers instead of NPTL version (#162634) + * Mon Jun 27 2005 Jakub Jelinek 2.3.90-1 - update from CVS - stack protector support diff --git a/sources b/sources index 9b72895..d50b48d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -ecd156926c093ac5ab2881878e4e8fde glibc-20050627T0850.tar.bz2 -f83f45af959e2e3154a82e6e10d0e862 glibc-fedora-20050627T0850.tar.bz2 +3019d91f848a79f2cf54b09be235bc02 glibc-20050708T0811.tar.bz2 +c228b4fac56dbbd432d4fdba3a4d85f0 glibc-fedora-20050708T0811.tar.bz2