From a0d8ce000e54c86051d9aca969fe6593ab3097c6 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 6 Oct 2004 09:51:52 +0000 Subject: [PATCH] auto-import glibc-2.3.3-66 on branch devel from glibc-2.3.3-66.src.rpm --- .cvsignore | 4 +- glibc-fedora.patch | 718 ++++++++++++++------------------------------- glibc.spec | 17 +- sources | 4 +- 4 files changed, 237 insertions(+), 506 deletions(-) diff --git a/.cvsignore b/.cvsignore index 65f0535..6f5f4fd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20041005T0745.tar.bz2 -glibc-fedora-20041005T0745.tar.bz2 +glibc-20041006T0900.tar.bz2 +glibc-fedora-20041006T0900.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index f953053..f653d58 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,33 +1,6 @@ ---- glibc-20041005T0745/ChangeLog 4 Oct 2004 23:30:29 -0000 1.8863 -+++ glibc-20041005T0745-fedora/ChangeLog 5 Oct 2004 15:43:21 -0000 1.8782.2.16 -@@ -1,3 +1,26 @@ -+2004-10-05 Ulrich Drepper -+ -+ * grp/initgroups.c: Remove duplicate group IDs. -+ * grp/compat-initgroups.c: Likewise. -+ * nscd/initgrcache.c: Likewise. -+ -+2004-10-05 Jakub Jelinek -+ -+ * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: Include dl-sysdep.h. -+ * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Likewise. -+ -+ * sysdeps/unix/sysv/linux/i386/sysconf.c: Include hp-timing.h. -+ (__sysconf): Return -1 for _SC_CPUTIME or _SC_THREAD_CPUTIME if -+ !HP_TIMING_AVAIL. -+ -+ * nscd/connections.c: Include dlfcn.h and gnu/lib-names.h. -+ (start_threads): If _POSIX_CLOCK_SELECTION is -1 but -+ _POSIX_THREADS > 0, dlopen LIBPTHREAD_SO and look for -+ pthread_condattr_setclock in it. -+ -+ * nscd/Makefile (relro-LDFLAGS): Add -Wl,-z,now if have-z-relro. -+ ($(objpfx)nscd): Add $(relro-LDFLAGS). -+ - 2004-10-04 Ulrich Drepper - - * nscd/gai.c: Define __no_netlink_support if NEED_NETLINK is -@@ -479,6 +502,22 @@ +--- glibc-20041006T0900/ChangeLog 6 Oct 2004 03:18:15 -0000 1.8867 ++++ glibc-20041006T0900-fedora/ChangeLog 6 Oct 2004 09:09:30 -0000 1.8782.2.17 +@@ -516,6 +516,22 @@ * string/string.h: Add __nonnull annotations. * stdlib/stdlib.h: Likewise. @@ -50,7 +23,7 @@ 2004-09-20 H.J. Lu * sysdeps/unix/sysv/linux/ia64/sysdep.h (DO_INLINE_SYSCALL): -@@ -1208,6 +1247,23 @@ +@@ -1245,6 +1261,23 @@ before return type. * locale/localename.c (__current_locale_name): Likewise. @@ -74,7 +47,7 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit -@@ -1364,6 +1420,22 @@ +@@ -1401,6 +1434,22 @@ * resolv/nss_dns/dns-canon.c (_nss_dns_getcanonname_r): Initialize status to NSS_STATUS_UNAVAIL. @@ -97,7 +70,7 @@ 2004-08-19 Ulrich Drepper * sysdeps/posix/getaddrinfo.c (gaih_inet): Use h->h_name in the -@@ -1668,6 +1740,12 @@ +@@ -1705,6 +1754,12 @@ * iconvdata/testdata/ISO-2022-JP-3: Regenerated. @@ -110,8 +83,8 @@ 2004-08-10 Alfred M. Szmidt * sysdeps/generic/bits/in.h (struct ip_mreq): Remove definition. ---- glibc-20041005T0745/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20041005T0745-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20041006T0900/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20041006T0900-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. @@ -161,8 +134,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-20041005T0745/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20041005T0745-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20041006T0900/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20041006T0900-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. @@ -189,8 +162,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20041005T0745/csu/elf-init.c 16 Aug 2004 04:51:00 -0000 1.3 -+++ glibc-20041005T0745-fedora/csu/elf-init.c 22 Sep 2004 21:20:47 -0000 1.3.2.1 +--- glibc-20041006T0900/csu/elf-init.c 16 Aug 2004 04:51:00 -0000 1.3 ++++ glibc-20041006T0900-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; @@ -216,8 +189,8 @@ #endif /* These function symbols are provided for the .init/.fini section entry ---- glibc-20041005T0745/elf/dl-support.c 26 Sep 2004 12:11:41 -0000 1.85 -+++ glibc-20041005T0745-fedora/elf/dl-support.c 27 Sep 2004 06:18:12 -0000 1.84.2.2 +--- glibc-20041006T0900/elf/dl-support.c 26 Sep 2004 12:11:41 -0000 1.85 ++++ glibc-20041006T0900-fedora/elf/dl-support.c 27 Sep 2004 06:18:12 -0000 1.84.2.2 @@ -287,6 +287,11 @@ _dl_non_dynamic_init (void) if (_dl_platform != NULL) _dl_platformlen = strlen (_dl_platform); @@ -230,8 +203,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-20041005T0745/elf/ldconfig.c 10 Aug 2004 04:04:32 -0000 1.47 -+++ glibc-20041005T0745-fedora/elf/ldconfig.c 22 Sep 2004 21:20:48 -0000 1.47.2.1 +--- glibc-20041006T0900/elf/ldconfig.c 10 Aug 2004 04:04:32 -0000 1.47 ++++ glibc-20041006T0900-fedora/elf/ldconfig.c 22 Sep 2004 21:20:48 -0000 1.47.2.1 @@ -944,17 +944,19 @@ search_dirs (void) @@ -313,8 +286,8 @@ } search_dirs (); ---- glibc-20041005T0745/elf/rtld.c 4 Oct 2004 07:06:20 -0000 1.332 -+++ glibc-20041005T0745-fedora/elf/rtld.c 4 Oct 2004 08:56:14 -0000 1.330.2.3 +--- glibc-20041006T0900/elf/rtld.c 6 Oct 2004 03:17:28 -0000 1.333 ++++ glibc-20041006T0900-fedora/elf/rtld.c 6 Oct 2004 09:09:32 -0000 1.330.2.4 @@ -1077,6 +1077,49 @@ of this helper program; chances are you ++GL(dl_nloaded); ++GL(dl_load_adds); @@ -430,8 +403,8 @@ if (__builtin_expect (npreloads, 0) != 0) { /* Set up PRELOADS with a vector of the preloaded libraries. */ ---- glibc-20041005T0745/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 -+++ glibc-20041005T0745-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 +--- glibc-20041006T0900/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 ++++ glibc-20041006T0900-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 @@ -1,8 +1,8 @@ #include #include @@ -443,133 +416,8 @@ # define USE_TLS__THREAD struct A ---- glibc-20041005T0745/grp/compat-initgroups.c 30 Sep 2004 01:29:38 -0000 1.1 -+++ glibc-20041005T0745-fedora/grp/compat-initgroups.c 5 Oct 2004 11:23:17 -0000 1.1.2.2 -@@ -58,31 +58,42 @@ compat_call (service_user *nip, const ch - for (m = grpbuf.gr_mem; *m != NULL; ++m) - if (strcmp (*m, user) == 0) - { -- /* Matches user. Insert this group. */ -- if (__builtin_expect (*start == *size, 0)) -- { -- /* Need a bigger buffer. */ -- gid_t *newgroups; -- long int newsize; -- -- if (limit > 0 && *size == limit) -- /* We reached the maximum. */ -- goto done; -- -- if (limit <= 0) -- newsize = 2 * *size; -- else -- newsize = MIN (limit, 2 * *size); -- -- newgroups = realloc (groups, newsize * sizeof (*groups)); -- if (newgroups == NULL) -- goto done; -- *groupsp = groups = newgroups; -- *size = newsize; -- } -- -- groups[*start] = grpbuf.gr_gid; -- *start += 1; -+ /* Check whether the group is already on the list. */ -+ long int cnt; -+ for (cnt = 0; cnt < *start; ++cnt) -+ if (groups[cnt] == grpbuf.gr_gid) -+ break; -+ -+ if (cnt == *start) -+ { -+ /* Matches user and not yet on the list. Insert -+ this group. */ -+ if (__builtin_expect (*start == *size, 0)) -+ { -+ /* Need a bigger buffer. */ -+ gid_t *newgroups; -+ long int newsize; -+ -+ if (limit > 0 && *size == limit) -+ /* We reached the maximum. */ -+ goto done; -+ -+ if (limit <= 0) -+ newsize = 2 * *size; -+ else -+ newsize = MIN (limit, 2 * *size); -+ -+ newgroups = realloc (groups, -+ newsize * sizeof (*groups)); -+ if (newgroups == NULL) -+ goto done; -+ *groupsp = groups = newgroups; -+ *size = newsize; -+ } -+ -+ groups[*start] = grpbuf.gr_gid; -+ *start += 1; -+ } - - break; - } ---- glibc-20041005T0745/grp/initgroups.c 30 Sep 2004 02:14:32 -0000 1.32 -+++ glibc-20041005T0745-fedora/grp/initgroups.c 5 Oct 2004 15:43:26 -0000 1.31.2.4 -@@ -73,7 +73,7 @@ internal_getgrouplist (const char *user, - /* Start is one, because we have the first group as parameter. */ - long int start = 1; - -- *groupsp[0] = group; -+ (*groupsp)[0] = group; - - if (__nss_group_database != NULL) - { -@@ -86,6 +86,8 @@ internal_getgrouplist (const char *user, - - while (! no_more) - { -+ long int prev_start = start; -+ - fct = __nss_lookup_function (nip, "initgroups_dyn"); - - if (fct == NULL) -@@ -100,6 +102,21 @@ internal_getgrouplist (const char *user, - status = DL_CALL_FCT (fct, (user, group, &start, size, groupsp, - limit, &errno)); - -+ /* Remove duplicates. */ -+ long int cnt = prev_start; -+ while (cnt < start) -+ { -+ long int inner; -+ for (inner = 0; inner < prev_start; ++inner) -+ if ((*groupsp)[inner] == (*groupsp)[cnt]) -+ break; -+ -+ if (inner < prev_start) -+ (*groupsp)[cnt] = (*groupsp)[--start]; -+ else -+ ++cnt; -+ } -+ - /* This is really only for debugging. */ - if (NSS_STATUS_TRYAGAIN > status || status > NSS_STATUS_RETURN) - __libc_fatal ("illegal status in internal_getgrouplist"); -@@ -124,10 +141,10 @@ int - getgrouplist (const char *user, gid_t group, gid_t *groups, int *ngroups) - { - gid_t *newgroups; -- long int size = *ngroups; -+ long int size = MAX (1, *ngroups); - int result; - -- newgroups = (gid_t *) malloc (size * sizeof (gid_t)); -+ newgroups = (gid_t *) malloc ((size + 1) * sizeof (gid_t)); - if (__builtin_expect (newgroups == NULL, 0)) - /* No more memory. */ - // XXX This is wrong. The user provided memory, we have to use ---- glibc-20041005T0745/iconv/iconvconfig.c 24 Sep 2004 17:09:04 -0000 1.20 -+++ glibc-20041005T0745-fedora/iconv/iconvconfig.c 22 Sep 2004 21:20:51 -0000 1.19.2.1 +--- glibc-20041006T0900/iconv/iconvconfig.c 24 Sep 2004 17:09:04 -0000 1.20 ++++ glibc-20041006T0900-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) @@ -646,8 +494,8 @@ /* Open the output file. */ assert (GCONV_MODULES_CACHE[0] == '/'); strcpy (stpcpy (mempcpy (tmpfname, prefix, prefix_len), GCONV_MODULES_CACHE), ---- glibc-20041005T0745/include/features.h 23 Jul 2004 06:50:54 -0000 1.35 -+++ glibc-20041005T0745-fedora/include/features.h 22 Sep 2004 21:20:53 -0000 1.35.2.1 +--- glibc-20041006T0900/include/features.h 23 Jul 2004 06:50:54 -0000 1.35 ++++ glibc-20041006T0900-fedora/include/features.h 22 Sep 2004 21:20:53 -0000 1.35.2.1 @@ -163,8 +163,8 @@ /* If none of the ANSI/POSIX macros are defined, use POSIX.1 and POSIX.2 @@ -659,8 +507,8 @@ # define _POSIX_SOURCE 1 # if defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) < 500 # define _POSIX_C_SOURCE 2 ---- glibc-20041005T0745/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20041005T0745-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20041006T0900/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20041006T0900-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 @@ -670,8 +518,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20041005T0745/libio/stdio.h 23 Jul 2004 07:07:41 -0000 1.78 -+++ glibc-20041005T0745-fedora/libio/stdio.h 22 Sep 2004 21:20:54 -0000 1.78.2.1 +--- glibc-20041006T0900/libio/stdio.h 23 Jul 2004 07:07:41 -0000 1.78 ++++ glibc-20041006T0900-fedora/libio/stdio.h 22 Sep 2004 21:20:54 -0000 1.78.2.1 @@ -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. */ @@ -685,9 +533,9 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20041005T0745/linuxthreads/ChangeLog 4 Oct 2004 19:28:07 -0000 1.821 -+++ glibc-20041005T0745-fedora/linuxthreads/ChangeLog 5 Oct 2004 08:25:14 -0000 1.817.2.4 -@@ -648,6 +648,12 @@ +--- glibc-20041006T0900/linuxthreads/ChangeLog 6 Oct 2004 08:05:13 -0000 1.823 ++++ glibc-20041006T0900-fedora/linuxthreads/ChangeLog 6 Oct 2004 09:09:33 -0000 1.817.2.5 +@@ -657,6 +657,12 @@ (pthread_barrierattr_setpshared): Return EINVAL if pshared is neither PTHREAD_PROCESS_PRIVATE nor PTHREAD_PROCESS_SHARED. @@ -700,7 +548,7 @@ 2003-09-02 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/dl-sysdep.h -@@ -780,6 +786,34 @@ +@@ -789,6 +795,34 @@ 2003-07-22 Jakub Jelinek @@ -735,8 +583,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-20041005T0745/linuxthreads/Makefile 20 Sep 2004 22:10:55 -0000 1.94 -+++ glibc-20041005T0745-fedora/linuxthreads/Makefile 22 Sep 2004 21:20:54 -0000 1.94.2.1 +--- glibc-20041006T0900/linuxthreads/Makefile 20 Sep 2004 22:10:55 -0000 1.94 ++++ glibc-20041006T0900-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 \ @@ -758,8 +606,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a ---- glibc-20041005T0745/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 -+++ glibc-20041005T0745-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 +--- glibc-20041006T0900/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 ++++ glibc-20041006T0900-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 } @@ -767,8 +615,8 @@ + THREAD_SETMEM (self, p_cancelstate, PTHREAD_CANCEL_DISABLE); __libc_thread_freeres (); } ---- glibc-20041005T0745/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 -+++ glibc-20041005T0745-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 +--- glibc-20041006T0900/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 ++++ glibc-20041006T0900-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); @@ -782,8 +630,8 @@ __pthread_mutexattr_destroy (&attr); ---- glibc-20041005T0745/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 -+++ glibc-20041005T0745-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 +--- glibc-20041006T0900/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 ++++ glibc-20041006T0900-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 @@ -21,6 +21,7 @@ # define __need_timespec # include @@ -792,8 +640,8 @@ #ifndef _PTHREAD_DESCR_DEFINED /* Thread descriptors. Needed for `sem_t' definition. */ ---- glibc-20041005T0745/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 -+++ glibc-20041005T0745-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 +--- glibc-20041006T0900/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 ++++ glibc-20041006T0900-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 @@ -2,7 +2,7 @@ #include #include @@ -803,8 +651,8 @@ struct tls_obj { ---- glibc-20041005T0745/linuxthreads/sysdeps/alpha/tls.h 30 Jan 2003 21:03:40 -0000 1.5 -+++ glibc-20041005T0745-fedora/linuxthreads/sysdeps/alpha/tls.h 22 Sep 2004 21:20:55 -0000 1.5.2.1 +--- glibc-20041006T0900/linuxthreads/sysdeps/alpha/tls.h 30 Jan 2003 21:03:40 -0000 1.5 ++++ glibc-20041006T0900-fedora/linuxthreads/sysdeps/alpha/tls.h 22 Sep 2004 21:20:55 -0000 1.5.2.1 @@ -53,54 +53,76 @@ typedef struct # include @@ -894,8 +742,8 @@ /* Get the thread descriptor definition. */ # include ---- glibc-20041005T0745/linuxthreads/sysdeps/i386/tls.h 25 Sep 2004 03:32:13 -0000 1.36 -+++ glibc-20041005T0745-fedora/linuxthreads/sysdeps/i386/tls.h 26 Sep 2004 08:45:21 -0000 1.35.2.3 +--- glibc-20041006T0900/linuxthreads/sysdeps/i386/tls.h 25 Sep 2004 03:32:13 -0000 1.36 ++++ glibc-20041006T0900-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) @@ -923,8 +771,8 @@ # if __ASSUME_LDT_WORKS > 0 # define TLS_DO_MODIFY_LDT_KERNEL_CHECK(doit) (doit) /* Nothing to check. */ # else ---- glibc-20041005T0745/linuxthreads/sysdeps/i386/i686/pt-machine.h 25 Sep 2004 10:04:15 -0000 1.23 -+++ glibc-20041005T0745-fedora/linuxthreads/sysdeps/i386/i686/pt-machine.h 26 Sep 2004 08:45:22 -0000 1.22.2.2 +--- glibc-20041006T0900/linuxthreads/sysdeps/i386/i686/pt-machine.h 25 Sep 2004 10:04:15 -0000 1.23 ++++ glibc-20041006T0900-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 @@ -936,8 +784,8 @@ #include "../useldt.h" #endif ---- glibc-20041005T0745/linuxthreads/sysdeps/ia64/tls.h 8 Jul 2004 21:20:57 -0000 1.9 -+++ glibc-20041005T0745-fedora/linuxthreads/sysdeps/ia64/tls.h 22 Sep 2004 21:20:55 -0000 1.9.2.1 +--- glibc-20041006T0900/linuxthreads/sysdeps/ia64/tls.h 8 Jul 2004 21:20:57 -0000 1.9 ++++ glibc-20041006T0900-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) @@ -954,8 +802,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20041005T0745/linuxthreads/sysdeps/powerpc/tls.h 9 Apr 2004 19:09:42 -0000 1.8 -+++ glibc-20041005T0745-fedora/linuxthreads/sysdeps/powerpc/tls.h 22 Sep 2004 21:20:55 -0000 1.8.2.1 +--- glibc-20041006T0900/linuxthreads/sysdeps/powerpc/tls.h 9 Apr 2004 19:09:42 -0000 1.8 ++++ glibc-20041006T0900-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) @@ -978,8 +826,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-20041005T0745/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 -+++ glibc-20041005T0745-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 +--- glibc-20041006T0900/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 ++++ glibc-20041006T0900-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)\"" @@ -996,8 +844,8 @@ + @echo '#define NPTL_STRUCT_PTHREAD_SIZE 0' > $@ +endif +endif ---- glibc-20041005T0745/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041005T0745-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 +--- glibc-20041006T0900/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041006T0900-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 @@ -1012,8 +860,8 @@ +#ifdef HAVE_TLS_SUPPORT +NPTL_STRUCT_PTHREAD_SIZE sizeof (struct pthread) +#endif ---- glibc-20041005T0745/linuxthreads/sysdeps/s390/tls.h 30 Jan 2003 18:34:11 -0000 1.3 -+++ glibc-20041005T0745-fedora/linuxthreads/sysdeps/s390/tls.h 22 Sep 2004 21:20:56 -0000 1.3.2.1 +--- glibc-20041006T0900/linuxthreads/sysdeps/s390/tls.h 30 Jan 2003 18:34:11 -0000 1.3 ++++ glibc-20041006T0900-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) @@ -1030,8 +878,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20041005T0745/linuxthreads/sysdeps/sh/tls.h 2 Mar 2003 11:44:20 -0000 1.9 -+++ glibc-20041005T0745-fedora/linuxthreads/sysdeps/sh/tls.h 22 Sep 2004 21:20:57 -0000 1.9.2.1 +--- glibc-20041006T0900/linuxthreads/sysdeps/sh/tls.h 2 Mar 2003 11:44:20 -0000 1.9 ++++ glibc-20041006T0900-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) @@ -1048,8 +896,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20041005T0745/linuxthreads/sysdeps/sparc/tls.h 4 Feb 2003 20:41:02 -0000 1.3 -+++ glibc-20041005T0745-fedora/linuxthreads/sysdeps/sparc/tls.h 22 Sep 2004 21:20:57 -0000 1.3.2.1 +--- glibc-20041006T0900/linuxthreads/sysdeps/sparc/tls.h 4 Feb 2003 20:41:02 -0000 1.3 ++++ glibc-20041006T0900-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) @@ -1066,8 +914,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20041005T0745/linuxthreads/sysdeps/x86_64/tls.h 18 Apr 2004 02:32:25 -0000 1.6 -+++ glibc-20041005T0745-fedora/linuxthreads/sysdeps/x86_64/tls.h 22 Sep 2004 21:20:57 -0000 1.6.2.1 +--- glibc-20041006T0900/linuxthreads/sysdeps/x86_64/tls.h 18 Apr 2004 02:32:25 -0000 1.6 ++++ glibc-20041006T0900-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) @@ -1084,8 +932,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20041005T0745/locale/iso-4217.def 10 Aug 2004 05:10:38 -0000 1.15 -+++ glibc-20041005T0745-fedora/locale/iso-4217.def 22 Sep 2004 21:20:57 -0000 1.15.2.1 +--- glibc-20041006T0900/locale/iso-4217.def 10 Aug 2004 05:10:38 -0000 1.15 ++++ glibc-20041006T0900-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 !!! @@ -1177,8 +1025,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20041005T0745/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 -+++ glibc-20041005T0745-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 +--- glibc-20041006T0900/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 ++++ glibc-20041006T0900-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, } } @@ -1222,8 +1070,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20041005T0745/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 -+++ glibc-20041005T0745-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 +--- glibc-20041006T0900/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 ++++ glibc-20041006T0900-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/'`; \ @@ -1232,8 +1080,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20041005T0745/localedata/SUPPORTED 17 May 2004 18:51:41 -0000 1.71 -+++ glibc-20041005T0745-fedora/localedata/SUPPORTED 22 Sep 2004 21:20:58 -0000 1.71.2.1 +--- glibc-20041006T0900/localedata/SUPPORTED 17 May 2004 18:51:41 -0000 1.71 ++++ glibc-20041006T0900-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 \ @@ -1275,8 +1123,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ/KOI8-T \ ---- glibc-20041005T0745/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20041005T0745-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20041006T0900/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20041006T0900-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -1291,8 +1139,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20041005T0745/localedata/locales/en_GB 4 Dec 2003 04:49:58 -0000 1.10 -+++ glibc-20041005T0745-fedora/localedata/locales/en_GB 22 Sep 2004 21:21:01 -0000 1.10.2.1 +--- glibc-20041006T0900/localedata/locales/en_GB 4 Dec 2003 04:49:58 -0000 1.10 ++++ glibc-20041006T0900-fedora/localedata/locales/en_GB 22 Sep 2004 21:21:01 -0000 1.10.2.1 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -1304,8 +1152,8 @@ date_fmt "/ / " ---- glibc-20041005T0745/localedata/locales/en_US 5 Dec 2003 09:48:09 -0000 1.7 -+++ glibc-20041005T0745-fedora/localedata/locales/en_US 22 Sep 2004 21:21:01 -0000 1.7.2.1 +--- glibc-20041006T0900/localedata/locales/en_US 5 Dec 2003 09:48:09 -0000 1.7 ++++ glibc-20041006T0900-fedora/localedata/locales/en_US 22 Sep 2004 21:21:01 -0000 1.7.2.1 @@ -100,7 +100,6 @@ mon " "";/ "";/ @@ -1314,8 +1162,8 @@ % Appropriate date and time representation (%c) % "%a %d %b %Y %r %Z" d_t_fmt "" ---- glibc-20041005T0745/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041005T0745-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20041006T0900/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041006T0900-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1386,8 +1234,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20041005T0745/localedata/locales/zh_TW 28 Sep 2002 05:25:36 -0000 1.5 -+++ glibc-20041005T0745-fedora/localedata/locales/zh_TW 22 Sep 2004 21:21:01 -0000 1.5.2.1 +--- glibc-20041006T0900/localedata/locales/zh_TW 28 Sep 2002 05:25:36 -0000 1.5 ++++ glibc-20041006T0900-fedora/localedata/locales/zh_TW 22 Sep 2004 21:21:01 -0000 1.5.2.1 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1415,8 +1263,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20041005T0745/malloc/arena.c 4 Oct 2004 02:27:14 -0000 1.10 -+++ glibc-20041005T0745-fedora/malloc/arena.c 4 Oct 2004 08:56:15 -0000 1.8.2.2 +--- glibc-20041006T0900/malloc/arena.c 4 Oct 2004 02:27:14 -0000 1.10 ++++ glibc-20041006T0900-fedora/malloc/arena.c 4 Oct 2004 08:56:15 -0000 1.8.2.2 @@ -18,7 +18,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -1426,8 +1274,8 @@ /* Compile-time constants. */ ---- glibc-20041005T0745/malloc/malloc.c 1 Oct 2004 23:51:18 -0000 1.129 -+++ glibc-20041005T0745-fedora/malloc/malloc.c 4 Oct 2004 08:56:16 -0000 1.127.2.2 +--- glibc-20041006T0900/malloc/malloc.c 1 Oct 2004 23:51:18 -0000 1.129 ++++ glibc-20041006T0900-fedora/malloc/malloc.c 4 Oct 2004 08:56:16 -0000 1.127.2.2 @@ -24,7 +24,7 @@ Doug Lea and adapted to multiple threads/arenas by Wolfram Gloger. @@ -1437,20 +1285,23 @@ based on: VERSION 2.7.0 Sun Mar 11 14:14:06 2001 Doug Lea (dl at gee) ---- glibc-20041005T0745/nptl/ChangeLog 4 Oct 2004 20:51:25 -0000 1.715 -+++ glibc-20041005T0745-fedora/nptl/ChangeLog 5 Oct 2004 15:10:07 -0000 1.706.2.7 -@@ -1,3 +1,10 @@ -+2004-10-05 Jakub Jelinek +--- glibc-20041006T0900/nptl/ChangeLog 6 Oct 2004 08:53:46 -0000 1.720 ++++ glibc-20041006T0900-fedora/nptl/ChangeLog 6 Oct 2004 09:25:01 -0000 1.706.2.10 +@@ -1,3 +1,13 @@ ++2004-10-06 Jakub Jelinek + -+ * sysdeps/pthread/timer_create.c (timer_create): Use -+ defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0 instead of -+ defined CLOCK_PROCESS_CPUTIME_ID #ifs and similarly for -+ THREAD_CPUTIME. ++ * sysdeps/unix/sysv/linux/jmp-unwind.c: Include pthreadP.h instead ++ of pthread-functions.h and pthreaddef.h. ++ * sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Likewise. + - 2004-10-04 Ulrich Drepper ++ * sysdeps/s390/jmpbuf-unwind.h: Include bits/wordsize.h. ++ (JMPBUF_CFA_UNWINDS_ADJ): Subtract 96 resp. 160 bytes from ++ CFA. ++ + 2004-10-06 Ulrich Drepper - * sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Define _POSIX_CPUTIME -@@ -197,6 +204,11 @@ + * tst-cancel4.c (tf_msgrcv): Check for failure in msgget. If the +@@ -221,6 +231,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1462,7 +1313,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -2271,6 +2283,11 @@ +@@ -2295,6 +2310,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1474,8 +1325,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20041005T0745/nptl/Makefile 20 Sep 2004 22:05:25 -0000 1.157 -+++ glibc-20041005T0745-fedora/nptl/Makefile 22 Sep 2004 21:21:01 -0000 1.157.2.1 +--- glibc-20041006T0900/nptl/Makefile 20 Sep 2004 22:05:25 -0000 1.157 ++++ glibc-20041006T0900-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 @@ -1498,8 +1349,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20041005T0745/nptl/alloca_cutoff.c 26 Nov 2002 22:50:01 -0000 1.1.1.1 -+++ glibc-20041005T0745-fedora/nptl/alloca_cutoff.c 22 Sep 2004 21:21:01 -0000 1.1.1.1.2.1 +--- glibc-20041006T0900/nptl/alloca_cutoff.c 26 Nov 2002 22:50:01 -0000 1.1.1.1 ++++ glibc-20041006T0900-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. @@ -1521,8 +1372,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-20041005T0745/nptl/descr.h 25 Sep 2004 07:35:42 -0000 1.24 -+++ glibc-20041005T0745-fedora/nptl/descr.h 25 Sep 2004 07:55:43 -0000 1.23.2.2 +--- glibc-20041006T0900/nptl/descr.h 25 Sep 2004 07:35:42 -0000 1.24 ++++ glibc-20041006T0900-fedora/nptl/descr.h 25 Sep 2004 07:55:43 -0000 1.23.2.2 @@ -27,9 +27,13 @@ #include #include @@ -1537,8 +1388,8 @@ #include "../nptl_db/thread_db.h" #include #ifdef HAVE_FORCED_UNWIND ---- glibc-20041005T0745/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 -+++ glibc-20041005T0745-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 +--- glibc-20041006T0900/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 ++++ glibc-20041006T0900-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. */ @@ -1580,8 +1431,8 @@ } return 0; ---- glibc-20041005T0745/nptl/tst-unload.c 25 Feb 2004 18:41:32 -0000 1.3 -+++ glibc-20041005T0745-fedora/nptl/tst-unload.c 22 Sep 2004 21:21:01 -0000 1.3.2.1 +--- glibc-20041006T0900/nptl/tst-unload.c 25 Feb 2004 18:41:32 -0000 1.3 ++++ glibc-20041006T0900-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. @@ -1603,8 +1454,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-20041005T0745/nptl/sysdeps/pthread/allocalim.h 26 Nov 2002 22:50:35 -0000 1.1.1.1 -+++ glibc-20041005T0745-fedora/nptl/sysdeps/pthread/allocalim.h 22 Sep 2004 21:21:02 -0000 1.1.1.1.2.1 +--- glibc-20041006T0900/nptl/sysdeps/pthread/allocalim.h 26 Nov 2002 22:50:35 -0000 1.1.1.1 ++++ glibc-20041006T0900-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. @@ -1626,8 +1477,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-20041005T0745/nptl/sysdeps/pthread/pt-initfini.c 31 Dec 2002 08:46:38 -0000 1.3 -+++ glibc-20041005T0745-fedora/nptl/sysdeps/pthread/pt-initfini.c 22 Sep 2004 21:21:02 -0000 1.3.2.1 +--- glibc-20041006T0900/nptl/sysdeps/pthread/pt-initfini.c 31 Dec 2002 08:46:38 -0000 1.3 ++++ glibc-20041006T0900-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. @@ -1654,38 +1505,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-20041005T0745/nptl/sysdeps/pthread/timer_create.c 4 Oct 2004 20:50:53 -0000 1.6 -+++ glibc-20041005T0745-fedora/nptl/sysdeps/pthread/timer_create.c 5 Oct 2004 15:10:09 -0000 1.5.2.2 -@@ -38,10 +38,10 @@ timer_create (clock_id, evp, timerid) - struct thread_node *thread = NULL; - - if (0 --#ifdef CLOCK_PROCESS_CPUTIME_ID -+#if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0 - || clock_id == CLOCK_PROCESS_CPUTIME_ID - #endif --#ifdef CLOCK_THREAD_CPUTIME_ID -+#if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0 - || clock_id == CLOCK_THREAD_CPUTIME_ID - #endif - ) -@@ -100,12 +100,12 @@ timer_create (clock_id, evp, timerid) - default: - thread = &__timer_signal_thread_rclk; - break; --#ifdef CLOCK_PROCESS_CPUTIME_ID -+#if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0 - case CLOCK_PROCESS_CPUTIME_ID: - thread = &__timer_signal_thread_pclk; - break; - #endif --#ifdef CLOCK_THREAD_CPUTIME_ID -+#if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0 - case CLOCK_THREAD_CPUTIME_ID: - thread = &__timer_signal_thread_tclk; - break; ---- glibc-20041005T0745/nptl/sysdeps/pthread/bits/libc-lock.h 11 Dec 2003 04:50:49 -0000 1.17 -+++ glibc-20041005T0745-fedora/nptl/sysdeps/pthread/bits/libc-lock.h 22 Sep 2004 21:21:02 -0000 1.17.2.1 +--- glibc-20041006T0900/nptl/sysdeps/pthread/bits/libc-lock.h 11 Dec 2003 04:50:49 -0000 1.17 ++++ glibc-20041006T0900-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. @@ -1707,8 +1528,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-20041005T0745/nptl/sysdeps/pthread/bits/sigthread.h 26 Nov 2002 22:50:35 -0000 1.1.1.1 -+++ glibc-20041005T0745-fedora/nptl/sysdeps/pthread/bits/sigthread.h 22 Sep 2004 21:21:02 -0000 1.1.1.1.2.1 +--- glibc-20041006T0900/nptl/sysdeps/pthread/bits/sigthread.h 26 Nov 2002 22:50:35 -0000 1.1.1.1 ++++ glibc-20041006T0900-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. @@ -1730,8 +1551,45 @@ 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-20041005T0745/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041005T0745-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20041006T0900/nptl/sysdeps/s390/jmpbuf-unwind.h 2 Sep 2004 22:46:00 -0000 1.2 ++++ glibc-20041006T0900-fedora/nptl/sysdeps/s390/jmpbuf-unwind.h 6 Oct 2004 09:22:13 -0000 1.2.2.1 +@@ -20,13 +20,18 @@ + #include + #include + #include ++#include + ++/* On s390{,x}, CFA is always 96 (resp. 160) bytes above actual ++ %r15. */ + #define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \ +- _JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj) ++ _JMPBUF_UNWINDS_ADJ (_jmpbuf, \ ++ (void *) (_Unwind_GetCFA (_context) \ ++ - 32 - 2 * __WORDSIZE), _adj) + +-#define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ +- ((uintptr_t) (_address) - (_adj) \ ++#define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ ++ ((uintptr_t) (_address) - (_adj) \ + < (uintptr_t) (_jmpbuf)->__gregs[__JB_GPR15] - (_adj)) + +-/* We use the normal lobngjmp for unwinding. */ ++/* We use the normal longjmp for unwinding. */ + #define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val) +--- glibc-20041006T0900/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c 15 Mar 2003 09:50:11 -0000 1.4 ++++ glibc-20041006T0900-fedora/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c 6 Oct 2004 09:25:02 -0000 1.4.2.1 +@@ -19,8 +19,7 @@ + + #include + #include +-#include +-#include ++#include + + extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe); + #pragma weak __pthread_cleanup_upto +--- glibc-20041006T0900/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041006T0900-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 + @@ -1739,8 +1597,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20041005T0745/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h 13 Apr 2004 02:00:09 -0000 1.6 -+++ glibc-20041005T0745-fedora/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h 22 Sep 2004 21:21:02 -0000 1.6.2.1 +--- glibc-20041006T0900/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h 13 Apr 2004 02:00:09 -0000 1.6 ++++ glibc-20041006T0900-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. @@ -1762,8 +1620,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-20041005T0745/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 13 Apr 2004 02:01:17 -0000 1.8 -+++ glibc-20041005T0745-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 22 Sep 2004 21:21:02 -0000 1.8.2.1 +--- glibc-20041006T0900/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 13 Apr 2004 02:01:17 -0000 1.8 ++++ glibc-20041006T0900-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. @@ -1785,8 +1643,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-20041005T0745/nptl/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h 4 Oct 2004 20:47:50 -0000 1.8 -+++ glibc-20041005T0745-fedora/nptl/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h 5 Oct 2004 08:25:24 -0000 1.7.2.2 +--- glibc-20041006T0900/nptl/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h 4 Oct 2004 20:47:50 -0000 1.8 ++++ glibc-20041006T0900-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. @@ -1808,78 +1666,27 @@ 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-20041005T0745/nscd/Makefile 4 Oct 2004 23:19:21 -0000 1.35 -+++ glibc-20041005T0745-fedora/nscd/Makefile 5 Oct 2004 08:25:24 -0000 1.28.2.4 -@@ -69,34 +69,43 @@ CFLAGS-nscd_gethst_r.c = -fexceptions - CFLAGS-nscd_getai.c = -fexceptions - CFLAGS-nscd_initgroups.c = -fexceptions +--- glibc-20041006T0900/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c 31 Jul 2003 19:13:08 -0000 1.3 ++++ glibc-20041006T0900-fedora/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c 6 Oct 2004 09:25:03 -0000 1.3.2.1 +@@ -1,5 +1,5 @@ + /* Clean up stack frames unwound by longjmp. Linux/s390 version. +- Copyright (C) 2003 Free Software Foundation, Inc. ++ Copyright (C) 2003, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. -+nscd-cflags = -DIS_IN_nscd=1 - ifeq (yesyes,$(have-fpie)$(build-shared)) --CFLAGS-nscd.c += -fpie --CFLAGS-connections.c += -fpie --CFLAGS-pwdcache.c += -fpie --CFLAGS-getpwnam_r.c += -fpie --CFLAGS-getpwuid_r.c += -fpie --CFLAGS-grpcache.c += -fpie --CFLAGS-getgrnam_r.c += -fpie --CFLAGS-getgrgid_r.c += -fpie --CFLAGS-hstcache.c += -fpie --CFLAGS-gethstbyad_r.c += -fpie --CFLAGS-gethstbynm2_r.c += -fpie --CFLAGS-dbg_log.c += -fpie --CFLAGS-nscd_conf.c += -fpie --CFLAGS-nscd_stat.c += -fpie --CFLAGS-cache.c += -fpie --CFLAGS-xmalloc.c += -fpie --CFLAGS-xstrdup.c += -fpie --CFLAGS-mem.c += -fpie --CFLAGS-nscd_setup_thread.c += -fpie --CFLAGS-aicache.c += -fpie --CFLAGS-selinux.c += -fpie --CFLAGS-initgrcache.c += -fpie --CFLAGS-gai.c += -fpie -+nscd-cflags += -fpie -+endif -+ -+CFLAGS-nscd.c += $(nscd-cflags) -+CFLAGS-connections.c += $(nscd-cflags) -+CFLAGS-pwdcache.c += $(nscd-cflags) -+CFLAGS-getpwnam_r.c += $(nscd-cflags) -+CFLAGS-getpwuid_r.c += $(nscd-cflags) -+CFLAGS-grpcache.c += $(nscd-cflags) -+CFLAGS-getgrnam_r.c += $(nscd-cflags) -+CFLAGS-getgrgid_r.c += $(nscd-cflags) -+CFLAGS-hstcache.c += $(nscd-cflags) -+CFLAGS-gethstbyad_r.c += $(nscd-cflags) -+CFLAGS-gethstbynm2_r.c += $(nscd-cflags) -+CFLAGS-dbg_log.c += $(nscd-cflags) -+CFLAGS-nscd_conf.c += $(nscd-cflags) -+CFLAGS-nscd_stat.c += $(nscd-cflags) -+CFLAGS-cache.c += $(nscd-cflags) -+CFLAGS-xmalloc.c += $(nscd-cflags) -+CFLAGS-xstrdup.c += $(nscd-cflags) -+CFLAGS-mem.c += $(nscd-cflags) -+CFLAGS-nscd_setup_thread.c += $(nscd-cflags) -+CFLAGS-aicache.c += $(nscd-cflags) -+CFLAGS-selinux.c += $(nscd-cflags) -+CFLAGS-initgrcache.c += $(nscd-cflags) -+CFLAGS-gai.c += $(nscd-cflags) -+ -+ifeq (yesyes,$(have-fpie)$(build-shared)) -+ifeq (yes,$(have-z-relro)) -+relro-LDFLAGS += -Wl,-z,now -+endif + The GNU C Library is free software; you can redistribute it and/or +@@ -19,8 +19,7 @@ - $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o)) - $(LINK.o) -pie -Wl,-O1 \ -- $(sysdep-LDFLAGS) $(config-LDFLAGS) \ -+ $(sysdep-LDFLAGS) $(config-LDFLAGS) $(relro-LDFLAGS) \ - $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \ - $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \ - $(LDFLAGS) $(LDFLAGS-$(@F)) \ ---- glibc-20041005T0745/nscd/connections.c 4 Oct 2004 16:38:27 -0000 1.62 -+++ glibc-20041005T0745-fedora/nscd/connections.c 5 Oct 2004 08:25:24 -0000 1.55.2.4 + #include + #include +-#include +-#include ++#include + + extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe); + #pragma weak __pthread_cleanup_upto +--- glibc-20041006T0900/nscd/connections.c 4 Oct 2004 16:38:27 -0000 1.62 ++++ glibc-20041006T0900-fedora/nscd/connections.c 5 Oct 2004 08:25:24 -0000 1.55.2.4 @@ -21,6 +21,7 @@ #include #include @@ -1970,40 +1777,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20041005T0745/nscd/initgrcache.c 30 Sep 2004 02:18:04 -0000 1.1 -+++ glibc-20041005T0745-fedora/nscd/initgrcache.c 5 Oct 2004 15:43:27 -0000 1.1.2.4 -@@ -117,6 +117,7 @@ addinitgroupsX (struct database_dyn *db, - /* Nothing added yet. */ - while (! no_more) - { -+ long int prev_start = start; - enum nss_status status; - initgroups_dyn_function fct; - fct = __nss_lookup_function (nip, "initgroups_dyn"); -@@ -133,6 +134,21 @@ addinitgroupsX (struct database_dyn *db, - status = DL_CALL_FCT (fct, (key, -1, &start, &size, &groups, - limit, &errno)); - -+ /* Remove duplicates. */ -+ long int cnt = prev_start; -+ while (cnt < start) -+ { -+ long int inner; -+ for (inner = 0; inner < prev_start; ++inner) -+ if (groups[inner] == groups[cnt]) -+ break; -+ -+ if (inner < prev_start) -+ groups[cnt] = groups[--start]; -+ else -+ ++cnt; -+ } -+ - if (status != NSS_STATUS_TRYAGAIN) - all_tryagain = false; - ---- glibc-20041005T0745/nscd/nscd.c 4 Oct 2004 16:14:31 -0000 1.42 -+++ glibc-20041005T0745-fedora/nscd/nscd.c 5 Oct 2004 08:25:25 -0000 1.38.2.4 +--- glibc-20041006T0900/nscd/nscd.c 4 Oct 2004 16:14:31 -0000 1.42 ++++ glibc-20041006T0900-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, }; @@ -2029,8 +1804,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20041005T0745/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 -+++ glibc-20041005T0745-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 +--- glibc-20041006T0900/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 ++++ glibc-20041006T0900-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 @@ -2042,8 +1817,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20041005T0745/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 -+++ glibc-20041005T0745-fedora/nscd/nscd_conf.c 4 Oct 2004 08:56:17 -0000 1.14.2.2 +--- glibc-20041006T0900/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 ++++ glibc-20041006T0900-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; @@ -2056,8 +1831,8 @@ break; } if (cnt == lastdb) ---- glibc-20041005T0745/sunrpc/rpc_parse.c 28 Sep 2004 02:03:49 -0000 1.7 -+++ glibc-20041005T0745-fedora/sunrpc/rpc_parse.c 29 Sep 2004 08:48:29 -0000 1.5.4.1 +--- glibc-20041006T0900/sunrpc/rpc_parse.c 28 Sep 2004 02:03:49 -0000 1.7 ++++ glibc-20041006T0900-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 */ @@ -2067,8 +1842,8 @@ /* * rpc_parse.c, Parser for the RPC protocol compiler ---- glibc-20041005T0745/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20041005T0745-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20041006T0900/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20041006T0900-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 @@ -2084,8 +1859,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-20041005T0745/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041005T0745-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 +--- glibc-20041006T0900/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041006T0900-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. @@ -2497,8 +2272,8 @@ + + +#define atomic_delay() asm ("rep; nop") ---- glibc-20041005T0745/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20041005T0745-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20041006T0900/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20041006T0900-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)) @@ -2510,8 +2285,8 @@ endif endif ---- glibc-20041005T0745/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20041005T0745-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20041006T0900/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20041006T0900-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. */ @@ -2863,8 +2638,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20041005T0745/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041005T0745-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20041006T0900/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041006T0900-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. @@ -2950,8 +2725,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20041005T0745/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20041005T0745-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20041006T0900/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20041006T0900-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); } @@ -2966,8 +2741,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20041005T0745/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20041005T0745-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20041006T0900/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20041006T0900-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" @@ -2977,8 +2752,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20041005T0745/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20041005T0745-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20041006T0900/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20041006T0900-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; @@ -3024,8 +2799,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20041005T0745/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041005T0745-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20041006T0900/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041006T0900-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. @@ -3086,39 +2861,8 @@ + } while (0) + +#include_next ---- glibc-20041005T0745/sysdeps/unix/sysv/linux/i386/sysconf.c 4 Oct 2004 19:24:54 -0000 1.4 -+++ glibc-20041005T0745-fedora/sysdeps/unix/sysv/linux/i386/sysconf.c 5 Oct 2004 08:25:29 -0000 1.3.2.1 -@@ -21,7 +21,7 @@ - #include - #include - #include -- -+#include - - static long int linux_sysconf (int name); - -@@ -347,13 +347,13 @@ __sysconf (int name) - { - if (name == _SC_CPUTIME || name == _SC_THREAD_CPUTIME) - { -- /* Check dynamically. */ -- int ac = i386_i486_test (); -- -- /* Only i386 and i486 have no TSC. */ -+#if HP_TIMING_AVAIL - // XXX We can add here test for machines which cannot support a -- // XXX usabel TSC. -- return ac == 0 || (ac & (1 << 21)) == 0 ? -1 : 200112L; -+ // XXX usable TSC. -+ return 200112L; -+#else -+ return -1; -+#endif - } - - /* All the remainder, except the cache information, is handled in ---- glibc-20041005T0745/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20041005T0745-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20041006T0900/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20041006T0900-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) @@ -3151,52 +2895,32 @@ + } while (0) + #include_next ---- glibc-20041005T0745/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041005T0745-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20041006T0900/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041006T0900-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-20041005T0745/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20041005T0745-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20041006T0900/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20041006T0900-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-20041005T0745/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20041005T0745-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20041006T0900/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20041006T0900-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-20041005T0745/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h 4 Oct 2004 20:59:35 -0000 1.14 -+++ glibc-20041005T0745-fedora/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h 5 Oct 2004 11:23:18 -0000 1.12.2.3 -@@ -22,6 +22,7 @@ - - #include - #include -+#include /* For RTLD_PRIVATE_ERRNO. */ - - /* For Linux we can use the system call table in the header file - /usr/include/asm/unistd.h ---- glibc-20041005T0745/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h 4 Oct 2004 20:59:34 -0000 1.16 -+++ glibc-20041005T0745-fedora/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h 5 Oct 2004 11:23:19 -0000 1.14.2.3 -@@ -23,6 +23,7 @@ - - #include - #include -+#include /* For RTLD_PRIVATE_ERRNO. */ - - /* For Linux we can use the system call table in the header file - /usr/include/asm/unistd.h ---- glibc-20041005T0745/sysdeps/unix/sysv/linux/sparc/sparc32/setresgid.c 19 Sep 2004 23:51:19 -0000 1.3 -+++ glibc-20041005T0745-fedora/sysdeps/unix/sysv/linux/sparc/sparc32/setresgid.c 1 Jan 1970 00:00:00 -0000 +--- glibc-20041006T0900/sysdeps/unix/sysv/linux/sparc/sparc32/setresgid.c 19 Sep 2004 23:51:19 -0000 1.3 ++++ glibc-20041006T0900-fedora/sysdeps/unix/sysv/linux/sparc/sparc32/setresgid.c 1 Jan 1970 00:00:00 -0000 @@ -1 +0,0 @@ -#include ---- glibc-20041005T0745/sysdeps/unix/sysv/linux/sparc/sparc32/setresuid.c 19 Sep 2004 23:51:44 -0000 1.3 -+++ glibc-20041005T0745-fedora/sysdeps/unix/sysv/linux/sparc/sparc32/setresuid.c 1 Jan 1970 00:00:00 -0000 +--- glibc-20041006T0900/sysdeps/unix/sysv/linux/sparc/sparc32/setresuid.c 19 Sep 2004 23:51:44 -0000 1.3 ++++ glibc-20041006T0900-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 7a057a9..c995798 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcdate 20041005T0745 +%define glibcdate 20041006T0900 %define glibcversion 2.3.3 -%define glibcrelease 65 +%define glibcrelease 66 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64 @@ -35,6 +35,7 @@ Prereq: basesystem, libgcc # This is for building auxiliary programs like memusage, nscd # For initial glibc bootstraps it can be commented out BuildPreReq: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.17.10-1 +BuildPreReq: sed >= 3.95 %ifarch %{prelinkarches} BuildPreReq: prelink >= 0.2.0-5 %endif @@ -480,7 +481,7 @@ GCC="gcc -m64" # If gcc supports __thread, test it even in --with-tls --without-__thread # builds. if echo '__thread int a;' | $GCC -xc - -S -o /dev/null 2>/dev/null; then - perl -pi -e 's/0 \|\|/1 ||/' ../elf/tst-tls10.h ../linuxthreads/tst-tls1.h + sed -ie 's/0 [|][|]/1 ||/' ../elf/tst-tls10.h ../linuxthreads/tst-tls1.h fi BuildFlags="$BuildFlags -DNDEBUG=1" @@ -924,8 +925,7 @@ ln -sf /%{_lib}/ld-linux-ia64.so.2 $RPM_BUILD_ROOT/lib/ld-linux-ia64.so.2 %endif # Increase timeouts -perl -pi -e 's/alarm \(TIMEOUT\)/alarm (TIMEOUT * 15 * '$numprocs' < 600 ? TIMEOUT * 15 * '$numprocs' : 600)/' \ - test-skeleton.c +export TIMEOUTFACTOR=16 echo ====================TESTING========================= cd build-%{_target_cpu}-linux make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || : @@ -1241,6 +1241,13 @@ rm -f *.filelist* %endif %changelog +* Wed Oct 6 2004 Jakub Jelinek 2.3.3-66 +- update from CVS +- avoid using perl in the spec file, buildrequire sed >= 3.95 + (#127671) +- export TIMEOUTFACTOR=16 +- fix _JMPBUF_CFA_UNWINDS_ADJ on s390{,x} + * Tue Oct 5 2004 Jakub Jelinek 2.3.3-65 - update from CVS - define _POSIX_THREAD_PROCESS_SHARED and _POSIX_CLOCK_SELECTION diff --git a/sources b/sources index 28b8e21..756e4ee 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b8c2720927883a5cc663703da652d742 glibc-20041005T0745.tar.bz2 -62d982ddea10cacfa5d552226f71a073 glibc-fedora-20041005T0745.tar.bz2 +87ebc90d9da0e6fb03ede93598b7c9b0 glibc-20041006T0900.tar.bz2 +909de94053f95ecf5cefd7284eb755aa glibc-fedora-20041006T0900.tar.bz2