From 33bafa6a65c1f0deaec19385b286f782cd644c46 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 18 May 2011 16:18:54 +0200 Subject: [PATCH] 2.13.90-13 --- .gitignore | 4 +- glibc-fedora.patch | 778 +++++++++++++++++++-------------------------- glibc.spec | 29 +- sources | 4 +- 4 files changed, 349 insertions(+), 466 deletions(-) diff --git a/.gitignore b/.gitignore index 171bad8..ecbeef0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/glibc-2.13-160-g320a5dc-fedora.tar.xz -/glibc-2.13-160-g320a5dc.tar.xz /glibc-ports-2.13-34-gf1d4d4b.tar.xz +/glibc-2.13-200-g0a197a9-fedora.tar.xz +/glibc-2.13-200-g0a197a9.tar.xz diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 0e4b5fa..c80857f 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,9 @@ ---- glibc-2.13-160-g320a5dc/ChangeLog -+++ glibc-2.13.90-12/ChangeLog -@@ -1,3 +1,10 @@ +--- glibc-2.13-200-g0a197a9/ChangeLog ++++ glibc-2.13.90-13/ChangeLog +@@ -172,6 +172,13 @@ + * libio/Makefile (tests): Add bug-fclose1. + * libio/bug-fclose1.c: New file. + +2011-05-13 Andreas Schwab + + * elf/dl-load.c (is_dst): Remove parameter secure, all callers @@ -11,7 +14,7 @@ 2011-05-12 Ulrich Drepper [BZ #12511] -@@ -519,6 +526,31 @@ +@@ -693,6 +700,31 @@ * sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime): Export. @@ -43,7 +46,7 @@ 2011-03-22 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment -@@ -579,6 +611,16 @@ +@@ -753,6 +785,16 @@ $LDFLAGS and -nostdlib -nostartfiles to linking step. Change main to _start. @@ -60,7 +63,7 @@ 2011-03-06 Ulrich Drepper * elf/dl-load.c (_dl_map_object): If we are looking for the first -@@ -615,6 +657,12 @@ +@@ -789,6 +831,12 @@ * sysdeps/sparc/sparc64/multiarch/memset.S(__bzero): Call __bzero_ultra1 instead of __memset_ultra1. @@ -73,7 +76,7 @@ 2011-02-23 Andreas Schwab Ulrich Drepper -@@ -633,12 +681,6 @@ +@@ -807,12 +855,6 @@ * elf/noload.c: Include . (main): Call mtrace. Close all opened handles. @@ -86,7 +89,7 @@ 2011-02-22 Samuel Thibault Fix __if_freereq crash: Unlike the generic version which uses free, -@@ -795,6 +837,12 @@ +@@ -969,6 +1011,12 @@ * shadow/sgetspent.c: Check return value of __sgetspent_r instead of errno. @@ -99,7 +102,7 @@ 2011-01-19 Ulrich Drepper [BZ #11724] -@@ -1482,6 +1530,29 @@ +@@ -1656,6 +1704,29 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid. @@ -129,7 +132,7 @@ 2010-09-24 Petr Baudis * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -2273,6 +2344,32 @@ +@@ -2447,6 +2518,32 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -162,7 +165,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -2325,6 +2422,24 @@ +@@ -2499,6 +2596,24 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -187,8 +190,8 @@ 2010-05-28 Luis Machado * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.13-160-g320a5dc/ChangeLog.15 -+++ glibc-2.13.90-12/ChangeLog.15 +--- glibc-2.13-200-g0a197a9/ChangeLog.15 ++++ glibc-2.13.90-13/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -254,8 +257,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.13-160-g320a5dc/ChangeLog.16 -+++ glibc-2.13.90-12/ChangeLog.16 +--- glibc-2.13-200-g0a197a9/ChangeLog.16 ++++ glibc-2.13.90-13/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -278,39 +281,8 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . -@@ -8922,6 +8930,12 @@ - * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. - (__argp_failure): Likewise. - -+2005-08-08 Jakub Jelinek -+ -+ * sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard): -+ Shift marked &errno down on big-endian instead of up. -+ * elf/tst-stackguard1.c (do_test): Fix a typo. -+ - 2005-08-08 Ulrich Drepper - - * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -9046,6 +9060,17 @@ - __syslog_chk. - * misc/Versions: Export __syslog_chk and __vsyslog_chk. - -+2005-07-29 Jakub Jelinek -+ -+ * sysdeps/unix/sysv/linux/dl-osinfo.h: Include errno.h, hp-timing.h, -+ endian.h. -+ (_dl_setup_stack_chk_guard): Even without -+ --enable-stackguard-randomization attempt to do some guard -+ randomization using hp-timing (if available) and kernel stack and -+ mmap randomization. -+ * elf/tst-stackguard1.c (do_test): Don't fail if the poor man's -+ randomization doesn't work well enough. -+ - 2005-07-28 Thomas Schwinge - - [BZ #1137] ---- glibc-2.13-160-g320a5dc/ChangeLog.17 -+++ glibc-2.13.90-12/ChangeLog.17 +--- glibc-2.13-200-g0a197a9/ChangeLog.17 ++++ glibc-2.13.90-13/ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -389,8 +361,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.13-160-g320a5dc/Makeconfig -+++ glibc-2.13.90-12/Makeconfig +--- glibc-2.13-200-g0a197a9/Makeconfig ++++ glibc-2.13.90-13/Makeconfig @@ -785,12 +785,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -407,11 +379,11 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.13-160-g320a5dc/NEWS -+++ glibc-2.13.90-12/NEWS -@@ -15,16 +15,6 @@ Version 2.14 - 12551, 12583, 12587, 12597, 12611, 12625, 12631, 12650, 12653, 12655, - 12660, 12681, 12685, 12711, 12713, 12714, 12717, 12723, 12734, 12738 +--- glibc-2.13-200-g0a197a9/NEWS ++++ glibc-2.13.90-13/NEWS +@@ -18,16 +18,6 @@ Version 2.14 + 12653, 12655, 12660, 12681, 12685, 12711, 12713, 12714, 12717, 12723, + 12724, 12734, 12738, 12746, 12766 -* The RPC implementation in libc is obsoleted. Old programs keep working - but new programs cannot be linked with the routines in libc anymore. @@ -426,8 +398,8 @@ * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at, syncfs ---- glibc-2.13-160-g320a5dc/config.h.in -+++ glibc-2.13.90-12/config.h.in +--- glibc-2.13-200-g0a197a9/config.h.in ++++ glibc-2.13.90-13/config.h.in @@ -204,6 +204,9 @@ /* Define if `.ctors' and `.dtors' sections shouldn't be used. */ #undef NO_CTORS_DTORS_SECTIONS @@ -438,8 +410,8 @@ /* */ ---- glibc-2.13-160-g320a5dc/configure -+++ glibc-2.13.90-12/configure +--- glibc-2.13-200-g0a197a9/configure ++++ glibc-2.13.90-13/configure @@ -784,6 +784,7 @@ enable_all_warnings enable_multi_arch enable_experimental_malloc @@ -508,8 +480,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.13-160-g320a5dc/configure.in -+++ glibc-2.13.90-12/configure.in +--- glibc-2.13-200-g0a197a9/configure.in ++++ glibc-2.13.90-13/configure.in @@ -316,6 +316,29 @@ else fi AC_SUBST(libc_cv_nss_crypt) @@ -540,8 +512,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.13-160-g320a5dc/csu/Makefile -+++ glibc-2.13.90-12/csu/Makefile +--- glibc-2.13-200-g0a197a9/csu/Makefile ++++ glibc-2.13.90-13/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -552,8 +524,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.13-160-g320a5dc/csu/elf-init.c -+++ glibc-2.13.90-12/csu/elf-init.c +--- glibc-2.13-200-g0a197a9/csu/elf-init.c ++++ glibc-2.13.90-13/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; @@ -578,8 +550,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.13-160-g320a5dc/debug/tst-chk1.c -+++ glibc-2.13.90-12/debug/tst-chk1.c +--- glibc-2.13-200-g0a197a9/debug/tst-chk1.c ++++ glibc-2.13.90-13/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -608,9 +580,9 @@ # define O 0 # else # define O 1 ---- glibc-2.13-160-g320a5dc/elf/Makefile -+++ glibc-2.13.90-12/elf/Makefile -@@ -89,6 +89,7 @@ distribute := rtld-Rules \ +--- glibc-2.13-200-g0a197a9/elf/Makefile ++++ glibc-2.13.90-13/elf/Makefile +@@ -90,6 +90,7 @@ distribute := rtld-Rules \ unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ unload6mod1.c unload6mod2.c unload6mod3.c \ unload7mod1.c unload7mod2.c \ @@ -618,7 +590,7 @@ tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \ tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \ tst-auditmod4a.c tst-auditmod4b.c \ -@@ -132,6 +133,7 @@ include ../Makeconfig +@@ -133,6 +134,7 @@ include ../Makeconfig ifeq ($(unwind-find-fde),yes) routines += unwind-dw2-fde-glibc shared-only-routines += unwind-dw2-fde-glibc @@ -626,7 +598,7 @@ endif before-compile = $(objpfx)trusted-dirs.h -@@ -198,7 +200,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ +@@ -199,7 +201,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \ tst-dlmodcount tst-dlopenrpath tst-deep1 \ tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ @@ -635,7 +607,7 @@ tst-audit1 tst-audit2 \ tst-stackguard1 tst-addr1 tst-thrlock \ tst-unique1 tst-unique2 tst-unique3 tst-unique4 \ -@@ -255,6 +257,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ +@@ -254,6 +256,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ unload4mod1 unload4mod2 unload4mod3 unload4mod4 \ unload6mod1 unload6mod2 unload6mod3 \ unload7mod1 unload7mod2 \ @@ -643,7 +615,7 @@ order2mod1 order2mod2 order2mod3 order2mod4 \ tst-unique1mod1 tst-unique1mod2 \ tst-unique2mod1 tst-unique2mod2 \ -@@ -477,7 +480,8 @@ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ +@@ -475,7 +478,8 @@ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) CFLAGS-cache.c = $(SYSCONF-FLAGS) @@ -663,7 +635,7 @@ $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so -@@ -853,6 +860,9 @@ $(objpfx)unload7: $(libdl) +@@ -856,6 +863,9 @@ $(objpfx)unload7: $(libdl) $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so unload7-ENV = MALLOC_PERTURB_=85 @@ -673,15 +645,8 @@ ifdef libdl $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so ---- glibc-2.13-160-g320a5dc/elf/dl-close.c -+++ glibc-2.13.90-12/elf/dl-close.c -@@ -1,5 +1,5 @@ - /* Close a shared object opened by `_dl_open'. -- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or +--- glibc-2.13-200-g0a197a9/elf/dl-close.c ++++ glibc-2.13.90-13/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) @@ -716,8 +681,8 @@ /* The loader is gone, so mark the object as not having one. Note: l_idx != IDX_STILL_USED -> object will be removed. */ ---- glibc-2.13-160-g320a5dc/elf/dl-deps.c -+++ glibc-2.13.90-12/elf/dl-deps.c +--- glibc-2.13-200-g0a197a9/elf/dl-deps.c ++++ glibc-2.13.90-13/elf/dl-deps.c @@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, nneeded * sizeof needed[0]); atomic_write_barrier (); @@ -855,8 +820,8 @@ + _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, + NULL, errstring); } ---- glibc-2.13-160-g320a5dc/elf/dl-init.c -+++ glibc-2.13.90-12/elf/dl-init.c +--- glibc-2.13-200-g0a197a9/elf/dl-init.c ++++ glibc-2.13.90-13/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -879,8 +844,8 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.13-160-g320a5dc/elf/dl-libc.c -+++ glibc-2.13.90-12/elf/dl-libc.c +--- glibc-2.13-200-g0a197a9/elf/dl-libc.c ++++ glibc-2.13.90-13/elf/dl-libc.c @@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) @@ -907,8 +872,8 @@ } if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 ---- glibc-2.13-160-g320a5dc/elf/dl-load.c -+++ glibc-2.13.90-12/elf/dl-load.c +--- glibc-2.13-200-g0a197a9/elf/dl-load.c ++++ glibc-2.13.90-13/elf/dl-load.c @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len) @@ -988,8 +953,8 @@ } else /* No DST we recognize. */ ---- glibc-2.13-160-g320a5dc/elf/dl-support.c -+++ glibc-2.13.90-12/elf/dl-support.c +--- glibc-2.13-200-g0a197a9/elf/dl-support.c ++++ glibc-2.13.90-13/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; @@ -1001,8 +966,8 @@ /* Random data provided by the kernel. */ void *_dl_random; ---- glibc-2.13-160-g320a5dc/elf/ldconfig.c -+++ glibc-2.13.90-12/elf/ldconfig.c +--- glibc-2.13-200-g0a197a9/elf/ldconfig.c ++++ glibc-2.13.90-13/elf/ldconfig.c @@ -1034,17 +1034,19 @@ search_dirs (void) @@ -1084,8 +1049,8 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.13-160-g320a5dc/elf/ldd.bash.in -+++ glibc-2.13.90-12/elf/ldd.bash.in +--- glibc-2.13-200-g0a197a9/elf/ldd.bash.in ++++ glibc-2.13.90-13/elf/ldd.bash.in @@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2 fi done @@ -1114,8 +1079,8 @@ try_trace "$RTLD" "$file" || result=1 ;; *) ---- glibc-2.13-160-g320a5dc/elf/rtld-Rules -+++ glibc-2.13.90-12/elf/rtld-Rules +--- glibc-2.13-200-g0a197a9/elf/rtld-Rules ++++ glibc-2.13.90-13/elf/rtld-Rules @@ -1,7 +1,7 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker. @@ -1133,8 +1098,8 @@ +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld endif ---- glibc-2.13-160-g320a5dc/elf/rtld.c -+++ glibc-2.13.90-12/elf/rtld.c +--- glibc-2.13-200-g0a197a9/elf/rtld.c ++++ glibc-2.13.90-13/elf/rtld.c @@ -107,7 +107,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -1178,34 +1143,8 @@ if (! prelinked && rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. ---- glibc-2.13-160-g320a5dc/elf/tst-stackguard1.c -+++ glibc-2.13.90-12/elf/tst-stackguard1.c -@@ -160,17 +160,21 @@ do_test (void) - the 16 runs, something is very wrong. */ - int ndifferences = 0; - int ndefaults = 0; -+ int npartlyrandomized = 0; - for (i = 0; i < N; ++i) - { - if (child_stack_chk_guards[i] != child_stack_chk_guards[i+1]) - ndifferences++; - else if (child_stack_chk_guards[i] == default_guard) - ndefaults++; -+ else if (*(char *) &child_stack_chk_guards[i] == 0) -+ npartlyrandomized++; - } - -- printf ("differences %d defaults %d\n", ndifferences, ndefaults); -+ printf ("differences %d defaults %d partly randomized %d\n", -+ ndifferences, ndefaults, npartlyrandomized); - -- if (ndifferences < N / 2 && ndefaults < N / 2) -+ if ((ndifferences + ndefaults + npartlyrandomized) < 3 * N / 4) - { - puts ("stack guard canaries are not randomized enough"); - puts ("nor equal to the default canary value"); ---- glibc-2.13-160-g320a5dc/elf/unload8.c -+++ glibc-2.13.90-12/elf/unload8.c +--- glibc-2.13-200-g0a197a9/elf/unload8.c ++++ glibc-2.13.90-13/elf/unload8.c @@ -0,0 +1,33 @@ +#include +#include @@ -1240,8 +1179,8 @@ + + return 0; +} ---- glibc-2.13-160-g320a5dc/elf/unload8mod1.c -+++ glibc-2.13.90-12/elf/unload8mod1.c +--- glibc-2.13-200-g0a197a9/elf/unload8mod1.c ++++ glibc-2.13.90-13/elf/unload8mod1.c @@ -0,0 +1,7 @@ +extern void mod2 (void); + @@ -1250,12 +1189,12 @@ +{ + mod2 (); +} ---- glibc-2.13-160-g320a5dc/elf/unload8mod1x.c -+++ glibc-2.13.90-12/elf/unload8mod1x.c +--- glibc-2.13-200-g0a197a9/elf/unload8mod1x.c ++++ glibc-2.13.90-13/elf/unload8mod1x.c @@ -0,0 +1 @@ +int mod1x; ---- glibc-2.13-160-g320a5dc/elf/unload8mod2.c -+++ glibc-2.13.90-12/elf/unload8mod2.c +--- glibc-2.13-200-g0a197a9/elf/unload8mod2.c ++++ glibc-2.13.90-13/elf/unload8mod2.c @@ -0,0 +1,7 @@ +extern void mod3 (void); + @@ -1264,8 +1203,8 @@ +{ + mod3 (); +} ---- glibc-2.13-160-g320a5dc/elf/unload8mod3.c -+++ glibc-2.13.90-12/elf/unload8mod3.c +--- glibc-2.13-200-g0a197a9/elf/unload8mod3.c ++++ glibc-2.13.90-13/elf/unload8mod3.c @@ -0,0 +1,27 @@ +#include +#include @@ -1294,24 +1233,24 @@ + + atexit (mod3_fini); +} ---- glibc-2.13-160-g320a5dc/extra-lib.mk -+++ glibc-2.13.90-12/extra-lib.mk +--- glibc-2.13-200-g0a197a9/extra-lib.mk ++++ glibc-2.13.90-13/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.13-160-g320a5dc/include/bits/stdlib-ldbl.h -+++ glibc-2.13.90-12/include/bits/stdlib-ldbl.h +--- glibc-2.13-200-g0a197a9/include/bits/stdlib-ldbl.h ++++ glibc-2.13.90-13/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.13-160-g320a5dc/include/bits/wchar-ldbl.h -+++ glibc-2.13.90-12/include/bits/wchar-ldbl.h +--- glibc-2.13-200-g0a197a9/include/bits/wchar-ldbl.h ++++ glibc-2.13.90-13/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.13-160-g320a5dc/include/features.h -+++ glibc-2.13.90-12/include/features.h +--- glibc-2.13-200-g0a197a9/include/features.h ++++ glibc-2.13.90-13/include/features.h @@ -310,8 +310,13 @@ #endif @@ -1328,8 +1267,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.13-160-g320a5dc/include/libc-symbols.h -+++ glibc-2.13.90-12/include/libc-symbols.h +--- glibc-2.13-200-g0a197a9/include/libc-symbols.h ++++ glibc-2.13.90-13/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) @@ -1339,8 +1278,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.13-160-g320a5dc/include/link.h -+++ glibc-2.13.90-12/include/link.h +--- glibc-2.13-200-g0a197a9/include/link.h ++++ glibc-2.13.90-13/include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. @@ -1369,8 +1308,8 @@ /* List of the dependencies introduced through symbol binding. */ struct link_map_reldeps ---- glibc-2.13-160-g320a5dc/include/stap-probe.h -+++ glibc-2.13.90-12/include/stap-probe.h +--- glibc-2.13-200-g0a197a9/include/stap-probe.h ++++ glibc-2.13.90-13/include/stap-probe.h @@ -0,0 +1,140 @@ +/* Macros for defining Systemtap static probe points. + Copyright (C) 2011 Free Software Foundation, Inc. @@ -1512,16 +1451,16 @@ +#endif /* USE_STAP_PROBE. */ + +#endif /* stap-probe.h */ ---- glibc-2.13-160-g320a5dc/include/sys/resource.h -+++ glibc-2.13.90-12/include/sys/resource.h +--- glibc-2.13-200-g0a197a9/include/sys/resource.h ++++ glibc-2.13.90-13/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.13-160-g320a5dc/inet/Makefile -+++ glibc-2.13.90-12/inet/Makefile +--- glibc-2.13-200-g0a197a9/inet/Makefile ++++ glibc-2.13.90-13/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -1531,8 +1470,8 @@ ifeq ($(have-thread-library),yes) CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions ---- glibc-2.13-160-g320a5dc/intl/locale.alias -+++ glibc-2.13.90-12/intl/locale.alias +--- glibc-2.13-200-g0a197a9/intl/locale.alias ++++ glibc-2.13.90-13/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -1542,8 +1481,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.13-160-g320a5dc/libio/stdio.h -+++ glibc-2.13.90-12/libio/stdio.h +--- glibc-2.13-200-g0a197a9/libio/stdio.h ++++ glibc-2.13.90-13/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. */ @@ -1557,8 +1496,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.13-160-g320a5dc/locale/iso-4217.def -+++ glibc-2.13.90-12/locale/iso-4217.def +--- glibc-2.13-200-g0a197a9/locale/iso-4217.def ++++ glibc-2.13.90-13/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1650,8 +1589,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.13-160-g320a5dc/locale/programs/locarchive.c -+++ glibc-2.13.90-12/locale/programs/locarchive.c +--- glibc-2.13-200-g0a197a9/locale/programs/locarchive.c ++++ glibc-2.13.90-13/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; @@ -1710,8 +1649,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.13-160-g320a5dc/localedata/Makefile -+++ glibc-2.13.90-12/localedata/Makefile +--- glibc-2.13-200-g0a197a9/localedata/Makefile ++++ glibc-2.13.90-13/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1720,8 +1659,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.13-160-g320a5dc/localedata/SUPPORTED -+++ glibc-2.13.90-12/localedata/SUPPORTED +--- glibc-2.13-200-g0a197a9/localedata/SUPPORTED ++++ glibc-2.13.90-13/localedata/SUPPORTED @@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1763,8 +1702,8 @@ sw_KE/UTF-8 \ sw_TZ/UTF-8 \ ta_IN/UTF-8 \ ---- glibc-2.13-160-g320a5dc/localedata/locales/cy_GB -+++ glibc-2.13.90-12/localedata/locales/cy_GB +--- glibc-2.13-200-g0a197a9/localedata/locales/cy_GB ++++ glibc-2.13.90-13/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1779,8 +1718,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.13-160-g320a5dc/localedata/locales/en_GB -+++ glibc-2.13.90-12/localedata/locales/en_GB +--- glibc-2.13-200-g0a197a9/localedata/locales/en_GB ++++ glibc-2.13.90-13/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1792,8 +1731,8 @@ date_fmt "/ / " ---- glibc-2.13-160-g320a5dc/localedata/locales/no_NO -+++ glibc-2.13.90-12/localedata/locales/no_NO +--- glibc-2.13-200-g0a197a9/localedata/locales/no_NO ++++ glibc-2.13.90-13/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1864,8 +1803,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.13-160-g320a5dc/localedata/locales/zh_TW -+++ glibc-2.13.90-12/localedata/locales/zh_TW +--- glibc-2.13-200-g0a197a9/localedata/locales/zh_TW ++++ glibc-2.13.90-13/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1893,8 +1832,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.13-160-g320a5dc/login/programs/pt_chown.c -+++ glibc-2.13.90-12/login/programs/pt_chown.c +--- glibc-2.13-200-g0a197a9/login/programs/pt_chown.c ++++ glibc-2.13.90-13/login/programs/pt_chown.c @@ -29,6 +29,7 @@ #include #include @@ -1936,8 +1875,8 @@ - return EXIT_SUCCESS; } ---- glibc-2.13-160-g320a5dc/malloc/mcheck.c -+++ glibc-2.13.90-12/malloc/mcheck.c +--- glibc-2.13-200-g0a197a9/malloc/mcheck.c ++++ glibc-2.13.90-13/malloc/mcheck.c @@ -25,10 +25,26 @@ # include # include @@ -2014,8 +1953,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.13-160-g320a5dc/manual/libc.texinfo -+++ glibc-2.13.90-12/manual/libc.texinfo +--- glibc-2.13-200-g0a197a9/manual/libc.texinfo ++++ glibc-2.13.90-13/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -2025,8 +1964,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.13-160-g320a5dc/misc/sys/cdefs.h -+++ glibc-2.13.90-12/misc/sys/cdefs.h +--- glibc-2.13-200-g0a197a9/misc/sys/cdefs.h ++++ glibc-2.13.90-13/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) @@ -2070,8 +2009,20 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.13-160-g320a5dc/nis/Makefile -+++ glibc-2.13.90-12/nis/Makefile +--- glibc-2.13-200-g0a197a9/nis/Makefile ++++ glibc-2.13.90-13/nis/Makefile +@@ -23,9 +23,9 @@ subdir := nis + + aux := nis_hash + ++headers := $(wildcard rpcsvc/*.[hx]) + distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ +- nisplus-parser.h nis_xdr.h nss \ +- $(wildcard rpcsvc/*.[hx]) ++ nisplus-parser.h nis_xdr.h nss + + # These are the databases available for the nis (and perhaps later nisplus) + # service. This must be a superset of the services in nss. @@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes)) include ../Rules @@ -2081,8 +2032,8 @@ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ ---- glibc-2.13-160-g320a5dc/nis/nss -+++ glibc-2.13.90-12/nis/nss +--- glibc-2.13-200-g0a197a9/nis/nss ++++ glibc-2.13.90-13/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 @@ -2092,8 +2043,8 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.13-160-g320a5dc/nptl/ChangeLog -+++ glibc-2.13.90-12/nptl/ChangeLog +--- glibc-2.13-200-g0a197a9/nptl/ChangeLog ++++ glibc-2.13.90-13/nptl/ChangeLog @@ -10,6 +10,51 @@ clearing memory. Patch partly by Robert Rex . @@ -2146,23 +2097,7 @@ 2011-01-19 Roland McGrath * pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo. -@@ -4003,6 +4048,15 @@ - Use __sigfillset. Document that sigfillset does the right thing wrt - to SIGSETXID. - -+2005-08-08 Jakub Jelinek -+ -+ * tst-stackguard1.c (do_test): Likewise. -+ -+2005-07-29 Jakub Jelinek -+ -+ * tst-stackguard1.c (do_test): Don't fail if the poor man's -+ randomization doesn't work well enough. -+ - 2005-07-11 Jakub Jelinek - - [BZ #1102] -@@ -4739,6 +4793,11 @@ +@@ -4739,6 +4784,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -2174,7 +2109,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6813,6 +6872,11 @@ +@@ -6813,6 +6863,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -2186,8 +2121,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.13-160-g320a5dc/nptl/DESIGN-systemtap-probes.txt -+++ glibc-2.13.90-12/nptl/DESIGN-systemtap-probes.txt +--- glibc-2.13-200-g0a197a9/nptl/DESIGN-systemtap-probes.txt ++++ glibc-2.13.90-13/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. @@ -2278,8 +2213,8 @@ + arg1 = condition +cond_broadcast - probe for pthread_cond_broadcast + arg1 = condition ---- glibc-2.13-160-g320a5dc/nptl/Makefile -+++ glibc-2.13.90-12/nptl/Makefile +--- glibc-2.13-200-g0a197a9/nptl/Makefile ++++ glibc-2.13.90-13/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -2312,8 +2247,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.13-160-g320a5dc/nptl/Versions -+++ glibc-2.13.90-12/nptl/Versions +--- glibc-2.13-200-g0a197a9/nptl/Versions ++++ glibc-2.13.90-13/nptl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; # Internal libc interface to libpthread @@ -2322,8 +2257,8 @@ } } ---- glibc-2.13-160-g320a5dc/nptl/allocatestack.c -+++ glibc-2.13.90-12/nptl/allocatestack.c +--- glibc-2.13-200-g0a197a9/nptl/allocatestack.c ++++ glibc-2.13.90-13/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. */ @@ -2342,8 +2277,8 @@ } while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling, ch | SETXID_BITMASK, ch)); ---- glibc-2.13-160-g320a5dc/nptl/nptl-init.c -+++ glibc-2.13.90-12/nptl/nptl-init.c +--- glibc-2.13-200-g0a197a9/nptl/nptl-init.c ++++ glibc-2.13.90-13/nptl/nptl-init.c @@ -396,7 +396,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. */ @@ -2353,8 +2288,8 @@ || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ ---- glibc-2.13-160-g320a5dc/nptl/pthread_cond_broadcast.c -+++ glibc-2.13.90-12/nptl/pthread_cond_broadcast.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_cond_broadcast.c ++++ glibc-2.13.90-13/nptl/pthread_cond_broadcast.c @@ -23,6 +23,7 @@ #include #include @@ -2372,8 +2307,8 @@ int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; /* Make sure we are alone. */ ---- glibc-2.13-160-g320a5dc/nptl/pthread_cond_destroy.c -+++ glibc-2.13.90-12/nptl/pthread_cond_destroy.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_cond_destroy.c ++++ glibc-2.13.90-13/nptl/pthread_cond_destroy.c @@ -20,6 +20,7 @@ #include #include @@ -2391,8 +2326,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.13-160-g320a5dc/nptl/pthread_cond_init.c -+++ glibc-2.13.90-12/nptl/pthread_cond_init.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_cond_init.c ++++ glibc-2.13.90-13/nptl/pthread_cond_init.c @@ -20,6 +20,7 @@ #include @@ -2410,8 +2345,8 @@ return 0; } versioned_symbol (libpthread, __pthread_cond_init, ---- glibc-2.13-160-g320a5dc/nptl/pthread_cond_signal.c -+++ glibc-2.13.90-12/nptl/pthread_cond_signal.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_cond_signal.c ++++ glibc-2.13.90-13/nptl/pthread_cond_signal.c @@ -26,6 +26,7 @@ #include @@ -2429,8 +2364,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.13-160-g320a5dc/nptl/pthread_cond_wait.c -+++ glibc-2.13.90-12/nptl/pthread_cond_wait.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_cond_wait.c ++++ glibc-2.13.90-13/nptl/pthread_cond_wait.c @@ -25,6 +25,7 @@ #include @@ -2448,8 +2383,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.13-160-g320a5dc/nptl/pthread_create.c -+++ glibc-2.13.90-12/nptl/pthread_create.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_create.c ++++ glibc-2.13.90-13/nptl/pthread_create.c @@ -31,6 +31,8 @@ #include @@ -2477,8 +2412,8 @@ /* Start the thread. */ return create_thread (pd, iattr, STACK_VARIABLES_ARGS); } ---- glibc-2.13-160-g320a5dc/nptl/pthread_join.c -+++ glibc-2.13.90-12/nptl/pthread_join.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_join.c ++++ glibc-2.13.90-13/nptl/pthread_join.c @@ -23,6 +23,8 @@ #include #include "pthreadP.h" @@ -2505,8 +2440,8 @@ + return result; } ---- glibc-2.13-160-g320a5dc/nptl/pthread_mutex_destroy.c -+++ glibc-2.13.90-12/nptl/pthread_mutex_destroy.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_mutex_destroy.c ++++ glibc-2.13.90-13/nptl/pthread_mutex_destroy.c @@ -20,11 +20,15 @@ #include #include "pthreadP.h" @@ -2523,8 +2458,8 @@ if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0 && mutex->__data.__nusers != 0) return EBUSY; ---- glibc-2.13-160-g320a5dc/nptl/pthread_mutex_init.c -+++ glibc-2.13.90-12/nptl/pthread_mutex_init.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_mutex_init.c ++++ glibc-2.13.90-13/nptl/pthread_mutex_init.c @@ -24,6 +24,8 @@ #include #include "pthreadP.h" @@ -2543,8 +2478,8 @@ return 0; } strong_alias (__pthread_mutex_init, pthread_mutex_init) ---- glibc-2.13-160-g320a5dc/nptl/pthread_mutex_lock.c -+++ glibc-2.13.90-12/nptl/pthread_mutex_lock.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_mutex_lock.c ++++ glibc-2.13.90-13/nptl/pthread_mutex_lock.c @@ -24,6 +24,7 @@ #include #include "pthreadP.h" @@ -2581,8 +2516,8 @@ return 0; } #ifndef __pthread_mutex_lock ---- glibc-2.13-160-g320a5dc/nptl/pthread_mutex_timedlock.c -+++ glibc-2.13.90-12/nptl/pthread_mutex_timedlock.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_mutex_timedlock.c ++++ glibc-2.13.90-13/nptl/pthread_mutex_timedlock.c @@ -24,6 +24,8 @@ #include #include @@ -2637,8 +2572,8 @@ } out: ---- glibc-2.13-160-g320a5dc/nptl/pthread_mutex_unlock.c -+++ glibc-2.13.90-12/nptl/pthread_mutex_unlock.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_mutex_unlock.c ++++ glibc-2.13.90-13/nptl/pthread_mutex_unlock.c @@ -22,6 +22,7 @@ #include #include "pthreadP.h" @@ -2675,8 +2610,8 @@ return 0; } ---- glibc-2.13-160-g320a5dc/nptl/pthread_rwlock_destroy.c -+++ glibc-2.13.90-12/nptl/pthread_rwlock_destroy.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_rwlock_destroy.c ++++ glibc-2.13.90-13/nptl/pthread_rwlock_destroy.c @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -2693,8 +2628,8 @@ /* Nothing to be done. For now. */ return 0; } ---- glibc-2.13-160-g320a5dc/nptl/pthread_rwlock_rdlock.c -+++ glibc-2.13.90-12/nptl/pthread_rwlock_rdlock.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_rwlock_rdlock.c ++++ glibc-2.13.90-13/nptl/pthread_rwlock_rdlock.c @@ -22,6 +22,7 @@ #include #include @@ -2721,8 +2656,8 @@ break; } ---- glibc-2.13-160-g320a5dc/nptl/pthread_rwlock_unlock.c -+++ glibc-2.13.90-12/nptl/pthread_rwlock_unlock.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_rwlock_unlock.c ++++ glibc-2.13.90-13/nptl/pthread_rwlock_unlock.c @@ -22,11 +22,14 @@ #include #include @@ -2738,8 +2673,8 @@ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); if (rwlock->__data.__writer) rwlock->__data.__writer = 0; ---- glibc-2.13-160-g320a5dc/nptl/pthread_rwlock_wrlock.c -+++ glibc-2.13.90-12/nptl/pthread_rwlock_wrlock.c +--- glibc-2.13-200-g0a197a9/nptl/pthread_rwlock_wrlock.c ++++ glibc-2.13.90-13/nptl/pthread_rwlock_wrlock.c @@ -22,6 +22,7 @@ #include #include @@ -2766,8 +2701,8 @@ break; } ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.13.90-13/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 @@ -2776,8 +2711,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/i386/Versions +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -2785,8 +2720,8 @@ + __uname; + } +} ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2806,8 +2741,8 @@ ENTER_KERNEL 2: movl %edx, %eax ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S @@ -24,6 +24,7 @@ #include #include @@ -2825,8 +2760,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S @@ -24,7 +24,7 @@ #include #include @@ -2845,8 +2780,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S @@ -24,7 +24,7 @@ #include #include @@ -2865,8 +2800,8 @@ cmpl $1000000000, 4(%ebp) movl $EINVAL, %eax jae 18f ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S @@ -25,6 +25,7 @@ #include #include @@ -2884,8 +2819,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S @@ -23,6 +23,7 @@ #include #include @@ -2903,8 +2838,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S @@ -23,6 +23,7 @@ #include #include @@ -2922,8 +2857,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2941,8 +2876,8 @@ __asm __volatile (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -2952,8 +2887,8 @@ cp = u.uts.version; else { ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -2961,8 +2896,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2992,8 +2927,8 @@ syscall 2: movl %edx, %eax ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -3011,8 +2946,8 @@ __asm __volatile ("syscall" \ : "=a" (__ignore) \ : "0" (SYS_futex), "D" (futex), \ ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S @@ -25,7 +25,7 @@ #include #include @@ -3031,8 +2966,8 @@ /* Get internal lock. */ movl $1, %esi xorl %eax, %eax ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S @@ -24,6 +24,7 @@ #include #include @@ -3050,8 +2985,8 @@ /* Get internal lock. */ movq %rdi, %r8 movl $1, %esi ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -23,6 +23,7 @@ #include #include @@ -3069,8 +3004,8 @@ cmpq $1000000000, 8(%rdx) movl $EINVAL, %eax jae 48f ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S @@ -23,6 +23,7 @@ #include #include @@ -3088,8 +3023,8 @@ cmpq $-1, dep_mutex(%rdi) /* Prepare structure passed to cancellation handler. */ ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S @@ -22,7 +22,7 @@ #include #include @@ -3109,8 +3044,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.13-160-g320a5dc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S -+++ glibc-2.13.90-12/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S +--- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S ++++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S @@ -22,7 +22,7 @@ #include #include @@ -3130,34 +3065,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.13-160-g320a5dc/nptl/tst-stackguard1.c -+++ glibc-2.13.90-12/nptl/tst-stackguard1.c -@@ -190,17 +190,21 @@ do_test (void) - the 16 runs, something is very wrong. */ - int ndifferences = 0; - int ndefaults = 0; -+ int npartlyrandomized = 0; - for (i = 0; i < N; ++i) - { - if (child_stack_chk_guards[i] != child_stack_chk_guards[i+1]) - ndifferences++; - else if (child_stack_chk_guards[i] == default_guard) - ndefaults++; -+ else if (*(char *) &child_stack_chk_guards[i] == 0) -+ npartlyrandomized++; - } - -- printf ("differences %d defaults %d\n", ndifferences, ndefaults); -+ printf ("differences %d defaults %d partly randomized %d\n", -+ ndifferences, ndefaults, npartlyrandomized); - -- if (ndifferences < N / 2 && ndefaults < N / 2) -+ if ((ndifferences + ndefaults + npartlyrandomized) < 3 * N / 4) - { - puts ("stack guard canaries are not randomized enough"); - puts ("nor equal to the default canary value"); ---- glibc-2.13-160-g320a5dc/nscd/nscd.conf -+++ glibc-2.13.90-12/nscd/nscd.conf +--- glibc-2.13-200-g0a197a9/nscd/nscd.conf ++++ glibc-2.13.90-13/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -3167,8 +3076,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.13-160-g320a5dc/nscd/nscd.init -+++ glibc-2.13.90-12/nscd/nscd.init +--- glibc-2.13-200-g0a197a9/nscd/nscd.init ++++ glibc-2.13.90-13/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -3245,8 +3154,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.13-160-g320a5dc/nss/Makefile -+++ glibc-2.13.90-12/nss/Makefile +--- glibc-2.13-200-g0a197a9/nss/Makefile ++++ glibc-2.13.90-13/nss/Makefile @@ -75,6 +75,7 @@ endif include ../Rules @@ -3255,8 +3164,8 @@ ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a ---- glibc-2.13-160-g320a5dc/nss/nss_files/files-XXX.c -+++ glibc-2.13.90-12/nss/nss_files/files-XXX.c +--- glibc-2.13-200-g0a197a9/nss/nss_files/files-XXX.c ++++ glibc-2.13.90-13/nss/nss_files/files-XXX.c @@ -1,5 +1,5 @@ /* Common code for file-based databases in nss_files module. - Copyright (C) 1996-1999,2001,2002,2004,2007,2008 @@ -3273,8 +3182,8 @@ int parse_result; if (buflen < sizeof *data + 2) ---- glibc-2.13-160-g320a5dc/posix/Makefile -+++ glibc-2.13.90-12/posix/Makefile +--- glibc-2.13-200-g0a197a9/posix/Makefile ++++ glibc-2.13.90-13/posix/Makefile @@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -3295,8 +3204,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.13-160-g320a5dc/posix/gai.conf -+++ glibc-2.13.90-12/posix/gai.conf +--- glibc-2.13-200-g0a197a9/posix/gai.conf ++++ glibc-2.13.90-13/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -3321,8 +3230,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.13-160-g320a5dc/posix/getconf.speclist.h -+++ glibc-2.13.90-12/posix/getconf.speclist.h +--- glibc-2.13-200-g0a197a9/posix/getconf.speclist.h ++++ glibc-2.13.90-13/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -3363,8 +3272,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.13-160-g320a5dc/posix/regcomp.c -+++ glibc-2.13.90-12/posix/regcomp.c +--- glibc-2.13-200-g0a197a9/posix/regcomp.c ++++ glibc-2.13.90-13/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. @@ -3496,8 +3405,8 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.13-160-g320a5dc/resolv/Makefile -+++ glibc-2.13.90-12/resolv/Makefile +--- glibc-2.13-200-g0a197a9/resolv/Makefile ++++ glibc-2.13.90-13/resolv/Makefile @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \ -Dgetnetbyaddr=res_getnetbyaddr @@ -3506,8 +3415,8 @@ # The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings ---- glibc-2.13-160-g320a5dc/resource/getrlimit.c -+++ glibc-2.13.90-12/resource/getrlimit.c +--- glibc-2.13-200-g0a197a9/resource/getrlimit.c ++++ glibc-2.13.90-13/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -3516,8 +3425,8 @@ weak_alias (__getrlimit, getrlimit) stub_warning (getrlimit) ---- glibc-2.13-160-g320a5dc/scripts/check-local-headers.sh -+++ glibc-2.13.90-12/scripts/check-local-headers.sh +--- glibc-2.13-200-g0a197a9/scripts/check-local-headers.sh ++++ glibc-2.13.90-13/scripts/check-local-headers.sh @@ -31,6 +31,8 @@ fgrep -v "$includedir/asm" | fgrep -v "$includedir/linux" | fgrep -v "$includedir/selinux" | @@ -3527,8 +3436,8 @@ fgrep -v "$includedir/gd" | fgrep -v "$includedir/nss3"; then # If we found a match something is wrong. ---- glibc-2.13-160-g320a5dc/stdio-common/vfprintf.c -+++ glibc-2.13.90-12/stdio-common/vfprintf.c +--- glibc-2.13-200-g0a197a9/stdio-common/vfprintf.c ++++ glibc-2.13.90-13/stdio-common/vfprintf.c @@ -1160,41 +1160,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) else if (!is_long && spec != L_('S')) \ { \ @@ -3574,8 +3483,8 @@ else \ len = strlen (string); \ } \ ---- glibc-2.13-160-g320a5dc/streams/Makefile -+++ glibc-2.13.90-12/streams/Makefile +--- glibc-2.13-200-g0a197a9/streams/Makefile ++++ glibc-2.13.90-13/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -3585,8 +3494,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.13-160-g320a5dc/sunrpc/Makefile -+++ glibc-2.13.90-12/sunrpc/Makefile +--- glibc-2.13-200-g0a197a9/sunrpc/Makefile ++++ glibc-2.13.90-13/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) \ @@ -3607,8 +3516,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.13-160-g320a5dc/sysdeps/generic/dl-cache.h -+++ glibc-2.13.90-12/sysdeps/generic/dl-cache.h +--- glibc-2.13-200-g0a197a9/sysdeps/generic/dl-cache.h ++++ glibc-2.13.90-13/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -3624,8 +3533,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.13-160-g320a5dc/sysdeps/i386/Makefile -+++ glibc-2.13.90-12/sysdeps/i386/Makefile +--- glibc-2.13-200-g0a197a9/sysdeps/i386/Makefile ++++ glibc-2.13.90-13/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -3650,8 +3559,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.13-160-g320a5dc/sysdeps/i386/__longjmp.S -+++ glibc-2.13.90-12/sysdeps/i386/__longjmp.S +--- glibc-2.13-200-g0a197a9/sysdeps/i386/__longjmp.S ++++ glibc-2.13.90-13/sysdeps/i386/__longjmp.S @@ -1,5 +1,5 @@ /* longjmp for i386. - Copyright (C) 1995-1998,2000,2002,2005,2006,2009 @@ -3698,8 +3607,8 @@ #endif /* Jump to saved PC. */ jmp *%edx ---- glibc-2.13-160-g320a5dc/sysdeps/i386/bsd-_setjmp.S -+++ glibc-2.13.90-12/sysdeps/i386/bsd-_setjmp.S +--- glibc-2.13-200-g0a197a9/sysdeps/i386/bsd-_setjmp.S ++++ glibc-2.13.90-13/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. @@ -3724,8 +3633,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.13-160-g320a5dc/sysdeps/i386/bsd-setjmp.S -+++ glibc-2.13.90-12/sysdeps/i386/bsd-setjmp.S +--- glibc-2.13-200-g0a197a9/sysdeps/i386/bsd-setjmp.S ++++ glibc-2.13.90-13/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. @@ -3750,8 +3659,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.13-160-g320a5dc/sysdeps/i386/i686/Makefile -+++ glibc-2.13.90-12/sysdeps/i386/i686/Makefile +--- glibc-2.13-200-g0a197a9/sysdeps/i386/i686/Makefile ++++ glibc-2.13.90-13/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -3772,8 +3681,8 @@ -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif ---- glibc-2.13-160-g320a5dc/sysdeps/i386/i686/multiarch/strspn.S -+++ glibc-2.13.90-12/sysdeps/i386/i686/multiarch/strspn.S +--- glibc-2.13-200-g0a197a9/sysdeps/i386/i686/multiarch/strspn.S ++++ glibc-2.13.90-13/sysdeps/i386/i686/multiarch/strspn.S @@ -76,8 +76,8 @@ END(strspn) # define ENTRY(name) \ .type __strspn_ia32, @function; \ @@ -3785,8 +3694,8 @@ CALL_MCOUNT # undef END # define END(name) \ ---- glibc-2.13-160-g320a5dc/sysdeps/i386/setjmp.S -+++ glibc-2.13.90-12/sysdeps/i386/setjmp.S +--- glibc-2.13-200-g0a197a9/sysdeps/i386/setjmp.S ++++ glibc-2.13.90-13/sysdeps/i386/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for i386. - Copyright (C) 1995,1996,1997,2000,2001,2005,2006 @@ -3810,8 +3719,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.13-160-g320a5dc/sysdeps/ia64/Makefile -+++ glibc-2.13.90-12/sysdeps/ia64/Makefile +--- glibc-2.13-200-g0a197a9/sysdeps/ia64/Makefile ++++ glibc-2.13.90-13/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -3823,8 +3732,8 @@ endif endif ---- glibc-2.13-160-g320a5dc/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.13.90-12/sysdeps/ia64/ia64libgcc.S +--- glibc-2.13-200-g0a197a9/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.13.90-13/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -4176,8 +4085,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.13-160-g320a5dc/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.13.90-12/sysdeps/ia64/libgcc-compat.c +--- glibc-2.13-200-g0a197a9/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.13.90-13/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -4263,16 +4172,16 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.13-160-g320a5dc/sysdeps/mach/hurd/getrlimit.c -+++ glibc-2.13.90-12/sysdeps/mach/hurd/getrlimit.c +--- glibc-2.13-200-g0a197a9/sysdeps/mach/hurd/getrlimit.c ++++ glibc-2.13.90-13/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.13-160-g320a5dc/sysdeps/posix/getaddrinfo.c -+++ glibc-2.13.90-12/sysdeps/posix/getaddrinfo.c +--- glibc-2.13-200-g0a197a9/sysdeps/posix/getaddrinfo.c ++++ glibc-2.13.90-13/sysdeps/posix/getaddrinfo.c @@ -1084,10 +1084,12 @@ static const struct scopeentry /* Link-local addresses: scope 2. */ { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 }, @@ -4286,8 +4195,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.13-160-g320a5dc/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.13.90-12/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.13-200-g0a197a9/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.13.90-13/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -4296,16 +4205,16 @@ endif ifeq ($(subdir),elf) ---- glibc-2.13-160-g320a5dc/sysdeps/powerpc/powerpc64/elf/Makefile -+++ glibc-2.13.90-12/sysdeps/powerpc/powerpc64/elf/Makefile +--- glibc-2.13-200-g0a197a9/sysdeps/powerpc/powerpc64/elf/Makefile ++++ glibc-2.13.90-13/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.13-160-g320a5dc/sysdeps/unix/nice.c -+++ glibc-2.13.90-12/sysdeps/unix/nice.c +--- glibc-2.13-200-g0a197a9/sysdeps/unix/nice.c ++++ glibc-2.13.90-13/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -4320,8 +4229,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.13-160-g320a5dc/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.13.90-12/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -4337,57 +4246,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.13-160-g320a5dc/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.13.90-12/sysdeps/unix/sysv/linux/dl-osinfo.h -@@ -17,10 +17,13 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#include - #include - #include - #include - #include -+#include -+#include - - #ifndef MIN - # define MIN(a,b) (((a)<(b))?(a):(b)) -@@ -80,6 +83,32 @@ _dl_setup_stack_chk_guard (void *dl_random) - unsigned char *p = (unsigned char *) &ret; - p[sizeof (ret) - 1] = 255; - p[sizeof (ret) - 2] = '\n'; -+#ifdef HP_TIMING_NOW -+ hp_timing_t hpt; -+ HP_TIMING_NOW (hpt); -+ hpt = (hpt & 0xffff) << 8; -+ ret ^= hpt; -+#endif -+ uintptr_t stk; -+ /* Avoid GCC being too smart. */ -+ asm ("" : "=r" (stk) : "r" (p)); -+ stk &= 0x7ffff0; -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+ stk <<= (__WORDSIZE - 23); -+#elif __WORDSIZE == 64 -+ stk <<= 31; -+#endif -+ ret ^= stk; -+ /* Avoid GCC being too smart. */ -+ p = (unsigned char *) &errno; -+ asm ("" : "=r" (stk) : "r" (p)); -+ stk &= 0x7fff00; -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+ stk <<= (__WORDSIZE - 29); -+#else -+ stk >>= 8; -+#endif -+ ret ^= stk; - } - else - #endif ---- glibc-2.13-160-g320a5dc/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.13.90-12/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -4430,8 +4290,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.13-160-g320a5dc/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.13.90-12/sysdeps/unix/sysv/linux/getpagesize.c +--- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/getpagesize.c ++++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/getpagesize.c @@ -28,7 +28,7 @@ int __getpagesize () @@ -4441,8 +4301,8 @@ assert (GLRO(dl_pagesize) != 0); return GLRO(dl_pagesize); #else ---- glibc-2.13-160-g320a5dc/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S -+++ glibc-2.13.90-12/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S +--- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S ++++ glibc-2.13.90-13/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 @@ -4476,8 +4336,8 @@ + LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx) jmp *%edx END (____longjmp_chk) ---- glibc-2.13-160-g320a5dc/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.13.90-12/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.13.90-13/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. @@ -4538,16 +4398,16 @@ + } while (0) + +#include_next ---- glibc-2.13-160-g320a5dc/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ glibc-2.13.90-12/sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ glibc-2.13.90-13/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.13-160-g320a5dc/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.13.90-12/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -4580,29 +4440,29 @@ + } while (0) + #include_next ---- glibc-2.13-160-g320a5dc/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.13.90-12/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.13-160-g320a5dc/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.13.90-12/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.13-160-g320a5dc/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.13.90-12/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.13.90-13/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.13-160-g320a5dc/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.13.90-12/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -4628,8 +4488,8 @@ struct netlink_res { ---- glibc-2.13-160-g320a5dc/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.13.90-12/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -4639,8 +4499,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.13-160-g320a5dc/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.13.90-12/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -4686,8 +4546,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.13-160-g320a5dc/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S -+++ glibc-2.13.90-12/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +--- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S ++++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S @@ -19,6 +19,7 @@ #include #include @@ -4714,8 +4574,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (____longjmp_chk) ---- glibc-2.13-160-g320a5dc/sysdeps/x86_64/__longjmp.S -+++ glibc-2.13.90-12/sysdeps/x86_64/__longjmp.S +--- glibc-2.13-200-g0a197a9/sysdeps/x86_64/__longjmp.S ++++ glibc-2.13.90-13/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. @@ -4745,8 +4605,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (__longjmp) ---- glibc-2.13-160-g320a5dc/sysdeps/x86_64/setjmp.S -+++ glibc-2.13.90-12/sysdeps/x86_64/setjmp.S +--- glibc-2.13-200-g0a197a9/sysdeps/x86_64/setjmp.S ++++ glibc-2.13.90-13/sysdeps/x86_64/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for x86-64. - Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc. @@ -4770,8 +4630,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%rax) #endif ---- glibc-2.13-160-g320a5dc/timezone/zic.c -+++ glibc-2.13.90-12/timezone/zic.c +--- glibc-2.13-200-g0a197a9/timezone/zic.c ++++ glibc-2.13.90-13/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 904dc8d..014c1da 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.13-160-g320a5dc +%define glibcsrcdir glibc-2.13-200-g0a197a9 %define glibcversion 2.13.90 %define glibcportsdir glibc-ports-2.13-34-gf1d4d4b ### glibc.spec.in follows: @@ -18,7 +18,7 @@ %define buildpower6 0 %endif %define rtkaioarches %{ix86} x86_64 ia64 ppc ppc64 s390 s390x -%define biarcharches %{ix86} x86_64 ppc ppc64 +%define biarcharches %{ix86} x86_64 ppc ppc64 s390 s390x %define debuginfocommonarches %{biarcharches} alpha alphaev6 %define multiarcharches ppc ppc64 %{ix86} x86_64 %{sparc} %define systemtaparches %{ix86} x86_64 @@ -27,7 +27,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 12 +Release: 13 # 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 @@ -1051,6 +1051,29 @@ rm -f *.filelist* %endif %changelog +* Wed May 18 2011 Andreas Schwab - 2.13.90-13 +- Update from master + - Update GB18030 to 2005 version (BZ#11837) + - Update RE_SYNTAX*_AWK constants in regex.h + - Handle long variable names in putenv (BZ#11892) + - Fix test for error_one_per_line mode in error (BZ#12766) + - Cleanup x86-64 sys/user.h (BZ#11820) + - Several locale data updates (BZ#11987, BZ#9732, BZ#9730, BZ#4357, + BZ#12582) + - Avoid potential deadlock in mtrace (BZ#6420) + - Fix a few problems in fopen and freopen + - Provide more helpful error message in getopt (BZ#7101) + - Make stack canary value harder to read through read overflow (BZ#10149) + - Use mmap for allocation of buffers used for __abort_msg (BZ#11901) + - Fix handling of static TLS in dlopen'ed objects (BZ#12453) + - Fix initialization of optimization values for AIO (BZ#12083) + - Fix handling of conversion problem in CP932 module (BZ#12601) + - Fix potential problem with out-of-scope buffer (BZ#12626) + - Handle recursive calls in backtrace better (BZ#12432) + - Fix handling of incomplete character storage in state + - Fix file descriptor position after fclose (BZ#12724) +- Reinstall NIS RPC headers + * Fri May 13 2011 Andreas Schwab - 2.13.90-12 - Update from master - Fix resizing table for unique symbols when adding symbol for copy diff --git a/sources b/sources index 0ad99fb..137a987 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -10c24084eeef6c746f50e7549d8473a8 glibc-2.13-160-g320a5dc-fedora.tar.xz -7e9560e4c432573d7673759fefaef994 glibc-2.13-160-g320a5dc.tar.xz +ca87afb83701b1866847b9bd530fdcb2 glibc-2.13-200-g0a197a9-fedora.tar.xz +e2ec132be414bd3baf70ead36e998801 glibc-2.13-200-g0a197a9.tar.xz 58bc3858b6d73b2868f6399a4850f0b7 glibc-ports-2.13-34-gf1d4d4b.tar.xz