From d05dd8538a552f4b4831d073eb11ff694d99419f Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 1 Sep 2011 14:44:40 +0200 Subject: [PATCH] 2.14.90-7 --- .gitignore | 4 +- glibc-fedora.patch | 647 +++++++++++++++++++++++---------------------- glibc.spec | 10 +- sources | 4 +- 4 files changed, 341 insertions(+), 324 deletions(-) diff --git a/.gitignore b/.gitignore index 09c90d3..c7d10a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/glibc-2.14-209-gad69cc2-fedora.tar.xz -/glibc-2.14-209-gad69cc2.tar.xz /glibc-ports-2.14-7-g978f13e.tar.xz +/glibc-2.14-213-g3ba5751-fedora.tar.xz +/glibc-2.14-213-g3ba5751.tar.xz diff --git a/glibc-fedora.patch b/glibc-fedora.patch index e4f8548..7639cc1 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,22 @@ ---- glibc-2.14-209-gad69cc2/ChangeLog -+++ /ChangeLog -@@ -803,6 +803,14 @@ +--- glibc-2.14-213-g3ba5751/ChangeLog ++++ glibc-2.14.90-6/ChangeLog +@@ -37,6 +37,15 @@ + * sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi + directive. + ++2011-09-01 Andreas Schwab ++ ++ * resolv/res_query.c (__libc_res_nquery): Update assertion. ++ ++2011-08-31 Andreas Schwab ++ ++ * include/link.h (FORCED_DYNAMIC_TLS_OFFSET) [NO_TLS_OFFSET == 0]: ++ Change to -1. ++ + 2011-08-24 David S. Miller + + * sysdeps/sparc/sparc64/strcmp.S: Rewrite. +@@ -842,6 +851,14 @@ * config.make.in: Likewise. * malloc/Makefile: Likewise. @@ -15,7 +31,7 @@ 2011-06-27 Andreas Schwab * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP -@@ -934,6 +942,10 @@ +@@ -973,6 +990,10 @@ * inet/getnetgrent_r.c: Use DL_CALL_FCT in several places. @@ -26,7 +42,7 @@ 2011-06-20 David S. Miller * sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple -@@ -1556,6 +1568,13 @@ +@@ -1595,6 +1616,13 @@ * libio/Makefile (tests): Add bug-fclose1. * libio/bug-fclose1.c: New file. @@ -40,7 +56,7 @@ 2011-05-12 Ulrich Drepper [BZ #12511] -@@ -1833,13 +1852,6 @@ +@@ -1872,13 +1900,6 @@ * stdlib/bug-getcontext.c: New file. * stdlib/Makefile: Add rules to build and run bug-getcontext. @@ -54,7 +70,7 @@ 2011-04-11 Andreas Krebbel * sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes -@@ -2077,6 +2089,31 @@ +@@ -2116,6 +2137,31 @@ * sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime): Export. @@ -86,7 +102,7 @@ 2011-03-22 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment -@@ -2137,6 +2174,16 @@ +@@ -2176,6 +2222,16 @@ $LDFLAGS and -nostdlib -nostartfiles to linking step. Change main to _start. @@ -103,7 +119,7 @@ 2011-03-06 Ulrich Drepper * elf/dl-load.c (_dl_map_object): If we are looking for the first -@@ -2353,6 +2400,12 @@ +@@ -2392,6 +2448,12 @@ * shadow/sgetspent.c: Check return value of __sgetspent_r instead of errno. @@ -116,7 +132,7 @@ 2011-01-19 Ulrich Drepper [BZ #11724] -@@ -3040,6 +3093,26 @@ +@@ -3079,6 +3141,26 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid. @@ -143,7 +159,7 @@ 2010-09-24 Petr Baudis * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -3832,6 +3905,22 @@ +@@ -3871,6 +3953,17 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -154,11 +170,6 @@ + * sysdeps/mach/hurd/getrlimit.c: Add libc_hidden_def. + * resource/getrlimit.c: Likewise. + -+2010-06-28 Andreas Schwab -+ -+ * allocatestack.c (setxid_mark_thread): Ensure that the exiting -+ thread is woken up. -+ +2010-06-21 Andreas Schwab + + * sysdeps/i386/i686/Makefile: Don't pass -mtune to assembler. @@ -166,7 +177,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -3884,6 +3973,24 @@ +@@ -3923,6 +4016,24 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -191,8 +202,8 @@ 2010-05-28 Luis Machado * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.14-209-gad69cc2/ChangeLog.15 -+++ /ChangeLog.15 +--- glibc-2.14-213-g3ba5751/ChangeLog.15 ++++ glibc-2.14.90-6/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -258,8 +269,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.14-209-gad69cc2/ChangeLog.16 -+++ /ChangeLog.16 +--- glibc-2.14-213-g3ba5751/ChangeLog.16 ++++ glibc-2.14.90-6/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -282,8 +293,8 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . ---- glibc-2.14-209-gad69cc2/ChangeLog.17 -+++ /ChangeLog.17 +--- glibc-2.14-213-g3ba5751/ChangeLog.17 ++++ glibc-2.14.90-6/ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -362,8 +373,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.14-209-gad69cc2/Makeconfig -+++ /Makeconfig +--- glibc-2.14-213-g3ba5751/Makeconfig ++++ glibc-2.14.90-6/Makeconfig @@ -799,12 +799,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -380,8 +391,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.14-209-gad69cc2/NEWS -+++ /NEWS +--- glibc-2.14-213-g3ba5751/NEWS ++++ glibc-2.14.90-6/NEWS @@ -45,16 +45,6 @@ Version 2.14 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, 12795, 12811, 12813, 12814, 12841 @@ -399,8 +410,8 @@ * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at, syncfs, setns, sendmmsg ---- glibc-2.14-209-gad69cc2/config.h.in -+++ /config.h.in +--- glibc-2.14-213-g3ba5751/config.h.in ++++ glibc-2.14.90-6/config.h.in @@ -204,6 +204,9 @@ /* Define if `.ctors' and `.dtors' sections shouldn't be used. */ #undef NO_CTORS_DTORS_SECTIONS @@ -411,8 +422,8 @@ /* */ ---- glibc-2.14-209-gad69cc2/configure -+++ /configure +--- glibc-2.14-213-g3ba5751/configure ++++ glibc-2.14.90-6/configure @@ -795,6 +795,7 @@ enable_kernel enable_all_warnings enable_multi_arch @@ -481,8 +492,8 @@ # The way shlib-versions is used to generate soversions.mk uses a # fairly simplistic model for name recognition that can't distinguish # i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os ---- glibc-2.14-209-gad69cc2/configure.in -+++ /configure.in +--- glibc-2.14-213-g3ba5751/configure.in ++++ glibc-2.14.90-6/configure.in @@ -316,6 +316,29 @@ else fi AC_SUBST(libc_cv_nss_crypt) @@ -513,8 +524,8 @@ # The way shlib-versions is used to generate soversions.mk uses a # fairly simplistic model for name recognition that can't distinguish # i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os ---- glibc-2.14-209-gad69cc2/csu/Makefile -+++ /csu/Makefile +--- glibc-2.14-213-g3ba5751/csu/Makefile ++++ glibc-2.14.90-6/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -525,8 +536,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.14-209-gad69cc2/csu/elf-init.c -+++ /csu/elf-init.c +--- glibc-2.14-213-g3ba5751/csu/elf-init.c ++++ glibc-2.14.90-6/csu/elf-init.c @@ -64,6 +64,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; @@ -551,8 +562,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.14-209-gad69cc2/debug/tst-chk1.c -+++ /debug/tst-chk1.c +--- glibc-2.14-213-g3ba5751/debug/tst-chk1.c ++++ glibc-2.14.90-6/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -581,8 +592,8 @@ # define O 0 # else # define O 1 ---- glibc-2.14-209-gad69cc2/elf/Makefile -+++ /elf/Makefile +--- glibc-2.14-213-g3ba5751/elf/Makefile ++++ glibc-2.14.90-6/elf/Makefile @@ -135,6 +135,7 @@ include ../Makeconfig ifeq ($(unwind-find-fde),yes) routines += unwind-dw2-fde-glibc @@ -601,8 +612,8 @@ test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names)))) generated += $(addsuffix .so,$(strip $(modules-names))) ---- glibc-2.14-209-gad69cc2/elf/dl-close.c -+++ /elf/dl-close.c +--- glibc-2.14-213-g3ba5751/elf/dl-close.c ++++ glibc-2.14.90-6/elf/dl-close.c @@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) if (map->l_direct_opencount > 0 || map->l_type != lt_loaded || dl_close_state != not_pending) @@ -623,8 +634,8 @@ /* There are still references to this object. Do nothing more. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) ---- glibc-2.14-209-gad69cc2/elf/dl-deps.c -+++ /elf/dl-deps.c +--- glibc-2.14-213-g3ba5751/elf/dl-deps.c ++++ glibc-2.14.90-6/elf/dl-deps.c @@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, nneeded * sizeof needed[0]); atomic_write_barrier (); @@ -650,8 +661,8 @@ if (errno_reason) _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, ---- glibc-2.14-209-gad69cc2/elf/dl-init.c -+++ /elf/dl-init.c +--- glibc-2.14-213-g3ba5751/elf/dl-init.c ++++ glibc-2.14.90-6/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -674,8 +685,8 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.14-209-gad69cc2/elf/dl-libc.c -+++ /elf/dl-libc.c +--- glibc-2.14-213-g3ba5751/elf/dl-libc.c ++++ glibc-2.14.90-6/elf/dl-libc.c @@ -270,13 +270,13 @@ libc_freeres_fn (free_mem) for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) @@ -702,8 +713,8 @@ } if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 ---- glibc-2.14-209-gad69cc2/elf/dl-load.c -+++ /elf/dl-load.c +--- glibc-2.14-213-g3ba5751/elf/dl-load.c ++++ glibc-2.14.90-6/elf/dl-load.c @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len) @@ -783,8 +794,8 @@ } else /* No DST we recognize. */ ---- glibc-2.14-209-gad69cc2/elf/dl-support.c -+++ /elf/dl-support.c +--- glibc-2.14-213-g3ba5751/elf/dl-support.c ++++ glibc-2.14.90-6/elf/dl-support.c @@ -81,10 +81,8 @@ unsigned long long _dl_load_adds; create a fake scope containing nothing. */ struct r_scope_elem _dl_initial_searchlist; @@ -796,8 +807,8 @@ /* Random data provided by the kernel. */ void *_dl_random; ---- glibc-2.14-209-gad69cc2/elf/ldconfig.c -+++ /elf/ldconfig.c +--- glibc-2.14-213-g3ba5751/elf/ldconfig.c ++++ glibc-2.14.90-6/elf/ldconfig.c @@ -1034,17 +1034,19 @@ search_dirs (void) @@ -879,8 +890,8 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.14-209-gad69cc2/elf/ldd.bash.in -+++ /elf/ldd.bash.in +--- glibc-2.14-213-g3ba5751/elf/ldd.bash.in ++++ glibc-2.14.90-6/elf/ldd.bash.in @@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2 fi done @@ -909,8 +920,8 @@ try_trace "$RTLD" "$file" || result=1 ;; *) ---- glibc-2.14-209-gad69cc2/elf/rtld-Rules -+++ /elf/rtld-Rules +--- glibc-2.14-213-g3ba5751/elf/rtld-Rules ++++ glibc-2.14.90-6/elf/rtld-Rules @@ -1,7 +1,7 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker. @@ -928,8 +939,8 @@ +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld endif ---- glibc-2.14-209-gad69cc2/elf/rtld.c -+++ /elf/rtld.c +--- glibc-2.14-213-g3ba5751/elf/rtld.c ++++ glibc-2.14.90-6/elf/rtld.c @@ -107,7 +107,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -957,7 +968,7 @@ if (*user_entry == (ElfW(Addr)) ENTRY_POINT) { -@@ -2272,6 +2268,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", +@@ -2271,6 +2267,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", lnp->dont_free = 1; lnp = lnp->next; } @@ -965,7 +976,7 @@ if (l != &GL(dl_rtld_map)) _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, -@@ -2321,7 +2318,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", +@@ -2317,7 +2314,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", /* Make sure no new search directories have been added. */ assert (GLRO(dl_init_all_dirs) == GL(dl_all_dirs)); @@ -973,24 +984,24 @@ if (! prelinked && rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. ---- glibc-2.14-209-gad69cc2/extra-lib.mk -+++ /extra-lib.mk +--- glibc-2.14-213-g3ba5751/extra-lib.mk ++++ glibc-2.14.90-6/extra-lib.mk @@ -101,4 +101,4 @@ ifneq (,$(cpp-srcs-left)) include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) endif -CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 +CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -DIN_LIB=$(lib) ---- glibc-2.14-209-gad69cc2/include/bits/stdlib-ldbl.h -+++ /include/bits/stdlib-ldbl.h +--- glibc-2.14-213-g3ba5751/include/bits/stdlib-ldbl.h ++++ glibc-2.14.90-6/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-209-gad69cc2/include/bits/wchar-ldbl.h -+++ /include/bits/wchar-ldbl.h +--- glibc-2.14-213-g3ba5751/include/bits/wchar-ldbl.h ++++ glibc-2.14.90-6/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-209-gad69cc2/include/features.h -+++ /include/features.h +--- glibc-2.14-213-g3ba5751/include/features.h ++++ glibc-2.14.90-6/include/features.h @@ -310,8 +310,13 @@ #endif @@ -1007,8 +1018,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.14-209-gad69cc2/include/libc-symbols.h -+++ /include/libc-symbols.h +--- glibc-2.14-213-g3ba5751/include/libc-symbols.h ++++ glibc-2.14.90-6/include/libc-symbols.h @@ -635,7 +635,7 @@ for linking") # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libc_hidden_def(name) hidden_def (name) @@ -1018,8 +1029,8 @@ # define libc_hidden_ver(local, name) hidden_ver (local, name) # define libc_hidden_data_def(name) hidden_data_def (name) # define libc_hidden_data_weak(name) hidden_data_weak (name) ---- glibc-2.14-209-gad69cc2/include/link.h -+++ /include/link.h +--- glibc-2.14-213-g3ba5751/include/link.h ++++ glibc-2.14.90-6/include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. @@ -1048,8 +1059,17 @@ /* List of the dependencies introduced through symbol binding. */ struct link_map_reldeps ---- glibc-2.14-209-gad69cc2/include/stap-probe.h -+++ /include/stap-probe.h +@@ -290,7 +290,7 @@ struct link_map + #endif + #ifndef FORCED_DYNAMIC_TLS_OFFSET + # if NO_TLS_OFFSET == 0 +-# define FORCED_DYNAMIC_TLS_OFFSET 1 ++# define FORCED_DYNAMIC_TLS_OFFSET -1 + # elif NO_TLS_OFFSET == -1 + # define FORCED_DYNAMIC_TLS_OFFSET -2 + # else +--- glibc-2.14-213-g3ba5751/include/stap-probe.h ++++ glibc-2.14.90-6/include/stap-probe.h @@ -0,0 +1,140 @@ +/* Macros for defining Systemtap static probe points. + Copyright (C) 2011 Free Software Foundation, Inc. @@ -1191,16 +1211,16 @@ +#endif /* USE_STAP_PROBE. */ + +#endif /* stap-probe.h */ ---- glibc-2.14-209-gad69cc2/include/sys/resource.h -+++ /include/sys/resource.h +--- glibc-2.14-213-g3ba5751/include/sys/resource.h ++++ glibc-2.14.90-6/include/sys/resource.h @@ -13,4 +13,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage) extern int __setrlimit (enum __rlimit_resource __resource, const struct rlimit *__rlimits); +libc_hidden_proto (__getrlimit) #endif ---- glibc-2.14-209-gad69cc2/inet/Makefile -+++ /inet/Makefile +--- glibc-2.14-213-g3ba5751/inet/Makefile ++++ glibc-2.14.90-6/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -1210,8 +1230,8 @@ ifeq ($(have-thread-library),yes) CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions ---- glibc-2.14-209-gad69cc2/intl/locale.alias -+++ /intl/locale.alias +--- glibc-2.14-213-g3ba5751/intl/locale.alias ++++ glibc-2.14.90-6/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -1221,8 +1241,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.14-209-gad69cc2/libio/stdio.h -+++ /libio/stdio.h +--- glibc-2.14-213-g3ba5751/libio/stdio.h ++++ glibc-2.14.90-6/libio/stdio.h @@ -169,10 +169,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -1236,8 +1256,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.14-209-gad69cc2/locale/iso-4217.def -+++ /locale/iso-4217.def +--- glibc-2.14-213-g3ba5751/locale/iso-4217.def ++++ glibc-2.14.90-6/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1329,8 +1349,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.14-209-gad69cc2/locale/programs/locarchive.c -+++ /locale/programs/locarchive.c +--- glibc-2.14-213-g3ba5751/locale/programs/locarchive.c ++++ glibc-2.14.90-6/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; @@ -1389,8 +1409,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.14-209-gad69cc2/localedata/ChangeLog -+++ /localedata/ChangeLog +--- glibc-2.14-213-g3ba5751/localedata/ChangeLog ++++ glibc-2.14.90-6/localedata/ChangeLog @@ -3,6 +3,14 @@ * tests-mbwc/tst_funcs.h (TST_DECL_VARS, TST_HEAD_LOCALE): Remove unused variable. @@ -1406,8 +1426,8 @@ 2011-05-21 Ulrich Drepper [BZ #12788] ---- glibc-2.14-209-gad69cc2/localedata/Makefile -+++ /localedata/Makefile +--- glibc-2.14-213-g3ba5751/localedata/Makefile ++++ glibc-2.14.90-6/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1416,8 +1436,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.14-209-gad69cc2/localedata/SUPPORTED -+++ /localedata/SUPPORTED +--- glibc-2.14-213-g3ba5751/localedata/SUPPORTED ++++ glibc-2.14.90-6/localedata/SUPPORTED @@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1459,8 +1479,8 @@ sw_KE/UTF-8 \ sw_TZ/UTF-8 \ ta_IN/UTF-8 \ ---- glibc-2.14-209-gad69cc2/localedata/locales/cy_GB -+++ /localedata/locales/cy_GB +--- glibc-2.14-213-g3ba5751/localedata/locales/cy_GB ++++ glibc-2.14.90-6/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1475,8 +1495,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.14-209-gad69cc2/localedata/locales/en_GB -+++ /localedata/locales/en_GB +--- glibc-2.14-213-g3ba5751/localedata/locales/en_GB ++++ glibc-2.14.90-6/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1488,8 +1508,8 @@ date_fmt "/ / " ---- glibc-2.14-209-gad69cc2/localedata/locales/no_NO -+++ /localedata/locales/no_NO +--- glibc-2.14-213-g3ba5751/localedata/locales/no_NO ++++ glibc-2.14.90-6/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1560,8 +1580,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.14-209-gad69cc2/localedata/locales/zh_TW -+++ /localedata/locales/zh_TW +--- glibc-2.14-213-g3ba5751/localedata/locales/zh_TW ++++ glibc-2.14.90-6/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1589,8 +1609,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.14-209-gad69cc2/login/programs/pt_chown.c -+++ /login/programs/pt_chown.c +--- glibc-2.14-213-g3ba5751/login/programs/pt_chown.c ++++ glibc-2.14.90-6/login/programs/pt_chown.c @@ -29,6 +29,7 @@ #include #include @@ -1632,8 +1652,8 @@ - return EXIT_SUCCESS; } ---- glibc-2.14-209-gad69cc2/malloc/mcheck.c -+++ /malloc/mcheck.c +--- glibc-2.14-213-g3ba5751/malloc/mcheck.c ++++ glibc-2.14.90-6/malloc/mcheck.c @@ -25,10 +25,26 @@ # include # include @@ -1710,8 +1730,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.14-209-gad69cc2/manual/libc.texinfo -+++ /manual/libc.texinfo +--- glibc-2.14-213-g3ba5751/manual/libc.texinfo ++++ glibc-2.14.90-6/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1721,8 +1741,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.14-209-gad69cc2/misc/sys/cdefs.h -+++ /misc/sys/cdefs.h +--- glibc-2.14-213-g3ba5751/misc/sys/cdefs.h ++++ glibc-2.14.90-6/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) @@ -1766,8 +1786,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.14-209-gad69cc2/nis/Makefile -+++ /nis/Makefile +--- glibc-2.14-213-g3ba5751/nis/Makefile ++++ glibc-2.14.90-6/nis/Makefile @@ -23,9 +23,9 @@ subdir := nis aux := nis_hash @@ -1789,8 +1809,8 @@ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ ---- glibc-2.14-209-gad69cc2/nis/nss -+++ /nis/nss +--- glibc-2.14-213-g3ba5751/nis/nss ++++ glibc-2.14.90-6/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 @@ -1800,9 +1820,9 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.14-209-gad69cc2/nptl/ChangeLog -+++ /nptl/ChangeLog -@@ -53,6 +53,51 @@ +--- glibc-2.14-213-g3ba5751/nptl/ChangeLog ++++ glibc-2.14.90-6/nptl/ChangeLog +@@ -58,6 +58,51 @@ clearing memory. Patch partly by Robert Rex . @@ -1854,7 +1874,7 @@ 2011-01-19 Roland McGrath * pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo. -@@ -4782,6 +4827,11 @@ +@@ -4787,6 +4832,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1866,7 +1886,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6856,6 +6906,11 @@ +@@ -6861,6 +6911,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1878,8 +1898,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.14-209-gad69cc2/nptl/DESIGN-systemtap-probes.txt -+++ /nptl/DESIGN-systemtap-probes.txt +--- glibc-2.14-213-g3ba5751/nptl/DESIGN-systemtap-probes.txt ++++ glibc-2.14.90-6/nptl/DESIGN-systemtap-probes.txt @@ -0,0 +1,89 @@ +Systemtap is a dynamic tracing/instrumenting tool available on Linux. Probes +that are not fired at run time have close to zero overhead. @@ -1970,8 +1990,8 @@ + arg1 = condition +cond_broadcast - probe for pthread_cond_broadcast + arg1 = condition ---- glibc-2.14-209-gad69cc2/nptl/Makefile -+++ /nptl/Makefile +--- glibc-2.14-213-g3ba5751/nptl/Makefile ++++ glibc-2.14.90-6/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -2004,8 +2024,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.14-209-gad69cc2/nptl/Versions -+++ /nptl/Versions +--- glibc-2.14-213-g3ba5751/nptl/Versions ++++ glibc-2.14.90-6/nptl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; # Internal libc interface to libpthread @@ -2014,28 +2034,8 @@ } } ---- glibc-2.14-209-gad69cc2/nptl/allocatestack.c -+++ /nptl/allocatestack.c -@@ -999,7 +999,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t) - - /* If the thread is exiting right now, ignore it. */ - if ((ch & EXITING_BITMASK) != 0) -- return; -+ { -+ /* Release the futex if there is no other setxid in -+ progress. */ -+ if ((ch & SETXID_BITMASK) == 0) -+ { -+ t->setxid_futex = 1; -+ lll_futex_wake (&t->setxid_futex, 1, LLL_PRIVATE); -+ } -+ return; -+ } - } - while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling, - ch | SETXID_BITMASK, ch)); ---- glibc-2.14-209-gad69cc2/nptl/nptl-init.c -+++ /nptl/nptl-init.c +--- glibc-2.14-213-g3ba5751/nptl/nptl-init.c ++++ glibc-2.14.90-6/nptl/nptl-init.c @@ -414,7 +414,7 @@ __pthread_initialize_minimal_internal (void) /* Determine the default allowed stack size. This is the size used in case the user does not specify one. */ @@ -2045,8 +2045,8 @@ || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ ---- glibc-2.14-209-gad69cc2/nptl/pthread_cond_broadcast.c -+++ /nptl/pthread_cond_broadcast.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_cond_broadcast.c ++++ glibc-2.14.90-6/nptl/pthread_cond_broadcast.c @@ -23,6 +23,7 @@ #include #include @@ -2064,8 +2064,8 @@ int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; /* Make sure we are alone. */ ---- glibc-2.14-209-gad69cc2/nptl/pthread_cond_destroy.c -+++ /nptl/pthread_cond_destroy.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_cond_destroy.c ++++ glibc-2.14.90-6/nptl/pthread_cond_destroy.c @@ -20,6 +20,7 @@ #include #include @@ -2083,8 +2083,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-209-gad69cc2/nptl/pthread_cond_init.c -+++ /nptl/pthread_cond_init.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_cond_init.c ++++ glibc-2.14.90-6/nptl/pthread_cond_init.c @@ -20,6 +20,7 @@ #include @@ -2102,8 +2102,8 @@ return 0; } versioned_symbol (libpthread, __pthread_cond_init, ---- glibc-2.14-209-gad69cc2/nptl/pthread_cond_signal.c -+++ /nptl/pthread_cond_signal.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_cond_signal.c ++++ glibc-2.14.90-6/nptl/pthread_cond_signal.c @@ -26,6 +26,7 @@ #include @@ -2121,8 +2121,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-209-gad69cc2/nptl/pthread_cond_wait.c -+++ /nptl/pthread_cond_wait.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_cond_wait.c ++++ glibc-2.14.90-6/nptl/pthread_cond_wait.c @@ -25,6 +25,7 @@ #include @@ -2140,8 +2140,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-209-gad69cc2/nptl/pthread_create.c -+++ /nptl/pthread_create.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_create.c ++++ glibc-2.14.90-6/nptl/pthread_create.c @@ -31,6 +31,8 @@ #include @@ -2169,8 +2169,8 @@ /* Start the thread. */ return create_thread (pd, iattr, STACK_VARIABLES_ARGS); } ---- glibc-2.14-209-gad69cc2/nptl/pthread_join.c -+++ /nptl/pthread_join.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_join.c ++++ glibc-2.14.90-6/nptl/pthread_join.c @@ -23,6 +23,8 @@ #include #include "pthreadP.h" @@ -2197,8 +2197,8 @@ + return result; } ---- glibc-2.14-209-gad69cc2/nptl/pthread_mutex_destroy.c -+++ /nptl/pthread_mutex_destroy.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_mutex_destroy.c ++++ glibc-2.14.90-6/nptl/pthread_mutex_destroy.c @@ -20,11 +20,15 @@ #include #include "pthreadP.h" @@ -2215,8 +2215,8 @@ if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0 && mutex->__data.__nusers != 0) return EBUSY; ---- glibc-2.14-209-gad69cc2/nptl/pthread_mutex_init.c -+++ /nptl/pthread_mutex_init.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_mutex_init.c ++++ glibc-2.14.90-6/nptl/pthread_mutex_init.c @@ -24,6 +24,8 @@ #include #include "pthreadP.h" @@ -2235,8 +2235,8 @@ return 0; } strong_alias (__pthread_mutex_init, pthread_mutex_init) ---- glibc-2.14-209-gad69cc2/nptl/pthread_mutex_lock.c -+++ /nptl/pthread_mutex_lock.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_mutex_lock.c ++++ glibc-2.14.90-6/nptl/pthread_mutex_lock.c @@ -24,6 +24,7 @@ #include #include "pthreadP.h" @@ -2273,8 +2273,8 @@ return 0; } #ifndef __pthread_mutex_lock ---- glibc-2.14-209-gad69cc2/nptl/pthread_mutex_timedlock.c -+++ /nptl/pthread_mutex_timedlock.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_mutex_timedlock.c ++++ glibc-2.14.90-6/nptl/pthread_mutex_timedlock.c @@ -24,6 +24,8 @@ #include #include @@ -2329,8 +2329,8 @@ } out: ---- glibc-2.14-209-gad69cc2/nptl/pthread_mutex_unlock.c -+++ /nptl/pthread_mutex_unlock.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_mutex_unlock.c ++++ glibc-2.14.90-6/nptl/pthread_mutex_unlock.c @@ -22,6 +22,7 @@ #include #include "pthreadP.h" @@ -2367,8 +2367,8 @@ return 0; } ---- glibc-2.14-209-gad69cc2/nptl/pthread_rwlock_destroy.c -+++ /nptl/pthread_rwlock_destroy.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_rwlock_destroy.c ++++ glibc-2.14.90-6/nptl/pthread_rwlock_destroy.c @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -2385,8 +2385,8 @@ /* Nothing to be done. For now. */ return 0; } ---- glibc-2.14-209-gad69cc2/nptl/pthread_rwlock_rdlock.c -+++ /nptl/pthread_rwlock_rdlock.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_rwlock_rdlock.c ++++ glibc-2.14.90-6/nptl/pthread_rwlock_rdlock.c @@ -22,6 +22,7 @@ #include #include @@ -2413,8 +2413,8 @@ break; } ---- glibc-2.14-209-gad69cc2/nptl/pthread_rwlock_unlock.c -+++ /nptl/pthread_rwlock_unlock.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_rwlock_unlock.c ++++ glibc-2.14.90-6/nptl/pthread_rwlock_unlock.c @@ -22,11 +22,14 @@ #include #include @@ -2430,8 +2430,8 @@ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); if (rwlock->__data.__writer) rwlock->__data.__writer = 0; ---- glibc-2.14-209-gad69cc2/nptl/pthread_rwlock_wrlock.c -+++ /nptl/pthread_rwlock_wrlock.c +--- glibc-2.14-213-g3ba5751/nptl/pthread_rwlock_wrlock.c ++++ glibc-2.14.90-6/nptl/pthread_rwlock_wrlock.c @@ -22,6 +22,7 @@ #include #include @@ -2458,8 +2458,8 @@ break; } ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ /nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.14.90-6/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 @@ -2468,8 +2468,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ /nptl/sysdeps/unix/sysv/linux/i386/Versions +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -2477,8 +2477,8 @@ + __uname; + } +} ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S -+++ /nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2498,8 +2498,8 @@ ENTER_KERNEL 2: movl %edx, %eax ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S -+++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S @@ -24,6 +24,7 @@ #include #include @@ -2517,8 +2517,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S -+++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S @@ -24,7 +24,7 @@ #include #include @@ -2537,8 +2537,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S -+++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S @@ -24,7 +24,7 @@ #include #include @@ -2557,8 +2557,8 @@ cmpl $1000000000, 4(%ebp) movl $EINVAL, %eax jae 18f ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S -+++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S @@ -25,6 +25,7 @@ #include #include @@ -2576,8 +2576,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S -+++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S @@ -23,6 +23,7 @@ #include #include @@ -2595,8 +2595,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S -+++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S @@ -23,6 +23,7 @@ #include #include @@ -2614,8 +2614,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h -+++ /nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2633,8 +2633,8 @@ __asm __volatile (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ /nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -2644,8 +2644,8 @@ cp = u.uts.version; else { ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ /nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -2653,8 +2653,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S -+++ /nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2684,8 +2684,8 @@ syscall 2: movl %edx, %eax ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h -+++ /nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2703,8 +2703,8 @@ __asm __volatile ("syscall" \ : "=a" (__ignore) \ : "0" (SYS_futex), "D" (futex), \ ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S -+++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S @@ -25,7 +25,7 @@ #include #include @@ -2723,8 +2723,8 @@ /* Get internal lock. */ movl $1, %esi xorl %eax, %eax ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S -+++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S @@ -24,6 +24,7 @@ #include #include @@ -2742,8 +2742,8 @@ /* Get internal lock. */ movq %rdi, %r8 movl $1, %esi ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S -+++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -23,6 +23,7 @@ #include #include @@ -2761,8 +2761,8 @@ cmpq $1000000000, 8(%rdx) movl $EINVAL, %eax jae 48f ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S -+++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S @@ -23,6 +23,7 @@ #include #include @@ -2780,8 +2780,8 @@ cmpq $-1, dep_mutex(%rdi) /* Prepare structure passed to cancellation handler. */ ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S -+++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S @@ -22,7 +22,7 @@ #include #include @@ -2801,8 +2801,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-209-gad69cc2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S -+++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S +--- glibc-2.14-213-g3ba5751/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S ++++ glibc-2.14.90-6/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S @@ -22,7 +22,7 @@ #include #include @@ -2822,8 +2822,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-209-gad69cc2/nscd/nscd.conf -+++ /nscd/nscd.conf +--- glibc-2.14-213-g3ba5751/nscd/nscd.conf ++++ glibc-2.14.90-6/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -2833,8 +2833,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.14-209-gad69cc2/nscd/nscd.init -+++ /nscd/nscd.init +--- glibc-2.14-213-g3ba5751/nscd/nscd.init ++++ glibc-2.14.90-6/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -2911,8 +2911,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.14-209-gad69cc2/nss/Makefile -+++ /nss/Makefile +--- glibc-2.14-213-g3ba5751/nss/Makefile ++++ glibc-2.14.90-6/nss/Makefile @@ -88,6 +88,7 @@ endif include ../Rules @@ -2921,8 +2921,8 @@ ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a ---- glibc-2.14-209-gad69cc2/nss/nss_files/files-XXX.c -+++ /nss/nss_files/files-XXX.c +--- glibc-2.14-213-g3ba5751/nss/nss_files/files-XXX.c ++++ glibc-2.14.90-6/nss/nss_files/files-XXX.c @@ -190,7 +190,7 @@ internal_getent (struct STRUCTURE *result, { char *p; @@ -2932,8 +2932,8 @@ int parse_result; if (buflen < sizeof *data + 2) ---- glibc-2.14-209-gad69cc2/posix/Makefile -+++ /posix/Makefile +--- glibc-2.14-213-g3ba5751/posix/Makefile ++++ glibc-2.14.90-6/posix/Makefile @@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -2954,8 +2954,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.14-209-gad69cc2/posix/gai.conf -+++ /posix/gai.conf +--- glibc-2.14-213-g3ba5751/posix/gai.conf ++++ glibc-2.14.90-6/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -2980,8 +2980,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.14-209-gad69cc2/posix/getconf.speclist.h -+++ /posix/getconf.speclist.h +--- glibc-2.14-213-g3ba5751/posix/getconf.speclist.h ++++ glibc-2.14.90-6/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -3022,8 +3022,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.14-209-gad69cc2/posix/regcomp.c -+++ /posix/regcomp.c +--- glibc-2.14-213-g3ba5751/posix/regcomp.c ++++ glibc-2.14.90-6/posix/regcomp.c @@ -2745,40 +2745,29 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, /* Local function for parse_bracket_exp used in _LIBC environement. @@ -3155,8 +3155,8 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.14-209-gad69cc2/resolv/Makefile -+++ /resolv/Makefile +--- glibc-2.14-213-g3ba5751/resolv/Makefile ++++ glibc-2.14.90-6/resolv/Makefile @@ -80,6 +80,7 @@ ifeq (yes,$(have-ssp)) CFLAGS-libresolv += -fstack-protector endif @@ -3165,8 +3165,19 @@ # The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings ---- glibc-2.14-209-gad69cc2/resource/getrlimit.c -+++ /resource/getrlimit.c +--- glibc-2.14-213-g3ba5751/resolv/res_query.c ++++ glibc-2.14.90-6/resolv/res_query.c +@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, + && *resplen2 > (int) sizeof (HEADER)) + { + /* Special case of partial answer. */ +- assert (hp != hp2); ++ assert (n == 0 || hp != hp2); + hp = hp2; + } + else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) +--- glibc-2.14-213-g3ba5751/resource/getrlimit.c ++++ glibc-2.14.90-6/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -3175,8 +3186,8 @@ weak_alias (__getrlimit, getrlimit) stub_warning (getrlimit) ---- glibc-2.14-209-gad69cc2/scripts/check-local-headers.sh -+++ /scripts/check-local-headers.sh +--- glibc-2.14-213-g3ba5751/scripts/check-local-headers.sh ++++ glibc-2.14.90-6/scripts/check-local-headers.sh @@ -29,7 +29,7 @@ exec ${AWK} -v includedir="$includedir" ' BEGIN { status = 0 @@ -3186,8 +3197,8 @@ } /^[^ ]/ && $1 ~ /.*:/ { obj = $1 } { ---- glibc-2.14-209-gad69cc2/stdio-common/vfprintf.c -+++ /stdio-common/vfprintf.c +--- glibc-2.14-213-g3ba5751/stdio-common/vfprintf.c ++++ glibc-2.14.90-6/stdio-common/vfprintf.c @@ -1161,41 +1161,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) else if (!is_long && spec != L_('S')) \ { \ @@ -3233,8 +3244,8 @@ else \ len = strlen (string); \ } \ ---- glibc-2.14-209-gad69cc2/streams/Makefile -+++ /streams/Makefile +--- glibc-2.14-213-g3ba5751/streams/Makefile ++++ glibc-2.14.90-6/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -3244,8 +3255,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.14-209-gad69cc2/sunrpc/Makefile -+++ /sunrpc/Makefile +--- glibc-2.14-213-g3ba5751/sunrpc/Makefile ++++ glibc-2.14.90-6/sunrpc/Makefile @@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ des_crypt.h) headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ @@ -3266,8 +3277,8 @@ $(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so ---- glibc-2.14-209-gad69cc2/sysdeps/generic/dl-cache.h -+++ /sysdeps/generic/dl-cache.h +--- glibc-2.14-213-g3ba5751/sysdeps/generic/dl-cache.h ++++ glibc-2.14.90-6/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -3283,8 +3294,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.14-209-gad69cc2/sysdeps/i386/Makefile -+++ /sysdeps/i386/Makefile +--- glibc-2.14-213-g3ba5751/sysdeps/i386/Makefile ++++ glibc-2.14.90-6/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -3309,8 +3320,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-209-gad69cc2/sysdeps/i386/__longjmp.S -+++ /sysdeps/i386/__longjmp.S +--- glibc-2.14-213-g3ba5751/sysdeps/i386/__longjmp.S ++++ glibc-2.14.90-6/sysdeps/i386/__longjmp.S @@ -1,5 +1,5 @@ /* longjmp for i386. - Copyright (C) 1995-1998,2000,2002,2005,2006,2009 @@ -3357,8 +3368,8 @@ #endif /* Jump to saved PC. */ jmp *%edx ---- glibc-2.14-209-gad69cc2/sysdeps/i386/bsd-_setjmp.S -+++ /sysdeps/i386/bsd-_setjmp.S +--- glibc-2.14-213-g3ba5751/sysdeps/i386/bsd-_setjmp.S ++++ glibc-2.14.90-6/sysdeps/i386/bsd-_setjmp.S @@ -1,5 +1,6 @@ /* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'. i386 version. - Copyright (C) 1994-1997,2000-2002,2005, 2006 Free Software Foundation, Inc. @@ -3383,8 +3394,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-209-gad69cc2/sysdeps/i386/bsd-setjmp.S -+++ /sysdeps/i386/bsd-setjmp.S +--- glibc-2.14-213-g3ba5751/sysdeps/i386/bsd-setjmp.S ++++ glibc-2.14.90-6/sysdeps/i386/bsd-setjmp.S @@ -1,5 +1,6 @@ /* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. i386 version. - Copyright (C) 1994-1997,2000,2001,2005, 2006 Free Software Foundation, Inc. @@ -3409,8 +3420,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-209-gad69cc2/sysdeps/i386/i686/Makefile -+++ /sysdeps/i386/i686/Makefile +--- glibc-2.14-213-g3ba5751/sysdeps/i386/i686/Makefile ++++ glibc-2.14.90-6/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -3431,8 +3442,8 @@ -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif ---- glibc-2.14-209-gad69cc2/sysdeps/i386/setjmp.S -+++ /sysdeps/i386/setjmp.S +--- glibc-2.14-213-g3ba5751/sysdeps/i386/setjmp.S ++++ glibc-2.14.90-6/sysdeps/i386/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for i386. - Copyright (C) 1995,1996,1997,2000,2001,2005,2006 @@ -3456,8 +3467,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-209-gad69cc2/sysdeps/ia64/Makefile -+++ /sysdeps/ia64/Makefile +--- glibc-2.14-213-g3ba5751/sysdeps/ia64/Makefile ++++ glibc-2.14.90-6/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -3469,8 +3480,8 @@ endif endif ---- glibc-2.14-209-gad69cc2/sysdeps/ia64/ia64libgcc.S -+++ /sysdeps/ia64/ia64libgcc.S +--- glibc-2.14-213-g3ba5751/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.14.90-6/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -3822,8 +3833,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.14-209-gad69cc2/sysdeps/ia64/libgcc-compat.c -+++ /sysdeps/ia64/libgcc-compat.c +--- glibc-2.14-213-g3ba5751/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.14.90-6/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -3909,16 +3920,16 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.14-209-gad69cc2/sysdeps/mach/hurd/getrlimit.c -+++ /sysdeps/mach/hurd/getrlimit.c +--- glibc-2.14-213-g3ba5751/sysdeps/mach/hurd/getrlimit.c ++++ glibc-2.14.90-6/sysdeps/mach/hurd/getrlimit.c @@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) return 0; } +libc_hidden_def (__getrlimit) weak_alias (__getrlimit, getrlimit) ---- glibc-2.14-209-gad69cc2/sysdeps/posix/getaddrinfo.c -+++ /sysdeps/posix/getaddrinfo.c +--- glibc-2.14-213-g3ba5751/sysdeps/posix/getaddrinfo.c ++++ glibc-2.14.90-6/sysdeps/posix/getaddrinfo.c @@ -565,8 +565,8 @@ gaih_inet (const char *name, const struct gaih_service *service, /* If we do not have to look for IPv6 addresses, use @@ -4043,8 +4054,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.14-209-gad69cc2/sysdeps/powerpc/powerpc64/Makefile -+++ /sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.14-213-g3ba5751/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.14.90-6/sysdeps/powerpc/powerpc64/Makefile @@ -33,6 +33,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -4053,16 +4064,16 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-209-gad69cc2/sysdeps/powerpc/powerpc64/elf/Makefile -+++ /sysdeps/powerpc/powerpc64/elf/Makefile +--- glibc-2.14-213-g3ba5751/sysdeps/powerpc/powerpc64/elf/Makefile ++++ glibc-2.14.90-6/sysdeps/powerpc/powerpc64/elf/Makefile @@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-regs) CFLAGS-rtld-memmove.os = $(no-special-regs) CFLAGS-rtld-memchr.os = $(no-special-regs) CFLAGS-rtld-strnlen.os = $(no-special-regs) + +CFLAGS-gmon-start.c = -fno-strict-aliasing ---- glibc-2.14-209-gad69cc2/sysdeps/s390/s390-64/utf16-utf32-z9.c -+++ /sysdeps/s390/s390-64/utf16-utf32-z9.c +--- glibc-2.14-213-g3ba5751/sysdeps/s390/s390-64/utf16-utf32-z9.c ++++ glibc-2.14.90-6/sysdeps/s390/s390-64/utf16-utf32-z9.c @@ -169,10 +169,7 @@ gconv_end (struct __gconv_step *data) register unsigned long long outlen asm("11") = outend - outptr; \ uint64_t cc = 0; \ @@ -4075,8 +4086,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-209-gad69cc2/sysdeps/s390/s390-64/utf8-utf16-z9.c -+++ /sysdeps/s390/s390-64/utf8-utf16-z9.c +--- glibc-2.14-213-g3ba5751/sysdeps/s390/s390-64/utf8-utf16-z9.c ++++ glibc-2.14.90-6/sysdeps/s390/s390-64/utf8-utf16-z9.c @@ -151,10 +151,7 @@ gconv_end (struct __gconv_step *data) register unsigned long long outlen asm("11") = outend - outptr; \ uint64_t cc = 0; \ @@ -4089,8 +4100,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-209-gad69cc2/sysdeps/s390/s390-64/utf8-utf32-z9.c -+++ /sysdeps/s390/s390-64/utf8-utf32-z9.c +--- glibc-2.14-213-g3ba5751/sysdeps/s390/s390-64/utf8-utf32-z9.c ++++ glibc-2.14.90-6/sysdeps/s390/s390-64/utf8-utf32-z9.c @@ -155,10 +155,7 @@ gconv_end (struct __gconv_step *data) register unsigned long long outlen asm("11") = outend - outptr; \ uint64_t cc = 0; \ @@ -4103,8 +4114,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-209-gad69cc2/sysdeps/unix/nice.c -+++ /sysdeps/unix/nice.c +--- glibc-2.14-213-g3ba5751/sysdeps/unix/nice.c ++++ glibc-2.14.90-6/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -4119,8 +4130,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.14-209-gad69cc2/sysdeps/unix/sysv/linux/check_pf.c -+++ /sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.14-213-g3ba5751/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.14.90-6/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -4136,8 +4147,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.14-209-gad69cc2/sysdeps/unix/sysv/linux/futimesat.c -+++ /sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.14-213-g3ba5751/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.14.90-6/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -4180,8 +4191,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.14-209-gad69cc2/sysdeps/unix/sysv/linux/getpagesize.c -+++ /sysdeps/unix/sysv/linux/getpagesize.c +--- glibc-2.14-213-g3ba5751/sysdeps/unix/sysv/linux/getpagesize.c ++++ glibc-2.14.90-6/sysdeps/unix/sysv/linux/getpagesize.c @@ -28,7 +28,7 @@ int __getpagesize () @@ -4191,8 +4202,8 @@ assert (GLRO(dl_pagesize) != 0); return GLRO(dl_pagesize); #else ---- glibc-2.14-209-gad69cc2/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S -+++ /sysdeps/unix/sysv/linux/i386/____longjmp_chk.S +--- glibc-2.14-213-g3ba5751/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S ++++ glibc-2.14.90-6/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S @@ -1,4 +1,5 @@ -/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc. +/* Copyright (C) 2001,2004,2005,2006,2009,2011 @@ -4226,8 +4237,8 @@ + LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx) jmp *%edx END (____longjmp_chk) ---- glibc-2.14-209-gad69cc2/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ /sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.14-213-g3ba5751/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.14.90-6/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. @@ -4288,16 +4299,16 @@ + } while (0) + +#include_next ---- glibc-2.14-209-gad69cc2/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ /sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.14-213-g3ba5751/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ glibc-2.14.90-6/sysdeps/unix/sysv/linux/i386/getrlimit.c @@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) } weak_alias (__new_getrlimit, __getrlimit); +libc_hidden_weak (__getrlimit) versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2); ---- glibc-2.14-209-gad69cc2/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ /sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.14-213-g3ba5751/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.14.90-6/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -4330,29 +4341,29 @@ + } while (0) + #include_next ---- glibc-2.14-209-gad69cc2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ /sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.14-213-g3ba5751/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.14.90-6/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-209-gad69cc2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ /sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.14-213-g3ba5751/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.14.90-6/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-209-gad69cc2/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ /sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.14-213-g3ba5751/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.14.90-6/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.14-209-gad69cc2/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ /sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.14-213-g3ba5751/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.14.90-6/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -4378,8 +4389,8 @@ struct netlink_res { ---- glibc-2.14-209-gad69cc2/sysdeps/unix/sysv/linux/paths.h -+++ /sysdeps/unix/sysv/linux/paths.h +--- glibc-2.14-213-g3ba5751/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.14.90-6/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -4389,8 +4400,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.14-209-gad69cc2/sysdeps/unix/sysv/linux/tcsetattr.c -+++ /sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.14-213-g3ba5751/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.14.90-6/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -4436,8 +4447,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.14-209-gad69cc2/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S -+++ /sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +--- glibc-2.14-213-g3ba5751/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S ++++ glibc-2.14.90-6/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S @@ -19,6 +19,7 @@ #include #include @@ -4464,8 +4475,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (____longjmp_chk) ---- glibc-2.14-209-gad69cc2/sysdeps/x86_64/__longjmp.S -+++ /sysdeps/x86_64/__longjmp.S +--- glibc-2.14-213-g3ba5751/sysdeps/x86_64/__longjmp.S ++++ glibc-2.14.90-6/sysdeps/x86_64/__longjmp.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc. +/* Copyright (C) 2001,2004,2005,2006,2009,2011 Free Software Foundation, Inc. @@ -4495,8 +4506,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (__longjmp) ---- glibc-2.14-209-gad69cc2/sysdeps/x86_64/setjmp.S -+++ /sysdeps/x86_64/setjmp.S +--- glibc-2.14-213-g3ba5751/sysdeps/x86_64/setjmp.S ++++ glibc-2.14.90-6/sysdeps/x86_64/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for x86-64. - Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc. @@ -4520,8 +4531,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%rax) #endif ---- glibc-2.14-209-gad69cc2/timezone/zic.c -+++ /timezone/zic.c +--- glibc-2.14-213-g3ba5751/timezone/zic.c ++++ glibc-2.14.90-6/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 8e191ae..3720bd3 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.14-209-gad69cc2 +%define glibcsrcdir glibc-2.14-213-g3ba5751 %define glibcversion 2.14.90 %define glibcportsdir glibc-ports-2.14-7-g978f13e ### glibc.spec.in follows: @@ -28,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 6 +Release: 7 # 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 @@ -1075,6 +1075,12 @@ rm -f *.filelist* %endif %changelog +* Thu Sep 1 2011 Andreas Schwab - 2.14.90-7 +- Update from master + - Relocate objects in dependency order (#733462) +- Avoid assertion failure when first DNS answer was empty (#730856) +- Don't treat tls_offset == 1 as forced dynamic (#731228) + * Wed Aug 24 2011 Andreas Schwab - 2.14.90-6 - Update from master - Correct cycle detection during dependency sorting diff --git a/sources b/sources index 4f089b0..bb3d222 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -02a726d40df33004688d2b1f0bd94feb glibc-2.14-209-gad69cc2-fedora.tar.xz -a3f20e7d2e05b525aaf62abf30486753 glibc-2.14-209-gad69cc2.tar.xz +16c3101748d555b392b5fce6eb9fc62e glibc-2.14-213-g3ba5751-fedora.tar.xz +38cf77553ff7f11cf6b09910348041ed glibc-2.14-213-g3ba5751.tar.xz de9571b97cdfb83e6c148293b7e51040 glibc-ports-2.14-7-g978f13e.tar.xz