diff --git a/.cvsignore b/.cvsignore index 036a52a..f8400ab 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20041014T0548.tar.bz2 -glibc-fedora-20041014T0548.tar.bz2 +glibc-20041018T0940.tar.bz2 +glibc-fedora-20041018T0940.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 882ad4d..6bd6bad 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,21 @@ ---- glibc-20041014T0548/ChangeLog 14 Oct 2004 02:24:44 -0000 1.8882 -+++ glibc-20041014T0548-fedora/ChangeLog 14 Oct 2004 05:57:50 -0000 1.8782.2.19 -@@ -689,6 +689,22 @@ +--- glibc-20041018T0940/ChangeLog 18 Oct 2004 05:17:42 -0000 1.8895 ++++ glibc-20041018T0940-fedora/ChangeLog 18 Oct 2004 11:55:59 -0000 1.8782.2.22 +@@ -1,3 +1,14 @@ ++2004-10-18 Jakub Jelinek ++ ++ * malloc/arena.c (ptmalloc_init): Don't use brk if dlopened ++ from statically linked program and avoid calling _dl_addr in that ++ case. ++ ++2004-10-18 Jakub Jelinek ++ ++ * sysdeps/generic/strcpy_chk.c (__strcpy_chk): Speed up by checking ++ destlen only every 4 bytes. ++ + 2004-10-06 Maciej W. Rozycki + + * sysdeps/unix/sysv/linux/mips/mips32/sysdep.h +@@ -928,6 +939,22 @@ * string/string.h: Add __nonnull annotations. * stdlib/stdlib.h: Likewise. @@ -23,7 +38,7 @@ 2004-09-20 H.J. Lu * sysdeps/unix/sysv/linux/ia64/sysdep.h (DO_INLINE_SYSCALL): -@@ -1418,6 +1434,23 @@ +@@ -1657,6 +1684,23 @@ before return type. * locale/localename.c (__current_locale_name): Likewise. @@ -47,7 +62,7 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit -@@ -1574,6 +1607,22 @@ +@@ -1813,6 +1857,22 @@ * resolv/nss_dns/dns-canon.c (_nss_dns_getcanonname_r): Initialize status to NSS_STATUS_UNAVAIL. @@ -70,7 +85,7 @@ 2004-08-19 Ulrich Drepper * sysdeps/posix/getaddrinfo.c (gaih_inet): Use h->h_name in the -@@ -1878,6 +1927,12 @@ +@@ -2117,6 +2177,12 @@ * iconvdata/testdata/ISO-2022-JP-3: Regenerated. @@ -83,8 +98,8 @@ 2004-08-10 Alfred M. Szmidt * sysdeps/generic/bits/in.h (struct ip_mreq): Remove definition. ---- glibc-20041014T0548/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20041014T0548-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20041018T0940/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20041018T0940-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. @@ -134,8 +149,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-20041014T0548/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20041014T0548-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20041018T0940/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20041018T0940-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. @@ -162,8 +177,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20041014T0548/csu/elf-init.c 16 Aug 2004 04:51:00 -0000 1.3 -+++ glibc-20041014T0548-fedora/csu/elf-init.c 22 Sep 2004 21:20:47 -0000 1.3.2.1 +--- glibc-20041018T0940/csu/elf-init.c 16 Aug 2004 04:51:00 -0000 1.3 ++++ glibc-20041018T0940-fedora/csu/elf-init.c 22 Sep 2004 21:20:47 -0000 1.3.2.1 @@ -44,6 +44,24 @@ extern void (*__init_array_start []) (vo extern void (*__init_array_end []) (void) attribute_hidden; extern void (*__fini_array_start []) (void) attribute_hidden; @@ -189,54 +204,8 @@ #endif /* These function symbols are provided for the .init/.fini section entry ---- glibc-20041014T0548/dlfcn/dlinfo.c 14 Oct 2004 01:48:22 -0000 1.3 -+++ glibc-20041014T0548-fedora/dlfcn/dlinfo.c 14 Oct 2004 12:00:34 -0000 1.2.2.2 -@@ -39,13 +39,15 @@ dlinfo_doit (void *argsblock) - #if 0 - if (args->handle == RTLD_SELF) - { -+ Lmid_t nsid; - - /* Find the highest-addressed object that CALLER is not below. */ -- for (l = GL(dl_loaded); l != NULL; l = l->l_next) -- if (caller >= l->l_map_start && caller < l->l_map_end) -- /* There must be exactly one DSO for the range of the virtual -- memory. Otherwise something is really broken. */ -- break; -+ for (nsid = 0; nsid < DL_NNS; ++nsid) -+ for (l = GL(dl_ns)[nsid]._ns_loaded; l != NULL; l = l->l_next) -+ if (caller >= l->l_map_start && caller < l->l_map_end) -+ /* There must be exactly one DSO for the range of the virtual -+ memory. Otherwise something is really broken. */ -+ break; - - if (l == NULL) - GLRO(dl_signal_error) (0, NULL, NULL, N_("\ ---- glibc-20041014T0548/elf/dl-close.c 14 Oct 2004 02:00:27 -0000 1.106 -+++ glibc-20041014T0548-fedora/elf/dl-close.c 14 Oct 2004 09:57:38 -0000 1.104.2.2 -@@ -237,7 +237,7 @@ _dl_close (void *_map) - struct link_map *rl = depmap->l_initfini[k]; - - if (rl->l_idx < nopencount -- & list[rl->l_idx] == rl) -+ && list[rl->l_idx] == rl) - { - assert (new_opencount[rl->l_idx] > 0); - if (--new_opencount[rl->l_idx] == 0) ---- glibc-20041014T0548/elf/dl-load.c 14 Oct 2004 02:03:20 -0000 1.251 -+++ glibc-20041014T0548-fedora/elf/dl-load.c 14 Oct 2004 09:57:38 -0000 1.249.2.3 -@@ -909,7 +909,9 @@ _dl_map_object_from_fd (const char *name - l = _dl_new_object (realname, name, l_type, loader, mode, nsid); - if (__builtin_expect (l == NULL, 0)) - { -+#ifdef SHARED - fail_new: -+#endif - errstring = N_("cannot create shared object descriptor"); - goto call_lose_errno; - } ---- glibc-20041014T0548/elf/dl-support.c 14 Oct 2004 02:06:18 -0000 1.86 -+++ glibc-20041014T0548-fedora/elf/dl-support.c 14 Oct 2004 05:57:53 -0000 1.84.2.3 +--- glibc-20041018T0940/elf/dl-support.c 14 Oct 2004 02:06:18 -0000 1.86 ++++ glibc-20041018T0940-fedora/elf/dl-support.c 14 Oct 2004 05:57:53 -0000 1.84.2.3 @@ -274,6 +274,11 @@ _dl_non_dynamic_init (void) if (_dl_platform != NULL) _dl_platformlen = strlen (_dl_platform); @@ -249,8 +218,8 @@ /* Scan for a program header telling us the stack is nonexecutable. */ if (_dl_phdr != NULL) for (uint_fast16_t i = 0; i < _dl_phnum; ++i) ---- glibc-20041014T0548/elf/ldconfig.c 10 Aug 2004 04:04:32 -0000 1.47 -+++ glibc-20041014T0548-fedora/elf/ldconfig.c 22 Sep 2004 21:20:48 -0000 1.47.2.1 +--- glibc-20041018T0940/elf/ldconfig.c 10 Aug 2004 04:04:32 -0000 1.47 ++++ glibc-20041018T0940-fedora/elf/ldconfig.c 22 Sep 2004 21:20:48 -0000 1.47.2.1 @@ -944,17 +944,19 @@ search_dirs (void) @@ -332,17 +301,8 @@ } search_dirs (); ---- glibc-20041014T0548/elf/rtld.c 14 Oct 2004 02:07:44 -0000 1.334 -+++ glibc-20041014T0548-fedora/elf/rtld.c 14 Oct 2004 09:57:38 -0000 1.330.2.6 -@@ -537,7 +537,7 @@ _dl_start (void *arg) - # define ELF_MACHINE_START_ADDRESS(map, start) (start) - #endif - -- return ELF_MACHINE_START_ADDRESS (GL(dl_loaded), entry); -+ return ELF_MACHINE_START_ADDRESS (GL(dl_ns)[LM_ID_BASE]._ns_loaded, entry); - } - } - +--- glibc-20041018T0940/elf/rtld.c 14 Oct 2004 09:23:31 -0000 1.335 ++++ glibc-20041018T0940-fedora/elf/rtld.c 14 Oct 2004 09:57:38 -0000 1.330.2.6 @@ -1087,6 +1087,53 @@ of this helper program; chances are you ++GL(dl_ns)[LM_ID_BASE]._ns_nloaded; ++GL(dl_load_adds); @@ -465,8 +425,8 @@ if (__builtin_expect (npreloads, 0) != 0) { /* Set up PRELOADS with a vector of the preloaded libraries. */ ---- glibc-20041014T0548/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 -+++ glibc-20041014T0548-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 +--- glibc-20041018T0940/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 ++++ glibc-20041018T0940-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 @@ -1,8 +1,8 @@ #include #include @@ -478,8 +438,8 @@ # define USE_TLS__THREAD struct A ---- glibc-20041014T0548/iconv/iconvconfig.c 24 Sep 2004 17:09:04 -0000 1.20 -+++ glibc-20041014T0548-fedora/iconv/iconvconfig.c 22 Sep 2004 21:20:51 -0000 1.19.2.1 +--- glibc-20041018T0940/iconv/iconvconfig.c 24 Sep 2004 17:09:04 -0000 1.20 ++++ glibc-20041018T0940-fedora/iconv/iconvconfig.c 22 Sep 2004 21:20:51 -0000 1.19.2.1 @@ -989,6 +989,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -556,24 +516,9 @@ /* Open the output file. */ assert (GCONV_MODULES_CACHE[0] == '/'); strcpy (stpcpy (mempcpy (tmpfname, prefix, prefix_len), GCONV_MODULES_CACHE), ---- glibc-20041014T0548/include/errno.h 4 Oct 2004 20:59:37 -0000 1.12 -+++ glibc-20041014T0548-fedora/include/errno.h 14 Oct 2004 12:33:58 -0000 1.11.2.3 -@@ -36,7 +36,11 @@ extern __thread int errno attribute_tls_ - # define __set_errno(val) (errno = (val)) - - # ifndef __ASSEMBLER__ --extern int *__errno_location (void) __THROW __attribute__ ((__const__)); -+extern int *__errno_location (void) __THROW __attribute__ ((__const__)) -+# if RTLD_PRIVATE_ERRNO -+ attribute_hidden -+# endif -+; - libc_hidden_proto (__errno_location) - # endif - ---- glibc-20041014T0548/include/features.h 23 Jul 2004 06:50:54 -0000 1.35 -+++ glibc-20041014T0548-fedora/include/features.h 22 Sep 2004 21:20:53 -0000 1.35.2.1 -@@ -163,8 +163,8 @@ +--- glibc-20041018T0940/include/features.h 18 Oct 2004 04:17:16 -0000 1.36 ++++ glibc-20041018T0940-fedora/include/features.h 18 Oct 2004 09:58:43 -0000 1.35.2.2 +@@ -181,8 +181,8 @@ /* If none of the ANSI/POSIX macros are defined, use POSIX.1 and POSIX.2 (and IEEE Std 1003.1b-1993 unless _XOPEN_SOURCE is defined). */ @@ -584,8 +529,8 @@ # define _POSIX_SOURCE 1 # if defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) < 500 # define _POSIX_C_SOURCE 2 ---- glibc-20041014T0548/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20041014T0548-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20041018T0940/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20041018T0940-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 @@ -595,8 +540,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20041014T0548/libio/stdio.h 23 Jul 2004 07:07:41 -0000 1.78 -+++ glibc-20041014T0548-fedora/libio/stdio.h 22 Sep 2004 21:20:54 -0000 1.78.2.1 +--- glibc-20041018T0940/libio/stdio.h 18 Oct 2004 04:17:15 -0000 1.79 ++++ glibc-20041018T0940-fedora/libio/stdio.h 18 Oct 2004 09:58:44 -0000 1.78.2.2 @@ -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. */ @@ -610,9 +555,9 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20041014T0548/linuxthreads/ChangeLog 6 Oct 2004 08:05:13 -0000 1.823 -+++ glibc-20041014T0548-fedora/linuxthreads/ChangeLog 6 Oct 2004 09:09:33 -0000 1.817.2.5 -@@ -657,6 +657,12 @@ +--- glibc-20041018T0940/linuxthreads/ChangeLog 14 Oct 2004 16:10:58 -0000 1.824 ++++ glibc-20041018T0940-fedora/linuxthreads/ChangeLog 18 Oct 2004 09:58:46 -0000 1.817.2.6 +@@ -662,6 +662,12 @@ (pthread_barrierattr_setpshared): Return EINVAL if pshared is neither PTHREAD_PROCESS_PRIVATE nor PTHREAD_PROCESS_SHARED. @@ -625,7 +570,7 @@ 2003-09-02 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/dl-sysdep.h -@@ -789,6 +795,34 @@ +@@ -794,6 +800,34 @@ 2003-07-22 Jakub Jelinek @@ -660,8 +605,8 @@ * 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-20041014T0548/linuxthreads/Makefile 20 Sep 2004 22:10:55 -0000 1.94 -+++ glibc-20041014T0548-fedora/linuxthreads/Makefile 22 Sep 2004 21:20:54 -0000 1.94.2.1 +--- glibc-20041018T0940/linuxthreads/Makefile 20 Sep 2004 22:10:55 -0000 1.94 ++++ glibc-20041018T0940-fedora/linuxthreads/Makefile 22 Sep 2004 21:20:54 -0000 1.94.2.1 @@ -254,15 +254,18 @@ $(addprefix $(objpfx), \ $(filter-out $(tests-static) $(tests-reverse) unload, \ $(tests) $(test-srcs))): $(objpfx)libpthread.so \ @@ -683,8 +628,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a ---- glibc-20041014T0548/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 -+++ glibc-20041014T0548-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 +--- glibc-20041018T0940/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 ++++ glibc-20041018T0940-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 } @@ -692,8 +637,8 @@ + THREAD_SETMEM (self, p_cancelstate, PTHREAD_CANCEL_DISABLE); __libc_thread_freeres (); } ---- glibc-20041014T0548/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 -+++ glibc-20041014T0548-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 +--- glibc-20041018T0940/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 ++++ glibc-20041018T0940-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); @@ -707,8 +652,8 @@ __pthread_mutexattr_destroy (&attr); ---- glibc-20041014T0548/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 -+++ glibc-20041014T0548-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 +--- glibc-20041018T0940/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 ++++ glibc-20041018T0940-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 @@ -21,6 +21,7 @@ # define __need_timespec # include @@ -717,8 +662,8 @@ #ifndef _PTHREAD_DESCR_DEFINED /* Thread descriptors. Needed for `sem_t' definition. */ ---- glibc-20041014T0548/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 -+++ glibc-20041014T0548-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 +--- glibc-20041018T0940/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 ++++ glibc-20041018T0940-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 @@ -2,7 +2,7 @@ #include #include @@ -728,8 +673,8 @@ struct tls_obj { ---- glibc-20041014T0548/linuxthreads/sysdeps/alpha/tls.h 30 Jan 2003 21:03:40 -0000 1.5 -+++ glibc-20041014T0548-fedora/linuxthreads/sysdeps/alpha/tls.h 22 Sep 2004 21:20:55 -0000 1.5.2.1 +--- glibc-20041018T0940/linuxthreads/sysdeps/alpha/tls.h 30 Jan 2003 21:03:40 -0000 1.5 ++++ glibc-20041018T0940-fedora/linuxthreads/sysdeps/alpha/tls.h 22 Sep 2004 21:20:55 -0000 1.5.2.1 @@ -53,54 +53,76 @@ typedef struct # include @@ -819,8 +764,8 @@ /* Get the thread descriptor definition. */ # include ---- glibc-20041014T0548/linuxthreads/sysdeps/i386/tls.h 25 Sep 2004 03:32:13 -0000 1.36 -+++ glibc-20041014T0548-fedora/linuxthreads/sysdeps/i386/tls.h 26 Sep 2004 08:45:21 -0000 1.35.2.3 +--- glibc-20041018T0940/linuxthreads/sysdeps/i386/tls.h 25 Sep 2004 03:32:13 -0000 1.36 ++++ glibc-20041018T0940-fedora/linuxthreads/sysdeps/i386/tls.h 26 Sep 2004 08:45:21 -0000 1.35.2.3 @@ -81,7 +81,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -848,8 +793,8 @@ # if __ASSUME_LDT_WORKS > 0 # define TLS_DO_MODIFY_LDT_KERNEL_CHECK(doit) (doit) /* Nothing to check. */ # else ---- glibc-20041014T0548/linuxthreads/sysdeps/i386/i686/pt-machine.h 25 Sep 2004 10:04:15 -0000 1.23 -+++ glibc-20041014T0548-fedora/linuxthreads/sysdeps/i386/i686/pt-machine.h 26 Sep 2004 08:45:22 -0000 1.22.2.2 +--- glibc-20041018T0940/linuxthreads/sysdeps/i386/i686/pt-machine.h 25 Sep 2004 10:04:15 -0000 1.23 ++++ glibc-20041018T0940-fedora/linuxthreads/sysdeps/i386/i686/pt-machine.h 26 Sep 2004 08:45:22 -0000 1.22.2.2 @@ -69,9 +69,7 @@ __compare_and_swap (long int *p, long in } #endif @@ -861,8 +806,8 @@ #include "../useldt.h" #endif ---- glibc-20041014T0548/linuxthreads/sysdeps/ia64/tls.h 8 Jul 2004 21:20:57 -0000 1.9 -+++ glibc-20041014T0548-fedora/linuxthreads/sysdeps/ia64/tls.h 22 Sep 2004 21:20:55 -0000 1.9.2.1 +--- glibc-20041018T0940/linuxthreads/sysdeps/ia64/tls.h 8 Jul 2004 21:20:57 -0000 1.9 ++++ glibc-20041018T0940-fedora/linuxthreads/sysdeps/ia64/tls.h 22 Sep 2004 21:20:55 -0000 1.9.2.1 @@ -60,7 +60,14 @@ typedef struct # define TLS_TCB_SIZE sizeof (tcbhead_t) @@ -879,8 +824,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20041014T0548/linuxthreads/sysdeps/powerpc/tls.h 9 Apr 2004 19:09:42 -0000 1.8 -+++ glibc-20041014T0548-fedora/linuxthreads/sysdeps/powerpc/tls.h 22 Sep 2004 21:20:55 -0000 1.8.2.1 +--- glibc-20041018T0940/linuxthreads/sysdeps/powerpc/tls.h 9 Apr 2004 19:09:42 -0000 1.8 ++++ glibc-20041018T0940-fedora/linuxthreads/sysdeps/powerpc/tls.h 22 Sep 2004 21:20:55 -0000 1.8.2.1 @@ -64,11 +64,19 @@ typedef struct # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) @@ -903,8 +848,8 @@ 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-20041014T0548/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 -+++ glibc-20041014T0548-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 +--- glibc-20041018T0940/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 ++++ glibc-20041018T0940-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)\"" @@ -921,27 +866,8 @@ + @echo '#define NPTL_STRUCT_PTHREAD_SIZE 0' > $@ +endif +endif ---- glibc-20041014T0548/linuxthreads/sysdeps/pthread/errno-loc.c 1 Apr 2003 00:52:40 -0000 1.3 -+++ glibc-20041014T0548-fedora/linuxthreads/sysdeps/pthread/errno-loc.c 14 Oct 2004 09:57:39 -0000 1.3.2.1 -@@ -1,6 +1,6 @@ - /* MT support function to get address of `errno' variable, linuxthreads - version. -- Copyright (C) 1996, 1998, 2002, 2003 Free Software Foundation, Inc. -+ Copyright (C) 1996, 1998, 2002, 2003, 2004 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -23,7 +23,7 @@ - #include - #include - --#if ! USE___THREAD -+#if ! USE___THREAD && !RTLD_PRIVATE_ERRNO - #undef errno - extern int errno; - #endif ---- glibc-20041014T0548/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041014T0548-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 +--- glibc-20041018T0940/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041018T0940-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 @@ -956,8 +882,8 @@ +#ifdef HAVE_TLS_SUPPORT +NPTL_STRUCT_PTHREAD_SIZE sizeof (struct pthread) +#endif ---- glibc-20041014T0548/linuxthreads/sysdeps/s390/tls.h 30 Jan 2003 18:34:11 -0000 1.3 -+++ glibc-20041014T0548-fedora/linuxthreads/sysdeps/s390/tls.h 22 Sep 2004 21:20:56 -0000 1.3.2.1 +--- glibc-20041018T0940/linuxthreads/sysdeps/s390/tls.h 30 Jan 2003 18:34:11 -0000 1.3 ++++ glibc-20041018T0940-fedora/linuxthreads/sysdeps/s390/tls.h 22 Sep 2004 21:20:56 -0000 1.3.2.1 @@ -72,7 +72,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -974,8 +900,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20041014T0548/linuxthreads/sysdeps/sh/tls.h 2 Mar 2003 11:44:20 -0000 1.9 -+++ glibc-20041014T0548-fedora/linuxthreads/sysdeps/sh/tls.h 22 Sep 2004 21:20:57 -0000 1.9.2.1 +--- glibc-20041018T0940/linuxthreads/sysdeps/sh/tls.h 2 Mar 2003 11:44:20 -0000 1.9 ++++ glibc-20041018T0940-fedora/linuxthreads/sysdeps/sh/tls.h 22 Sep 2004 21:20:57 -0000 1.9.2.1 @@ -64,7 +64,14 @@ typedef struct # define TLS_TCB_SIZE sizeof (tcbhead_t) @@ -992,8 +918,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20041014T0548/linuxthreads/sysdeps/sparc/tls.h 4 Feb 2003 20:41:02 -0000 1.3 -+++ glibc-20041014T0548-fedora/linuxthreads/sysdeps/sparc/tls.h 22 Sep 2004 21:20:57 -0000 1.3.2.1 +--- glibc-20041018T0940/linuxthreads/sysdeps/sparc/tls.h 4 Feb 2003 20:41:02 -0000 1.3 ++++ glibc-20041018T0940-fedora/linuxthreads/sysdeps/sparc/tls.h 22 Sep 2004 21:20:57 -0000 1.3.2.1 @@ -64,7 +64,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1010,8 +936,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20041014T0548/linuxthreads/sysdeps/x86_64/tls.h 18 Apr 2004 02:32:25 -0000 1.6 -+++ glibc-20041014T0548-fedora/linuxthreads/sysdeps/x86_64/tls.h 22 Sep 2004 21:20:57 -0000 1.6.2.1 +--- glibc-20041018T0940/linuxthreads/sysdeps/x86_64/tls.h 18 Apr 2004 02:32:25 -0000 1.6 ++++ glibc-20041018T0940-fedora/linuxthreads/sysdeps/x86_64/tls.h 22 Sep 2004 21:20:57 -0000 1.6.2.1 @@ -66,7 +66,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1028,8 +954,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20041014T0548/locale/iso-4217.def 10 Aug 2004 05:10:38 -0000 1.15 -+++ glibc-20041014T0548-fedora/locale/iso-4217.def 22 Sep 2004 21:20:57 -0000 1.15.2.1 +--- glibc-20041018T0940/locale/iso-4217.def 10 Aug 2004 05:10:38 -0000 1.15 ++++ glibc-20041018T0940-fedora/locale/iso-4217.def 22 Sep 2004 21:20:57 -0000 1.15.2.1 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1121,8 +1047,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20041014T0548/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 -+++ glibc-20041014T0548-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 +--- glibc-20041018T0940/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 ++++ glibc-20041018T0940-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, } } @@ -1166,8 +1092,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20041014T0548/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 -+++ glibc-20041014T0548-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 +--- glibc-20041018T0940/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 ++++ glibc-20041018T0940-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/'`; \ @@ -1176,8 +1102,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20041014T0548/localedata/SUPPORTED 17 May 2004 18:51:41 -0000 1.71 -+++ glibc-20041014T0548-fedora/localedata/SUPPORTED 22 Sep 2004 21:20:58 -0000 1.71.2.1 +--- glibc-20041018T0940/localedata/SUPPORTED 17 May 2004 18:51:41 -0000 1.71 ++++ glibc-20041018T0940-fedora/localedata/SUPPORTED 22 Sep 2004 21:20:58 -0000 1.71.2.1 @@ -64,6 +64,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1219,8 +1145,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ/KOI8-T \ ---- glibc-20041014T0548/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20041014T0548-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20041018T0940/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20041018T0940-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -1235,8 +1161,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20041014T0548/localedata/locales/en_GB 4 Dec 2003 04:49:58 -0000 1.10 -+++ glibc-20041014T0548-fedora/localedata/locales/en_GB 22 Sep 2004 21:21:01 -0000 1.10.2.1 +--- glibc-20041018T0940/localedata/locales/en_GB 4 Dec 2003 04:49:58 -0000 1.10 ++++ glibc-20041018T0940-fedora/localedata/locales/en_GB 22 Sep 2004 21:21:01 -0000 1.10.2.1 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -1248,8 +1174,8 @@ date_fmt "/ / " ---- glibc-20041014T0548/localedata/locales/en_US 5 Dec 2003 09:48:09 -0000 1.7 -+++ glibc-20041014T0548-fedora/localedata/locales/en_US 22 Sep 2004 21:21:01 -0000 1.7.2.1 +--- glibc-20041018T0940/localedata/locales/en_US 5 Dec 2003 09:48:09 -0000 1.7 ++++ glibc-20041018T0940-fedora/localedata/locales/en_US 22 Sep 2004 21:21:01 -0000 1.7.2.1 @@ -100,7 +100,6 @@ mon " "";/ "";/ @@ -1258,8 +1184,8 @@ % Appropriate date and time representation (%c) % "%a %d %b %Y %r %Z" d_t_fmt "" ---- glibc-20041014T0548/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041014T0548-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20041018T0940/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041018T0940-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1330,8 +1256,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20041014T0548/localedata/locales/zh_TW 28 Sep 2002 05:25:36 -0000 1.5 -+++ glibc-20041014T0548-fedora/localedata/locales/zh_TW 22 Sep 2004 21:21:01 -0000 1.5.2.1 +--- glibc-20041018T0940/localedata/locales/zh_TW 28 Sep 2002 05:25:36 -0000 1.5 ++++ glibc-20041018T0940-fedora/localedata/locales/zh_TW 22 Sep 2004 21:21:01 -0000 1.5.2.1 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1359,19 +1285,38 @@ revision "0.2" date "2000-08-02" % ---- glibc-20041014T0548/malloc/arena.c 14 Oct 2004 01:55:55 -0000 1.11 -+++ glibc-20041014T0548-fedora/malloc/arena.c 14 Oct 2004 05:57:53 -0000 1.8.2.3 +--- glibc-20041018T0940/malloc/arena.c 14 Oct 2004 01:55:55 -0000 1.11 ++++ glibc-20041018T0940-fedora/malloc/arena.c 18 Oct 2004 11:56:08 -0000 1.8.2.4 @@ -18,7 +18,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: arena.c,v 1.11 2004/10/14 01:55:55 drepper Exp $ */ -+/* $Id: arena.c,v 1.8.2.3 2004/10/14 05:57:53 jakub Exp $ */ ++/* $Id: arena.c,v 1.8.2.4 2004/10/18 11:56:08 jakub Exp $ */ /* Compile-time constants. */ ---- glibc-20041014T0548/malloc/malloc.c 14 Oct 2004 01:56:52 -0000 1.131 -+++ glibc-20041014T0548-fedora/malloc/malloc.c 14 Oct 2004 05:57:53 -0000 1.127.2.4 +@@ -429,10 +429,16 @@ ptmalloc_init (void) + main_arena.next = &main_arena; + + #if defined _LIBC && defined SHARED +- /* In case this libc copy is in a non-default namespace, never use brk. */ ++ /* In case this libc copy is in a non-default namespace, never use brk. ++ Likewise if dlopened from statically linked program. */ + Dl_info di; + struct link_map *l; +- if (_dl_addr (ptmalloc_init, &di, &l, NULL) != 0 && l->l_ns != LM_ID_BASE) ++ extern struct dl_open_hook *_dl_open_hook; ++ libc_hidden_proto (_dl_open_hook); ++ ++ if (_dl_open_hook != NULL ++ || (_dl_addr (ptmalloc_init, &di, &l, NULL) != 0 ++ && l->l_ns != LM_ID_BASE)) + __morecore = __failing_morecore; + #endif + +--- glibc-20041018T0940/malloc/malloc.c 14 Oct 2004 01:56:52 -0000 1.131 ++++ glibc-20041018T0940-fedora/malloc/malloc.c 14 Oct 2004 05:57:53 -0000 1.127.2.4 @@ -24,7 +24,7 @@ Doug Lea and adapted to multiple threads/arenas by Wolfram Gloger. @@ -1381,9 +1326,9 @@ based on: VERSION 2.7.0 Sun Mar 11 14:14:06 2001 Doug Lea (dl at gee) ---- glibc-20041014T0548/nptl/ChangeLog 6 Oct 2004 18:09:17 -0000 1.721 -+++ glibc-20041014T0548-fedora/nptl/ChangeLog 12 Oct 2004 12:00:22 -0000 1.706.2.11 -@@ -239,6 +239,11 @@ +--- glibc-20041018T0940/nptl/ChangeLog 18 Oct 2004 04:19:48 -0000 1.723 ++++ glibc-20041018T0940-fedora/nptl/ChangeLog 18 Oct 2004 09:58:48 -0000 1.706.2.12 +@@ -242,6 +242,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1395,7 +1340,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -2313,6 +2318,11 @@ +@@ -2316,6 +2321,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1407,8 +1352,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20041014T0548/nptl/Makefile 20 Sep 2004 22:05:25 -0000 1.157 -+++ glibc-20041014T0548-fedora/nptl/Makefile 22 Sep 2004 21:21:01 -0000 1.157.2.1 +--- glibc-20041018T0940/nptl/Makefile 20 Sep 2004 22:05:25 -0000 1.157 ++++ glibc-20041018T0940-fedora/nptl/Makefile 22 Sep 2004 21:21:01 -0000 1.157.2.1 @@ -503,15 +503,19 @@ $(addprefix $(objpfx), \ $(tests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1431,8 +1376,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20041014T0548/nptl/alloca_cutoff.c 26 Nov 2002 22:50:01 -0000 1.1.1.1 -+++ glibc-20041014T0548-fedora/nptl/alloca_cutoff.c 22 Sep 2004 21:21:01 -0000 1.1.1.1.2.1 +--- glibc-20041018T0940/nptl/alloca_cutoff.c 26 Nov 2002 22:50:01 -0000 1.1.1.1 ++++ glibc-20041018T0940-fedora/nptl/alloca_cutoff.c 22 Sep 2004 21:21:01 -0000 1.1.1.1.2.1 @@ -3,16 +3,16 @@ This file is part of the GNU C Library. @@ -1454,8 +1399,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ---- glibc-20041014T0548/nptl/descr.h 25 Sep 2004 07:35:42 -0000 1.24 -+++ glibc-20041014T0548-fedora/nptl/descr.h 25 Sep 2004 07:55:43 -0000 1.23.2.2 +--- glibc-20041018T0940/nptl/descr.h 25 Sep 2004 07:35:42 -0000 1.24 ++++ glibc-20041018T0940-fedora/nptl/descr.h 25 Sep 2004 07:55:43 -0000 1.23.2.2 @@ -27,9 +27,13 @@ #include #include @@ -1470,8 +1415,8 @@ #include "../nptl_db/thread_db.h" #include #ifdef HAVE_FORCED_UNWIND ---- glibc-20041014T0548/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 -+++ glibc-20041014T0548-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 +--- glibc-20041018T0940/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 ++++ glibc-20041018T0940-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. */ @@ -1513,8 +1458,8 @@ } return 0; ---- glibc-20041014T0548/nptl/tst-unload.c 25 Feb 2004 18:41:32 -0000 1.3 -+++ glibc-20041014T0548-fedora/nptl/tst-unload.c 22 Sep 2004 21:21:01 -0000 1.3.2.1 +--- glibc-20041018T0940/nptl/tst-unload.c 25 Feb 2004 18:41:32 -0000 1.3 ++++ glibc-20041018T0940-fedora/nptl/tst-unload.c 22 Sep 2004 21:21:01 -0000 1.3.2.1 @@ -3,16 +3,16 @@ Contributed by Ulrich Drepper , 2000. @@ -1536,8 +1481,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ---- glibc-20041014T0548/nptl/sysdeps/pthread/allocalim.h 26 Nov 2002 22:50:35 -0000 1.1.1.1 -+++ glibc-20041014T0548-fedora/nptl/sysdeps/pthread/allocalim.h 22 Sep 2004 21:21:02 -0000 1.1.1.1.2.1 +--- glibc-20041018T0940/nptl/sysdeps/pthread/allocalim.h 26 Nov 2002 22:50:35 -0000 1.1.1.1 ++++ glibc-20041018T0940-fedora/nptl/sysdeps/pthread/allocalim.h 22 Sep 2004 21:21:02 -0000 1.1.1.1.2.1 @@ -3,16 +3,16 @@ This file is part of the GNU C Library. @@ -1559,8 +1504,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ---- glibc-20041014T0548/nptl/sysdeps/pthread/pt-initfini.c 31 Dec 2002 08:46:38 -0000 1.3 -+++ glibc-20041014T0548-fedora/nptl/sysdeps/pthread/pt-initfini.c 22 Sep 2004 21:21:02 -0000 1.3.2.1 +--- glibc-20041018T0940/nptl/sysdeps/pthread/pt-initfini.c 31 Dec 2002 08:46:38 -0000 1.3 ++++ glibc-20041018T0940-fedora/nptl/sysdeps/pthread/pt-initfini.c 22 Sep 2004 21:21:02 -0000 1.3.2.1 @@ -3,11 +3,11 @@ This file is part of the GNU C Library. @@ -1587,8 +1532,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ---- glibc-20041014T0548/nptl/sysdeps/pthread/bits/libc-lock.h 11 Dec 2003 04:50:49 -0000 1.17 -+++ glibc-20041014T0548-fedora/nptl/sysdeps/pthread/bits/libc-lock.h 22 Sep 2004 21:21:02 -0000 1.17.2.1 +--- glibc-20041018T0940/nptl/sysdeps/pthread/bits/libc-lock.h 11 Dec 2003 04:50:49 -0000 1.17 ++++ glibc-20041018T0940-fedora/nptl/sysdeps/pthread/bits/libc-lock.h 22 Sep 2004 21:21:02 -0000 1.17.2.1 @@ -3,16 +3,16 @@ This file is part of the GNU C Library. @@ -1610,8 +1555,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ---- glibc-20041014T0548/nptl/sysdeps/pthread/bits/sigthread.h 26 Nov 2002 22:50:35 -0000 1.1.1.1 -+++ glibc-20041014T0548-fedora/nptl/sysdeps/pthread/bits/sigthread.h 22 Sep 2004 21:21:02 -0000 1.1.1.1.2.1 +--- glibc-20041018T0940/nptl/sysdeps/pthread/bits/sigthread.h 26 Nov 2002 22:50:35 -0000 1.1.1.1 ++++ glibc-20041018T0940-fedora/nptl/sysdeps/pthread/bits/sigthread.h 22 Sep 2004 21:21:02 -0000 1.1.1.1.2.1 @@ -3,16 +3,16 @@ This file is part of the GNU C Library. @@ -1633,8 +1578,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ---- glibc-20041014T0548/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041014T0548-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20041018T0940/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041018T0940-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 + @@ -1642,8 +1587,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20041014T0548/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h 13 Apr 2004 02:00:09 -0000 1.6 -+++ glibc-20041014T0548-fedora/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h 22 Sep 2004 21:21:02 -0000 1.6.2.1 +--- glibc-20041018T0940/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h 13 Apr 2004 02:00:09 -0000 1.6 ++++ glibc-20041018T0940-fedora/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h 22 Sep 2004 21:21:02 -0000 1.6.2.1 @@ -3,16 +3,16 @@ This file is part of the GNU C Library. @@ -1665,8 +1610,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ---- glibc-20041014T0548/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 13 Apr 2004 02:01:17 -0000 1.8 -+++ glibc-20041014T0548-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 22 Sep 2004 21:21:02 -0000 1.8.2.1 +--- glibc-20041018T0940/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 13 Apr 2004 02:01:17 -0000 1.8 ++++ glibc-20041018T0940-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 22 Sep 2004 21:21:02 -0000 1.8.2.1 @@ -3,16 +3,16 @@ This file is part of the GNU C Library. @@ -1688,8 +1633,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ---- glibc-20041014T0548/nptl/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h 4 Oct 2004 20:47:50 -0000 1.8 -+++ glibc-20041014T0548-fedora/nptl/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h 5 Oct 2004 08:25:24 -0000 1.7.2.2 +--- glibc-20041018T0940/nptl/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h 4 Oct 2004 20:47:50 -0000 1.8 ++++ glibc-20041018T0940-fedora/nptl/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h 5 Oct 2004 08:25:24 -0000 1.7.2.2 @@ -3,16 +3,16 @@ This file is part of the GNU C Library. @@ -1711,8 +1656,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ---- glibc-20041014T0548/nscd/connections.c 4 Oct 2004 16:38:27 -0000 1.62 -+++ glibc-20041014T0548-fedora/nscd/connections.c 5 Oct 2004 08:25:24 -0000 1.55.2.4 +--- glibc-20041018T0940/nscd/connections.c 15 Oct 2004 21:12:15 -0000 1.64 ++++ glibc-20041018T0940-fedora/nscd/connections.c 18 Oct 2004 09:58:49 -0000 1.55.2.5 @@ -21,6 +21,7 @@ #include #include @@ -1729,7 +1674,7 @@ #include "nscd.h" #include "dbg_log.h" -@@ -1455,19 +1457,39 @@ start_threads (void) +@@ -1453,19 +1455,39 @@ start_threads (void) pthread_condattr_t condattr; pthread_condattr_init (&condattr); @@ -1776,7 +1721,7 @@ #endif pthread_cond_init (&readylist_cond, &condattr); -@@ -1532,7 +1554,6 @@ start_threads (void) +@@ -1530,7 +1552,6 @@ start_threads (void) main_loop_poll (); } @@ -1784,7 +1729,7 @@ /* Look up the uid, gid, and supplementary groups to run nscd as. When this function is called, we are not listening on the nscd socket yet so we can just use the ordinary lookup functions without causing a lockup */ -@@ -1601,3 +1622,18 @@ finish_drop_privileges (void) +@@ -1599,3 +1620,18 @@ finish_drop_privileges (void) exit (1); } } @@ -1803,8 +1748,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20041014T0548/nscd/nscd.c 4 Oct 2004 16:14:31 -0000 1.42 -+++ glibc-20041014T0548-fedora/nscd/nscd.c 5 Oct 2004 08:25:25 -0000 1.38.2.4 +--- glibc-20041018T0940/nscd/nscd.c 4 Oct 2004 16:14:31 -0000 1.42 ++++ glibc-20041018T0940-fedora/nscd/nscd.c 5 Oct 2004 08:25:25 -0000 1.38.2.4 @@ -122,9 +122,16 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1830,8 +1775,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20041014T0548/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 -+++ glibc-20041014T0548-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 +--- glibc-20041018T0940/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 ++++ glibc-20041018T0940-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 @@ -1843,8 +1788,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20041014T0548/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 -+++ glibc-20041014T0548-fedora/nscd/nscd_conf.c 4 Oct 2004 08:56:17 -0000 1.14.2.2 +--- glibc-20041018T0940/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 ++++ glibc-20041018T0940-fedora/nscd/nscd_conf.c 4 Oct 2004 08:56:17 -0000 1.14.2.2 @@ -230,7 +230,10 @@ nscd_parse_file (const char *fname, stru if (strcmp (arg2, "no") == 0) dbs[cnt].shared = 0; @@ -1857,19 +1802,129 @@ break; } if (cnt == lastdb) ---- glibc-20041014T0548/sunrpc/rpc_parse.c 28 Sep 2004 02:03:49 -0000 1.7 -+++ glibc-20041014T0548-fedora/sunrpc/rpc_parse.c 29 Sep 2004 08:48:29 -0000 1.5.4.1 -@@ -32,7 +32,7 @@ - * From: @(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI +--- glibc-20041018T0940/resolv/gethnamaddr.c 18 Oct 2004 05:09:59 -0000 1.50 ++++ glibc-20041018T0940-fedora/resolv/gethnamaddr.c 18 Oct 2004 09:58:50 -0000 1.49.2.1 +@@ -51,7 +51,7 @@ + + #if defined(LIBC_SCCS) && !defined(lint) + static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; +-static char rcsid[] = "$Id: gethnamaddr.c,v 1.50 2004/10/18 05:09:59 drepper Exp $"; ++static char rcsid[] = "$Id: gethnamaddr.c,v 1.49.2.1 2004/10/18 09:58:50 jakub Exp $"; + #endif /* LIBC_SCCS and not lint */ + + #include +--- glibc-20041018T0940/sunrpc/rpc_clntout.c 17 Oct 2004 14:59:39 -0000 1.7 ++++ glibc-20041018T0940-fedora/sunrpc/rpc_clntout.c 18 Oct 2004 09:58:53 -0000 1.6.4.1 +@@ -33,7 +33,7 @@ */ - const char parse_rcsid[] = -- "$Id: rpc_parse.c,v 1.7 2004/09/28 02:03:49 drepper Exp $"; -+ "$Id: rpc_parse.c,v 1.5.4.1 2004/09/29 08:48:29 jakub Exp $"; + #if defined(LIBC_SCCS) && !defined(lint) + static const char clntout_rcsid[] = +- "$Id: rpc_clntout.c,v 1.7 2004/10/17 14:59:39 drepper Exp $"; ++ "$Id: rpc_clntout.c,v 1.6.4.1 2004/10/18 09:58:53 jakub Exp $"; + #endif /* - * rpc_parse.c, Parser for the RPC protocol compiler ---- glibc-20041014T0548/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20041014T0548-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20041018T0940/sunrpc/rpc_cout.c 17 Oct 2004 14:59:39 -0000 1.14 ++++ glibc-20041018T0940-fedora/sunrpc/rpc_cout.c 18 Oct 2004 09:58:53 -0000 1.13.4.1 +@@ -33,7 +33,7 @@ + */ + #if defined(LIBC_SCCS) && !defined(lint) + static const char cout_rcsid[] = +-"$Id: rpc_cout.c,v 1.14 2004/10/17 14:59:39 drepper Exp $"; ++"$Id: rpc_cout.c,v 1.13.4.1 2004/10/18 09:58:53 jakub Exp $"; + #endif + + /* +--- glibc-20041018T0940/sunrpc/rpc_hout.c 17 Oct 2004 14:59:39 -0000 1.8 ++++ glibc-20041018T0940-fedora/sunrpc/rpc_hout.c 18 Oct 2004 09:58:53 -0000 1.7.4.1 +@@ -33,7 +33,7 @@ + */ + #if defined(LIBC_SCCS) && !defined(lint) + static const char hout_rcsid[] = +- "$Id: rpc_hout.c,v 1.8 2004/10/17 14:59:39 drepper Exp $"; ++ "$Id: rpc_hout.c,v 1.7.4.1 2004/10/18 09:58:53 jakub Exp $"; + #endif + + /* +--- glibc-20041018T0940/sunrpc/rpc_main.c 17 Oct 2004 14:59:39 -0000 1.24 ++++ glibc-20041018T0940-fedora/sunrpc/rpc_main.c 18 Oct 2004 09:58:53 -0000 1.23.2.1 +@@ -33,7 +33,7 @@ + */ + #if defined(LIBC_SCCS) && !defined(lint) + static const char main_rcsid[] = +- "$Id: rpc_main.c,v 1.24 2004/10/17 14:59:39 drepper Exp $"; ++ "$Id: rpc_main.c,v 1.23.2.1 2004/10/18 09:58:53 jakub Exp $"; + #endif + + /* +--- glibc-20041018T0940/sunrpc/rpc_parse.c 17 Oct 2004 14:59:39 -0000 1.8 ++++ glibc-20041018T0940-fedora/sunrpc/rpc_parse.c 18 Oct 2004 09:58:53 -0000 1.5.4.2 +@@ -33,7 +33,7 @@ + */ + #if defined(LIBC_SCCS) && !defined(lint) + static const char parse_rcsid[] = +- "$Id: rpc_parse.c,v 1.8 2004/10/17 14:59:39 drepper Exp $"; ++ "$Id: rpc_parse.c,v 1.5.4.2 2004/10/18 09:58:53 jakub Exp $"; + #endif + + /* +--- glibc-20041018T0940/sunrpc/rpc_sample.c 17 Oct 2004 14:59:39 -0000 1.6 ++++ glibc-20041018T0940-fedora/sunrpc/rpc_sample.c 18 Oct 2004 09:58:53 -0000 1.5.6.1 +@@ -33,7 +33,7 @@ + */ + #if defined(LIBC_SCCS) && !defined(lint) + static const char sample_rcsid[] = +- "$Id: rpc_sample.c,v 1.6 2004/10/17 14:59:39 drepper Exp $"; ++ "$Id: rpc_sample.c,v 1.5.6.1 2004/10/18 09:58:53 jakub Exp $"; + #endif + + /* +--- glibc-20041018T0940/sunrpc/rpc_scan.c 17 Oct 2004 14:59:39 -0000 1.9 ++++ glibc-20041018T0940-fedora/sunrpc/rpc_scan.c 18 Oct 2004 09:58:53 -0000 1.8.4.1 +@@ -33,7 +33,7 @@ + */ + #if defined(LIBC_SCCS) && !defined(lint) + static const char scan_rcsid[] = +- "$Id: rpc_scan.c,v 1.9 2004/10/17 14:59:39 drepper Exp $"; ++ "$Id: rpc_scan.c,v 1.8.4.1 2004/10/18 09:58:53 jakub Exp $"; + #endif + + /* +--- glibc-20041018T0940/sunrpc/rpc_svcout.c 17 Oct 2004 14:59:39 -0000 1.12 ++++ glibc-20041018T0940-fedora/sunrpc/rpc_svcout.c 18 Oct 2004 09:58:53 -0000 1.11.2.1 +@@ -33,7 +33,7 @@ + */ + #if defined(LIBC_SCCS) && !defined(lint) + static const char svcout_rcsid[] = +- "$Id: rpc_svcout.c,v 1.12 2004/10/17 14:59:39 drepper Exp $"; ++ "$Id: rpc_svcout.c,v 1.11.2.1 2004/10/18 09:58:53 jakub Exp $"; + #endif + + /* +--- glibc-20041018T0940/sunrpc/rpc_tblout.c 17 Oct 2004 14:59:39 -0000 1.3 ++++ glibc-20041018T0940-fedora/sunrpc/rpc_tblout.c 18 Oct 2004 09:58:53 -0000 1.2.6.1 +@@ -33,7 +33,7 @@ + */ + #if defined(LIBC_SCCS) && !defined(lint) + static const char tblout_rcsid[] = +- "$Id: rpc_tblout.c,v 1.3 2004/10/17 14:59:39 drepper Exp $"; ++ "$Id: rpc_tblout.c,v 1.2.6.1 2004/10/18 09:58:53 jakub Exp $"; + #endif + + /* +--- glibc-20041018T0940/sunrpc/rpc_util.c 17 Oct 2004 14:59:39 -0000 1.7 ++++ glibc-20041018T0940-fedora/sunrpc/rpc_util.c 18 Oct 2004 09:58:53 -0000 1.6.6.1 +@@ -33,7 +33,7 @@ + */ + #if defined(LIBC_SCCS) && !defined(lint) + static const char util_rcsid[] = +- "$Id: rpc_util.c,v 1.7 2004/10/17 14:59:39 drepper Exp $"; ++ "$Id: rpc_util.c,v 1.6.6.1 2004/10/18 09:58:53 jakub Exp $"; + #endif + + /* +--- glibc-20041018T0940/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20041018T0940-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 @@ -1885,27 +1940,51 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20041014T0548/sysdeps/generic/errno-loc.c 31 Dec 2002 20:39:08 -0000 1.7 -+++ glibc-20041014T0548-fedora/sysdeps/generic/errno-loc.c 14 Oct 2004 09:57:41 -0000 1.7.2.1 -@@ -1,6 +1,6 @@ - /* MT support function to get address of `errno' variable, non-threaded - version. -- Copyright (C) 1996, 1998, 2002 Free Software Foundation, Inc. -+ Copyright (C) 1996, 1998, 2002, 2004 Free Software Foundation, Inc. - This file is part of the GNU C Library. +--- glibc-20041018T0940/sysdeps/generic/strcpy_chk.c 18 Oct 2004 04:17:12 -0000 1.1 ++++ glibc-20041018T0940-fedora/sysdeps/generic/strcpy_chk.c 18 Oct 2004 10:00:48 -0000 1.1.2.2 +@@ -31,14 +31,36 @@ __strcpy_chk (dest, src, destlen) + { + reg_char c; + char *s = (char *) src; +- const ptrdiff_t off = dest - s - 1; ++ const ptrdiff_t off = dest - s; ++ ++ while (__builtin_expect (destlen >= 4, 0)) ++ { ++ c = s[0]; ++ s[off] = c; ++ if (c == '\0') ++ return dest; ++ c = s[1]; ++ s[off + 1] = c; ++ if (c == '\0') ++ return dest; ++ c = s[2]; ++ s[off + 2] = c; ++ if (c == '\0') ++ return dest; ++ c = s[3]; ++ s[off + 3] = c; ++ if (c == '\0') ++ return dest; ++ destlen -= 4; ++ s += 4; ++ } - The GNU C Library is free software; you can redistribute it and/or -@@ -21,7 +21,7 @@ - #include - #include + do + { + if (__builtin_expect (destlen-- == 0, 0)) +- __chk_fail (); +- c = *s++; +- s[off] = c; ++ __chk_fail (); ++ c = *s; ++ *(s++ + off) = c; + } + while (c != '\0'); --#if ! USE___THREAD -+#if ! USE___THREAD && !RTLD_PRIVATE_ERRNO - #undef errno - extern int errno; - #endif ---- glibc-20041014T0548/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041014T0548-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 +--- glibc-20041018T0940/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041018T0940-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 @@ -0,0 +1,410 @@ +/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -2317,8 +2396,8 @@ + + +#define atomic_delay() asm ("rep; nop") ---- glibc-20041014T0548/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20041014T0548-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20041018T0940/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20041018T0940-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)) @@ -2330,8 +2409,8 @@ endif endif ---- glibc-20041014T0548/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20041014T0548-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20041018T0940/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20041018T0940-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. */ @@ -2683,8 +2762,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20041014T0548/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041014T0548-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20041018T0940/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041018T0940-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. @@ -2770,192 +2849,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20041014T0548/sysdeps/mips/dl-machine.h 25 Aug 2004 05:57:35 -0000 1.75 -+++ glibc-20041014T0548-fedora/sysdeps/mips/dl-machine.h 14 Oct 2004 12:00:36 -0000 1.75.2.1 -@@ -231,10 +231,11 @@ elf_machine_runtime_link_map (ElfW(Addr) - } - } - -- { -- struct link_map *l = GL(dl_loaded); -+ struct link_map *l; -+ Lmid_t nsid; - -- while (l) -+ for (nsid = 0; nsid < DL_NNS; ++nsid) -+ for (l = GL(dl_ns)[nsid]._ns_loaded; l != NULL; l = l->l_next) - { - ElfW(Addr) base, limit; - const ElfW(Phdr) *p = l->l_phdr; -@@ -250,9 +251,7 @@ elf_machine_runtime_link_map (ElfW(Addr) - return l; - } - } -- l = l->l_next; - } -- } - - _dl_signal_error (0, NULL, NULL, "cannot find runtime link map"); - return NULL; ---- glibc-20041014T0548/sysdeps/powerpc/powerpc32/dl-machine.c 5 Mar 2004 10:23:44 -0000 1.9 -+++ glibc-20041014T0548-fedora/sysdeps/powerpc/powerpc32/dl-machine.c 14 Oct 2004 12:00:36 -0000 1.9.2.1 -@@ -106,6 +106,7 @@ __elf_preferred_address(struct link_map - { - ElfW(Addr) low, high; - struct link_map *l; -+ Lmid_t nsid; - - /* If the object has a preference, load it there! */ - if (mapstartpref != 0) -@@ -117,29 +118,30 @@ __elf_preferred_address(struct link_map - be superceded by the program's load address). */ - low = 0x0003FFFF; - high = 0x70000000; -- for (l = GL(dl_loaded); l; l = l->l_next) -- { -- ElfW(Addr) mapstart, mapend; -- mapstart = l->l_map_start & ~(GLRO(dl_pagesize) - 1); -- mapend = l->l_map_end | (GLRO(dl_pagesize) - 1); -- assert (mapend > mapstart); -- -- /* Prefer gaps below the main executable, note that l == -- _dl_loaded does not work for static binaries loading -- e.g. libnss_*.so. */ -- if ((mapend >= high || l->l_type == lt_executable) -- && high >= mapstart) -- high = mapstart; -- else if (mapend >= low && low >= mapstart) -- low = mapend; -- else if (high >= mapend && mapstart >= low) -- { -- if (high - mapend >= mapstart - low) -- low = mapend; -- else -- high = mapstart; -- } -- } -+ for (nsid = 0; nsid < DL_NNS; ++nsid) -+ for (l = GL(dl_ns)[nsid]._ns_loaded; l; l = l->l_next) -+ { -+ ElfW(Addr) mapstart, mapend; -+ mapstart = l->l_map_start & ~(GLRO(dl_pagesize) - 1); -+ mapend = l->l_map_end | (GLRO(dl_pagesize) - 1); -+ assert (mapend > mapstart); -+ -+ /* Prefer gaps below the main executable, note that l == -+ _dl_loaded does not work for static binaries loading -+ e.g. libnss_*.so. */ -+ if ((mapend >= high || l->l_type == lt_executable) -+ && high >= mapstart) -+ high = mapstart; -+ else if (mapend >= low && low >= mapstart) -+ low = mapend; -+ else if (high >= mapend && mapstart >= low) -+ { -+ if (high - mapend >= mapstart - low) -+ low = mapend; -+ else -+ high = mapstart; -+ } -+ } - - high -= 0x10000; /* Allow some room between objects. */ - maplength = (maplength | (GLRO(dl_pagesize) - 1)) + 1; ---- glibc-20041014T0548/sysdeps/sparc/fpu/bits/mathinline.h 30 Sep 2004 06:16:29 -0000 1.15 -+++ glibc-20041014T0548-fedora/sysdeps/sparc/fpu/bits/mathinline.h 14 Oct 2004 09:57:42 -0000 1.14.2.2 -@@ -112,7 +112,7 @@ - - /* Test for negative number. Used in the signbit() macro. */ - __MATH_INLINE int --__signbitf (float __x) __THROW -+__NTH (__signbitf (float __x)) - { - __extension__ union { float __f; int __i; } __u = { __f: __x }; - return __u.__i < 0; -@@ -121,14 +121,14 @@ __signbitf (float __x) __THROW - # if __WORDSIZE == 32 - - __MATH_INLINE int --__signbit (double __x) __THROW -+__NTH (__signbit (double __x)) - { - __extension__ union { double __d; int __i[2]; } __u = { __d: __x }; - return __u.__i[0] < 0; - } - - __MATH_INLINE int --__signbitl (long double __x) __THROW -+__NTH (__signbitl (long double __x)) - { - return __signbit ((double)__x); - } -@@ -136,14 +136,14 @@ __signbitl (long double __x) __THROW - # else /* sparc64 */ - - __MATH_INLINE int --__signbit (double __x) __THROW -+__NTH (__signbit (double __x)) - { - __extension__ union { double __d; long int __i; } __u = { __d: __x }; - return __u.__i < 0; - } - - __MATH_INLINE int --__signbitl (long double __x) __THROW -+__NTH (__signbitl (long double __x)) - { - __extension__ union { long double __l; long int __i[2]; } __u = { __l: __x }; - return __u.__i[0] < 0; -@@ -156,7 +156,7 @@ __signbitl (long double __x) __THROW - # if !defined __NO_MATH_INLINES && !__GNUC_PREREQ (3, 2) - - __MATH_INLINE double --sqrt (double __x) __THROW -+__NTH (sqrt (double __x)) - { - register double __r; - __asm ("fsqrtd %1,%0" : "=f" (__r) : "f" (__x)); -@@ -164,7 +164,7 @@ sqrt (double __x) __THROW - } - - __MATH_INLINE float --sqrtf (float __x) __THROW -+__NTH (sqrtf (float __x)) - { - register float __r; - __asm ("fsqrts %1,%0" : "=f" (__r) : "f" (__x)); -@@ -173,7 +173,7 @@ sqrtf (float __x) __THROW - - # if __WORDSIZE == 64 - __MATH_INLINE long double --sqrtl (long double __x) __THROW -+__NTH (sqrtl (long double __x)) - { - long double __r; - extern void _Qp_sqrt (long double *, __const__ long double *); -@@ -219,16 +219,16 @@ __ieee754_sqrtl (long double __x) - - # ifndef __NO_MATH_INLINES - --__MATH_INLINE double fdim (double __x, double __y) __THROW; -+__MATH_INLINE double __NTH (fdim (double __x, double __y)); - __MATH_INLINE double --fdim (double __x, double __y) __THROW -+__NTH (fdim (double __x, double __y)) - { - return __x <= __y ? 0 : __x - __y; - } - --__MATH_INLINE float fdimf (float __x, float __y) __THROW; -+__MATH_INLINE float __NTH (fdimf (float __x, float __y)); - __MATH_INLINE float --fdimf (float __x, float __y) __THROW -+__NTH (fdimf (float __x, float __y)) - { - return __x <= __y ? 0 : __x - __y; - } ---- glibc-20041014T0548/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20041014T0548-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20041018T0940/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20041018T0940-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); } @@ -2970,8 +2865,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20041014T0548/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20041014T0548-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20041018T0940/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20041018T0940-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" @@ -2981,8 +2876,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20041014T0548/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20041014T0548-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20041018T0940/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20041018T0940-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; @@ -3028,8 +2923,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20041014T0548/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041014T0548-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20041018T0940/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041018T0940-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. @@ -3090,48 +2985,8 @@ + } while (0) + +#include_next ---- glibc-20041014T0548/sysdeps/unix/sysv/linux/i386/setresgid.c 19 Sep 2004 23:44:35 -0000 1.11 -+++ glibc-20041014T0548-fedora/sysdeps/unix/sysv/linux/i386/setresgid.c 14 Oct 2004 09:57:42 -0000 1.11.2.1 -@@ -28,7 +28,7 @@ - #include - - --#ifdef __NR_setresgid -+#if defined __NR_setresgid || defined __NR_setresgid32 - - # ifdef __NR_setresgid32 - # if __ASSUME_32BITUIDS == 0 -@@ -43,7 +43,7 @@ __setresgid (gid_t rgid, gid_t egid, gid - { - int result; - --# if __ASSUME_32BITUIDS > 0 -+# if __ASSUME_32BITUIDS > 0 || !defined __NR_setresgid - result = INLINE_SYSCALL (setresgid32, 3, rgid, egid, sgid); - # else - # ifdef __NR_setresgid32 ---- glibc-20041014T0548/sysdeps/unix/sysv/linux/i386/setresuid.c 19 Sep 2004 23:44:35 -0000 1.12 -+++ glibc-20041014T0548-fedora/sysdeps/unix/sysv/linux/i386/setresuid.c 14 Oct 2004 09:57:42 -0000 1.12.2.1 -@@ -28,7 +28,7 @@ - #include - - --#ifdef __NR_setresuid -+#if defined __NR_setresuid || defined __NR_setresuid32 - - # ifdef __NR_setresuid32 - # if __ASSUME_32BITUIDS == 0 -@@ -43,7 +43,7 @@ __setresuid (uid_t ruid, uid_t euid, uid - { - int result; - --# if __ASSUME_32BITUIDS > 0 -+# if __ASSUME_32BITUIDS > 0 || !defined __NR_setresuid - result = INLINE_SYSCALL (setresuid32, 3, ruid, euid, suid); - # else - # ifdef __NR_setresuid32 ---- glibc-20041014T0548/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20041014T0548-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20041018T0940/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20041018T0940-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) @@ -3164,32 +3019,24 @@ + } while (0) + #include_next ---- glibc-20041014T0548/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041014T0548-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20041018T0940/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041018T0940-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-20041014T0548/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041014T0548-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20041018T0940/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041018T0940-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-20041014T0548/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20041014T0548-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20041018T0940/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20041018T0940-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"_ ---- glibc-20041014T0548/sysdeps/unix/sysv/linux/sparc/sparc32/setresgid.c 19 Sep 2004 23:51:19 -0000 1.3 -+++ glibc-20041014T0548-fedora/sysdeps/unix/sysv/linux/sparc/sparc32/setresgid.c 1 Jan 1970 00:00:00 -0000 -@@ -1 +0,0 @@ --#include ---- glibc-20041014T0548/sysdeps/unix/sysv/linux/sparc/sparc32/setresuid.c 19 Sep 2004 23:51:44 -0000 1.3 -+++ glibc-20041014T0548-fedora/sysdeps/unix/sysv/linux/sparc/sparc32/setresuid.c 1 Jan 1970 00:00:00 -0000 -@@ -1 +0,0 @@ --#include diff --git a/glibc.spec b/glibc.spec index 93a4c75..f903bcb 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcdate 20041014T0548 +%define glibcdate 20041018T0940 %define glibcversion 2.3.3 -%define glibcrelease 68 +%define glibcrelease 69 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64 @@ -1241,6 +1241,10 @@ rm -f *.filelist* %endif %changelog +* Mon Oct 18 2004 Jakub Jelinek 2.3.3-69 +- update from CVS + - object size checking support (-D_FORTIFY_SOURCE={1,2}) + * Thu Oct 14 2004 Jakub Jelinek 2.3.3-68 - update from CVS - support for namespaces in the dynamic linker diff --git a/sources b/sources index ccf8722..78151c6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -731d7871eb5fa4e0a0dde99110a3ce8f glibc-20041014T0548.tar.bz2 -93013075d931290f694a445c19073688 glibc-fedora-20041014T0548.tar.bz2 +43f15f618f807a66a7b914105ee9f1e1 glibc-20041018T0940.tar.bz2 +a55c8198040b7384958494abc763d416 glibc-fedora-20041018T0940.tar.bz2