From b691459b9d2eb83f4c5c220bc00f0b09d375d4db Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 11 Feb 2005 10:07:12 +0000 Subject: [PATCH] auto-import glibc-2.3.4-8 on branch devel from glibc-2.3.4-8.src.rpm --- .cvsignore | 4 +- glibc-fedora.patch | 799 ++++++++++++++++++++++++++++++++++----------- glibc.spec | 18 +- sources | 4 +- 4 files changed, 630 insertions(+), 195 deletions(-) diff --git a/.cvsignore b/.cvsignore index e9721f8..acb9860 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20050208T2213.tar.bz2 -glibc-fedora-20050208T2213.tar.bz2 +glibc-20050211T0853.tar.bz2 +glibc-fedora-20050211T0853.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index d03b960..d4ee94a 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,22 @@ ---- glibc-20050208T2213/ChangeLog 8 Feb 2005 21:40:07 -0000 1.9181 -+++ glibc-20050208T2213-fedora/ChangeLog 8 Feb 2005 22:32:33 -0000 1.8782.2.72 -@@ -1671,6 +1671,14 @@ +--- glibc-20050211T0853/ChangeLog 11 Feb 2005 00:29:55 -0000 1.9190 ++++ glibc-20050211T0853-fedora/ChangeLog 11 Feb 2005 09:07:53 -0000 1.8782.2.74 +@@ -1,3 +1,15 @@ ++2005-02-09 Jakub Jelinek ++ ++ * sysdeps/unix/sysv/linux/bits/termios.h (CMSPAR): Define. ++ * sysdeps/unix/sysv/linux/alpha/bits/termios.h: Add __USE_MISC ++ and __USE_XOPEN guards to match linux/bits/termios.h. ++ (CMSPAR): Define. ++ * sysdeps/unix/sysv/linux/powerpc/bits/termios.h: Add __USE_MISC ++ and __USE_XOPEN guards to match linux/bits/termios.h. ++ (CMSPAR): Define. ++ * sysdeps/unix/sysv/linux/sparc/bits/termios.h: Add __USE_MISC ++ and __USE_XOPEN guards to match linux/bits/termios.h. ++ + 2005-02-10 Roland McGrath + + [BZ #157] +@@ -1731,6 +1743,14 @@ 2004-11-26 Jakub Jelinek @@ -15,7 +31,7 @@ * posix/Makefile (install-others): Add $(inst_libexecdir)/getconf. (CFLAGS-sysconf.c): Add -D_GETCONF_DIR. (CFLAGS-getconf.c): New. -@@ -2262,6 +2270,16 @@ +@@ -2322,6 +2342,16 @@ * sysdeps/generic/tempname.c (__path_search): Add missing argument TRY_TMPDIR. @@ -32,7 +48,7 @@ 2004-10-31 Mariusz Mazur * sysdeps/unix/sysv/linux/alpha/setregid.c: New file. -@@ -2557,6 +2575,11 @@ +@@ -2617,6 +2647,11 @@ * posix/execvp.c (execvp): Also ignore ENODEV and ETIMEDOUT errno values. @@ -44,7 +60,7 @@ 2004-10-20 Roland McGrath * Makeconfig ($(common-objpfx)shlib-versions.v.i): Check also -@@ -2629,6 +2652,11 @@ +@@ -2689,6 +2724,11 @@ * debug/catchsegv.sh: Update copyright year. Use mktemp to create segv_output file. @@ -56,7 +72,7 @@ 2004-10-18 Jakub Jelinek * elf/dl-libc.c (__libc_dlsym_private, __libc_register_dl_open_hook): -@@ -3612,6 +3640,22 @@ +@@ -3672,6 +3712,22 @@ * string/string.h: Add __nonnull annotations. * stdlib/stdlib.h: Likewise. @@ -79,7 +95,7 @@ 2004-09-20 H.J. Lu * sysdeps/unix/sysv/linux/ia64/sysdep.h (DO_INLINE_SYSCALL): -@@ -4341,6 +4385,23 @@ +@@ -4401,6 +4457,23 @@ before return type. * locale/localename.c (__current_locale_name): Likewise. @@ -103,7 +119,7 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit -@@ -4497,6 +4558,22 @@ +@@ -4557,6 +4630,22 @@ * resolv/nss_dns/dns-canon.c (_nss_dns_getcanonname_r): Initialize status to NSS_STATUS_UNAVAIL. @@ -126,7 +142,7 @@ 2004-08-19 Ulrich Drepper * sysdeps/posix/getaddrinfo.c (gaih_inet): Use h->h_name in the -@@ -4801,6 +4878,12 @@ +@@ -4861,6 +4950,12 @@ * iconvdata/testdata/ISO-2022-JP-3: Regenerated. @@ -139,8 +155,8 @@ 2004-08-10 Alfred M. Szmidt * sysdeps/generic/bits/in.h (struct ip_mreq): Remove definition. ---- glibc-20050208T2213/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20050208T2213-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050211T0853/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20050211T0853-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. @@ -190,8 +206,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-20050208T2213/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20050208T2213-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050211T0853/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20050211T0853-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. @@ -218,16 +234,16 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20050208T2213/version.h 20 Dec 2004 23:37:41 -0000 1.67 -+++ glibc-20050208T2213-fedora/version.h 6 Jan 2005 15:21:51 -0000 1.65.2.3 +--- glibc-20050211T0853/version.h 20 Dec 2004 23:37:41 -0000 1.67 ++++ glibc-20050211T0853-fedora/version.h 6 Jan 2005 15:21:51 -0000 1.65.2.3 @@ -1,4 +1,4 @@ /* This file just defines the current version number of libc. */ #define RELEASE "development" -#define VERSION "2.3.90" +#define VERSION "2.3.4" ---- glibc-20050208T2213/csu/elf-init.c 6 Jan 2005 22:40:27 -0000 1.4 -+++ glibc-20050208T2213-fedora/csu/elf-init.c 8 Feb 2005 10:03:57 -0000 1.3.2.2 +--- glibc-20050211T0853/csu/elf-init.c 6 Jan 2005 22:40:27 -0000 1.4 ++++ glibc-20050211T0853-fedora/csu/elf-init.c 8 Feb 2005 10:03:57 -0000 1.3.2.2 @@ -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; @@ -253,8 +269,8 @@ #endif /* These function symbols are provided for the .init/.fini section entry ---- glibc-20050208T2213/debug/tst-chk1.c 18 Nov 2004 23:23:17 -0000 1.5 -+++ glibc-20050208T2213-fedora/debug/tst-chk1.c 19 Nov 2004 00:18:08 -0000 1.1.2.7 +--- glibc-20050211T0853/debug/tst-chk1.c 18 Nov 2004 23:23:17 -0000 1.5 ++++ glibc-20050211T0853-fedora/debug/tst-chk1.c 19 Nov 2004 00:18:08 -0000 1.1.2.7 @@ -213,7 +213,7 @@ do_test (void) if (memcmp (a.buf1, "aabcdabcjj", 10)) FAIL (); @@ -273,8 +289,8 @@ # define O 0 #else # define O 1 ---- glibc-20050208T2213/elf/dl-support.c 6 Nov 2004 00:24:49 -0000 1.87 -+++ glibc-20050208T2213-fedora/elf/dl-support.c 10 Nov 2004 09:02:46 -0000 1.84.2.4 +--- glibc-20050211T0853/elf/dl-support.c 6 Nov 2004 00:24:49 -0000 1.87 ++++ glibc-20050211T0853-fedora/elf/dl-support.c 10 Nov 2004 09:02:46 -0000 1.84.2.4 @@ -281,6 +281,11 @@ _dl_non_dynamic_init (void) if (_dl_platform != NULL) _dl_platformlen = strlen (_dl_platform); @@ -287,8 +303,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-20050208T2213/elf/ldconfig.c 12 Jan 2005 23:39:52 -0000 1.48 -+++ glibc-20050208T2213-fedora/elf/ldconfig.c 8 Feb 2005 10:04:03 -0000 1.47.2.2 +--- glibc-20050211T0853/elf/ldconfig.c 12 Jan 2005 23:39:52 -0000 1.48 ++++ glibc-20050211T0853-fedora/elf/ldconfig.c 8 Feb 2005 10:04:03 -0000 1.47.2.2 @@ -944,17 +944,19 @@ search_dirs (void) @@ -370,8 +386,8 @@ } search_dirs (); ---- glibc-20050208T2213/elf/rtld.c 25 Jan 2005 11:11:43 -0000 1.346 -+++ glibc-20050208T2213-fedora/elf/rtld.c 8 Feb 2005 10:04:03 -0000 1.330.2.12 +--- glibc-20050211T0853/elf/rtld.c 25 Jan 2005 11:11:43 -0000 1.346 ++++ glibc-20050211T0853-fedora/elf/rtld.c 8 Feb 2005 10:04:03 -0000 1.330.2.12 @@ -1223,6 +1223,53 @@ ld.so does not support TLS, but program ++GL(dl_ns)[LM_ID_BASE]._ns_nloaded; ++GL(dl_load_adds); @@ -494,8 +510,8 @@ if (__builtin_expect (npreloads, 0) != 0) { /* Set up PRELOADS with a vector of the preloaded libraries. */ ---- glibc-20050208T2213/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 -+++ glibc-20050208T2213-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 +--- glibc-20050211T0853/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 ++++ glibc-20050211T0853-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 @@ -1,8 +1,8 @@ #include #include @@ -507,8 +523,8 @@ # define USE_TLS__THREAD struct A ---- glibc-20050208T2213/iconv/iconvconfig.c 12 Jan 2005 23:39:51 -0000 1.22 -+++ glibc-20050208T2213-fedora/iconv/iconvconfig.c 8 Feb 2005 10:04:05 -0000 1.19.2.3 +--- glibc-20050211T0853/iconv/iconvconfig.c 12 Jan 2005 23:39:51 -0000 1.22 ++++ glibc-20050211T0853-fedora/iconv/iconvconfig.c 8 Feb 2005 10:04:05 -0000 1.19.2.3 @@ -1013,6 +1013,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -585,8 +601,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20050208T2213/include/features.h 20 Dec 2004 23:37:42 -0000 1.37 -+++ glibc-20050208T2213-fedora/include/features.h 6 Jan 2005 14:57:02 -0000 1.35.2.5 +--- glibc-20050211T0853/include/features.h 20 Dec 2004 23:37:42 -0000 1.37 ++++ glibc-20050211T0853-fedora/include/features.h 6 Jan 2005 14:57:02 -0000 1.35.2.5 @@ -181,8 +181,8 @@ /* If none of the ANSI/POSIX macros are defined, use POSIX.1 and POSIX.2 @@ -613,8 +629,8 @@ # if _FORTIFY_SOURCE == 1 # define __USE_FORTIFY_LEVEL 1 # elif _FORTIFY_SOURCE > 1 ---- glibc-20050208T2213/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20050208T2213-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20050211T0853/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20050211T0853-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 @@ -624,8 +640,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20050208T2213/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 -+++ glibc-20050208T2213-fedora/libio/stdio.h 8 Feb 2005 10:04:09 -0000 1.78.2.4 +--- glibc-20050211T0853/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 ++++ glibc-20050211T0853-fedora/libio/stdio.h 8 Feb 2005 10:04:09 -0000 1.78.2.4 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -639,8 +655,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20050208T2213/libio/bits/stdio2.h 18 Oct 2004 04:17:14 -0000 1.1 -+++ glibc-20050208T2213-fedora/libio/bits/stdio2.h 2 Nov 2004 13:30:19 -0000 1.1.2.2 +--- glibc-20050211T0853/libio/bits/stdio2.h 18 Oct 2004 04:17:14 -0000 1.1 ++++ glibc-20050211T0853-fedora/libio/bits/stdio2.h 2 Nov 2004 13:30:19 -0000 1.1.2.2 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -671,9 +687,9 @@ #endif ---- glibc-20050208T2213/linuxthreads/ChangeLog 7 Feb 2005 19:30:19 -0000 1.836 -+++ glibc-20050208T2213-fedora/linuxthreads/ChangeLog 8 Feb 2005 10:04:10 -0000 1.817.2.16 -@@ -761,6 +761,12 @@ +--- glibc-20050211T0853/linuxthreads/ChangeLog 10 Feb 2005 07:16:22 -0000 1.837 ++++ glibc-20050211T0853-fedora/linuxthreads/ChangeLog 11 Feb 2005 09:01:50 -0000 1.817.2.17 +@@ -766,6 +766,12 @@ (pthread_barrierattr_setpshared): Return EINVAL if pshared is neither PTHREAD_PROCESS_PRIVATE nor PTHREAD_PROCESS_SHARED. @@ -686,7 +702,7 @@ 2003-09-02 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/dl-sysdep.h -@@ -893,6 +899,34 @@ +@@ -898,6 +904,34 @@ 2003-07-22 Jakub Jelinek @@ -721,8 +737,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-20050208T2213/linuxthreads/Makefile 7 Feb 2005 19:30:03 -0000 1.98 -+++ glibc-20050208T2213-fedora/linuxthreads/Makefile 8 Feb 2005 10:04:10 -0000 1.94.2.5 +--- glibc-20050211T0853/linuxthreads/Makefile 7 Feb 2005 19:30:03 -0000 1.98 ++++ glibc-20050211T0853-fedora/linuxthreads/Makefile 8 Feb 2005 10:04:10 -0000 1.94.2.5 @@ -245,15 +245,18 @@ $(addprefix $(objpfx), \ $(filter-out $(tests-static) $(tests-reverse) unload, \ $(tests) $(test-srcs))): $(objpfx)libpthread.so \ @@ -744,8 +760,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a ---- glibc-20050208T2213/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 -+++ glibc-20050208T2213-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 +--- glibc-20050211T0853/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 ++++ glibc-20050211T0853-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 } @@ -753,8 +769,8 @@ + THREAD_SETMEM (self, p_cancelstate, PTHREAD_CANCEL_DISABLE); __libc_thread_freeres (); } ---- glibc-20050208T2213/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 -+++ glibc-20050208T2213-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 +--- glibc-20050211T0853/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 ++++ glibc-20050211T0853-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); @@ -768,8 +784,8 @@ __pthread_mutexattr_destroy (&attr); ---- glibc-20050208T2213/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 -+++ glibc-20050208T2213-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 +--- glibc-20050211T0853/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 ++++ glibc-20050211T0853-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 @@ -21,6 +21,7 @@ # define __need_timespec # include @@ -778,8 +794,8 @@ #ifndef _PTHREAD_DESCR_DEFINED /* Thread descriptors. Needed for `sem_t' definition. */ ---- glibc-20050208T2213/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 -+++ glibc-20050208T2213-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 +--- glibc-20050211T0853/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 ++++ glibc-20050211T0853-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 @@ -2,7 +2,7 @@ #include #include @@ -789,8 +805,8 @@ struct tls_obj { ---- glibc-20050208T2213/linuxthreads/sysdeps/alpha/tls.h 9 Jan 2005 20:01:12 -0000 1.6 -+++ glibc-20050208T2213-fedora/linuxthreads/sysdeps/alpha/tls.h 8 Feb 2005 10:04:11 -0000 1.5.2.2 +--- glibc-20050211T0853/linuxthreads/sysdeps/alpha/tls.h 9 Jan 2005 20:01:12 -0000 1.6 ++++ glibc-20050211T0853-fedora/linuxthreads/sysdeps/alpha/tls.h 8 Feb 2005 10:04:11 -0000 1.5.2.2 @@ -58,54 +58,76 @@ typedef struct # include @@ -880,8 +896,8 @@ /* Get the thread descriptor definition. */ # include ---- glibc-20050208T2213/linuxthreads/sysdeps/i386/tls.h 9 Jan 2005 20:01:13 -0000 1.38 -+++ glibc-20050208T2213-fedora/linuxthreads/sysdeps/i386/tls.h 8 Feb 2005 10:04:12 -0000 1.35.2.5 +--- glibc-20050211T0853/linuxthreads/sysdeps/i386/tls.h 9 Jan 2005 20:01:13 -0000 1.38 ++++ glibc-20050211T0853-fedora/linuxthreads/sysdeps/i386/tls.h 8 Feb 2005 10:04:12 -0000 1.35.2.5 @@ -86,7 +86,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -898,8 +914,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050208T2213/linuxthreads/sysdeps/ia64/tls.h 9 Jan 2005 20:01:13 -0000 1.10 -+++ glibc-20050208T2213-fedora/linuxthreads/sysdeps/ia64/tls.h 8 Feb 2005 10:04:14 -0000 1.9.2.2 +--- glibc-20050211T0853/linuxthreads/sysdeps/ia64/tls.h 9 Jan 2005 20:01:13 -0000 1.10 ++++ glibc-20050211T0853-fedora/linuxthreads/sysdeps/ia64/tls.h 8 Feb 2005 10:04:14 -0000 1.9.2.2 @@ -65,7 +65,14 @@ typedef struct # define TLS_TCB_SIZE sizeof (tcbhead_t) @@ -916,8 +932,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050208T2213/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 -+++ glibc-20050208T2213-fedora/linuxthreads/sysdeps/powerpc/tls.h 8 Feb 2005 10:04:14 -0000 1.8.2.2 +--- glibc-20050211T0853/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 ++++ glibc-20050211T0853-fedora/linuxthreads/sysdeps/powerpc/tls.h 8 Feb 2005 10:04:14 -0000 1.8.2.2 @@ -69,11 +69,19 @@ typedef struct # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) @@ -940,8 +956,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-20050208T2213/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 -+++ glibc-20050208T2213-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 +--- glibc-20050211T0853/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 ++++ glibc-20050211T0853-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)\"" @@ -958,8 +974,8 @@ + @echo '#define NPTL_STRUCT_PTHREAD_SIZE 0' > $@ +endif +endif ---- glibc-20050208T2213/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050208T2213-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 +--- glibc-20050211T0853/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050211T0853-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 @@ -974,8 +990,8 @@ +#ifdef HAVE_TLS_SUPPORT +NPTL_STRUCT_PTHREAD_SIZE sizeof (struct pthread) +#endif ---- glibc-20050208T2213/linuxthreads/sysdeps/s390/tls.h 9 Jan 2005 20:01:14 -0000 1.4 -+++ glibc-20050208T2213-fedora/linuxthreads/sysdeps/s390/tls.h 8 Feb 2005 10:04:15 -0000 1.3.2.2 +--- glibc-20050211T0853/linuxthreads/sysdeps/s390/tls.h 9 Jan 2005 20:01:14 -0000 1.4 ++++ glibc-20050211T0853-fedora/linuxthreads/sysdeps/s390/tls.h 8 Feb 2005 10:04:15 -0000 1.3.2.2 @@ -77,7 +77,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -992,8 +1008,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050208T2213/linuxthreads/sysdeps/sh/tls.h 9 Jan 2005 20:01:15 -0000 1.10 -+++ glibc-20050208T2213-fedora/linuxthreads/sysdeps/sh/tls.h 8 Feb 2005 10:04:15 -0000 1.9.2.2 +--- glibc-20050211T0853/linuxthreads/sysdeps/sh/tls.h 9 Jan 2005 20:01:15 -0000 1.10 ++++ glibc-20050211T0853-fedora/linuxthreads/sysdeps/sh/tls.h 8 Feb 2005 10:04:15 -0000 1.9.2.2 @@ -69,7 +69,14 @@ typedef struct # define TLS_TCB_SIZE sizeof (tcbhead_t) @@ -1010,8 +1026,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050208T2213/linuxthreads/sysdeps/sparc/tls.h 9 Jan 2005 20:01:15 -0000 1.4 -+++ glibc-20050208T2213-fedora/linuxthreads/sysdeps/sparc/tls.h 8 Feb 2005 10:04:16 -0000 1.3.2.2 +--- glibc-20050211T0853/linuxthreads/sysdeps/sparc/tls.h 9 Jan 2005 20:01:15 -0000 1.4 ++++ glibc-20050211T0853-fedora/linuxthreads/sysdeps/sparc/tls.h 8 Feb 2005 10:04:16 -0000 1.3.2.2 @@ -69,7 +69,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1028,8 +1044,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050208T2213/linuxthreads/sysdeps/x86_64/tls.h 9 Jan 2005 20:01:15 -0000 1.7 -+++ glibc-20050208T2213-fedora/linuxthreads/sysdeps/x86_64/tls.h 8 Feb 2005 10:04:16 -0000 1.6.2.2 +--- glibc-20050211T0853/linuxthreads/sysdeps/x86_64/tls.h 9 Jan 2005 20:01:15 -0000 1.7 ++++ glibc-20050211T0853-fedora/linuxthreads/sysdeps/x86_64/tls.h 8 Feb 2005 10:04:16 -0000 1.6.2.2 @@ -71,7 +71,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1046,8 +1062,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050208T2213/locale/iso-4217.def 10 Aug 2004 05:10:38 -0000 1.15 -+++ glibc-20050208T2213-fedora/locale/iso-4217.def 22 Sep 2004 21:20:57 -0000 1.15.2.1 +--- glibc-20050211T0853/locale/iso-4217.def 10 Aug 2004 05:10:38 -0000 1.15 ++++ glibc-20050211T0853-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 !!! @@ -1139,8 +1155,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20050208T2213/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 -+++ glibc-20050208T2213-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 +--- glibc-20050211T0853/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 ++++ glibc-20050211T0853-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, } } @@ -1184,8 +1200,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20050208T2213/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 -+++ glibc-20050208T2213-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 +--- glibc-20050211T0853/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 ++++ glibc-20050211T0853-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/'`; \ @@ -1194,8 +1210,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20050208T2213/localedata/SUPPORTED 31 Oct 2004 20:49:54 -0000 1.72 -+++ glibc-20050208T2213-fedora/localedata/SUPPORTED 2 Nov 2004 12:25:45 -0000 1.71.2.2 +--- glibc-20050211T0853/localedata/SUPPORTED 31 Oct 2004 20:49:54 -0000 1.72 ++++ glibc-20050211T0853-fedora/localedata/SUPPORTED 2 Nov 2004 12:25:45 -0000 1.71.2.2 @@ -63,6 +63,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1237,8 +1253,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ/KOI8-T \ ---- glibc-20050208T2213/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20050208T2213-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20050211T0853/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20050211T0853-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -1253,8 +1269,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20050208T2213/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20050208T2213-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20050211T0853/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20050211T0853-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -1266,8 +1282,8 @@ date_fmt "/ / " ---- glibc-20050208T2213/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 -+++ glibc-20050208T2213-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 +--- glibc-20050211T0853/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 ++++ glibc-20050211T0853-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 @@ -100,7 +100,6 @@ mon " "";/ "";/ @@ -1276,8 +1292,8 @@ % Appropriate date and time representation (%c) % "%a %d %b %Y %r %Z" d_t_fmt "" ---- glibc-20050208T2213/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050208T2213-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20050211T0853/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050211T0853-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1348,8 +1364,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20050208T2213/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20050208T2213-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20050211T0853/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20050211T0853-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1377,8 +1393,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20050208T2213/malloc/arena.c 10 Dec 2004 11:42:08 -0000 1.13 -+++ glibc-20050208T2213-fedora/malloc/arena.c 13 Dec 2004 23:32:35 -0000 1.8.2.6 +--- glibc-20050211T0853/malloc/arena.c 10 Dec 2004 11:42:08 -0000 1.13 ++++ glibc-20050211T0853-fedora/malloc/arena.c 13 Dec 2004 23:32:35 -0000 1.8.2.6 @@ -18,7 +18,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -1388,8 +1404,8 @@ /* Compile-time constants. */ ---- glibc-20050208T2213/malloc/hooks.c 14 Dec 2004 21:18:02 -0000 1.16 -+++ glibc-20050208T2213-fedora/malloc/hooks.c 15 Dec 2004 09:16:05 -0000 1.15.2.1 +--- glibc-20050211T0853/malloc/hooks.c 14 Dec 2004 21:18:02 -0000 1.16 ++++ glibc-20050211T0853-fedora/malloc/hooks.c 15 Dec 2004 09:16:05 -0000 1.15.2.1 @@ -18,7 +18,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -1399,8 +1415,8 @@ /* What to do if the standard debugging hooks are in place and a corrupt pointer is detected: do nothing (0), print an error message ---- glibc-20050208T2213/malloc/malloc.c 7 Jan 2005 21:47:56 -0000 1.143 -+++ glibc-20050208T2213-fedora/malloc/malloc.c 8 Feb 2005 10:04:17 -0000 1.127.2.14 +--- glibc-20050211T0853/malloc/malloc.c 7 Jan 2005 21:47:56 -0000 1.143 ++++ glibc-20050211T0853-fedora/malloc/malloc.c 8 Feb 2005 10:04:17 -0000 1.127.2.14 @@ -24,7 +24,7 @@ Doug Lea and adapted to multiple threads/arenas by Wolfram Gloger. @@ -1410,8 +1426,8 @@ based on: VERSION 2.7.0 Sun Mar 11 14:14:06 2001 Doug Lea (dl at gee) ---- glibc-20050208T2213/math/math_private.h 8 Feb 2005 04:37:48 -0000 1.19 -+++ glibc-20050208T2213-fedora/math/math_private.h 8 Feb 2005 10:04:22 -0000 1.18.2.1 +--- glibc-20050211T0853/math/math_private.h 8 Feb 2005 04:37:48 -0000 1.19 ++++ glibc-20050211T0853-fedora/math/math_private.h 8 Feb 2005 10:04:22 -0000 1.18.2.1 @@ -11,7 +11,7 @@ /* @@ -1421,8 +1437,8 @@ */ #ifndef _MATH_PRIVATE_H_ ---- glibc-20050208T2213/nptl/ChangeLog 8 Feb 2005 09:02:56 -0000 1.762 -+++ glibc-20050208T2213-fedora/nptl/ChangeLog 8 Feb 2005 10:04:25 -0000 1.706.2.35 +--- glibc-20050211T0853/nptl/ChangeLog 8 Feb 2005 09:02:56 -0000 1.762 ++++ glibc-20050211T0853-fedora/nptl/ChangeLog 8 Feb 2005 10:04:25 -0000 1.706.2.35 @@ -507,6 +507,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1447,8 +1463,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20050208T2213/nptl/Makefile 22 Dec 2004 20:07:09 -0000 1.166 -+++ glibc-20050208T2213-fedora/nptl/Makefile 6 Jan 2005 14:57:04 -0000 1.157.2.9 +--- glibc-20050211T0853/nptl/Makefile 22 Dec 2004 20:07:09 -0000 1.166 ++++ glibc-20050211T0853-fedora/nptl/Makefile 6 Jan 2005 14:57:04 -0000 1.157.2.9 @@ -499,15 +499,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1471,8 +1487,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20050208T2213/nptl/alloca_cutoff.c 26 Nov 2002 22:50:01 -0000 1.1.1.1 -+++ glibc-20050208T2213-fedora/nptl/alloca_cutoff.c 22 Sep 2004 21:21:01 -0000 1.1.1.1.2.1 +--- glibc-20050211T0853/nptl/alloca_cutoff.c 26 Nov 2002 22:50:01 -0000 1.1.1.1 ++++ glibc-20050211T0853-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. @@ -1494,8 +1510,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-20050208T2213/nptl/descr.h 12 Nov 2004 01:24:24 -0000 1.25 -+++ glibc-20050208T2213-fedora/nptl/descr.h 12 Nov 2004 16:56:12 -0000 1.23.2.3 +--- glibc-20050211T0853/nptl/descr.h 12 Nov 2004 01:24:24 -0000 1.25 ++++ glibc-20050211T0853-fedora/nptl/descr.h 12 Nov 2004 16:56:12 -0000 1.23.2.3 @@ -27,9 +27,13 @@ #include #include @@ -1510,8 +1526,8 @@ #include "../nptl_db/thread_db.h" #include #ifdef HAVE_FORCED_UNWIND ---- glibc-20050208T2213/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 -+++ glibc-20050208T2213-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 +--- glibc-20050211T0853/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 ++++ glibc-20050211T0853-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. */ @@ -1553,8 +1569,8 @@ } return 0; ---- glibc-20050208T2213/nptl/tst-unload.c 25 Feb 2004 18:41:32 -0000 1.3 -+++ glibc-20050208T2213-fedora/nptl/tst-unload.c 22 Sep 2004 21:21:01 -0000 1.3.2.1 +--- glibc-20050211T0853/nptl/tst-unload.c 25 Feb 2004 18:41:32 -0000 1.3 ++++ glibc-20050211T0853-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. @@ -1576,8 +1592,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-20050208T2213/nptl/sysdeps/pthread/allocalim.h 26 Nov 2002 22:50:35 -0000 1.1.1.1 -+++ glibc-20050208T2213-fedora/nptl/sysdeps/pthread/allocalim.h 22 Sep 2004 21:21:02 -0000 1.1.1.1.2.1 +--- glibc-20050211T0853/nptl/sysdeps/pthread/allocalim.h 26 Nov 2002 22:50:35 -0000 1.1.1.1 ++++ glibc-20050211T0853-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. @@ -1599,8 +1615,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-20050208T2213/nptl/sysdeps/pthread/pt-initfini.c 31 Dec 2002 08:46:38 -0000 1.3 -+++ glibc-20050208T2213-fedora/nptl/sysdeps/pthread/pt-initfini.c 22 Sep 2004 21:21:02 -0000 1.3.2.1 +--- glibc-20050211T0853/nptl/sysdeps/pthread/pt-initfini.c 31 Dec 2002 08:46:38 -0000 1.3 ++++ glibc-20050211T0853-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. @@ -1627,8 +1643,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-20050208T2213/nptl/sysdeps/pthread/bits/libc-lock.h 11 Dec 2003 04:50:49 -0000 1.17 -+++ glibc-20050208T2213-fedora/nptl/sysdeps/pthread/bits/libc-lock.h 22 Sep 2004 21:21:02 -0000 1.17.2.1 +--- glibc-20050211T0853/nptl/sysdeps/pthread/bits/libc-lock.h 11 Dec 2003 04:50:49 -0000 1.17 ++++ glibc-20050211T0853-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. @@ -1650,8 +1666,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-20050208T2213/nptl/sysdeps/pthread/bits/sigthread.h 26 Nov 2002 22:50:35 -0000 1.1.1.1 -+++ glibc-20050208T2213-fedora/nptl/sysdeps/pthread/bits/sigthread.h 22 Sep 2004 21:21:02 -0000 1.1.1.1.2.1 +--- glibc-20050211T0853/nptl/sysdeps/pthread/bits/sigthread.h 26 Nov 2002 22:50:35 -0000 1.1.1.1 ++++ glibc-20050211T0853-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. @@ -1673,8 +1689,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-20050208T2213/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050208T2213-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20050211T0853/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050211T0853-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 + @@ -1682,8 +1698,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20050208T2213/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h 13 Apr 2004 02:00:09 -0000 1.6 -+++ glibc-20050208T2213-fedora/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h 22 Sep 2004 21:21:02 -0000 1.6.2.1 +--- glibc-20050211T0853/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h 13 Apr 2004 02:00:09 -0000 1.6 ++++ glibc-20050211T0853-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. @@ -1705,8 +1721,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-20050208T2213/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 10 Dec 2004 00:23:51 -0000 1.11 -+++ glibc-20050208T2213-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 3 Dec 2004 11:20:52 -0000 1.8.2.4 +--- glibc-20050211T0853/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 10 Dec 2004 00:23:51 -0000 1.11 ++++ glibc-20050211T0853-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 3 Dec 2004 11:20:52 -0000 1.8.2.4 @@ -3,16 +3,16 @@ This file is part of the GNU C Library. @@ -1728,8 +1744,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-20050208T2213/nscd/connections.c 30 Jan 2005 20:32:33 -0000 1.65 -+++ glibc-20050208T2213-fedora/nscd/connections.c 8 Feb 2005 10:04:34 -0000 1.55.2.6 +--- glibc-20050211T0853/nscd/connections.c 30 Jan 2005 20:32:33 -0000 1.65 ++++ glibc-20050211T0853-fedora/nscd/connections.c 8 Feb 2005 10:04:34 -0000 1.55.2.6 @@ -21,6 +21,7 @@ #include #include @@ -1820,8 +1836,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20050208T2213/nscd/nscd.c 7 Feb 2005 22:51:22 -0000 1.44 -+++ glibc-20050208T2213-fedora/nscd/nscd.c 8 Feb 2005 10:04:34 -0000 1.38.2.5 +--- glibc-20050211T0853/nscd/nscd.c 7 Feb 2005 22:51:22 -0000 1.44 ++++ glibc-20050211T0853-fedora/nscd/nscd.c 8 Feb 2005 10:04:34 -0000 1.38.2.5 @@ -122,9 +122,16 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1847,8 +1863,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20050208T2213/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 -+++ glibc-20050208T2213-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 +--- glibc-20050211T0853/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 ++++ glibc-20050211T0853-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 @@ -1860,8 +1876,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20050208T2213/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 -+++ glibc-20050208T2213-fedora/nscd/nscd_conf.c 4 Oct 2004 08:56:17 -0000 1.14.2.2 +--- glibc-20050211T0853/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 ++++ glibc-20050211T0853-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; @@ -1874,8 +1890,8 @@ break; } if (cnt == lastdb) ---- glibc-20050208T2213/posix/Makefile 23 Jan 2005 04:41:24 -0000 1.181 -+++ glibc-20050208T2213-fedora/posix/Makefile 8 Feb 2005 10:04:36 -0000 1.171.2.10 +--- glibc-20050211T0853/posix/Makefile 23 Jan 2005 04:41:24 -0000 1.181 ++++ glibc-20050211T0853-fedora/posix/Makefile 8 Feb 2005 10:04:36 -0000 1.171.2.10 @@ -102,7 +102,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1909,8 +1925,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20050208T2213/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050208T2213-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20050211T0853/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050211T0853-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -1927,8 +1943,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20050208T2213/resolv/gethnamaddr.c 18 Oct 2004 05:09:59 -0000 1.50 -+++ glibc-20050208T2213-fedora/resolv/gethnamaddr.c 18 Oct 2004 09:58:50 -0000 1.49.2.1 +--- glibc-20050211T0853/resolv/gethnamaddr.c 18 Oct 2004 05:09:59 -0000 1.50 ++++ glibc-20050211T0853-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) @@ -1938,8 +1954,8 @@ #endif /* LIBC_SCCS and not lint */ #include ---- glibc-20050208T2213/sunrpc/rpc_clntout.c 17 Oct 2004 14:59:39 -0000 1.7 -+++ glibc-20050208T2213-fedora/sunrpc/rpc_clntout.c 18 Oct 2004 09:58:53 -0000 1.6.4.1 +--- glibc-20050211T0853/sunrpc/rpc_clntout.c 17 Oct 2004 14:59:39 -0000 1.7 ++++ glibc-20050211T0853-fedora/sunrpc/rpc_clntout.c 18 Oct 2004 09:58:53 -0000 1.6.4.1 @@ -33,7 +33,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) @@ -1949,8 +1965,8 @@ #endif /* ---- glibc-20050208T2213/sunrpc/rpc_cout.c 17 Oct 2004 14:59:39 -0000 1.14 -+++ glibc-20050208T2213-fedora/sunrpc/rpc_cout.c 18 Oct 2004 09:58:53 -0000 1.13.4.1 +--- glibc-20050211T0853/sunrpc/rpc_cout.c 17 Oct 2004 14:59:39 -0000 1.14 ++++ glibc-20050211T0853-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) @@ -1960,8 +1976,8 @@ #endif /* ---- glibc-20050208T2213/sunrpc/rpc_hout.c 17 Oct 2004 14:59:39 -0000 1.8 -+++ glibc-20050208T2213-fedora/sunrpc/rpc_hout.c 18 Oct 2004 09:58:53 -0000 1.7.4.1 +--- glibc-20050211T0853/sunrpc/rpc_hout.c 17 Oct 2004 14:59:39 -0000 1.8 ++++ glibc-20050211T0853-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) @@ -1971,8 +1987,8 @@ #endif /* ---- glibc-20050208T2213/sunrpc/rpc_main.c 26 Jan 2005 02:40:09 -0000 1.25 -+++ glibc-20050208T2213-fedora/sunrpc/rpc_main.c 8 Feb 2005 10:04:46 -0000 1.23.2.2 +--- glibc-20050211T0853/sunrpc/rpc_main.c 26 Jan 2005 02:40:09 -0000 1.25 ++++ glibc-20050211T0853-fedora/sunrpc/rpc_main.c 8 Feb 2005 10:04:46 -0000 1.23.2.2 @@ -33,7 +33,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) @@ -1982,8 +1998,8 @@ #endif /* ---- glibc-20050208T2213/sunrpc/rpc_parse.c 17 Oct 2004 14:59:39 -0000 1.8 -+++ glibc-20050208T2213-fedora/sunrpc/rpc_parse.c 18 Oct 2004 09:58:53 -0000 1.5.4.2 +--- glibc-20050211T0853/sunrpc/rpc_parse.c 17 Oct 2004 14:59:39 -0000 1.8 ++++ glibc-20050211T0853-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) @@ -1993,8 +2009,8 @@ #endif /* ---- glibc-20050208T2213/sunrpc/rpc_sample.c 17 Oct 2004 14:59:39 -0000 1.6 -+++ glibc-20050208T2213-fedora/sunrpc/rpc_sample.c 18 Oct 2004 09:58:53 -0000 1.5.6.1 +--- glibc-20050211T0853/sunrpc/rpc_sample.c 17 Oct 2004 14:59:39 -0000 1.6 ++++ glibc-20050211T0853-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) @@ -2004,8 +2020,8 @@ #endif /* ---- glibc-20050208T2213/sunrpc/rpc_scan.c 17 Oct 2004 14:59:39 -0000 1.9 -+++ glibc-20050208T2213-fedora/sunrpc/rpc_scan.c 18 Oct 2004 09:58:53 -0000 1.8.4.1 +--- glibc-20050211T0853/sunrpc/rpc_scan.c 17 Oct 2004 14:59:39 -0000 1.9 ++++ glibc-20050211T0853-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) @@ -2015,8 +2031,8 @@ #endif /* ---- glibc-20050208T2213/sunrpc/rpc_svcout.c 17 Oct 2004 14:59:39 -0000 1.12 -+++ glibc-20050208T2213-fedora/sunrpc/rpc_svcout.c 18 Oct 2004 09:58:53 -0000 1.11.2.1 +--- glibc-20050211T0853/sunrpc/rpc_svcout.c 17 Oct 2004 14:59:39 -0000 1.12 ++++ glibc-20050211T0853-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) @@ -2026,8 +2042,8 @@ #endif /* ---- glibc-20050208T2213/sunrpc/rpc_tblout.c 17 Oct 2004 14:59:39 -0000 1.3 -+++ glibc-20050208T2213-fedora/sunrpc/rpc_tblout.c 18 Oct 2004 09:58:53 -0000 1.2.6.1 +--- glibc-20050211T0853/sunrpc/rpc_tblout.c 17 Oct 2004 14:59:39 -0000 1.3 ++++ glibc-20050211T0853-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) @@ -2037,8 +2053,8 @@ #endif /* ---- glibc-20050208T2213/sunrpc/rpc_util.c 17 Oct 2004 14:59:39 -0000 1.7 -+++ glibc-20050208T2213-fedora/sunrpc/rpc_util.c 18 Oct 2004 09:58:53 -0000 1.6.6.1 +--- glibc-20050211T0853/sunrpc/rpc_util.c 17 Oct 2004 14:59:39 -0000 1.7 ++++ glibc-20050211T0853-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) @@ -2048,8 +2064,8 @@ #endif /* ---- glibc-20050208T2213/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20050208T2213-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20050211T0853/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20050211T0853-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 @@ -2065,8 +2081,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-20050208T2213/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050208T2213-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 +--- glibc-20050211T0853/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050211T0853-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. @@ -2478,8 +2494,8 @@ + + +#define atomic_delay() asm ("rep; nop") ---- glibc-20050208T2213/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20050208T2213-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20050211T0853/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20050211T0853-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)) @@ -2491,8 +2507,8 @@ endif endif ---- glibc-20050208T2213/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20050208T2213-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20050211T0853/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20050211T0853-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. */ @@ -2844,8 +2860,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20050208T2213/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050208T2213-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050211T0853/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050211T0853-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. @@ -2931,8 +2947,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20050208T2213/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20050208T2213-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20050211T0853/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20050211T0853-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); } @@ -2947,8 +2963,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20050208T2213/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20050208T2213-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20050211T0853/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20050211T0853-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" @@ -2958,8 +2974,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20050208T2213/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 -+++ glibc-20050208T2213-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 +--- glibc-20050211T0853/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 ++++ glibc-20050211T0853-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 @@ -33,7 +33,10 @@ __readonly_area (const char *ptr, size_t FILE *fp = fopen ("/proc/self/maps", "rc"); @@ -2972,8 +2988,8 @@ /* We need no locking. */ __fsetlocking (fp, FSETLOCKING_BYCALLER); ---- glibc-20050208T2213/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20050208T2213-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20050211T0853/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20050211T0853-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; @@ -3019,8 +3035,153 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20050208T2213/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050208T2213-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050211T0853/sysdeps/unix/sysv/linux/alpha/bits/termios.h 31 Mar 2004 08:53:28 -0000 1.7 ++++ glibc-20050211T0853-fedora/sysdeps/unix/sysv/linux/alpha/bits/termios.h 11 Feb 2005 09:07:59 -0000 1.7.2.1 +@@ -1,5 +1,5 @@ + /* termios type and macro definitions. Linux version. +- Copyright (C) 1993,1994,1995,1996,1997,1999,2003 ++ Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2003, 2005 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + +@@ -91,34 +91,42 @@ struct termios + + #define OFILL 00000100 + #define OFDEL 00000200 +-#define NLDLY 00001400 +-#define NL0 00000000 +-#define NL1 00000400 +-#define NL2 00001000 +-#define NL3 00001400 +-#define TABDLY 00006000 +-#define TAB0 00000000 +-#define TAB1 00002000 +-#define TAB2 00004000 +-#define TAB3 00006000 +-#define CRDLY 00030000 +-#define CR0 00000000 +-#define CR1 00010000 +-#define CR2 00020000 +-#define CR3 00030000 +-#define FFDLY 00040000 +-#define FF0 00000000 +-#define FF1 00040000 +-#define BSDLY 00100000 +-#define BS0 00000000 +-#define BS1 00100000 ++#if defined __USE_MISC || defined __USE_XOPEN ++# define NLDLY 00001400 ++# define NL0 00000000 ++# define NL1 00000400 ++# define NL2 00001000 ++# define NL3 00001400 ++# define TABDLY 00006000 ++# define TAB0 00000000 ++# define TAB1 00002000 ++# define TAB2 00004000 ++# define TAB3 00006000 ++# define CRDLY 00030000 ++# define CR0 00000000 ++# define CR1 00010000 ++# define CR2 00020000 ++# define CR3 00030000 ++# define FFDLY 00040000 ++# define FF0 00000000 ++# define FF1 00040000 ++# define BSDLY 00100000 ++# define BS0 00000000 ++# define BS1 00100000 ++#endif ++ + #define VTDLY 00200000 + #define VT0 00000000 + #define VT1 00200000 +-#define XTABS 01000000 /* Hmm.. Linux/i386 considers this part of TABDLY.. */ ++ ++#ifdef __USE_MISC ++# define XTABS 01000000 /* Hmm.. Linux/i386 considers this part of TABDLY.. */ ++#endif + + /* c_cflag bit meaning */ +-#define CBAUD 0000037 ++#ifdef __USE_MISC ++# define CBAUD 0000037 ++#endif + #define B0 0000000 /* hang up */ + #define B50 0000001 + #define B75 0000002 +@@ -135,9 +143,11 @@ struct termios + #define B9600 0000015 + #define B19200 0000016 + #define B38400 0000017 +-#define EXTA B19200 +-#define EXTB B38400 +-#define CBAUDEX 0000000 ++#ifdef __USE_MISC ++# define EXTA B19200 ++# define EXTB B38400 ++# define CBAUDEX 0000000 ++#endif + #define B57600 00020 + #define B115200 00021 + #define B230400 00022 +@@ -169,23 +179,30 @@ struct termios + #define HUPCL 00040000 + + #define CLOCAL 00100000 +-#define CRTSCTS 020000000000 /* flow control */ ++#ifdef __USE_MISC ++# define CMSPAR 010000000000 /* mark or space (stick) parity */ ++# define CRTSCTS 020000000000 /* flow control */ ++#endif + + /* c_lflag bits */ + #define ISIG 0x00000080 + #define ICANON 0x00000100 +-#define XCASE 0x00004000 ++#if defined __USE_MISC || defined __USE_XOPEN ++# define XCASE 0x00004000 ++#endif + #define ECHO 0x00000008 + #define ECHOE 0x00000002 + #define ECHOK 0x00000004 + #define ECHONL 0x00000010 + #define NOFLSH 0x80000000 + #define TOSTOP 0x00400000 +-#define ECHOCTL 0x00000040 +-#define ECHOPRT 0x00000020 +-#define ECHOKE 0x00000001 +-#define FLUSHO 0x00800000 +-#define PENDIN 0x20000000 ++#ifdef __USE_MISC ++# define ECHOCTL 0x00000040 ++# define ECHOPRT 0x00000020 ++# define ECHOKE 0x00000001 ++# define FLUSHO 0x00800000 ++# define PENDIN 0x20000000 ++#endif + #define IEXTEN 0x00000400 + + /* Values for the ACTION argument to `tcflow'. */ +--- glibc-20050211T0853/sysdeps/unix/sysv/linux/bits/termios.h 31 Mar 2004 08:53:29 -0000 1.10 ++++ glibc-20050211T0853-fedora/sysdeps/unix/sysv/linux/bits/termios.h 11 Feb 2005 09:08:00 -0000 1.10.2.1 +@@ -1,5 +1,5 @@ + /* termios type and macro definitions. Linux version. +- Copyright (C) 1993,1994,1995,1996,1997,1998,1999,2003 ++ Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2003, 2005 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + +@@ -172,6 +172,7 @@ struct termios + #define __MAX_BAUD B4000000 + #ifdef __USE_MISC + # define CIBAUD 002003600000 /* input baud rate (not used) */ ++# define CMSPAR 010000000000 /* mark or space (stick) parity */ + # define CRTSCTS 020000000000 /* flow control */ + #endif + +--- glibc-20050211T0853/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050211T0853-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. @@ -3081,8 +3242,8 @@ + } while (0) + +#include_next ---- glibc-20050208T2213/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20050208T2213-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20050211T0853/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20050211T0853-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) @@ -3115,24 +3276,290 @@ + } while (0) + #include_next ---- glibc-20050208T2213/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050208T2213-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050211T0853/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050211T0853-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-20050208T2213/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050208T2213-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050211T0853/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050211T0853-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-20050208T2213/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20050208T2213-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20050211T0853/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20050211T0853-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-20050211T0853/sysdeps/unix/sysv/linux/powerpc/bits/termios.h 13 May 2004 02:17:03 -0000 1.12 ++++ glibc-20050211T0853-fedora/sysdeps/unix/sysv/linux/powerpc/bits/termios.h 11 Feb 2005 09:08:01 -0000 1.12.2.1 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1997,1999,2001,2003,2004 Free Software Foundation, Inc. ++/* Copyright (C) 1997,1999,2001,2003,2004,2005 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 +@@ -92,34 +92,41 @@ struct termios { + + #define OFILL 00000100 + #define OFDEL 00000200 +-#define NLDLY 00001400 +-#define NL0 00000000 +-#define NL1 00000400 +-#define NL2 00001000 +-#define NL3 00001400 +-#define TABDLY 00006000 +-#define TAB0 00000000 +-#define TAB1 00002000 +-#define TAB2 00004000 +-#define TAB3 00006000 +-#define XTABS 00006000 /* Required by POSIX to be == TAB3. */ +-#define CRDLY 00030000 +-#define CR0 00000000 +-#define CR1 00010000 +-#define CR2 00020000 +-#define CR3 00030000 +-#define FFDLY 00040000 +-#define FF0 00000000 +-#define FF1 00040000 +-#define BSDLY 00100000 +-#define BS0 00000000 +-#define BS1 00100000 ++#if defined __USE_MISC || defined __USE_XOPEN ++# define NLDLY 00001400 ++# define NL0 00000000 ++# define NL1 00000400 ++# define NL2 00001000 ++# define NL3 00001400 ++# define TABDLY 00006000 ++# define TAB0 00000000 ++# define TAB1 00002000 ++# define TAB2 00004000 ++# define TAB3 00006000 ++# define CRDLY 00030000 ++# define CR0 00000000 ++# define CR1 00010000 ++# define CR2 00020000 ++# define CR3 00030000 ++# define FFDLY 00040000 ++# define FF0 00000000 ++# define FF1 00040000 ++# define BSDLY 00100000 ++# define BS0 00000000 ++# define BS1 00100000 ++#endif + #define VTDLY 00200000 + #define VT0 00000000 + #define VT1 00200000 + ++#ifdef __USE_MISC ++# define XTABS 00006000 ++#endif ++ + /* c_cflag bit meaning */ +-#define CBAUD 0000377 ++#ifdef __USE_MISC ++# define CBAUD 0000377 ++#endif + #define B0 0000000 /* hang up */ + #define B50 0000001 + #define B75 0000002 +@@ -136,9 +143,11 @@ struct termios { + #define B9600 0000015 + #define B19200 0000016 + #define B38400 0000017 +-#define EXTA B19200 +-#define EXTB B38400 +-#define CBAUDEX 0000020 ++#ifdef __USE_MISC ++# define EXTA B19200 ++# define EXTB B38400 ++# define CBAUDEX 0000020 ++#endif + #define B57600 00020 + #define B115200 00021 + #define B230400 00022 +@@ -169,23 +178,30 @@ struct termios { + #define HUPCL 00040000 + + #define CLOCAL 00100000 +-#define CRTSCTS 020000000000 /* flow control */ ++#ifdef __USE_MISC ++# define CMSPAR 010000000000 /* mark or space (stick) parity */ ++# define CRTSCTS 020000000000 /* flow control */ ++#endif + + /* c_lflag bits */ + #define ISIG 0x00000080 + #define ICANON 0x00000100 +-#define XCASE 0x00004000 ++#if defined __USE_MISC || defined __USE_XOPEN ++# define XCASE 0x00004000 ++#endif + #define ECHO 0x00000008 + #define ECHOE 0x00000002 + #define ECHOK 0x00000004 + #define ECHONL 0x00000010 + #define NOFLSH 0x80000000 + #define TOSTOP 0x00400000 +-#define ECHOCTL 0x00000040 +-#define ECHOPRT 0x00000020 +-#define ECHOKE 0x00000001 +-#define FLUSHO 0x00800000 +-#define PENDIN 0x20000000 ++#ifdef __USE_MISC ++# define ECHOCTL 0x00000040 ++# define ECHOPRT 0x00000020 ++# define ECHOKE 0x00000001 ++# define FLUSHO 0x00800000 ++# define PENDIN 0x20000000 ++#endif + #define IEXTEN 0x00000400 + + /* Values for the ACTION argument to `tcflow'. */ +--- glibc-20050211T0853/sysdeps/unix/sysv/linux/sparc/bits/termios.h 31 Mar 2004 08:53:30 -0000 1.10 ++++ glibc-20050211T0853-fedora/sysdeps/unix/sysv/linux/sparc/bits/termios.h 11 Feb 2005 09:08:01 -0000 1.10.2.1 +@@ -1,5 +1,6 @@ + /* termios type and macro definitions. Linux/SPARC version. +- Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000 Free Software Foundation, Inc. ++ Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2005 ++ 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 +@@ -84,34 +85,41 @@ struct termios + #define ONLRET 0x00000020 + #define OFILL 0x00000040 + #define OFDEL 0x00000080 +-#define NLDLY 0x00000100 +-#define NL0 0x00000000 +-#define NL1 0x00000100 +-#define CRDLY 0x00000600 +-#define CR0 0x00000000 +-#define CR1 0x00000200 +-#define CR2 0x00000400 +-#define CR3 0x00000600 +-#define TABDLY 0x00001800 +-#define TAB0 0x00000000 +-#define TAB1 0x00000800 +-#define TAB2 0x00001000 +-#define TAB3 0x00001800 +-#define XTABS 0x00001800 +-#define BSDLY 0x00002000 +-#define BS0 0x00000000 +-#define BS1 0x00002000 +-#define VTDLY 0x00004000 +-#define VT0 0x00000000 +-#define VT1 0x00004000 ++#if defined __USE_MISC || defined __USE_XOPEN ++# define NLDLY 0x00000100 ++# define NL0 0x00000000 ++# define NL1 0x00000100 ++# define CRDLY 0x00000600 ++# define CR0 0x00000000 ++# define CR1 0x00000200 ++# define CR2 0x00000400 ++# define CR3 0x00000600 ++# define TABDLY 0x00001800 ++# define TAB0 0x00000000 ++# define TAB1 0x00000800 ++# define TAB2 0x00001000 ++# define TAB3 0x00001800 ++# define BSDLY 0x00002000 ++# define BS0 0x00000000 ++# define BS1 0x00002000 + #define FFDLY 0x00008000 + #define FF0 0x00000000 + #define FF1 0x00008000 ++#endif ++#define VTDLY 0x00004000 ++#define VT0 0x00000000 ++#define VT1 0x00004000 + #define PAGEOUT 0x00010000 /* SUNOS specific */ + #define WRAP 0x00020000 /* SUNOS specific */ + ++#ifdef __USE_MISC ++# define XTABS 0x00001800 ++#endif ++ + /* c_cflag bit meaning */ +-#define CBAUD 0x0000100f ++#ifdef __USE_MISC ++# define CBAUD 0x0000100f ++#endif + #define B0 0x00000000 /* hang up */ + #define B50 0x00000001 + #define B75 0x00000002 +@@ -128,8 +136,10 @@ struct termios + #define B9600 0x0000000d + #define B19200 0x0000000e + #define B38400 0x0000000f +-#define EXTA B19200 +-#define EXTB B38400 ++#ifdef __USE_MISC ++# define EXTA B19200 ++# define EXTB B38400 ++#endif + #define CSIZE 0x00000030 + #define CS5 0x00000000 + #define CS6 0x00000010 +@@ -141,7 +151,9 @@ struct termios + #define PARODD 0x00000200 + #define HUPCL 0x00000400 + #define CLOCAL 0x00000800 +-#define CBAUDEX 0x00001000 ++#ifdef __USE_MISC ++# define CBAUDEX 0x00001000 ++#endif + #define B57600 0x00001001 + #define B115200 0x00001002 + #define B230400 0x00001003 +@@ -159,26 +171,32 @@ struct termios + #define B2000000 0x0000100f + #define __MAX_BAUD B2000000 + +-#define CIBAUD 0x100f0000 /* input baud rate (not used) */ +-#define CMSPAR 0x40000000 /* mark or space (stick) parity */ +-#define CRTSCTS 0x80000000 /* flow control */ ++#ifdef __USE_MISC ++# define CIBAUD 0x100f0000 /* input baud rate (not used) */ ++# define CMSPAR 0x40000000 /* mark or space (stick) parity */ ++# define CRTSCTS 0x80000000 /* flow control */ ++#endif + + /* c_lflag bits */ + #define ISIG 0x00000001 + #define ICANON 0x00000002 +-#define XCASE 0x00000004 ++#if defined __USE_MISC || defined __USE_XOPEN ++# define XCASE 0x00000004 ++#endif + #define ECHO 0x00000008 + #define ECHOE 0x00000010 + #define ECHOK 0x00000020 + #define ECHONL 0x00000040 + #define NOFLSH 0x00000080 + #define TOSTOP 0x00000100 +-#define ECHOCTL 0x00000200 +-#define ECHOPRT 0x00000400 +-#define ECHOKE 0x00000800 +-#define DEFECHO 0x00001000 /* SUNOS thing, what is it? */ +-#define FLUSHO 0x00002000 +-#define PENDIN 0x00004000 ++#ifdef __USE_MISC ++# define ECHOCTL 0x00000200 ++# define ECHOPRT 0x00000400 ++# define ECHOKE 0x00000800 ++# define DEFECHO 0x00001000 /* SUNOS thing, what is it? */ ++# define FLUSHO 0x00002000 ++# define PENDIN 0x00004000 ++#endif + #define IEXTEN 0x00008000 + + /* modem lines */ diff --git a/glibc.spec b/glibc.spec index 64879a9..6be301c 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,7 +1,7 @@ -%define glibcdate 20050208T2213 +%define glibcdate 20050211T0853 %define glibcname glibc %define glibcversion 2.3.4 -%define glibcrelease 7 +%define glibcrelease 8 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64 @@ -15,10 +15,10 @@ Version: %{glibcversion} Release: %{glibcrelease} License: LGPL Group: System Environment/Libraries -%define glibcsrcdir %{name}-%{glibcdate} +%define glibcsrcdir %{glibcname}-%{glibcdate} Source0: %{glibcsrcdir}.tar.bz2 -Source1: %{name}-fedora-%{glibcdate}.tar.bz2 -Patch0: %{name}-fedora.patch +Source1: %{glibcname}-fedora-%{glibcdate}.tar.bz2 +Patch0: %{glibcname}-fedora.patch Patch1: %{name}-nptl-check.patch Patch2: %{name}-ppc-assume.patch Patch3: %{name}-ia64-lib64.patch @@ -1273,6 +1273,14 @@ rm -f *.filelist* %endif %changelog +* Fri Feb 11 2005 Jakub Jelinek 2.3.4-8 +- update from CVS + - bi-arch (BZ#632) + - fix libdl on s390 and maybe other platforms + - fix initstate{,_r} (BZ#710) + - fix generation (BZ#157) +- define CMSPAR in bits/termios.h (#147533) + * Tue Feb 8 2005 Jakub Jelinek 2.3.4-7 - update from CVS - fix TLS handling in linuxthreads diff --git a/sources b/sources index 9015a5d..589725a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -29ef378addf63019bdb4ed547fc7ce7b glibc-20050208T2213.tar.bz2 -e827219fbea78a16c77bd29229303584 glibc-fedora-20050208T2213.tar.bz2 +5a0fc7eeefa9c6f59bb7a8a0e01c0a93 glibc-20050211T0853.tar.bz2 +ca315ae07344727a7beef55dd44b2e79 glibc-fedora-20050211T0853.tar.bz2