From 65bf1c4263c6361866b4b2b46eaa7241604b6686 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Feb 18 2009 20:47:04 +0000 Subject: 2.9.90-4 --- diff --git a/.cvsignore b/.cvsignore index b680a9c..6771e64 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20090204T2135.tar.bz2 -glibc-fedora-20090204T2135.tar.bz2 +glibc-20090218T1534.tar.bz2 +glibc-fedora-20090218T1534.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 1b6df06..594541d 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,6 @@ ---- glibc-20090204T2135/ChangeLog 4 Feb 2009 21:27:48 -0000 1.11470 -+++ glibc-20090204T2135-fedora/ChangeLog 4 Feb 2009 22:35:54 -0000 1.8782.2.318 -@@ -6379,6 +6379,13 @@ +--- glibc-20090218T1534/ChangeLog 16 Feb 2009 21:00:06 -0000 1.11497 ++++ glibc-20090218T1534-fedora/ChangeLog 18 Feb 2009 15:49:26 -0000 1.8782.2.319 +@@ -6595,6 +6595,13 @@ * include/sys/cdefs.h: Redefine __nonnull so that test for incorrect parameters in the libc code itself are not omitted. @@ -14,7 +14,7 @@ 2007-05-09 Jakub Jelinek * sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow -@@ -6674,6 +6681,10 @@ +@@ -6890,6 +6897,10 @@ [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -25,7 +25,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -7931,6 +7942,15 @@ +@@ -8147,6 +8158,15 @@ separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -41,8 +41,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-20090204T2135/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20090204T2135-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3 +--- glibc-20090218T1534/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20090218T1534-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -108,8 +108,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20090204T2135/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 -+++ glibc-20090204T2135-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 +--- glibc-20090218T1534/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 ++++ glibc-20090218T1534-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 @@ -171,6 +171,11 @@ [BZ #2611] * stdio-common/renameat.c (renameat): Fix typo. @@ -281,8 +281,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20090204T2135/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 -+++ glibc-20090204T2135-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6 +--- glibc-20090218T1534/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 ++++ glibc-20090218T1534-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -293,8 +293,8 @@ vpath initfini.c $(sysdirs) ---- glibc-20090204T2135/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20090204T2135-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20090218T1534/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20090218T1534-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -319,8 +319,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20090204T2135/debug/tst-chk1.c 5 Mar 2008 06:51:37 -0000 1.19 -+++ glibc-20090204T2135-fedora/debug/tst-chk1.c 5 Mar 2008 09:37:40 -0000 1.1.2.19 +--- glibc-20090218T1534/debug/tst-chk1.c 5 Mar 2008 06:51:37 -0000 1.19 ++++ glibc-20090218T1534-fedora/debug/tst-chk1.c 5 Mar 2008 09:37:40 -0000 1.1.2.19 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -349,9 +349,9 @@ # define O 0 # else # define O 1 ---- glibc-20090204T2135/elf/ldconfig.c 2 Jan 2009 08:46:29 -0000 1.64 -+++ glibc-20090204T2135-fedora/elf/ldconfig.c 2 Jan 2009 21:13:54 -0000 1.47.2.19 -@@ -1000,17 +1000,19 @@ search_dirs (void) +--- glibc-20090218T1534/elf/ldconfig.c 6 Feb 2009 20:09:33 -0000 1.65 ++++ glibc-20090218T1534-fedora/elf/ldconfig.c 18 Feb 2009 15:49:28 -0000 1.47.2.20 +@@ -1020,17 +1020,19 @@ search_dirs (void) static void parse_conf_include (const char *config_file, unsigned int lineno, @@ -373,7 +373,7 @@ if (do_chroot && opt_chroot) { -@@ -1071,7 +1073,14 @@ parse_conf (const char *filename, bool d +@@ -1091,7 +1093,14 @@ parse_conf (const char *filename, bool d cp += 8; while ((dir = strsep (&cp, " \t")) != NULL) if (dir[0] != '\0') @@ -389,7 +389,7 @@ } else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5])) { -@@ -1134,7 +1143,7 @@ parse_conf (const char *filename, bool d +@@ -1154,7 +1163,7 @@ parse_conf (const char *filename, bool d config files to read. */ static void parse_conf_include (const char *config_file, unsigned int lineno, @@ -398,7 +398,7 @@ { if (opt_chroot && pattern[0] != '/') error (EXIT_FAILURE, 0, -@@ -1164,7 +1173,7 @@ parse_conf_include (const char *config_f +@@ -1184,7 +1193,7 @@ parse_conf_include (const char *config_f { case 0: for (size_t i = 0; i < gl.gl_pathc; ++i) @@ -407,7 +407,7 @@ globfree64 (&gl); break; -@@ -1207,6 +1216,8 @@ main (int argc, char **argv) +@@ -1227,6 +1236,8 @@ main (int argc, char **argv) /* Set the text message domain. */ textdomain (_libc_intl_domainname); @@ -416,7 +416,7 @@ /* Parse and process arguments. */ int remaining; argp_parse (&argp, argc, argv, 0, &remaining, NULL); -@@ -1318,12 +1329,14 @@ main (int argc, char **argv) +@@ -1338,12 +1349,14 @@ main (int argc, char **argv) if (!opt_only_cline) { @@ -432,8 +432,8 @@ } if (! opt_ignore_aux_cache) ---- glibc-20090204T2135/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20090204T2135-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20090218T1534/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20090218T1534-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -458,8 +458,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20090204T2135/include/features.h 13 Nov 2008 21:41:25 -0000 1.51 -+++ glibc-20090204T2135-fedora/include/features.h 13 Nov 2008 22:19:33 -0000 1.35.2.21 +--- glibc-20090218T1534/include/features.h 13 Nov 2008 21:41:25 -0000 1.51 ++++ glibc-20090218T1534-fedora/include/features.h 13 Nov 2008 22:19:33 -0000 1.35.2.21 @@ -282,8 +282,13 @@ #endif @@ -476,16 +476,16 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-20090204T2135/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090204T2135-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20090218T1534/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090218T1534-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20090204T2135/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090204T2135-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20090218T1534/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090218T1534-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20090204T2135/intl/locale.alias 28 Oct 2007 01:39:54 -0000 1.24 -+++ glibc-20090204T2135-fedora/intl/locale.alias 12 Dec 2007 18:13:23 -0000 1.23.2.2 +--- glibc-20090218T1534/intl/locale.alias 28 Oct 2007 01:39:54 -0000 1.24 ++++ glibc-20090218T1534-fedora/intl/locale.alias 12 Dec 2007 18:13:23 -0000 1.23.2.2 @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -495,8 +495,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20090204T2135/libio/stdio.h 24 May 2008 18:14:36 -0000 1.93 -+++ glibc-20090204T2135-fedora/libio/stdio.h 24 May 2008 22:22:18 -0000 1.78.2.14 +--- glibc-20090218T1534/libio/stdio.h 24 May 2008 18:14:36 -0000 1.93 ++++ glibc-20090218T1534-fedora/libio/stdio.h 24 May 2008 22:22:18 -0000 1.78.2.14 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -510,8 +510,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20090204T2135/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 -+++ glibc-20090204T2135-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5 +--- glibc-20090218T1534/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 ++++ glibc-20090218T1534-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -603,8 +603,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20090204T2135/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25 -+++ glibc-20090204T2135-fedora/locale/programs/locarchive.c 31 Jul 2007 17:45:53 -0000 1.21.2.4 +--- glibc-20090218T1534/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25 ++++ glibc-20090218T1534-fedora/locale/programs/locarchive.c 31 Jul 2007 17:45:53 -0000 1.21.2.4 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -636,8 +636,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-20090204T2135/localedata/Makefile 31 Oct 2008 15:12:03 -0000 1.109 -+++ glibc-20090204T2135-fedora/localedata/Makefile 31 Oct 2008 21:33:57 -0000 1.101.2.9 +--- glibc-20090218T1534/localedata/Makefile 7 Feb 2009 05:28:00 -0000 1.110 ++++ glibc-20090218T1534-fedora/localedata/Makefile 18 Feb 2009 15:49:33 -0000 1.101.2.10 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -646,8 +646,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20090204T2135/localedata/SUPPORTED 6 Dec 2008 03:02:45 -0000 1.115 -+++ glibc-20090204T2135-fedora/localedata/SUPPORTED 2 Jan 2009 21:13:56 -0000 1.71.2.23 +--- glibc-20090218T1534/localedata/SUPPORTED 6 Dec 2008 03:02:45 -0000 1.115 ++++ glibc-20090218T1534-fedora/localedata/SUPPORTED 2 Jan 2009 21:13:56 -0000 1.71.2.23 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -689,8 +689,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20090204T2135/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20090204T2135-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20090218T1534/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20090218T1534-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -705,8 +705,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20090204T2135/localedata/locales/en_GB 31 Oct 2008 19:00:57 -0000 1.18 -+++ glibc-20090204T2135-fedora/localedata/locales/en_GB 31 Oct 2008 21:33:57 -0000 1.10.2.7 +--- glibc-20090218T1534/localedata/locales/en_GB 31 Oct 2008 19:00:57 -0000 1.18 ++++ glibc-20090218T1534-fedora/localedata/locales/en_GB 31 Oct 2008 21:33:57 -0000 1.10.2.7 @@ -116,8 +116,8 @@ mon "" d_fmt "" @@ -718,8 +718,8 @@ date_fmt "/ / " ---- glibc-20090204T2135/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090204T2135-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20090218T1534/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090218T1534-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -790,8 +790,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20090204T2135/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20090204T2135-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20090218T1534/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20090218T1534-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -819,8 +819,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20090204T2135/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20 -+++ glibc-20090204T2135-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2 +--- glibc-20090218T1534/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20 ++++ glibc-20090218T1534-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2 @@ -24,9 +24,25 @@ # include # include @@ -896,8 +896,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20090204T2135/manual/libc.texinfo 31 Jan 2008 01:43:04 -0000 1.98 -+++ glibc-20090204T2135-fedora/manual/libc.texinfo 31 Jan 2008 08:43:19 -0000 1.94.2.4 +--- glibc-20090218T1534/manual/libc.texinfo 31 Jan 2008 01:43:04 -0000 1.98 ++++ glibc-20090218T1534-fedora/manual/libc.texinfo 31 Jan 2008 08:43:19 -0000 1.94.2.4 @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -907,8 +907,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-20090204T2135/misc/sys/cdefs.h 3 Oct 2007 18:27:02 -0000 1.73 -+++ glibc-20090204T2135-fedora/misc/sys/cdefs.h 3 Oct 2007 19:32:28 -0000 1.58.2.10 +--- glibc-20090218T1534/misc/sys/cdefs.h 3 Oct 2007 18:27:02 -0000 1.73 ++++ glibc-20090218T1534-fedora/misc/sys/cdefs.h 3 Oct 2007 19:32:28 -0000 1.58.2.10 @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -952,17 +952,17 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-20090204T2135/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 -+++ glibc-20090204T2135-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 +--- glibc-20090218T1534/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 ++++ glibc-20090218T1534-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 @@ -25,4 +25,4 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get # the next entry. -#SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE ---- glibc-20090204T2135/nptl/ChangeLog 29 Jan 2009 20:52:36 -0000 1.1101 -+++ glibc-20090204T2135-fedora/nptl/ChangeLog 4 Feb 2009 22:35:58 -0000 1.706.2.167 -@@ -3406,6 +3406,15 @@ +--- glibc-20090218T1534/nptl/ChangeLog 13 Feb 2009 23:36:40 -0000 1.1102 ++++ glibc-20090218T1534-fedora/nptl/ChangeLog 18 Feb 2009 15:49:35 -0000 1.706.2.168 +@@ -3411,6 +3411,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -978,7 +978,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -4142,6 +4151,11 @@ +@@ -4147,6 +4156,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -990,7 +990,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6216,6 +6230,11 @@ +@@ -6221,6 +6235,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1002,8 +1002,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20090204T2135/nptl/Makefile 12 Nov 2008 13:38:23 -0000 1.195 -+++ glibc-20090204T2135-fedora/nptl/Makefile 12 Nov 2008 20:29:34 -0000 1.157.2.37 +--- glibc-20090218T1534/nptl/Makefile 12 Nov 2008 13:38:23 -0000 1.195 ++++ glibc-20090218T1534-fedora/nptl/Makefile 12 Nov 2008 20:29:34 -0000 1.157.2.37 @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1036,8 +1036,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20090204T2135/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20090204T2135-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20090218T1534/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20090218T1534-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1062,8 +1062,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20090204T2135/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090204T2135-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20090218T1534/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090218T1534-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 + @@ -1071,8 +1071,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20090204T2135/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 8 Mar 2008 01:57:04 -0000 1.16 -+++ glibc-20090204T2135-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 14 Mar 2008 22:36:45 -0000 1.8.2.9 +--- glibc-20090218T1534/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 8 Mar 2008 01:57:04 -0000 1.16 ++++ glibc-20090218T1534-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 14 Mar 2008 22:36:45 -0000 1.8.2.9 @@ -181,4 +181,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -1081,8 +1081,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* posix_opt.h */ ---- glibc-20090204T2135/nscd/nscd.conf 6 Nov 2007 00:50:48 -0000 1.16 -+++ glibc-20090204T2135-fedora/nscd/nscd.conf 12 Dec 2007 18:13:28 -0000 1.8.2.7 +--- glibc-20090218T1534/nscd/nscd.conf 6 Nov 2007 00:50:48 -0000 1.16 ++++ glibc-20090218T1534-fedora/nscd/nscd.conf 12 Dec 2007 18:13:28 -0000 1.8.2.7 @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1092,8 +1092,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-20090204T2135/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 -+++ glibc-20090204T2135-fedora/nscd/nscd.init 12 Dec 2007 18:13:28 -0000 1.6.2.6 +--- glibc-20090218T1534/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 ++++ glibc-20090218T1534-fedora/nscd/nscd.init 12 Dec 2007 18:13:28 -0000 1.6.2.6 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1150,29 +1150,45 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-20090204T2135/posix/Makefile 20 Nov 2007 00:41:16 -0000 1.203 -+++ glibc-20090204T2135-fedora/posix/Makefile 12 Dec 2007 18:13:30 -0000 1.171.2.27 -@@ -301,11 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi +--- glibc-20090218T1534/posix/Makefile 7 Feb 2009 08:18:49 -0000 1.204 ++++ glibc-20090218T1534-fedora/posix/Makefile 18 Feb 2009 15:49:37 -0000 1.171.2.28 +@@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist -$(objpfx)getconf.speclist: $(objpfx)getconf -ifeq (no,$(cross-compiling)) - LC_ALL=C GETCONF_DIR=/dev/null \ -- $(run-program-prefix) $< _POSIX_V6_WIDTH_RESTRICTED_ENVS > $@.new +- $(run-program-prefix) $< _POSIX_V7_WIDTH_RESTRICTED_ENVS > $@.new +- LC_ALL=C GETCONF_DIR=/dev/null \ +- $(run-program-prefix) $< _POSIX_V6_WIDTH_RESTRICTED_ENVS >> $@.new +- LC_ALL=C GETCONF_DIR=/dev/null \ +- $(run-program-prefix) $< _XBS5_WIDTH_RESTRICTED_ENVS >> $@.new -else - > $@.new -endif +$(objpfx)getconf.speclist: getconf.speclist.h + $(CC) -E $(CFLAGS) $(CPPFLAGS) $< \ -+ | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ ++ | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-20090204T2135/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090204T2135-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 -@@ -0,0 +1,15 @@ +--- glibc-20090218T1534/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090218T1534-fedora/posix/getconf.speclist.h 18 Feb 2009 16:47:01 -0000 1.1.2.3 +@@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = ++#if _POSIX_V7_ILP32_OFF32 == 1 ++"POSIX_V7_ILP32_OFF32" ++#endif ++#if _POSIX_V7_ILP32_OFFBIG == 1 ++"POSIX_V7_ILP32_OFFBIG" ++#endif ++#if _POSIX_V7_LP64_OFF64 == 1 ++"POSIX_V7_LP64_OFF64" ++#endif ++#if _POSIX_V7_LPBIG_OFFBIG == 1 ++"POSIX_V7_LPBIG_OFFBIG" ++#endif +#if _POSIX_V6_ILP32_OFF32 == 1 +"POSIX_V6_ILP32_OFF32" +#endif @@ -1185,9 +1201,21 @@ +#if _POSIX_V6_LPBIG_OFFBIG == 1 +"POSIX_V6_LPBIG_OFFBIG" +#endif ++#if _XBS5_ILP32_OFF32 == 1 ++"XBS5_ILP32_OFF32" ++#endif ++#if _XBS5_ILP32_OFFBIG == 1 ++"XBS5_ILP32_OFFBIG" ++#endif ++#if _XBS5_LP64_OFF64 == 1 ++"XBS5_LP64_OFF64" ++#endif ++#if _XBS5_LPBIG_OFFBIG == 1 ++"XBS5_LPBIG_OFFBIG" ++#endif +""; ---- glibc-20090204T2135/resolv/Versions 1 Aug 2008 17:15:34 -0000 1.25 -+++ glibc-20090204T2135-fedora/resolv/Versions 2 Jan 2009 21:14:01 -0000 1.20.2.6 +--- glibc-20090218T1534/resolv/Versions 1 Aug 2008 17:15:34 -0000 1.25 ++++ glibc-20090218T1534-fedora/resolv/Versions 2 Jan 2009 21:14:01 -0000 1.20.2.6 @@ -102,7 +102,7 @@ libnss_dns { _nss_dns_gethostbyname_r; _nss_dns_getnetbyaddr_r; _nss_dns_getnetbyname_r; _nss_dns_getcanonname_r; @@ -1197,8 +1225,8 @@ } } ---- glibc-20090204T2135/streams/Makefile 23 Oct 2002 23:48:41 -0000 1.4 -+++ glibc-20090204T2135-fedora/streams/Makefile 14 Mar 2008 22:36:46 -0000 1.4.2.1 +--- glibc-20090218T1534/streams/Makefile 23 Oct 2002 23:48:41 -0000 1.4 ++++ glibc-20090218T1534-fedora/streams/Makefile 14 Mar 2008 22:36:46 -0000 1.4.2.1 @@ -21,7 +21,7 @@ # subdir := streams @@ -1208,8 +1236,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-20090204T2135/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20090204T2135-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20090218T1534/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20090218T1534-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 @@ -1225,8 +1253,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-20090204T2135/sysdeps/i386/Makefile 13 May 2008 05:30:43 -0000 1.21 -+++ glibc-20090204T2135-fedora/sysdeps/i386/Makefile 15 May 2008 07:57:47 -0000 1.16.2.5 +--- glibc-20090218T1534/sysdeps/i386/Makefile 13 May 2008 05:30:43 -0000 1.21 ++++ glibc-20090218T1534-fedora/sysdeps/i386/Makefile 15 May 2008 07:57:47 -0000 1.16.2.5 @@ -64,6 +64,14 @@ endif ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS))) @@ -1242,8 +1270,8 @@ endif ifeq ($(subdir),elf) ---- glibc-20090204T2135/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20090204T2135-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20090218T1534/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20090218T1534-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)) @@ -1255,8 +1283,8 @@ endif endif ---- glibc-20090204T2135/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20090204T2135-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20090218T1534/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20090218T1534-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. */ @@ -1608,8 +1636,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20090204T2135/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090204T2135-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20090218T1534/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090218T1534-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. @@ -1695,8 +1723,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20090204T2135/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 -+++ glibc-20090204T2135-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5 +--- glibc-20090218T1534/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 ++++ glibc-20090218T1534-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5 @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1705,8 +1733,8 @@ endif ifeq ($(subdir),elf) ---- glibc-20090204T2135/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 -+++ glibc-20090204T2135-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 +--- glibc-20090218T1534/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 ++++ glibc-20090218T1534-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1721,8 +1749,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-20090204T2135/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 00:24:52 -0000 1.15 -+++ glibc-20090204T2135-fedora/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 20:20:42 -0000 1.3.2.11 +--- glibc-20090218T1534/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 00:24:52 -0000 1.15 ++++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 20:20:42 -0000 1.3.2.11 @@ -27,13 +27,10 @@ #include #include @@ -1738,8 +1766,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-20090204T2135/sysdeps/unix/sysv/linux/dl-osinfo.h 11 Jan 2009 04:42:04 -0000 1.29 -+++ glibc-20090204T2135-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 4 Feb 2009 22:36:00 -0000 1.14.2.15 +--- glibc-20090218T1534/sysdeps/unix/sysv/linux/dl-osinfo.h 11 Jan 2009 04:42:04 -0000 1.29 ++++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 4 Feb 2009 22:36:00 -0000 1.14.2.15 @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -1787,8 +1815,8 @@ } else #endif ---- glibc-20090204T2135/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 -+++ glibc-20090204T2135-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 +--- glibc-20090218T1534/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 ++++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1831,8 +1859,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-20090204T2135/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 -+++ glibc-20090204T2135-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 +--- glibc-20090218T1534/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 ++++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 @@ -25,6 +25,24 @@ #include @@ -1858,8 +1886,8 @@ struct netlink_res { ---- glibc-20090204T2135/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20090204T2135-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20090218T1534/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20090218T1534-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" @@ -1869,8 +1897,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20090204T2135/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20090204T2135-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20090218T1534/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20090218T1534-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; @@ -1916,8 +1944,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20090204T2135/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 -+++ glibc-20090204T2135-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6 +--- glibc-20090218T1534/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 ++++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6 @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -1936,8 +1964,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-20090204T2135/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090204T2135-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20090218T1534/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090218T1534-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. @@ -1998,8 +2026,8 @@ + } while (0) + +#include_next ---- glibc-20090204T2135/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20090204T2135-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20090218T1534/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20090218T1534-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) @@ -2032,29 +2060,29 @@ + } while (0) + #include_next ---- glibc-20090204T2135/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090204T2135-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20090218T1534/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090218T1534-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-20090204T2135/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20090204T2135-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20090218T1534/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20090218T1534-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-20090204T2135/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20090204T2135-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20090218T1534/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20090218T1534-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-20090204T2135/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 -+++ glibc-20090204T2135-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4 +--- glibc-20090218T1534/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 ++++ glibc-20090218T1534-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4 @@ -89,9 +89,6 @@ L(pseudo_end): ret diff --git a/glibc.spec b/glibc.spec index 8bc53ed..f64af2f 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,9 +1,9 @@ -%define glibcdate 20090204T2135 +%define glibcdate 20090218T1534 %define glibcname glibc -%define glibcsrcdir glibc-20090204T2135 +%define glibcsrcdir glibc-20090218T1534 %define glibc_release_tarballs 0 %define run_glibc_tests 1 -%define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6 +%define auxarches i686 athlon sparcv9v sparc64v alphaev6 %define xenarches i686 athlon %ifarch %{xenarches} %define buildxen 1 @@ -23,7 +23,7 @@ Summary: The GNU libc libraries Name: glibc Version: 2.9.90 -Release: 3 +Release: 4 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -57,7 +57,7 @@ BuildRequires: /bin/ps, /bin/kill, /bin/awk # This is to ensure that __frame_state_for is exported by glibc # will be compatible with egcs 1.x.y BuildRequires: gcc >= 3.2 -%define enablekernel 2.6.9 +%define enablekernel 2.6.18 %ifarch i386 %define nptl_target_cpu i486 %else @@ -118,14 +118,24 @@ executables. Install glibc-devel if you are going to develop programs which will use the standard C libraries. +%package static +Summary: C library static libraries for -static linking. +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +The glibc-static package contains the C library static libraries +for -static linking. You don't need these, unless you link statically, +which is highly discouraged. + %package headers Summary: Header files for development using standard C libraries. Group: Development/Libraries Provides: %{name}-headers(%{_target_cpu}) %ifarch x86_64 # If both -m32 and -m64 is to be supported on AMD64, x86_64 glibc-headers -# have to be installed, not i386 ones. -Obsoletes: %{name}-headers(i386) +# have to be installed, not i586 ones. +Obsoletes: %{name}-headers(i586) %endif Requires(pre): kernel-headers Requires: kernel-headers >= 2.2.1, %{name} = %{version}-%{release} @@ -253,7 +263,7 @@ BuildFlags="-march=%{nptl_target_cpu} -mtune=generic" %ifarch i686 BuildFlags="-march=i686 -mtune=generic" %endif -%ifarch i386 +%ifarch i386 i486 i586 BuildFlags="$BuildFlags -mno-tls-direct-seg-refs" %endif %ifarch x86_64 @@ -350,7 +360,7 @@ build_nptl linuxnptl-power6 cd build-%{nptl_target_cpu}-linuxnptl $GCC -static -L. -Os ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \ -DNO_SIZE_OPTIMIZATION \ -%ifarch i386 +%ifarch i386 i486 i586 -DARCH_386 \ %endif '-DLIBTLS="/%{_lib}/tls/"' \ @@ -592,7 +602,12 @@ mv rpm.filelist rpm.filelist.full grep -v '%{_prefix}/%{_lib}/lib.*_p.a' rpm.filelist.full | egrep -v "(%{_prefix}/include)|(%{_infodir})" > rpm.filelist -grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist >> devel.filelist +grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist \ + | grep '/lib\(\(c\|pthread\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \ + >> devel.filelist +grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist \ + | grep -v '/lib\(\(c\|pthread\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \ + > static.filelist grep '%{_prefix}/%{_lib}/.*\.o' < rpm.filelist >> devel.filelist grep '%{_prefix}/%{_lib}/lib.*\.so' < rpm.filelist >> devel.filelist @@ -736,6 +751,13 @@ echo ====================PLT RELOCS END================== %endif +pushd $RPM_BUILD_ROOT/usr/%{_lib}/ +$GCC -Wl,-r -o libpthread.o -Wl,--whole-archive ./libpthread.a +rm libpthread.a +ar rcs libpthread.a libpthread.o +rm libpthread.o +popd + %if "%{_enable_debug_packages}" == "1" # The #line directives gperf generates do not give the proper @@ -766,7 +788,7 @@ list_debug_archives() %ifarch %{debuginfocommonarches} %ifarch %{ix86} -%define basearch i386 +%define basearch i586 %endif %ifarch alpha alphaev6 %define basearch alpha @@ -813,7 +835,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir echo Cutting down the list of unpackaged files >> debuginfocommon.filelist sed -e '/%%dir/d;/%%config/d;/%%verify/d;s/%%lang([^)]*) //;s#^/*##' \ - common.filelist devel.filelist headers.filelist \ + common.filelist devel.filelist static.filelist headers.filelist \ utils.filelist nscd.filelist debuginfocommon.filelist | (cd $RPM_BUILD_ROOT; xargs --no-run-if-empty rm -f 2> /dev/null || :) @@ -951,6 +973,9 @@ rm -f *.filelist* %files -f devel.filelist devel %defattr(-,root,root) +%files -f static.filelist static +%defattr(-,root,root) + %files -f headers.filelist headers %defattr(-,root,root) @@ -988,6 +1013,14 @@ rm -f *.filelist* %endif %changelog +* Wed Feb 18 2009 Jakub Jelinek 2.9.90-4 +- update from trunk +- adjust for i586 + i686 from i386 + i686 build +- split static libraries into glibc-static subpackage +- ld -r the whole libpthread.a together to avoid endless issues with + -static ... -lpthread +- require 2.6.18 and later kernel + * Wed Feb 4 2009 Jakub Jelinek 2.9.90-3 - update from trunk - ISO C++ compliant strchr etc. with GCC 4.4+ diff --git a/import.log b/import.log index 852f1fe..77040b5 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ glibc-2_9-1:HEAD:glibc-2.9-1.src.rpm:1226616331 glibc-2_9_90-1:HEAD:glibc-2.9.90-1.src.rpm:1230934009 glibc-2_9_90-2:HEAD:glibc-2.9.90-2.src.rpm:1231411404 glibc-2_9_90-3:HEAD:glibc-2.9.90-3.src.rpm:1233787870 +glibc-2_9_90-4:HEAD:glibc-2.9.90-4.src.rpm:1234989992 diff --git a/sources b/sources index a292331..1176190 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -dd114e19a2e660ea0b9014bbc2655d14 glibc-20090204T2135.tar.bz2 -4a6e83c1bf9d0292d9ca267ebbe51ab2 glibc-fedora-20090204T2135.tar.bz2 +086325bc4b2a05d1870f12b627d894ca glibc-20090218T1534.tar.bz2 +407b035feb8ac8f685409d8208f99605 glibc-fedora-20090218T1534.tar.bz2