From a9d8ca8272da17b7ee0e59af90bfef546771e624 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 27 Apr 2005 12:26:45 +0000 Subject: [PATCH] auto-import glibc-2.3.5-2 on branch devel from glibc-2.3.5-2.src.rpm --- .cvsignore | 4 +- glibc-fedora.patch | 432 ++++++++++++++++++++++++++------------------- glibc.spec | 115 ++++++++++-- sources | 4 +- 4 files changed, 355 insertions(+), 200 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9ad3ab6..a57f606 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20050415T0909.tar.bz2 -glibc-fedora-20050415T0909.tar.bz2 +glibc-20050427T1043.tar.bz2 +glibc-fedora-20050427T1043.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index b3bb663..78748e9 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,18 @@ ---- glibc-20050415T0909/ChangeLog 15 Apr 2005 06:33:21 -0000 1.9326 -+++ glibc-20050415T0909-fedora/ChangeLog 15 Apr 2005 09:32:38 -0000 1.8782.2.93 -@@ -471,17 +471,6 @@ +--- glibc-20050427T1043/ChangeLog 27 Apr 2005 09:50:36 -0000 1.9338 ++++ glibc-20050427T1043-fedora/ChangeLog 27 Apr 2005 11:40:16 -0000 1.8782.2.95 +@@ -1,3 +1,11 @@ ++2005-04-27 Jakub Jelinek ++ ++ * elf/rtld.c (dl_main): Call _dl_init_linuxthreads_paths ++ if GLRO(dl_osversion) <= 0x20413. ++ * elf/dl-load.c (_dl_init_paths): Allocate one extra pointer in ++ rtld_search_dirs.dirs. ++ (_dl_init_linuxthreads_paths): New function. ++ + 2005-04-27 Roland McGrath + + [BZ #877] +@@ -613,17 +621,6 @@ 2005-03-28 Roland McGrath @@ -18,7 +30,7 @@ * locale/langinfo.h (_NL_LOCALE_NAME): New macro. [__USE_GNU] (NL_LOCALE_NAME): New macro. * locale/nl_langinfo.c: Grok special item value for _NL_LOCALE_NAME, -@@ -1550,6 +1539,18 @@ +@@ -1692,6 +1689,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -37,8 +49,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20050415T0909/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20050415T0909-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050427T1043/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20050427T1043-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. @@ -88,8 +100,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-20050415T0909/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20050415T0909-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050427T1043/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20050427T1043-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. @@ -116,8 +128,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20050415T0909/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20050415T0909-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20050427T1043/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20050427T1043-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -198,8 +210,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20050415T0909/Versions.def 28 Mar 2005 20:42:44 -0000 1.61 -+++ glibc-20050415T0909-fedora/Versions.def 24 Mar 2005 08:18:51 -0000 1.58.2.3 +--- glibc-20050427T1043/Versions.def 28 Mar 2005 20:42:44 -0000 1.61 ++++ glibc-20050427T1043-fedora/Versions.def 24 Mar 2005 08:18:51 -0000 1.58.2.3 @@ -20,7 +20,6 @@ libc { GLIBC_2.3.2 GLIBC_2.3.3 @@ -216,16 +228,16 @@ } libnsl { GLIBC_2.0 ---- glibc-20050415T0909/version.h 20 Dec 2004 23:37:41 -0000 1.67 -+++ glibc-20050415T0909-fedora/version.h 15 Apr 2005 09:32:42 -0000 1.65.2.4 +--- glibc-20050427T1043/version.h 20 Dec 2004 23:37:41 -0000 1.67 ++++ glibc-20050427T1043-fedora/version.h 15 Apr 2005 09:32:42 -0000 1.65.2.4 @@ -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.5" ---- glibc-20050415T0909/csu/elf-init.c 14 Feb 2005 21:21:36 -0000 1.5 -+++ glibc-20050415T0909-fedora/csu/elf-init.c 3 Mar 2005 13:33:53 -0000 1.3.2.3 +--- glibc-20050427T1043/csu/elf-init.c 14 Feb 2005 21:21:36 -0000 1.5 ++++ glibc-20050427T1043-fedora/csu/elf-init.c 3 Mar 2005 13:33:53 -0000 1.3.2.3 @@ -44,6 +44,24 @@ extern void (*__init_array_start []) (vo extern void (*__init_array_end []) (void) attribute_hidden; extern void (*__fini_array_start []) (void) attribute_hidden; @@ -251,8 +263,8 @@ #endif /* These function symbols are provided for the .init/.fini section entry ---- glibc-20050415T0909/debug/Versions 1 Mar 2005 00:12:31 -0000 1.6 -+++ glibc-20050415T0909-fedora/debug/Versions 3 Mar 2005 16:52:26 -0000 1.3.4.3 +--- glibc-20050427T1043/debug/Versions 1 Mar 2005 00:12:31 -0000 1.6 ++++ glibc-20050427T1043-fedora/debug/Versions 3 Mar 2005 16:52:26 -0000 1.3.4.3 @@ -18,10 +18,4 @@ libc { __printf_chk; __fprintf_chk; __vprintf_chk; __vfprintf_chk; __gets_chk; @@ -264,8 +276,8 @@ - __recv_chk; __recvfrom_chk; - } } ---- glibc-20050415T0909/debug/fgets_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050415T0909-fedora/debug/fgets_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050427T1043/debug/fgets_chk.c 21 Feb 2005 22:53:35 -0000 1.1 ++++ glibc-20050427T1043-fedora/debug/fgets_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 @@ -30,6 +30,7 @@ #include #include @@ -279,8 +291,8 @@ return result; } +#endif ---- glibc-20050415T0909/debug/fgets_u_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050415T0909-fedora/debug/fgets_u_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050427T1043/debug/fgets_u_chk.c 21 Feb 2005 22:53:35 -0000 1.1 ++++ glibc-20050427T1043-fedora/debug/fgets_u_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 @@ -30,6 +30,7 @@ #include #include @@ -294,8 +306,8 @@ return result; } +#endif ---- glibc-20050415T0909/debug/getcwd_chk.c 1 Mar 2005 00:42:41 -0000 1.2 -+++ glibc-20050415T0909-fedora/debug/getcwd_chk.c 3 Mar 2005 16:52:26 -0000 1.2.2.2 +--- glibc-20050427T1043/debug/getcwd_chk.c 1 Mar 2005 00:42:41 -0000 1.2 ++++ glibc-20050427T1043-fedora/debug/getcwd_chk.c 3 Mar 2005 16:52:26 -0000 1.2.2.2 @@ -20,7 +20,7 @@ #include #include @@ -310,8 +322,8 @@ return __getcwd (buf, size); } +#endif ---- glibc-20050415T0909/debug/getwd_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050415T0909-fedora/debug/getwd_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050427T1043/debug/getwd_chk.c 21 Feb 2005 22:53:35 -0000 1.1 ++++ glibc-20050427T1043-fedora/debug/getwd_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 @@ -20,7 +20,7 @@ #include #include @@ -326,8 +338,8 @@ link_warning (getwd, "the `getwd' function is dangerous and should not be used.") +#endif ---- glibc-20050415T0909/debug/pread64_chk.c 19 Mar 2005 00:08:11 -0000 1.4 -+++ glibc-20050415T0909-fedora/debug/pread64_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 +--- glibc-20050427T1043/debug/pread64_chk.c 19 Mar 2005 00:08:11 -0000 1.4 ++++ glibc-20050427T1043-fedora/debug/pread64_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 @@ -19,7 +19,7 @@ #include #include @@ -342,8 +354,8 @@ return __pread64 (fd, buf, nbytes, offset); } +#endif ---- glibc-20050415T0909/debug/pread_chk.c 19 Mar 2005 00:07:31 -0000 1.4 -+++ glibc-20050415T0909-fedora/debug/pread_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 +--- glibc-20050427T1043/debug/pread_chk.c 19 Mar 2005 00:07:31 -0000 1.4 ++++ glibc-20050427T1043-fedora/debug/pread_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 @@ -19,7 +19,7 @@ #include #include @@ -358,8 +370,8 @@ return __pread (fd, buf, nbytes, offset); } +#endif ---- glibc-20050415T0909/debug/read_chk.c 1 Mar 2005 00:35:58 -0000 1.4 -+++ glibc-20050415T0909-fedora/debug/read_chk.c 3 Mar 2005 16:52:26 -0000 1.4.2.2 +--- glibc-20050427T1043/debug/read_chk.c 1 Mar 2005 00:35:58 -0000 1.4 ++++ glibc-20050427T1043-fedora/debug/read_chk.c 3 Mar 2005 16:52:26 -0000 1.4.2.2 @@ -23,7 +23,7 @@ # include #endif @@ -374,8 +386,8 @@ #endif } +#endif ---- glibc-20050415T0909/debug/readlink_chk.c 1 Mar 2005 00:41:15 -0000 1.3 -+++ glibc-20050415T0909-fedora/debug/readlink_chk.c 3 Mar 2005 16:52:26 -0000 1.3.2.2 +--- glibc-20050427T1043/debug/readlink_chk.c 1 Mar 2005 00:41:15 -0000 1.3 ++++ glibc-20050427T1043-fedora/debug/readlink_chk.c 3 Mar 2005 16:52:26 -0000 1.3.2.2 @@ -23,7 +23,7 @@ # include #endif @@ -390,8 +402,8 @@ #endif } +#endif ---- glibc-20050415T0909/debug/recv_chk.c 6 Mar 2005 21:24:42 -0000 1.2 -+++ glibc-20050415T0909-fedora/debug/recv_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 +--- glibc-20050427T1043/debug/recv_chk.c 6 Mar 2005 21:24:42 -0000 1.2 ++++ glibc-20050427T1043-fedora/debug/recv_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 @@ -19,7 +19,7 @@ #include #include @@ -406,8 +418,8 @@ return __recv (fd, buf, n, flags); } +#endif ---- glibc-20050415T0909/debug/recvfrom_chk.c 6 Mar 2005 21:24:16 -0000 1.2 -+++ glibc-20050415T0909-fedora/debug/recvfrom_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 +--- glibc-20050427T1043/debug/recvfrom_chk.c 6 Mar 2005 21:24:16 -0000 1.2 ++++ glibc-20050427T1043-fedora/debug/recvfrom_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 @@ -19,7 +19,7 @@ #include #include @@ -422,8 +434,8 @@ return __recvfrom (fd, buf, n, flags, addr, addr_len); } +#endif ---- glibc-20050415T0909/debug/tst-chk1.c 19 Mar 2005 00:09:08 -0000 1.7 -+++ glibc-20050415T0909-fedora/debug/tst-chk1.c 19 Mar 2005 21:04:10 -0000 1.1.2.10 +--- glibc-20050427T1043/debug/tst-chk1.c 19 Mar 2005 00:09:08 -0000 1.7 ++++ glibc-20050427T1043-fedora/debug/tst-chk1.c 19 Mar 2005 21:04:10 -0000 1.1.2.10 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -461,8 +473,54 @@ CHK_FAIL_START if (getwd (getcwdbuf + 2) != getcwdbuf + 2) FAIL (); ---- glibc-20050415T0909/elf/dl-support.c 7 Apr 2005 20:57:04 -0000 1.88 -+++ glibc-20050415T0909-fedora/elf/dl-support.c 15 Apr 2005 09:32:44 -0000 1.84.2.5 +--- glibc-20050427T1043/elf/dl-load.c 26 Apr 2005 04:25:58 -0000 1.268 ++++ glibc-20050427T1043-fedora/elf/dl-load.c 27 Apr 2005 11:40:21 -0000 1.249.2.12 +@@ -644,7 +644,7 @@ _dl_init_paths (const char *llp) + + /* First set up the rest of the default search directory entries. */ + aelem = rtld_search_dirs.dirs = (struct r_search_path_elem **) +- malloc ((nsystem_dirs_len + 1) * sizeof (struct r_search_path_elem *)); ++ malloc ((nsystem_dirs_len + 2) * sizeof (struct r_search_path_elem *)); + if (rtld_search_dirs.dirs == NULL) + { + errstring = N_("cannot create search path array"); +@@ -780,6 +780,34 @@ _dl_init_paths (const char *llp) + } + + ++void ++internal_function ++_dl_init_linuxthreads_paths (void) ++{ ++ size_t cnt; ++ struct r_search_path_elem *elem, **aelem; ++ ++ elem = malloc (sizeof (struct r_search_path_elem) ++ + ncapstr * sizeof (enum r_dir_status)); ++ if (elem == NULL) ++ return; ++ ++ for (aelem = rtld_search_dirs.dirs; *aelem; aelem++); ++ aelem[0] = elem; ++ aelem[1] = NULL; ++ elem->what = "linuxthreads search path"; ++ elem->where = NULL; ++ elem->dirname = "/" DL_DST_LIB "/obsolete/linuxthreads/"; ++ elem->dirnamelen = sizeof ("/" DL_DST_LIB "/obsolete/linuxthreads/") - 1; ++ if (elem->dirnamelen > max_dirnamelen) ++ max_dirnamelen = elem->dirnamelen; ++ for (cnt = 0; cnt < ncapstr; ++cnt) ++ elem->status[cnt] = unknown; ++ elem->next = NULL; ++ aelem[-1]->next = elem; ++} ++ ++ + static void + __attribute__ ((noreturn, noinline)) + lose (int code, int fd, const char *name, char *realname, struct link_map *l, +--- glibc-20050427T1043/elf/dl-support.c 7 Apr 2005 20:57:04 -0000 1.88 ++++ glibc-20050427T1043-fedora/elf/dl-support.c 15 Apr 2005 09:32:44 -0000 1.84.2.5 @@ -281,6 +281,11 @@ _dl_non_dynamic_init (void) if (_dl_platform != NULL) _dl_platformlen = strlen (_dl_platform); @@ -475,8 +533,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-20050415T0909/elf/ldconfig.c 7 Apr 2005 20:56:56 -0000 1.49 -+++ glibc-20050415T0909-fedora/elf/ldconfig.c 15 Apr 2005 09:32:44 -0000 1.47.2.3 +--- glibc-20050427T1043/elf/ldconfig.c 7 Apr 2005 20:56:56 -0000 1.49 ++++ glibc-20050427T1043-fedora/elf/ldconfig.c 15 Apr 2005 09:32:44 -0000 1.47.2.3 @@ -953,17 +953,19 @@ search_dirs (void) @@ -558,9 +616,9 @@ } search_dirs (); ---- glibc-20050415T0909/elf/rtld.c 7 Apr 2005 20:56:48 -0000 1.351 -+++ glibc-20050415T0909-fedora/elf/rtld.c 15 Apr 2005 09:32:44 -0000 1.330.2.17 -@@ -1335,6 +1335,53 @@ ld.so does not support TLS, but program +--- glibc-20050427T1043/elf/rtld.c 7 Apr 2005 20:56:48 -0000 1.351 ++++ glibc-20050427T1043-fedora/elf/rtld.c 27 Apr 2005 11:40:21 -0000 1.330.2.18 +@@ -1335,6 +1335,59 @@ ld.so does not support TLS, but program ++GL(dl_ns)[LM_ID_BASE]._ns_nloaded; ++GL(dl_load_adds); @@ -610,11 +668,17 @@ + } + } +#endif ++ ++ if (GLRO(dl_osversion) <= 0x20413) ++ { ++ extern void internal_function _dl_init_linuxthreads_paths (void); ++ _dl_init_linuxthreads_paths (); ++ } + /* If LD_USE_LOAD_BIAS env variable has not been seen, default to not using bias for non-prelinked PIEs and libraries and using it for executables or prelinked PIEs or libraries. */ -@@ -1672,6 +1719,57 @@ ERROR: ld.so: object '%s' cannot be load +@@ -1672,6 +1725,57 @@ ERROR: ld.so: object '%s' cannot be load } } @@ -672,8 +736,8 @@ if (__builtin_expect (*first_preload != NULL, 0)) { /* Set up PRELOADS with a vector of the preloaded libraries. */ ---- glibc-20050415T0909/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 -+++ glibc-20050415T0909-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 +--- glibc-20050427T1043/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 ++++ glibc-20050427T1043-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 @@ -1,8 +1,8 @@ #include #include @@ -685,8 +749,8 @@ # define USE_TLS__THREAD struct A ---- glibc-20050415T0909/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 -+++ glibc-20050415T0909-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 +--- glibc-20050427T1043/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 ++++ glibc-20050427T1043-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 @@ -1013,6 +1013,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -763,8 +827,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20050415T0909/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 -+++ glibc-20050415T0909-fedora/include/features.h 3 Mar 2005 14:03:16 -0000 1.35.2.7 +--- glibc-20050427T1043/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 ++++ glibc-20050427T1043-fedora/include/features.h 3 Mar 2005 14:03:16 -0000 1.35.2.7 @@ -262,7 +262,13 @@ # define __USE_REENTRANT 1 #endif @@ -789,8 +853,8 @@ #define __GLIBC_PREREQ(maj, min) \ ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) ---- glibc-20050415T0909/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20050415T0909-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20050427T1043/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20050427T1043-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 @@ -800,8 +864,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20050415T0909/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 -+++ glibc-20050415T0909-fedora/libio/stdio.h 8 Feb 2005 10:04:09 -0000 1.78.2.4 +--- glibc-20050427T1043/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 ++++ glibc-20050427T1043-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. */ @@ -815,8 +879,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20050415T0909/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20050415T0909-fedora/libio/bits/stdio2.h 19 Mar 2005 20:18:03 -0000 1.1.2.5 +--- glibc-20050427T1043/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20050427T1043-fedora/libio/bits/stdio2.h 19 Mar 2005 20:18:03 -0000 1.1.2.5 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -887,9 +951,9 @@ return __fgets_unlocked_alias (__s, __n, __stream); } #endif ---- glibc-20050415T0909/linuxthreads/ChangeLog 31 Mar 2005 10:02:53 -0000 1.844 -+++ glibc-20050415T0909-fedora/linuxthreads/ChangeLog 1 Apr 2005 15:13:15 -0000 1.817.2.21 -@@ -801,6 +801,12 @@ +--- glibc-20050427T1043/linuxthreads/ChangeLog 27 Apr 2005 08:03:47 -0000 1.845 ++++ glibc-20050427T1043-fedora/linuxthreads/ChangeLog 27 Apr 2005 11:31:15 -0000 1.817.2.22 +@@ -806,6 +806,12 @@ (pthread_barrierattr_setpshared): Return EINVAL if pshared is neither PTHREAD_PROCESS_PRIVATE nor PTHREAD_PROCESS_SHARED. @@ -902,7 +966,7 @@ 2003-09-02 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/dl-sysdep.h -@@ -933,6 +939,34 @@ +@@ -938,6 +944,34 @@ 2003-07-22 Jakub Jelinek @@ -937,8 +1001,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-20050415T0909/linuxthreads/Makefile 7 Feb 2005 19:30:03 -0000 1.98 -+++ glibc-20050415T0909-fedora/linuxthreads/Makefile 8 Feb 2005 10:04:10 -0000 1.94.2.5 +--- glibc-20050427T1043/linuxthreads/Makefile 7 Feb 2005 19:30:03 -0000 1.98 ++++ glibc-20050427T1043-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 \ @@ -960,8 +1024,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a ---- glibc-20050415T0909/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 -+++ glibc-20050415T0909-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 +--- glibc-20050427T1043/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 ++++ glibc-20050427T1043-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 } @@ -969,8 +1033,8 @@ + THREAD_SETMEM (self, p_cancelstate, PTHREAD_CANCEL_DISABLE); __libc_thread_freeres (); } ---- glibc-20050415T0909/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 -+++ glibc-20050415T0909-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 +--- glibc-20050427T1043/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 ++++ glibc-20050427T1043-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); @@ -984,8 +1048,8 @@ __pthread_mutexattr_destroy (&attr); ---- glibc-20050415T0909/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 -+++ glibc-20050415T0909-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 +--- glibc-20050427T1043/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 ++++ glibc-20050427T1043-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 @@ -21,6 +21,7 @@ # define __need_timespec # include @@ -994,8 +1058,8 @@ #ifndef _PTHREAD_DESCR_DEFINED /* Thread descriptors. Needed for `sem_t' definition. */ ---- glibc-20050415T0909/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 -+++ glibc-20050415T0909-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 +--- glibc-20050427T1043/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 ++++ glibc-20050427T1043-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 @@ -2,7 +2,7 @@ #include #include @@ -1005,8 +1069,8 @@ struct tls_obj { ---- glibc-20050415T0909/linuxthreads/sysdeps/alpha/tls.h 9 Jan 2005 20:01:12 -0000 1.6 -+++ glibc-20050415T0909-fedora/linuxthreads/sysdeps/alpha/tls.h 8 Feb 2005 10:04:11 -0000 1.5.2.2 +--- glibc-20050427T1043/linuxthreads/sysdeps/alpha/tls.h 9 Jan 2005 20:01:12 -0000 1.6 ++++ glibc-20050427T1043-fedora/linuxthreads/sysdeps/alpha/tls.h 8 Feb 2005 10:04:11 -0000 1.5.2.2 @@ -58,54 +58,76 @@ typedef struct # include @@ -1096,8 +1160,8 @@ /* Get the thread descriptor definition. */ # include ---- glibc-20050415T0909/linuxthreads/sysdeps/i386/tls.h 9 Jan 2005 20:01:13 -0000 1.38 -+++ glibc-20050415T0909-fedora/linuxthreads/sysdeps/i386/tls.h 8 Feb 2005 10:04:12 -0000 1.35.2.5 +--- glibc-20050427T1043/linuxthreads/sysdeps/i386/tls.h 9 Jan 2005 20:01:13 -0000 1.38 ++++ glibc-20050427T1043-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) @@ -1114,8 +1178,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050415T0909/linuxthreads/sysdeps/ia64/tls.h 9 Jan 2005 20:01:13 -0000 1.10 -+++ glibc-20050415T0909-fedora/linuxthreads/sysdeps/ia64/tls.h 8 Feb 2005 10:04:14 -0000 1.9.2.2 +--- glibc-20050427T1043/linuxthreads/sysdeps/ia64/tls.h 9 Jan 2005 20:01:13 -0000 1.10 ++++ glibc-20050427T1043-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) @@ -1132,8 +1196,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050415T0909/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 -+++ glibc-20050415T0909-fedora/linuxthreads/sysdeps/powerpc/tls.h 8 Feb 2005 10:04:14 -0000 1.8.2.2 +--- glibc-20050427T1043/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 ++++ glibc-20050427T1043-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) @@ -1156,8 +1220,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-20050415T0909/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 -+++ glibc-20050415T0909-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 +--- glibc-20050427T1043/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 ++++ glibc-20050427T1043-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)\"" @@ -1174,8 +1238,8 @@ + @echo '#define NPTL_STRUCT_PTHREAD_SIZE 0' > $@ +endif +endif ---- glibc-20050415T0909/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050415T0909-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 +--- glibc-20050427T1043/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050427T1043-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 @@ -1190,8 +1254,8 @@ +#ifdef HAVE_TLS_SUPPORT +NPTL_STRUCT_PTHREAD_SIZE sizeof (struct pthread) +#endif ---- glibc-20050415T0909/linuxthreads/sysdeps/s390/tls.h 9 Jan 2005 20:01:14 -0000 1.4 -+++ glibc-20050415T0909-fedora/linuxthreads/sysdeps/s390/tls.h 8 Feb 2005 10:04:15 -0000 1.3.2.2 +--- glibc-20050427T1043/linuxthreads/sysdeps/s390/tls.h 9 Jan 2005 20:01:14 -0000 1.4 ++++ glibc-20050427T1043-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) @@ -1208,8 +1272,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050415T0909/linuxthreads/sysdeps/sh/tls.h 9 Jan 2005 20:01:15 -0000 1.10 -+++ glibc-20050415T0909-fedora/linuxthreads/sysdeps/sh/tls.h 8 Feb 2005 10:04:15 -0000 1.9.2.2 +--- glibc-20050427T1043/linuxthreads/sysdeps/sh/tls.h 9 Jan 2005 20:01:15 -0000 1.10 ++++ glibc-20050427T1043-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) @@ -1226,8 +1290,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050415T0909/linuxthreads/sysdeps/sparc/tls.h 9 Jan 2005 20:01:15 -0000 1.4 -+++ glibc-20050415T0909-fedora/linuxthreads/sysdeps/sparc/tls.h 8 Feb 2005 10:04:16 -0000 1.3.2.2 +--- glibc-20050427T1043/linuxthreads/sysdeps/sparc/tls.h 9 Jan 2005 20:01:15 -0000 1.4 ++++ glibc-20050427T1043-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) @@ -1244,8 +1308,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050415T0909/linuxthreads/sysdeps/x86_64/tls.h 9 Jan 2005 20:01:15 -0000 1.7 -+++ glibc-20050415T0909-fedora/linuxthreads/sysdeps/x86_64/tls.h 8 Feb 2005 10:04:16 -0000 1.6.2.2 +--- glibc-20050427T1043/linuxthreads/sysdeps/x86_64/tls.h 9 Jan 2005 20:01:15 -0000 1.7 ++++ glibc-20050427T1043-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) @@ -1262,8 +1326,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050415T0909/locale/iso-4217.def 20 Mar 2005 04:14:36 -0000 1.16 -+++ glibc-20050415T0909-fedora/locale/iso-4217.def 24 Mar 2005 08:19:03 -0000 1.15.2.2 +--- glibc-20050427T1043/locale/iso-4217.def 20 Mar 2005 04:14:36 -0000 1.16 ++++ glibc-20050427T1043-fedora/locale/iso-4217.def 24 Mar 2005 08:19:03 -0000 1.15.2.2 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1355,8 +1419,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20050415T0909/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 -+++ glibc-20050415T0909-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 +--- glibc-20050427T1043/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 ++++ glibc-20050427T1043-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, } } @@ -1400,8 +1464,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20050415T0909/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 -+++ glibc-20050415T0909-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 +--- glibc-20050427T1043/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 ++++ glibc-20050427T1043-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/'`; \ @@ -1410,8 +1474,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20050415T0909/localedata/SUPPORTED 20 Mar 2005 04:16:36 -0000 1.74 -+++ glibc-20050415T0909-fedora/localedata/SUPPORTED 24 Mar 2005 08:19:04 -0000 1.71.2.4 +--- glibc-20050427T1043/localedata/SUPPORTED 20 Mar 2005 04:16:36 -0000 1.74 ++++ glibc-20050427T1043-fedora/localedata/SUPPORTED 24 Mar 2005 08:19:04 -0000 1.71.2.4 @@ -64,6 +64,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1453,8 +1517,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ/KOI8-T \ ---- glibc-20050415T0909/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20050415T0909-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20050427T1043/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20050427T1043-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -1469,8 +1533,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20050415T0909/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20050415T0909-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20050427T1043/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20050427T1043-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -1482,8 +1546,8 @@ date_fmt "/ / " ---- glibc-20050415T0909/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 -+++ glibc-20050415T0909-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 +--- glibc-20050427T1043/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 ++++ glibc-20050427T1043-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 @@ -100,7 +100,6 @@ mon " "";/ "";/ @@ -1492,8 +1556,8 @@ % Appropriate date and time representation (%c) % "%a %d %b %Y %r %Z" d_t_fmt "" ---- glibc-20050415T0909/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050415T0909-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20050427T1043/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050427T1043-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1564,8 +1628,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20050415T0909/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20050415T0909-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20050427T1043/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20050427T1043-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1593,8 +1657,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20050415T0909/math/Versions 28 Mar 2005 20:42:43 -0000 1.9 -+++ glibc-20050415T0909-fedora/math/Versions 26 Feb 2000 01:04:00 -0000 1.8 +--- glibc-20050427T1043/math/Versions 28 Mar 2005 20:42:43 -0000 1.9 ++++ glibc-20050427T1043-fedora/math/Versions 26 Feb 2000 01:04:00 -0000 1.8 @@ -94,7 +94,7 @@ libm { } GLIBC_2.1 { @@ -1616,9 +1680,9 @@ - exp2l; - } } ---- glibc-20050415T0909/nptl/ChangeLog 14 Apr 2005 21:37:37 -0000 1.771 -+++ glibc-20050415T0909-fedora/nptl/ChangeLog 15 Apr 2005 09:32:48 -0000 1.706.2.41 -@@ -593,6 +593,11 @@ +--- glibc-20050427T1043/nptl/ChangeLog 27 Apr 2005 09:56:16 -0000 1.775 ++++ glibc-20050427T1043-fedora/nptl/ChangeLog 27 Apr 2005 11:31:25 -0000 1.706.2.42 +@@ -615,6 +615,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1630,7 +1694,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -2667,6 +2672,11 @@ +@@ -2689,6 +2694,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1642,8 +1706,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20050415T0909/nptl/Makefile 22 Dec 2004 20:07:09 -0000 1.166 -+++ glibc-20050415T0909-fedora/nptl/Makefile 6 Jan 2005 14:57:04 -0000 1.157.2.9 +--- glibc-20050427T1043/nptl/Makefile 27 Apr 2005 09:55:18 -0000 1.167 ++++ glibc-20050427T1043-fedora/nptl/Makefile 27 Apr 2005 11:31:25 -0000 1.157.2.10 @@ -499,15 +499,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1666,8 +1730,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20050415T0909/nptl/descr.h 12 Nov 2004 01:24:24 -0000 1.25 -+++ glibc-20050415T0909-fedora/nptl/descr.h 12 Nov 2004 16:56:12 -0000 1.23.2.3 +--- glibc-20050427T1043/nptl/descr.h 12 Nov 2004 01:24:24 -0000 1.25 ++++ glibc-20050427T1043-fedora/nptl/descr.h 12 Nov 2004 16:56:12 -0000 1.23.2.3 @@ -27,9 +27,13 @@ #include #include @@ -1682,8 +1746,8 @@ #include "../nptl_db/thread_db.h" #include #ifdef HAVE_FORCED_UNWIND ---- glibc-20050415T0909/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 -+++ glibc-20050415T0909-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 +--- glibc-20050427T1043/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 ++++ glibc-20050427T1043-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. */ @@ -1725,8 +1789,8 @@ } return 0; ---- glibc-20050415T0909/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050415T0909-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20050427T1043/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050427T1043-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 + @@ -1734,8 +1798,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20050415T0909/nscd/connections.c 22 Feb 2005 22:52:32 -0000 1.66 -+++ glibc-20050415T0909-fedora/nscd/connections.c 3 Mar 2005 13:34:09 -0000 1.55.2.7 +--- glibc-20050427T1043/nscd/connections.c 22 Feb 2005 22:52:32 -0000 1.66 ++++ glibc-20050427T1043-fedora/nscd/connections.c 3 Mar 2005 13:34:09 -0000 1.55.2.7 @@ -21,6 +21,7 @@ #include #include @@ -1826,8 +1890,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20050415T0909/nscd/nscd.c 7 Feb 2005 22:51:22 -0000 1.44 -+++ glibc-20050415T0909-fedora/nscd/nscd.c 8 Feb 2005 10:04:34 -0000 1.38.2.5 +--- glibc-20050427T1043/nscd/nscd.c 7 Feb 2005 22:51:22 -0000 1.44 ++++ glibc-20050427T1043-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, }; @@ -1853,8 +1917,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20050415T0909/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 -+++ glibc-20050415T0909-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 +--- glibc-20050427T1043/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 ++++ glibc-20050427T1043-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 @@ -1866,8 +1930,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20050415T0909/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 -+++ glibc-20050415T0909-fedora/nscd/nscd_conf.c 4 Oct 2004 08:56:17 -0000 1.14.2.2 +--- glibc-20050427T1043/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 ++++ glibc-20050427T1043-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; @@ -1880,8 +1944,8 @@ break; } if (cnt == lastdb) ---- glibc-20050415T0909/posix/Makefile 14 Apr 2005 21:19:34 -0000 1.184 -+++ glibc-20050415T0909-fedora/posix/Makefile 15 Apr 2005 09:32:51 -0000 1.171.2.12 +--- glibc-20050427T1043/posix/Makefile 14 Apr 2005 21:19:34 -0000 1.184 ++++ glibc-20050427T1043-fedora/posix/Makefile 15 Apr 2005 09:32:51 -0000 1.171.2.12 @@ -106,7 +106,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1915,8 +1979,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20050415T0909/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050415T0909-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20050427T1043/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050427T1043-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 = @@ -1933,8 +1997,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20050415T0909/posix/bits/unistd.h 20 Mar 2005 16:48:41 -0000 1.8 -+++ glibc-20050415T0909-fedora/posix/bits/unistd.h 20 Mar 2005 18:12:27 -0000 1.3.2.4 +--- glibc-20050427T1043/posix/bits/unistd.h 20 Mar 2005 16:48:41 -0000 1.8 ++++ glibc-20050427T1043-fedora/posix/bits/unistd.h 20 Mar 2005 18:12:27 -0000 1.3.2.4 @@ -21,25 +21,19 @@ # error "Never include directly; use instead." #endif @@ -2052,8 +2116,8 @@ - return __getwd_alias (__buf); -} -#endif ---- glibc-20050415T0909/socket/bits/socket2.h 19 Mar 2005 00:13:57 -0000 1.5 -+++ glibc-20050415T0909-fedora/socket/bits/socket2.h 19 Mar 2005 20:18:08 -0000 1.2.2.5 +--- glibc-20050427T1043/socket/bits/socket2.h 19 Mar 2005 00:13:57 -0000 1.5 ++++ glibc-20050427T1043-fedora/socket/bits/socket2.h 19 Mar 2005 20:18:08 -0000 1.2.2.5 @@ -21,24 +21,18 @@ # error "Never include directly; use instead." #endif @@ -2094,8 +2158,8 @@ + __chk_fail (); return __recvfrom_alias (__fd, __buf, __n, __flags, __addr, __addr_len); } ---- glibc-20050415T0909/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20050415T0909-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20050427T1043/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20050427T1043-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 @@ -2111,8 +2175,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-20050415T0909/sysdeps/generic/w_exp2.c 28 Mar 2005 20:42:42 -0000 1.3 -+++ glibc-20050415T0909-fedora/sysdeps/generic/w_exp2.c 6 Jun 2001 12:40:16 -0000 1.2 +--- glibc-20050427T1043/sysdeps/generic/w_exp2.c 28 Mar 2005 20:42:42 -0000 1.3 ++++ glibc-20050427T1043-fedora/sysdeps/generic/w_exp2.c 6 Jun 2001 12:40:16 -0000 1.2 @@ -31,6 +31,6 @@ __exp2 (double x) /* wrapper exp2 */ } weak_alias (__exp2, exp2) @@ -2122,8 +2186,8 @@ +strong_alias (__exp2, __expl2) +weak_alias (__exp2, expl2) #endif ---- glibc-20050415T0909/sysdeps/i386/Versions 28 Mar 2005 20:42:43 -0000 1.5 -+++ glibc-20050415T0909-fedora/sysdeps/i386/Versions 29 Apr 2003 22:47:20 -0000 1.4 +--- glibc-20050427T1043/sysdeps/i386/Versions 28 Mar 2005 20:42:43 -0000 1.5 ++++ glibc-20050427T1043-fedora/sysdeps/i386/Versions 29 Apr 2003 22:47:20 -0000 1.4 @@ -20,10 +20,3 @@ libc { __strspn_cg; __strspn_g; __strstr_cg; __strstr_g; } @@ -2135,8 +2199,8 @@ - exp2l; - } -} ---- glibc-20050415T0909/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050415T0909-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 +--- glibc-20050427T1043/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050427T1043-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. @@ -2548,8 +2612,8 @@ + + +#define atomic_delay() asm ("rep; nop") ---- glibc-20050415T0909/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20050415T0909-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20050427T1043/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20050427T1043-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)) @@ -2561,8 +2625,8 @@ endif endif ---- glibc-20050415T0909/sysdeps/ia64/Versions 28 Mar 2005 20:42:43 -0000 1.10 -+++ glibc-20050415T0909-fedora/sysdeps/ia64/Versions 3 May 2002 07:10:31 -0000 1.9 +--- glibc-20050427T1043/sysdeps/ia64/Versions 28 Mar 2005 20:42:43 -0000 1.10 ++++ glibc-20050427T1043-fedora/sysdeps/ia64/Versions 3 May 2002 07:10:31 -0000 1.9 @@ -12,10 +12,3 @@ libc { __multi3; } @@ -2574,8 +2638,8 @@ - exp2l; - } -} ---- glibc-20050415T0909/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20050415T0909-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20050427T1043/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20050427T1043-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. */ @@ -2927,8 +2991,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20050415T0909/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050415T0909-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050427T1043/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050427T1043-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. @@ -3014,8 +3078,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20050415T0909/sysdeps/m68k/Versions 28 Mar 2005 20:42:42 -0000 1.2 -+++ glibc-20050415T0909-fedora/sysdeps/m68k/Versions 29 Jan 1999 09:06:03 -0000 1.1 +--- glibc-20050427T1043/sysdeps/m68k/Versions 28 Mar 2005 20:42:42 -0000 1.2 ++++ glibc-20050427T1043-fedora/sysdeps/m68k/Versions 29 Jan 1999 09:06:03 -0000 1.1 @@ -4,10 +4,3 @@ libc { __divdi3; __moddi3; __udivdi3; __umoddi3; } @@ -3027,8 +3091,8 @@ - exp2l; - } -} ---- glibc-20050415T0909/sysdeps/mips/mips64/Versions 28 Mar 2005 20:42:43 -0000 1.1 -+++ glibc-20050415T0909-fedora/sysdeps/mips/mips64/Versions 1 Jan 1970 00:00:00 -0000 +--- glibc-20050427T1043/sysdeps/mips/mips64/Versions 28 Mar 2005 20:42:43 -0000 1.1 ++++ glibc-20050427T1043-fedora/sysdeps/mips/mips64/Versions 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ -libm { - GLIBC_2.1 { @@ -3037,8 +3101,8 @@ - exp2l; - } -} ---- glibc-20050415T0909/sysdeps/sparc/sparc64/Versions 28 Mar 2005 20:42:42 -0000 1.2 -+++ glibc-20050415T0909-fedora/sysdeps/sparc/sparc64/Versions 19 May 1999 14:21:36 -0000 1.1 +--- glibc-20050427T1043/sysdeps/sparc/sparc64/Versions 28 Mar 2005 20:42:42 -0000 1.2 ++++ glibc-20050427T1043-fedora/sysdeps/sparc/sparc64/Versions 19 May 1999 14:21:36 -0000 1.1 @@ -5,10 +5,3 @@ libc { __align_cpy_8; __align_cpy_16; } @@ -3050,8 +3114,8 @@ - exp2l; - } -} ---- glibc-20050415T0909/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20050415T0909-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20050427T1043/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20050427T1043-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); } @@ -3066,8 +3130,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20050415T0909/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20050415T0909-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20050427T1043/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20050427T1043-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" @@ -3077,8 +3141,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20050415T0909/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 -+++ glibc-20050415T0909-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 +--- glibc-20050427T1043/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 ++++ glibc-20050427T1043-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"); @@ -3091,8 +3155,8 @@ /* We need no locking. */ __fsetlocking (fp, FSETLOCKING_BYCALLER); ---- glibc-20050415T0909/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20050415T0909-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20050427T1043/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20050427T1043-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; @@ -3138,8 +3202,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20050415T0909/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050415T0909-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050427T1043/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050427T1043-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. @@ -3200,8 +3264,8 @@ + } while (0) + +#include_next ---- glibc-20050415T0909/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20050415T0909-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20050427T1043/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20050427T1043-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) @@ -3234,29 +3298,29 @@ + } while (0) + #include_next ---- glibc-20050415T0909/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050415T0909-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050427T1043/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050427T1043-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-20050415T0909/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050415T0909-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050427T1043/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050427T1043-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-20050415T0909/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20050415T0909-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20050427T1043/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20050427T1043-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-20050415T0909/sysdeps/x86_64/Versions 28 Mar 2005 20:42:42 -0000 1.3 -+++ glibc-20050415T0909-fedora/sysdeps/x86_64/Versions 1 Jan 1970 00:00:00 -0000 +--- glibc-20050427T1043/sysdeps/x86_64/Versions 28 Mar 2005 20:42:42 -0000 1.3 ++++ glibc-20050427T1043-fedora/sysdeps/x86_64/Versions 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ -libm { - GLIBC_2.1 { diff --git a/glibc.spec b/glibc.spec index c10a89d..53207d1 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,14 +1,22 @@ -%define glibcdate 20050415T0909 +%define glibcdate 20050427T1043 %define glibcname glibc -%define glibcsrcdir glibc-20050415T0909 +%define glibcsrcdir glibc-20050427T1043 %define glibc_release_tarballs 0 %define glibcversion 2.3.5 -%define glibcrelease 1 +%define glibcrelease 2 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64 -%define rtkaioarches noarch %define withtlsarches i386 i686 athlon x86_64 ia64 s390 s390x alpha alphaev6 sparc sparcv9 ppc ppc64 +%define xenarches i686 athlon +%ifarch %{xenarches} +%define buildxen 1 +%define xenpackage 1 +%else +%define buildxen 0 +%define xenpackage 0 +%endif +%define rtkaioarches noarch %define debuginfocommonarches %{ix86} alpha alphaev6 sparc sparcv9 %define _unpackaged_files_terminate_build 0 Summary: The GNU libc libraries. @@ -97,6 +105,20 @@ contains the most important sets of shared libraries: the standard C library and the standard math library. Without these two libraries, a Linux system will not function. +%if %{xenpackage} +%package xen +Summary: The GNU libc libraries (optimized for running under Xen) +Group: System Environment/Libraries +Requires: glibc = %{version}-%{release}, glibc-utils = %{version}-%{release} + +%description xen +The standard glibc package is optimized for native kernels and does not +perform as well under the Xen hypervisor. This package provides alternative +library binaries that will be selected instead when running under Xen. + +Install glibc-xen if you might run your system under the Xen hypervisor. +%endif + %package devel Summary: Object files for development using standard C libraries. Group: Development/Libraries @@ -573,18 +595,30 @@ cd .. %endif %ifarch %{nptlarches} -rm -rf build-%{nptl_target_cpu}-linuxnptl -mkdir build-%{nptl_target_cpu}-linuxnptl ; cd build-%{nptl_target_cpu}-linuxnptl +build_nptl() +{ +builddir=build-%{nptl_target_cpu}-$1 +shift +rm -rf $builddir +mkdir $builddir ; cd $builddir EnableKernel="--enable-kernel=%{enablekernelnptl} --disable-profile" Pthreads=nptl WithTls="--with-tls --with-__thread" -CC="$GCC" CFLAGS="$BuildFlags -g -O3" ../configure --prefix=%{_prefix} \ +build_CFLAGS="$BuildFlags -g -O3 $*" +CC="$GCC" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \ --enable-add-ons=$Pthreads$AddOns --without-cvs $EnableKernel \ --with-headers=%{_prefix}/include --enable-bind-now \ $WithTls --build %{nptl_target_cpu}-redhat-linux --host %{nptl_target_cpu}-redhat-linux -make -j$numprocs -r CFLAGS="$BuildFlags -g -O3" PARALLELMFLAGS=-s +make -j$numprocs -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s cd .. +} + +build_nptl linuxnptl + +%if %{buildxen} +build_nptl linuxnptl-nosegneg -mno-tls-direct-seg-refs +%endif %endif %install @@ -647,12 +681,14 @@ cd .. %endif %ifarch %{nptlarches} -cd build-%{nptl_target_cpu}-linuxnptl +ObsDir=obsolete/linuxthreads mkdir -p $RPM_BUILD_ROOT/%{_lib}/obsolete/linuxthreads mv -f $RPM_BUILD_ROOT/%{_lib}/lib{c,m,pthread,rt,thread_db}[.-]*so* $RPM_BUILD_ROOT/%{_lib}/obsolete/linuxthreads/ + +install_nptl() { +cd build-%{nptl_target_cpu}-$1 Pthreads=nptl -SubDir= -ObsDir=obsolete/linuxthreads +SubDir=$2 mkdir -p $RPM_BUILD_ROOT/%{_lib}/$SubDir/ cp -a libc.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libc-*.so` ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libc-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libc.so.*` @@ -671,6 +707,9 @@ ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/librt-*.so` $RPM_BUILD_ROOT/%{_ %endif cp -a ${Pthreads}_db/libthread_db.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libthread_db-*.so` ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libthread_db-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libthread_db.so.*` +} + +install_nptl linuxnptl mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{_lib}/linuxthreads mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/{libc,libpthread,libpthread_nonshared,librt}.a \ @@ -707,6 +746,12 @@ rm -rf $RPM_BUILD_ROOT/nptl cd .. +%if %{buildxen} +%define nosegneg_subdir i686/nosegneg +install_nptl linuxnptl-nosegneg %{nosegneg_subdir} +cd .. +%endif + %endif # compatibility hack: this locale has vanished from glibc, but some other @@ -876,6 +921,13 @@ grep -v '%{_prefix}/bin' < rpm.filelist.full | grep -v '%{_prefix}/sbin/[^gi]' | grep -v '%{_prefix}/share' > rpm.filelist +> nosegneg.filelist +%if %{xenpackage} +grep '/%{_lib}/%{nosegneg_subdir}' < rpm.filelist >> nosegneg.filelist +mv rpm.filelist rpm.filelist.full +grep -v '/%{_lib}/%{nosegneg_subdir}' < rpm.filelist.full > rpm.filelist +%endif + echo '%{_prefix}/sbin/build-locale-archive' >> common.filelist echo '%{_prefix}/sbin/nscd' > nscd.filelist @@ -948,6 +1000,12 @@ echo ====================TESTING NPTL==================== cd build-%{nptl_target_cpu}-linuxnptl make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || : cd .. +%if %{buildxen} +echo ====================TESTING NPTL -mno-tls-direct-seg-refs============= +cd build-%{nptl_target_cpu}-linuxnptl-nosegneg +make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || : +cd .. +%endif %endif echo ====================TESTING DETAILS================= for i in `sed -n 's|^.*\*\*\* \[\([^]]*\.out\)\].*$|\1|p' build-*-linux*/check.log`; do @@ -1004,7 +1062,8 @@ echo -n > $csf strip $RPM_BUILD_ROOT/{sbin/ldconfig,usr/sbin/glibc_post_upgrade.%{_target_cpu},usr/sbin/build-locale-archive} # Strip ELF binaries -for f in `grep -v '%%\(dir\|lang\|config\|verify\)' rpm.filelist`; do +for f in `cat rpm.filelist nosegneg.filelist \ + | grep -v '%%\(dir\|lang\|config\|verify\)'`; do bf=$RPM_BUILD_ROOT$f if [ -f $bf -a -x $bf -a ! -h $bf ]; then if `file $bf 2>/dev/null | grep 'ELF.*, not stripped' | grep -vq 'statically linked'`; then @@ -1165,6 +1224,11 @@ if [ "$1" -ge "1" ]; then service nscd condrestart > /dev/null 2>&1 || : fi +%if %{xenpackage} +%post xen -p /sbin/ldconfig +%postun xen -p /sbin/ldconfig +%endif + %clean rm -rf "$RPM_BUILD_ROOT" rm -f *.filelist* @@ -1182,6 +1246,9 @@ rm -f *.filelist* %dir /lib/i686 %endif %endif +%if %{buildxen} && !%{xenpackage} +%dir /%{_lib}/%{nosegneg_subdir} +%endif %ifarch s390x %dir /lib /lib/ld64.so.1 @@ -1203,6 +1270,12 @@ rm -f *.filelist* %doc COPYING COPYING.LIB README.libm LICENSES %doc hesiod/README.hesiod +%if %{xenpackage} +%files -f nosegneg.filelist xen +%defattr(-,root,root) +%dir /%{_lib}/%{nosegneg_subdir} +%endif + %ifnarch %{auxarches} %files -f common.filelist common %defattr(-,root,root) @@ -1269,11 +1342,29 @@ rm -f *.filelist* %endif %changelog +* Wed Apr 27 2005 Jakub Jelinek 2.3.5-2 +- update from CVS + - with MALLOC_CHECK_=N N>0 (#153003) + - fix recursive dlclose (#154641) + - handle %z in strptime (#154804) + - automatically append /%{_lib}/obsolete/linuxthreads/ + to standard library search path if LD_ASSUME_KERNEL=N N <= 2.4.19 + or for glibc 2.0 binaries (or broken ones that don't use errno/h_errno + properly). Warning: all those will stop working when LinuxThreads + is finally nuked, which is not very far away + - remove nonnull attribute from acct prototype (BZ#877) + - kernel CPU clocks support + - fix *scanf in locales with multi-byte decimal point + +* Wed Apr 27 2005 Roland McGrath +- glibc-xen subpackage for i686 + * Fri Apr 15 2005 Roland McGrath 2.3.5-1 - update from CVS - fix execvp regression (BZ#851) - ia64 libm updates - sparc updates + - fix initstate{,_r}/strfry (#154504) - grok PT_NOTE in vDSO for kernel version and extra hwcap dirs, support "hwcap" keyword in ld.so.conf files diff --git a/sources b/sources index 73ca7f4..9d09a8c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -da1c24ee89cdbd7f45c4ba50591b1737 glibc-20050415T0909.tar.bz2 -fac327d3ddc3f31528ee5f3013005544 glibc-fedora-20050415T0909.tar.bz2 +cc5abca0a8ea1106df99f2561c2ed0cb glibc-20050427T1043.tar.bz2 +24d04e2efc77cba3c5fefc035190bc7d glibc-fedora-20050427T1043.tar.bz2