From 9d883eba955de9823d7294824e4a2044fe629fd6 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Apr 16 2010 11:00:31 +0000 Subject: 2.11.90-20 --- diff --git a/.cvsignore b/.cvsignore index db9e8c3..5d8efc4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-2.11-369-gea42a20.tar.bz2 -glibc-2.11-369-gea42a20-fedora.tar.bz2 +glibc-2.11-382-g1cdb215-fedora.tar.bz2 +glibc-2.11-382-g1cdb215.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index eb7a5dc..a795271 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,6 @@ ---- glibc-2.11-369-gea42a20/ChangeLog -+++ glibc-2.11.90-19/ChangeLog -@@ -105,6 +105,12 @@ +--- glibc-2.11-382-g1cdb215/ChangeLog ++++ glibc-2.11.90-20/ChangeLog +@@ -171,6 +171,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -13,7 +13,7 @@ 2010-04-05 Thomas Schwinge * sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/. -@@ -859,6 +865,19 @@ +@@ -925,6 +931,19 @@ * sysdeps/x86_64/fpu/fegetenv.c: Likewise * sysdeps/s390/fpu/fegetenv.c: Likewise. Remove unused headers. @@ -33,7 +33,7 @@ 2010-02-05 H.J. Lu [BZ #11230] -@@ -2802,6 +2821,11 @@ d2009-10-30 Ulrich Drepper +@@ -2868,6 +2887,11 @@ d2009-10-30 Ulrich Drepper * sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in the unique symbol hash table should not be const. @@ -45,7 +45,7 @@ 2009-07-21 Ulrich Drepper * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -3067,6 +3091,11 @@ d2009-10-30 Ulrich Drepper +@@ -3133,6 +3157,11 @@ d2009-10-30 Ulrich Drepper out common code into new function get_common_indeces. Determine extended family and model for Intel processors. @@ -57,7 +57,7 @@ 2009-06-26 Ulrich Drepper * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -11760,6 +11789,10 @@ d2009-10-30 Ulrich Drepper +@@ -11826,6 +11855,10 @@ d2009-10-30 Ulrich Drepper [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -68,7 +68,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -13017,6 +13050,15 @@ d2009-10-30 Ulrich Drepper +@@ -13083,6 +13116,15 @@ d2009-10-30 Ulrich Drepper separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -84,8 +84,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.11-369-gea42a20/ChangeLog.15 -+++ glibc-2.11.90-19/ChangeLog.15 +--- glibc-2.11-382-g1cdb215/ChangeLog.15 ++++ glibc-2.11.90-20/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -151,8 +151,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.11-369-gea42a20/ChangeLog.16 -+++ glibc-2.11.90-19/ChangeLog.16 +--- glibc-2.11-382-g1cdb215/ChangeLog.16 ++++ glibc-2.11.90-20/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -206,8 +206,8 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.11-369-gea42a20/Makeconfig -+++ glibc-2.11.90-19/Makeconfig +--- glibc-2.11-382-g1cdb215/Makeconfig ++++ glibc-2.11.90-20/Makeconfig @@ -780,12 +780,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -224,8 +224,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.11-369-gea42a20/csu/Makefile -+++ glibc-2.11.90-19/csu/Makefile +--- glibc-2.11-382-g1cdb215/csu/Makefile ++++ glibc-2.11.90-20/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -236,8 +236,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.11-369-gea42a20/csu/elf-init.c -+++ glibc-2.11.90-19/csu/elf-init.c +--- glibc-2.11-382-g1cdb215/csu/elf-init.c ++++ glibc-2.11.90-20/csu/elf-init.c @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **) extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -262,8 +262,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.11-369-gea42a20/debug/tst-chk1.c -+++ glibc-2.11.90-19/debug/tst-chk1.c +--- glibc-2.11-382-g1cdb215/debug/tst-chk1.c ++++ glibc-2.11.90-20/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -292,8 +292,8 @@ # define O 0 # else # define O 1 ---- glibc-2.11-369-gea42a20/elf/ldconfig.c -+++ glibc-2.11.90-19/elf/ldconfig.c +--- glibc-2.11-382-g1cdb215/elf/ldconfig.c ++++ glibc-2.11.90-20/elf/ldconfig.c @@ -1020,17 +1020,19 @@ search_dirs (void) @@ -375,8 +375,8 @@ } char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.11-369-gea42a20/elf/tst-stackguard1.c -+++ glibc-2.11.90-19/elf/tst-stackguard1.c +--- glibc-2.11-382-g1cdb215/elf/tst-stackguard1.c ++++ glibc-2.11.90-20/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -401,16 +401,16 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11-369-gea42a20/include/bits/stdlib-ldbl.h -+++ glibc-2.11.90-19/include/bits/stdlib-ldbl.h +--- glibc-2.11-382-g1cdb215/include/bits/stdlib-ldbl.h ++++ glibc-2.11.90-20/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11-369-gea42a20/include/bits/wchar-ldbl.h -+++ glibc-2.11.90-19/include/bits/wchar-ldbl.h +--- glibc-2.11-382-g1cdb215/include/bits/wchar-ldbl.h ++++ glibc-2.11.90-20/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11-369-gea42a20/include/features.h -+++ glibc-2.11.90-19/include/features.h +--- glibc-2.11-382-g1cdb215/include/features.h ++++ glibc-2.11.90-20/include/features.h @@ -308,8 +308,13 @@ #endif @@ -427,8 +427,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.11-369-gea42a20/intl/locale.alias -+++ glibc-2.11.90-19/intl/locale.alias +--- glibc-2.11-382-g1cdb215/intl/locale.alias ++++ glibc-2.11.90-20/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -438,8 +438,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.11-369-gea42a20/libio/stdio.h -+++ glibc-2.11.90-19/libio/stdio.h +--- glibc-2.11-382-g1cdb215/libio/stdio.h ++++ glibc-2.11.90-20/libio/stdio.h @@ -165,10 +165,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -453,8 +453,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.11-369-gea42a20/locale/iso-4217.def -+++ glibc-2.11.90-19/locale/iso-4217.def +--- glibc-2.11-382-g1cdb215/locale/iso-4217.def ++++ glibc-2.11.90-20/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -546,8 +546,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.11-369-gea42a20/locale/programs/locarchive.c -+++ glibc-2.11.90-19/locale/programs/locarchive.c +--- glibc-2.11-382-g1cdb215/locale/programs/locarchive.c ++++ glibc-2.11.90-20/locale/programs/locarchive.c @@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah) size_t reserved = RESERVE_MMAP_SIZE; int xflags = 0; @@ -606,8 +606,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.11-369-gea42a20/localedata/Makefile -+++ glibc-2.11.90-19/localedata/Makefile +--- glibc-2.11-382-g1cdb215/localedata/Makefile ++++ glibc-2.11.90-20/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -616,8 +616,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.11-369-gea42a20/localedata/SUPPORTED -+++ glibc-2.11.90-19/localedata/SUPPORTED +--- glibc-2.11-382-g1cdb215/localedata/SUPPORTED ++++ glibc-2.11.90-20/localedata/SUPPORTED @@ -85,6 +85,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -659,8 +659,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.11-369-gea42a20/localedata/locales/cy_GB -+++ glibc-2.11.90-19/localedata/locales/cy_GB +--- glibc-2.11-382-g1cdb215/localedata/locales/cy_GB ++++ glibc-2.11.90-20/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -675,8 +675,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.11-369-gea42a20/localedata/locales/en_GB -+++ glibc-2.11.90-19/localedata/locales/en_GB +--- glibc-2.11-382-g1cdb215/localedata/locales/en_GB ++++ glibc-2.11.90-20/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -688,8 +688,8 @@ date_fmt "/ / " ---- glibc-2.11-369-gea42a20/localedata/locales/no_NO -+++ glibc-2.11.90-19/localedata/locales/no_NO +--- glibc-2.11-382-g1cdb215/localedata/locales/no_NO ++++ glibc-2.11.90-20/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -760,8 +760,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.11-369-gea42a20/localedata/locales/zh_TW -+++ glibc-2.11.90-19/localedata/locales/zh_TW +--- glibc-2.11-382-g1cdb215/localedata/locales/zh_TW ++++ glibc-2.11.90-20/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -789,8 +789,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.11-369-gea42a20/malloc/mcheck.c -+++ glibc-2.11.90-19/malloc/mcheck.c +--- glibc-2.11-382-g1cdb215/malloc/mcheck.c ++++ glibc-2.11.90-20/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -866,8 +866,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.11-369-gea42a20/manual/libc.texinfo -+++ glibc-2.11.90-19/manual/libc.texinfo +--- glibc-2.11-382-g1cdb215/manual/libc.texinfo ++++ glibc-2.11.90-20/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -877,8 +877,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.11-369-gea42a20/misc/sys/cdefs.h -+++ glibc-2.11.90-19/misc/sys/cdefs.h +--- glibc-2.11-382-g1cdb215/misc/sys/cdefs.h ++++ glibc-2.11.90-20/misc/sys/cdefs.h @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -922,8 +922,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.11-369-gea42a20/nis/nss -+++ glibc-2.11.90-19/nis/nss +--- glibc-2.11-382-g1cdb215/nis/nss ++++ glibc-2.11.90-20/nis/nss @@ -25,7 +25,7 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get @@ -933,8 +933,8 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.11-369-gea42a20/nptl/ChangeLog -+++ glibc-2.11.90-19/nptl/ChangeLog +--- glibc-2.11-382-g1cdb215/nptl/ChangeLog ++++ glibc-2.11.90-20/nptl/ChangeLog @@ -3884,6 +3884,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -975,8 +975,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.11-369-gea42a20/nptl/Makefile -+++ glibc-2.11.90-19/nptl/Makefile +--- glibc-2.11-382-g1cdb215/nptl/Makefile ++++ glibc-2.11.90-20/nptl/Makefile @@ -341,7 +341,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1009,8 +1009,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.11-369-gea42a20/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.11.90-19/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.11-382-g1cdb215/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.11.90-20/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -189,4 +189,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -1019,8 +1019,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.11-369-gea42a20/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.11.90-19/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.11-382-g1cdb215/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.11.90-20/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1028,8 +1028,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.11-369-gea42a20/nptl/tst-stackguard1.c -+++ glibc-2.11.90-19/nptl/tst-stackguard1.c +--- glibc-2.11-382-g1cdb215/nptl/tst-stackguard1.c ++++ glibc-2.11.90-20/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1054,8 +1054,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11-369-gea42a20/nscd/nscd.conf -+++ glibc-2.11.90-19/nscd/nscd.conf +--- glibc-2.11-382-g1cdb215/nscd/nscd.conf ++++ glibc-2.11.90-20/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1065,8 +1065,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.11-369-gea42a20/nscd/nscd.init -+++ glibc-2.11.90-19/nscd/nscd.init +--- glibc-2.11-382-g1cdb215/nscd/nscd.init ++++ glibc-2.11.90-20/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1138,8 +1138,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.11-369-gea42a20/posix/Makefile -+++ glibc-2.11.90-19/posix/Makefile +--- glibc-2.11-382-g1cdb215/posix/Makefile ++++ glibc-2.11.90-20/posix/Makefile @@ -305,15 +305,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1160,8 +1160,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.11-369-gea42a20/posix/gai.conf -+++ glibc-2.11.90-19/posix/gai.conf +--- glibc-2.11-382-g1cdb215/posix/gai.conf ++++ glibc-2.11.90-20/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -1186,8 +1186,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.11-369-gea42a20/posix/getconf.speclist.h -+++ glibc-2.11.90-19/posix/getconf.speclist.h +--- glibc-2.11-382-g1cdb215/posix/getconf.speclist.h ++++ glibc-2.11.90-20/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1228,8 +1228,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.11-369-gea42a20/streams/Makefile -+++ glibc-2.11.90-19/streams/Makefile +--- glibc-2.11-382-g1cdb215/streams/Makefile ++++ glibc-2.11.90-20/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1239,8 +1239,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.11-369-gea42a20/sysdeps/generic/dl-cache.h -+++ glibc-2.11.90-19/sysdeps/generic/dl-cache.h +--- glibc-2.11-382-g1cdb215/sysdeps/generic/dl-cache.h ++++ glibc-2.11.90-20/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1256,8 +1256,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-2.11-369-gea42a20/sysdeps/i386/Makefile -+++ glibc-2.11.90-19/sysdeps/i386/Makefile +--- glibc-2.11-382-g1cdb215/sysdeps/i386/Makefile ++++ glibc-2.11.90-20/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -1282,8 +1282,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.11-369-gea42a20/sysdeps/ia64/Makefile -+++ glibc-2.11.90-19/sysdeps/ia64/Makefile +--- glibc-2.11-382-g1cdb215/sysdeps/ia64/Makefile ++++ glibc-2.11.90-20/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1295,8 +1295,8 @@ endif endif ---- glibc-2.11-369-gea42a20/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.11.90-19/sysdeps/ia64/ia64libgcc.S +--- glibc-2.11-382-g1cdb215/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.11.90-20/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1648,8 +1648,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.11-369-gea42a20/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.11.90-19/sysdeps/ia64/libgcc-compat.c +--- glibc-2.11-382-g1cdb215/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.11.90-20/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1735,8 +1735,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.11-369-gea42a20/sysdeps/posix/getaddrinfo.c -+++ glibc-2.11.90-19/sysdeps/posix/getaddrinfo.c +--- glibc-2.11-382-g1cdb215/sysdeps/posix/getaddrinfo.c ++++ glibc-2.11.90-20/sysdeps/posix/getaddrinfo.c @@ -1099,10 +1099,12 @@ static const struct scopeentry /* Link-local addresses: scope 2. */ { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 }, @@ -1750,8 +1750,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.11-369-gea42a20/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.11.90-19/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.11-382-g1cdb215/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.11.90-20/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1760,8 +1760,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.11-369-gea42a20/sysdeps/unix/nice.c -+++ glibc-2.11.90-19/sysdeps/unix/nice.c +--- glibc-2.11-382-g1cdb215/sysdeps/unix/nice.c ++++ glibc-2.11.90-20/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1776,8 +1776,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.11.90-19/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.11-382-g1cdb215/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.11.90-20/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -1793,8 +1793,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.11.90-19/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.11-382-g1cdb215/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.11.90-20/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -1842,8 +1842,8 @@ } else #endif ---- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.11.90-19/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.11-382-g1cdb215/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.11.90-20/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1886,8 +1886,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.11.90-19/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.11-382-g1cdb215/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.11.90-20/sysdeps/unix/sysv/linux/i386/dl-cache.h @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -1948,8 +1948,8 @@ + } while (0) + +#include_next ---- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.11.90-19/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.11-382-g1cdb215/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.11.90-20/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -1982,29 +1982,29 @@ + } while (0) + #include_next ---- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.11.90-19/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.11-382-g1cdb215/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.11.90-20/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.11.90-19/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.11-382-g1cdb215/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.11.90-20/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.11.90-19/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.11-382-g1cdb215/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.11.90-20/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed @@ -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-2.11-369-gea42a20/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.11.90-19/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.11-382-g1cdb215/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.11.90-20/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2030,8 +2030,8 @@ struct netlink_res { ---- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.11.90-19/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.11-382-g1cdb215/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.11.90-20/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2041,13 +2041,13 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c -+++ glibc-2.11.90-19/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c +--- glibc-2.11-382-g1cdb215/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c ++++ glibc-2.11.90-20/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c @@ -1 +1 @@ -#include "../../fxstat.c" +#include "../../i386/fxstat.c" ---- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.11.90-19/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.11-382-g1cdb215/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.11.90-20/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2093,8 +2093,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.11-369-gea42a20/timezone/zic.c -+++ glibc-2.11.90-19/timezone/zic.c +--- glibc-2.11-382-g1cdb215/timezone/zic.c ++++ glibc-2.11.90-20/timezone/zic.c @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) return; diff --git a/glibc.spec b/glibc.spec index d3d72c1..e55ce8e 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.11-369-gea42a20 +%define glibcsrcdir glibc-2.11-382-g1cdb215 %define glibcversion 2.11.90 ### glibc.spec.in follows: %define run_glibc_tests 1 @@ -23,7 +23,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 19 +Release: 20 # 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 @@ -1029,6 +1029,14 @@ rm -f *.filelist* %endif %changelog +* Fri Apr 16 2010 Andreas Schwab - 2.11.90-20 +- Update from master + - Fix bugs in x86-32 strcmp-sse4.S and strcmp-ssse3.S + - Add x86-32 FMA support + - Don't crash in trace mode when dependencies are missing + - x86-64 SSE4 optimized memcmp + - Fix makecontext on s390/s390x + * Tue Apr 13 2010 Andreas Schwab - 2.11.90-19 - Avoid multiarch memcmp in tzdata-update (#581677) diff --git a/import.log b/import.log index 8dfa59b..23806d0 100644 --- a/import.log +++ b/import.log @@ -51,3 +51,4 @@ glibc-2_11_90-16:F-13:glibc-2.11.90-16.src.rpm:1268921606 glibc-2_11_90-17:F-13:glibc-2.11.90-17.src.rpm:1270555199 glibc-2_11_90-18:F-13:glibc-2.11.90-18.src.rpm:1271075557 glibc-2_11_90-19:F-13:glibc-2.11.90-19.src.rpm:1271163610 +glibc-2_11_90-20:F-13:glibc-2.11.90-20.src.rpm:1271415479 diff --git a/sources b/sources index 786e816..8804807 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b3b1d618d8b9b1bb3b69391823492914 glibc-2.11-369-gea42a20.tar.bz2 -da4026ea06e468c3cdfb8fc91fe44a8d glibc-2.11-369-gea42a20-fedora.tar.bz2 +a77ec5cca6b2a2e48fd3254cf1bf0f29 glibc-2.11-382-g1cdb215-fedora.tar.bz2 +32bd4031f564ee0f229df8db8c850495 glibc-2.11-382-g1cdb215.tar.bz2