From 0d235659406d535672fd4eb1d2395cd57fe8f064 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 8 Nov 2011 13:42:22 +0100 Subject: [PATCH 01/15] 2.4.90-14 --- .gitignore | 6 +- glibc-fedora.patch | 685 ++++++++++++++++++++------------------------- glibc.spec | 22 +- sources | 6 +- 4 files changed, 321 insertions(+), 398 deletions(-) diff --git a/.gitignore b/.gitignore index 318563b..b064741 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/glibc-ports-2.14-25-gd3d9bde.tar.xz -/glibc-2.14-394-g8f3b1ff-fedora.tar.xz -/glibc-2.14-394-g8f3b1ff.tar.xz +/glibc-2.14-418-gb2ea1df-fedora.tar.xz +/glibc-2.14-418-gb2ea1df.tar.xz +/glibc-ports-2.14-43-gf335e01.tar.xz diff --git a/glibc-fedora.patch b/glibc-fedora.patch index af6a2a4..52804b5 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,18 +1,6 @@ ---- glibc-2.14-394-g8f3b1ff/ChangeLog -+++ glibc-2.14.90-13/ChangeLog -@@ -1312,6 +1312,11 @@ - - * sysdeps/mach/hurd/sys/param.h (DEV_BSIZE): New macro. - -+2011-09-02 Andreas Schwab -+ -+ * nscd/selinux.c (avc_create_thread): Set PR_SET_KEEPCAPS before -+ spawning AVC thread. -+ - 2011-09-08 Andreas Schwab - - * elf/dl-load.c (lose): Check for non-null L. -@@ -1574,6 +1579,15 @@ +--- glibc-2.14-418-gb2ea1df/ChangeLog ++++ /ChangeLog +@@ -1694,6 +1694,15 @@ * sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi directive. @@ -28,7 +16,7 @@ 2011-08-24 David S. Miller * sysdeps/sparc/sparc64/strcmp.S: Rewrite. -@@ -2379,6 +2393,14 @@ +@@ -2499,6 +2508,14 @@ * config.make.in: Likewise. * malloc/Makefile: Likewise. @@ -43,7 +31,7 @@ 2011-06-27 Andreas Schwab * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP -@@ -2510,6 +2532,10 @@ +@@ -2630,6 +2647,10 @@ * inet/getnetgrent_r.c: Use DL_CALL_FCT in several places. @@ -54,7 +42,7 @@ 2011-06-20 David S. Miller * sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple -@@ -3132,6 +3158,13 @@ +@@ -3252,6 +3273,13 @@ * libio/Makefile (tests): Add bug-fclose1. * libio/bug-fclose1.c: New file. @@ -68,7 +56,7 @@ 2011-05-12 Ulrich Drepper [BZ #12511] -@@ -3409,13 +3442,6 @@ +@@ -3529,13 +3557,6 @@ * stdlib/bug-getcontext.c: New file. * stdlib/Makefile: Add rules to build and run bug-getcontext. @@ -82,7 +70,7 @@ 2011-04-11 Andreas Krebbel * sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes -@@ -3653,6 +3679,31 @@ +@@ -3773,6 +3794,31 @@ * sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime): Export. @@ -114,7 +102,7 @@ 2011-03-22 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment -@@ -3713,6 +3764,16 @@ +@@ -3833,6 +3879,16 @@ $LDFLAGS and -nostdlib -nostartfiles to linking step. Change main to _start. @@ -131,7 +119,7 @@ 2011-03-06 Ulrich Drepper * elf/dl-load.c (_dl_map_object): If we are looking for the first -@@ -3929,6 +3990,12 @@ +@@ -4049,6 +4105,12 @@ * shadow/sgetspent.c: Check return value of __sgetspent_r instead of errno. @@ -144,7 +132,7 @@ 2011-01-19 Ulrich Drepper [BZ #11724] -@@ -4616,6 +4683,26 @@ +@@ -4736,6 +4798,26 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid. @@ -171,7 +159,7 @@ 2010-09-24 Petr Baudis * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -5408,6 +5495,17 @@ +@@ -5528,6 +5610,17 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -189,7 +177,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -5460,6 +5558,21 @@ +@@ -5580,6 +5673,21 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -211,8 +199,8 @@ 2010-05-28 Luis Machado * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.14-394-g8f3b1ff/ChangeLog.15 -+++ glibc-2.14.90-13/ChangeLog.15 +--- glibc-2.14-418-gb2ea1df/ChangeLog.15 ++++ /ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -278,8 +266,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.14-394-g8f3b1ff/ChangeLog.16 -+++ glibc-2.14.90-13/ChangeLog.16 +--- glibc-2.14-418-gb2ea1df/ChangeLog.16 ++++ /ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -302,8 +290,8 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . ---- glibc-2.14-394-g8f3b1ff/ChangeLog.17 -+++ glibc-2.14.90-13/ChangeLog.17 +--- glibc-2.14-418-gb2ea1df/ChangeLog.17 ++++ /ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -352,24 +340,8 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -13075,6 +13095,15 @@ d2009-10-30 Ulrich Drepper - separators also if no non-zero digits found. - * stdlib/Makefile (tests): Add tst-strtod3. - -+2006-12-10 Jakub Jelinek -+ -+ * sysdeps/unix/sysv/linux/netlinkaccess.h: Include linux/if_addr.h -+ if IFA_MAX is not defined. -+ (IFA_RTA, IFA_PAYLOAD, IFLA_RTA, IFLA_PAYLOAD): Define if not -+ defined. -+ * sysdeps/unix/sysv/linux/check_pf.c: Include netlinkaccess.h -+ instead of asm/types.h, linux/netlink.h and linux/rtnetlink.h. -+ - 2006-12-09 Ulrich Drepper - - [BZ #3632] ---- glibc-2.14-394-g8f3b1ff/Makeconfig -+++ glibc-2.14.90-13/Makeconfig +--- glibc-2.14-418-gb2ea1df/Makeconfig ++++ /Makeconfig @@ -803,12 +803,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -386,8 +358,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.14-394-g8f3b1ff/NEWS -+++ glibc-2.14.90-13/NEWS +--- glibc-2.14-418-gb2ea1df/NEWS ++++ /NEWS @@ -63,16 +63,6 @@ Version 2.14 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, 12795, 12811, 12813, 12814, 12841 @@ -405,8 +377,8 @@ * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at, syncfs, setns, sendmmsg ---- glibc-2.14-394-g8f3b1ff/config.h.in -+++ glibc-2.14.90-13/config.h.in +--- glibc-2.14-418-gb2ea1df/config.h.in ++++ /config.h.in @@ -184,6 +184,9 @@ /* Define if `.ctors' and `.dtors' sections shouldn't be used. */ #undef NO_CTORS_DTORS_SECTIONS @@ -417,8 +389,8 @@ /* */ ---- glibc-2.14-394-g8f3b1ff/configure -+++ glibc-2.14.90-13/configure +--- glibc-2.14-418-gb2ea1df/configure ++++ /configure @@ -791,6 +791,7 @@ enable_kernel enable_all_warnings enable_multi_arch @@ -487,8 +459,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-394-g8f3b1ff/configure.in -+++ glibc-2.14.90-13/configure.in +--- glibc-2.14-418-gb2ea1df/configure.in ++++ /configure.in @@ -291,6 +291,29 @@ else fi AC_SUBST(libc_cv_nss_crypt) @@ -519,8 +491,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-394-g8f3b1ff/csu/Makefile -+++ glibc-2.14.90-13/csu/Makefile +--- glibc-2.14-418-gb2ea1df/csu/Makefile ++++ /csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -531,8 +503,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.14-394-g8f3b1ff/csu/elf-init.c -+++ glibc-2.14.90-13/csu/elf-init.c +--- glibc-2.14-418-gb2ea1df/csu/elf-init.c ++++ /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; @@ -557,8 +529,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.14-394-g8f3b1ff/debug/tst-chk1.c -+++ glibc-2.14.90-13/debug/tst-chk1.c +--- glibc-2.14-418-gb2ea1df/debug/tst-chk1.c ++++ /debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -587,8 +559,8 @@ # define O 0 # else # define O 1 ---- glibc-2.14-394-g8f3b1ff/elf/Makefile -+++ glibc-2.14.90-13/elf/Makefile +--- glibc-2.14-418-gb2ea1df/elf/Makefile ++++ /elf/Makefile @@ -135,6 +135,7 @@ include ../Makeconfig ifeq ($(unwind-find-fde),yes) routines += unwind-dw2-fde-glibc @@ -607,8 +579,8 @@ test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names)))) generated += $(addsuffix .so,$(strip $(modules-names))) ---- glibc-2.14-394-g8f3b1ff/elf/dl-close.c -+++ glibc-2.14.90-13/elf/dl-close.c +--- glibc-2.14-418-gb2ea1df/elf/dl-close.c ++++ /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) @@ -629,9 +601,9 @@ /* There are still references to this object. Do nothing more. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) ---- glibc-2.14-394-g8f3b1ff/elf/dl-deps.c -+++ glibc-2.14.90-13/elf/dl-deps.c -@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, +--- glibc-2.14-418-gb2ea1df/elf/dl-deps.c ++++ /elf/dl-deps.c +@@ -489,6 +489,7 @@ _dl_map_object_deps (struct link_map *map, nneeded * sizeof needed[0]); atomic_write_barrier (); l->l_initfini = l_initfini; @@ -639,7 +611,7 @@ } /* If we have no auxiliary objects just go on to the next map. */ -@@ -678,6 +679,7 @@ Filters not supported with LD_TRACE_PRELINKING")); +@@ -689,6 +690,7 @@ Filters not supported with LD_TRACE_PRELINKING")); l_initfini[nlist] = NULL; atomic_write_barrier (); map->l_initfini = l_initfini; @@ -647,7 +619,7 @@ if (l_reldeps != NULL) { atomic_write_barrier (); -@@ -686,7 +688,7 @@ Filters not supported with LD_TRACE_PRELINKING")); +@@ -697,7 +699,7 @@ Filters not supported with LD_TRACE_PRELINKING")); _dl_scope_free (old_l_reldeps); } if (old_l_initfini != NULL) @@ -656,8 +628,8 @@ if (errno_reason) _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, ---- glibc-2.14-394-g8f3b1ff/elf/dl-init.c -+++ glibc-2.14.90-13/elf/dl-init.c +--- glibc-2.14-418-gb2ea1df/elf/dl-init.c ++++ /elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -680,8 +652,8 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.14-394-g8f3b1ff/elf/dl-libc.c -+++ glibc-2.14.90-13/elf/dl-libc.c +--- glibc-2.14-418-gb2ea1df/elf/dl-libc.c ++++ /elf/dl-libc.c @@ -270,13 +270,13 @@ libc_freeres_fn (free_mem) for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) @@ -708,8 +680,8 @@ } if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 ---- glibc-2.14-394-g8f3b1ff/elf/dl-load.c -+++ glibc-2.14.90-13/elf/dl-load.c +--- glibc-2.14-418-gb2ea1df/elf/dl-load.c ++++ /elf/dl-load.c @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len) @@ -789,8 +761,8 @@ } else /* No DST we recognize. */ ---- glibc-2.14-394-g8f3b1ff/elf/dl-support.c -+++ glibc-2.14.90-13/elf/dl-support.c +--- glibc-2.14-418-gb2ea1df/elf/dl-support.c ++++ /elf/dl-support.c @@ -82,10 +82,8 @@ unsigned long long _dl_load_adds; create a fake scope containing nothing. */ struct r_scope_elem _dl_initial_searchlist; @@ -802,8 +774,8 @@ /* Random data provided by the kernel. */ void *_dl_random; ---- glibc-2.14-394-g8f3b1ff/elf/ldconfig.c -+++ glibc-2.14.90-13/elf/ldconfig.c +--- glibc-2.14-418-gb2ea1df/elf/ldconfig.c ++++ /elf/ldconfig.c @@ -1034,17 +1034,19 @@ search_dirs (void) @@ -885,8 +857,8 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.14-394-g8f3b1ff/elf/ldd.bash.in -+++ glibc-2.14.90-13/elf/ldd.bash.in +--- glibc-2.14-418-gb2ea1df/elf/ldd.bash.in ++++ /elf/ldd.bash.in @@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2 fi done @@ -915,8 +887,8 @@ try_trace "$RTLD" "$file" || result=1 ;; *) ---- glibc-2.14-394-g8f3b1ff/elf/rtld-Rules -+++ glibc-2.14.90-13/elf/rtld-Rules +--- glibc-2.14-418-gb2ea1df/elf/rtld-Rules ++++ /elf/rtld-Rules @@ -1,7 +1,7 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker. @@ -934,8 +906,8 @@ +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld endif ---- glibc-2.14-394-g8f3b1ff/elf/rtld.c -+++ glibc-2.14.90-13/elf/rtld.c +--- glibc-2.14-418-gb2ea1df/elf/rtld.c ++++ /elf/rtld.c @@ -107,7 +107,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -990,24 +962,24 @@ if (! prelinked && rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. ---- glibc-2.14-394-g8f3b1ff/extra-lib.mk -+++ glibc-2.14.90-13/extra-lib.mk +--- glibc-2.14-418-gb2ea1df/extra-lib.mk ++++ /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-394-g8f3b1ff/include/bits/stdlib-ldbl.h -+++ glibc-2.14.90-13/include/bits/stdlib-ldbl.h +--- glibc-2.14-418-gb2ea1df/include/bits/stdlib-ldbl.h ++++ /include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-394-g8f3b1ff/include/bits/wchar-ldbl.h -+++ glibc-2.14.90-13/include/bits/wchar-ldbl.h +--- glibc-2.14-418-gb2ea1df/include/bits/wchar-ldbl.h ++++ /include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-394-g8f3b1ff/include/features.h -+++ glibc-2.14.90-13/include/features.h +--- glibc-2.14-418-gb2ea1df/include/features.h ++++ /include/features.h @@ -310,8 +310,13 @@ #endif @@ -1024,8 +996,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.14-394-g8f3b1ff/include/libc-symbols.h -+++ glibc-2.14.90-13/include/libc-symbols.h +--- glibc-2.14-418-gb2ea1df/include/libc-symbols.h ++++ /include/libc-symbols.h @@ -626,7 +626,7 @@ for linking") # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libc_hidden_def(name) hidden_def (name) @@ -1035,8 +1007,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-394-g8f3b1ff/include/link.h -+++ glibc-2.14.90-13/include/link.h +--- glibc-2.14-418-gb2ea1df/include/link.h ++++ /include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. @@ -1074,8 +1046,8 @@ # elif NO_TLS_OFFSET == -1 # define FORCED_DYNAMIC_TLS_OFFSET -2 # else ---- glibc-2.14-394-g8f3b1ff/include/stap-probe.h -+++ glibc-2.14.90-13/include/stap-probe.h +--- glibc-2.14-418-gb2ea1df/include/stap-probe.h ++++ /include/stap-probe.h @@ -0,0 +1,140 @@ +/* Macros for defining Systemtap static probe points. + Copyright (C) 2011 Free Software Foundation, Inc. @@ -1217,16 +1189,16 @@ +#endif /* USE_STAP_PROBE. */ + +#endif /* stap-probe.h */ ---- glibc-2.14-394-g8f3b1ff/include/sys/resource.h -+++ glibc-2.14.90-13/include/sys/resource.h +--- glibc-2.14-418-gb2ea1df/include/sys/resource.h ++++ /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-394-g8f3b1ff/inet/Makefile -+++ glibc-2.14.90-13/inet/Makefile +--- glibc-2.14-418-gb2ea1df/inet/Makefile ++++ /inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -1236,8 +1208,8 @@ ifeq ($(have-thread-library),yes) CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions ---- glibc-2.14-394-g8f3b1ff/intl/locale.alias -+++ glibc-2.14.90-13/intl/locale.alias +--- glibc-2.14-418-gb2ea1df/intl/locale.alias ++++ /intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -1247,8 +1219,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.14-394-g8f3b1ff/libio/stdio.h -+++ glibc-2.14.90-13/libio/stdio.h +--- glibc-2.14-418-gb2ea1df/libio/stdio.h ++++ /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. */ @@ -1262,8 +1234,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.14-394-g8f3b1ff/locale/iso-4217.def -+++ glibc-2.14.90-13/locale/iso-4217.def +--- glibc-2.14-418-gb2ea1df/locale/iso-4217.def ++++ /locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1355,8 +1327,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.14-394-g8f3b1ff/locale/programs/locarchive.c -+++ glibc-2.14.90-13/locale/programs/locarchive.c +--- glibc-2.14-418-gb2ea1df/locale/programs/locarchive.c ++++ /locale/programs/locarchive.c @@ -253,9 +253,9 @@ oldlocrecentcmp (const void *a, const void *b) /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -1388,8 +1360,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.14-394-g8f3b1ff/localedata/ChangeLog -+++ glibc-2.14.90-13/localedata/ChangeLog +--- glibc-2.14-418-gb2ea1df/localedata/ChangeLog ++++ /localedata/ChangeLog @@ -10,6 +10,14 @@ * tests-mbwc/tst_funcs.h (TST_DECL_VARS, TST_HEAD_LOCALE): Remove unused variable. @@ -1405,8 +1377,8 @@ 2011-05-21 Ulrich Drepper [BZ #12788] ---- glibc-2.14-394-g8f3b1ff/localedata/Makefile -+++ glibc-2.14.90-13/localedata/Makefile +--- glibc-2.14-418-gb2ea1df/localedata/Makefile ++++ /localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1415,8 +1387,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.14-394-g8f3b1ff/localedata/SUPPORTED -+++ glibc-2.14.90-13/localedata/SUPPORTED +--- glibc-2.14-418-gb2ea1df/localedata/SUPPORTED ++++ /localedata/SUPPORTED @@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1458,8 +1430,8 @@ sw_KE/UTF-8 \ sw_TZ/UTF-8 \ ta_IN/UTF-8 \ ---- glibc-2.14-394-g8f3b1ff/localedata/locales/cy_GB -+++ glibc-2.14.90-13/localedata/locales/cy_GB +--- glibc-2.14-418-gb2ea1df/localedata/locales/cy_GB ++++ /localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1474,8 +1446,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.14-394-g8f3b1ff/localedata/locales/en_GB -+++ glibc-2.14.90-13/localedata/locales/en_GB +--- glibc-2.14-418-gb2ea1df/localedata/locales/en_GB ++++ /localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1487,8 +1459,8 @@ date_fmt "/ / " ---- glibc-2.14-394-g8f3b1ff/localedata/locales/no_NO -+++ glibc-2.14.90-13/localedata/locales/no_NO +--- glibc-2.14-418-gb2ea1df/localedata/locales/no_NO ++++ /localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1559,8 +1531,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.14-394-g8f3b1ff/localedata/locales/zh_TW -+++ glibc-2.14.90-13/localedata/locales/zh_TW +--- glibc-2.14-418-gb2ea1df/localedata/locales/zh_TW ++++ /localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1588,8 +1560,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.14-394-g8f3b1ff/login/programs/pt_chown.c -+++ glibc-2.14.90-13/login/programs/pt_chown.c +--- glibc-2.14-418-gb2ea1df/login/programs/pt_chown.c ++++ /login/programs/pt_chown.c @@ -29,6 +29,7 @@ #include #include @@ -1631,8 +1603,8 @@ - return EXIT_SUCCESS; } ---- glibc-2.14-394-g8f3b1ff/malloc/mcheck.c -+++ glibc-2.14.90-13/malloc/mcheck.c +--- glibc-2.14-418-gb2ea1df/malloc/mcheck.c ++++ /malloc/mcheck.c @@ -25,10 +25,26 @@ # include # include @@ -1709,8 +1681,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.14-394-g8f3b1ff/manual/libc.texinfo -+++ glibc-2.14.90-13/manual/libc.texinfo +--- glibc-2.14-418-gb2ea1df/manual/libc.texinfo ++++ /manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1720,9 +1692,9 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.14-394-g8f3b1ff/misc/sys/cdefs.h -+++ glibc-2.14.90-13/misc/sys/cdefs.h -@@ -141,7 +141,10 @@ +--- glibc-2.14-418-gb2ea1df/misc/sys/cdefs.h ++++ /misc/sys/cdefs.h +@@ -146,7 +146,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -1734,7 +1706,7 @@ # define __warndecl(name, msg) \ extern void name (void) __attribute__((__warning__ (msg))) # define __warnattr(msg) __attribute__((__warning__ (msg))) -@@ -307,10 +310,16 @@ +@@ -312,10 +315,16 @@ /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 inline semantics, unless -fgnu89-inline is used. */ @@ -1753,7 +1725,7 @@ # define __extern_always_inline \ extern __always_inline __attribute__ ((__gnu_inline__, __artificial__)) # else -@@ -330,7 +339,10 @@ +@@ -335,7 +344,10 @@ /* GCC 4.3 and above allow passing all anonymous arguments of an __extern_always_inline function to some other vararg function. */ @@ -1765,8 +1737,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.14-394-g8f3b1ff/nis/Makefile -+++ glibc-2.14.90-13/nis/Makefile +--- glibc-2.14-418-gb2ea1df/nis/Makefile ++++ /nis/Makefile @@ -23,9 +23,9 @@ subdir := nis aux := nis_hash @@ -1788,8 +1760,8 @@ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ ---- glibc-2.14-394-g8f3b1ff/nis/nss -+++ glibc-2.14.90-13/nis/nss +--- glibc-2.14-418-gb2ea1df/nis/nss ++++ /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 @@ -1799,9 +1771,9 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.14-394-g8f3b1ff/nptl/ChangeLog -+++ glibc-2.14.90-13/nptl/ChangeLog -@@ -143,6 +143,51 @@ +--- glibc-2.14-418-gb2ea1df/nptl/ChangeLog ++++ /nptl/ChangeLog +@@ -158,6 +158,51 @@ clearing memory. Patch partly by Robert Rex . @@ -1853,7 +1825,7 @@ 2011-01-19 Roland McGrath * pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo. -@@ -4872,6 +4917,11 @@ +@@ -4887,6 +4932,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1865,7 +1837,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6946,6 +6996,11 @@ +@@ -6961,6 +7011,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1877,8 +1849,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.14-394-g8f3b1ff/nptl/DESIGN-systemtap-probes.txt -+++ glibc-2.14.90-13/nptl/DESIGN-systemtap-probes.txt +--- glibc-2.14-418-gb2ea1df/nptl/DESIGN-systemtap-probes.txt ++++ /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. @@ -1969,8 +1941,8 @@ + arg1 = condition +cond_broadcast - probe for pthread_cond_broadcast + arg1 = condition ---- glibc-2.14-394-g8f3b1ff/nptl/Makefile -+++ glibc-2.14.90-13/nptl/Makefile +--- glibc-2.14-418-gb2ea1df/nptl/Makefile ++++ /nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -2003,8 +1975,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.14-394-g8f3b1ff/nptl/Versions -+++ glibc-2.14.90-13/nptl/Versions +--- glibc-2.14-418-gb2ea1df/nptl/Versions ++++ /nptl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; # Internal libc interface to libpthread @@ -2013,8 +1985,8 @@ } } ---- glibc-2.14-394-g8f3b1ff/nptl/nptl-init.c -+++ glibc-2.14.90-13/nptl/nptl-init.c +--- glibc-2.14-418-gb2ea1df/nptl/nptl-init.c ++++ /nptl/nptl-init.c @@ -415,7 +415,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. */ @@ -2024,8 +1996,8 @@ || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_cond_broadcast.c -+++ glibc-2.14.90-13/nptl/pthread_cond_broadcast.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_broadcast.c ++++ /nptl/pthread_cond_broadcast.c @@ -23,6 +23,7 @@ #include #include @@ -2043,8 +2015,8 @@ int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; /* Make sure we are alone. */ ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_cond_destroy.c -+++ glibc-2.14.90-13/nptl/pthread_cond_destroy.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_destroy.c ++++ /nptl/pthread_cond_destroy.c @@ -20,6 +20,7 @@ #include #include @@ -2062,8 +2034,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_cond_init.c -+++ glibc-2.14.90-13/nptl/pthread_cond_init.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_init.c ++++ /nptl/pthread_cond_init.c @@ -20,6 +20,7 @@ #include @@ -2081,8 +2053,8 @@ return 0; } versioned_symbol (libpthread, __pthread_cond_init, ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_cond_signal.c -+++ glibc-2.14.90-13/nptl/pthread_cond_signal.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_signal.c ++++ /nptl/pthread_cond_signal.c @@ -26,6 +26,7 @@ #include @@ -2100,8 +2072,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_cond_wait.c -+++ glibc-2.14.90-13/nptl/pthread_cond_wait.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_wait.c ++++ /nptl/pthread_cond_wait.c @@ -25,6 +25,7 @@ #include @@ -2119,8 +2091,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_create.c -+++ glibc-2.14.90-13/nptl/pthread_create.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_create.c ++++ /nptl/pthread_create.c @@ -32,6 +32,8 @@ #include @@ -2148,8 +2120,8 @@ /* Start the thread. */ return create_thread (pd, iattr, STACK_VARIABLES_ARGS); } ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_join.c -+++ glibc-2.14.90-13/nptl/pthread_join.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_join.c ++++ /nptl/pthread_join.c @@ -23,6 +23,8 @@ #include #include "pthreadP.h" @@ -2176,8 +2148,8 @@ + return result; } ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_mutex_destroy.c -+++ glibc-2.14.90-13/nptl/pthread_mutex_destroy.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_destroy.c ++++ /nptl/pthread_mutex_destroy.c @@ -20,11 +20,15 @@ #include #include "pthreadP.h" @@ -2194,8 +2166,8 @@ if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0 && mutex->__data.__nusers != 0) return EBUSY; ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_mutex_init.c -+++ glibc-2.14.90-13/nptl/pthread_mutex_init.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_init.c ++++ /nptl/pthread_mutex_init.c @@ -24,6 +24,8 @@ #include #include "pthreadP.h" @@ -2214,8 +2186,8 @@ return 0; } strong_alias (__pthread_mutex_init, pthread_mutex_init) ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_mutex_lock.c -+++ glibc-2.14.90-13/nptl/pthread_mutex_lock.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_lock.c ++++ /nptl/pthread_mutex_lock.c @@ -24,6 +24,7 @@ #include #include "pthreadP.h" @@ -2252,8 +2224,8 @@ return 0; } #ifndef __pthread_mutex_lock ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_mutex_timedlock.c -+++ glibc-2.14.90-13/nptl/pthread_mutex_timedlock.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_timedlock.c ++++ /nptl/pthread_mutex_timedlock.c @@ -24,6 +24,8 @@ #include #include @@ -2308,8 +2280,8 @@ } out: ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_mutex_unlock.c -+++ glibc-2.14.90-13/nptl/pthread_mutex_unlock.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_unlock.c ++++ /nptl/pthread_mutex_unlock.c @@ -22,6 +22,7 @@ #include #include "pthreadP.h" @@ -2346,8 +2318,8 @@ return 0; } ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_rwlock_destroy.c -+++ glibc-2.14.90-13/nptl/pthread_rwlock_destroy.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_destroy.c ++++ /nptl/pthread_rwlock_destroy.c @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -2364,8 +2336,8 @@ /* Nothing to be done. For now. */ return 0; } ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_rwlock_rdlock.c -+++ glibc-2.14.90-13/nptl/pthread_rwlock_rdlock.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_rdlock.c ++++ /nptl/pthread_rwlock_rdlock.c @@ -22,6 +22,7 @@ #include #include @@ -2392,8 +2364,8 @@ break; } ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_rwlock_unlock.c -+++ glibc-2.14.90-13/nptl/pthread_rwlock_unlock.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_unlock.c ++++ /nptl/pthread_rwlock_unlock.c @@ -22,11 +22,14 @@ #include #include @@ -2409,8 +2381,8 @@ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); if (rwlock->__data.__writer) rwlock->__data.__writer = 0; ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_rwlock_wrlock.c -+++ glibc-2.14.90-13/nptl/pthread_rwlock_wrlock.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_wrlock.c ++++ /nptl/pthread_rwlock_wrlock.c @@ -22,6 +22,7 @@ #include #include @@ -2437,8 +2409,8 @@ break; } ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ /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 @@ -2447,8 +2419,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/Versions +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ /nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -2456,8 +2428,8 @@ + __uname; + } +} ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S ++++ /nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2477,8 +2449,8 @@ ENTER_KERNEL 2: movl %edx, %eax ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S ++++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S @@ -24,6 +24,7 @@ #include #include @@ -2496,8 +2468,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S ++++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S @@ -24,7 +24,7 @@ #include #include @@ -2516,8 +2488,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S ++++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S @@ -24,7 +24,7 @@ #include #include @@ -2536,8 +2508,8 @@ cmpl $1000000000, 4(%ebp) movl $EINVAL, %eax jae 18f ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S ++++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S @@ -25,6 +25,7 @@ #include #include @@ -2555,8 +2527,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S ++++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S @@ -23,6 +23,7 @@ #include #include @@ -2574,8 +2546,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S ++++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S @@ -23,6 +23,7 @@ #include #include @@ -2593,8 +2565,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h ++++ /nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2612,8 +2584,8 @@ __asm __volatile (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ /nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -2623,8 +2595,8 @@ cp = u.uts.version; else { ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ /nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -2632,8 +2604,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2663,8 +2635,8 @@ syscall 2: movl %edx, %eax ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2682,8 +2654,8 @@ __asm __volatile ("syscall" \ : "=a" (__ignore) \ : "0" (SYS_futex), "D" (futex), \ ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S @@ -25,7 +25,7 @@ #include #include @@ -2702,8 +2674,8 @@ /* Get internal lock. */ movl $1, %esi xorl %eax, %eax ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S @@ -24,6 +24,7 @@ #include #include @@ -2721,8 +2693,8 @@ /* Get internal lock. */ movq %rdi, %r8 movl $1, %esi ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -23,6 +23,7 @@ #include #include @@ -2740,8 +2712,8 @@ cmpq $1000000000, 8(%rdx) movl $EINVAL, %eax jae 48f ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S @@ -23,6 +23,7 @@ #include #include @@ -2759,8 +2731,8 @@ cmpq $-1, dep_mutex(%rdi) /* Prepare structure passed to cancellation handler. */ ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S @@ -22,7 +22,7 @@ #include #include @@ -2780,8 +2752,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S -+++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S @@ -22,7 +22,7 @@ #include #include @@ -2801,8 +2773,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-394-g8f3b1ff/nscd/nscd.conf -+++ glibc-2.14.90-13/nscd/nscd.conf +--- glibc-2.14-418-gb2ea1df/nscd/nscd.conf ++++ /nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -2812,8 +2784,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.14-394-g8f3b1ff/nscd/nscd.init -+++ glibc-2.14.90-13/nscd/nscd.init +--- glibc-2.14-418-gb2ea1df/nscd/nscd.init ++++ /nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -2890,29 +2862,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.14-394-g8f3b1ff/nscd/selinux.c -+++ glibc-2.14.90-13/nscd/selinux.c -@@ -270,6 +270,18 @@ avc_create_thread (void (*run) (void)) - { - int rc; - -+#if defined HAVE_LIBAUDIT && defined HAVE_LIBCAP -+ if (server_user != NULL && getuid () == 0) -+ { -+ /* We need to preserve the capabilities in the AVC thread. */ -+ if (prctl (PR_SET_KEEPCAPS, 1) == -1) -+ { -+ dbg_log (_("Failed to set keep-capabilities")); -+ error (EXIT_FAILURE, errno, _("prctl(KEEPCAPS) failed")); -+ } -+ } -+#endif -+ - rc = - pthread_create (&avc_notify_thread, NULL, (void *(*) (void *)) run, NULL); - if (rc != 0) ---- glibc-2.14-394-g8f3b1ff/nss/Makefile -+++ glibc-2.14.90-13/nss/Makefile +--- glibc-2.14-418-gb2ea1df/nss/Makefile ++++ /nss/Makefile @@ -88,6 +88,7 @@ endif include ../Rules @@ -2921,8 +2872,8 @@ ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a ---- glibc-2.14-394-g8f3b1ff/nss/nss_files/files-XXX.c -+++ glibc-2.14.90-13/nss/nss_files/files-XXX.c +--- glibc-2.14-418-gb2ea1df/nss/nss_files/files-XXX.c ++++ /nss/nss_files/files-XXX.c @@ -190,7 +190,7 @@ internal_getent (struct STRUCTURE *result, { char *p; @@ -2932,8 +2883,8 @@ int parse_result; if (buflen < sizeof *data + 2) ---- glibc-2.14-394-g8f3b1ff/posix/Makefile -+++ glibc-2.14.90-13/posix/Makefile +--- glibc-2.14-418-gb2ea1df/posix/Makefile ++++ /posix/Makefile @@ -320,15 +320,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -2954,8 +2905,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.14-394-g8f3b1ff/posix/gai.conf -+++ glibc-2.14.90-13/posix/gai.conf +--- glibc-2.14-418-gb2ea1df/posix/gai.conf ++++ /posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -2980,8 +2931,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.14-394-g8f3b1ff/posix/getconf.speclist.h -+++ glibc-2.14.90-13/posix/getconf.speclist.h +--- glibc-2.14-418-gb2ea1df/posix/getconf.speclist.h ++++ /posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -3022,8 +2973,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.14-394-g8f3b1ff/posix/regcomp.c -+++ glibc-2.14.90-13/posix/regcomp.c +--- glibc-2.14-418-gb2ea1df/posix/regcomp.c ++++ /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 +3106,8 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.14-394-g8f3b1ff/resolv/Makefile -+++ glibc-2.14.90-13/resolv/Makefile +--- glibc-2.14-418-gb2ea1df/resolv/Makefile ++++ /resolv/Makefile @@ -81,6 +81,7 @@ ifeq (yes,$(have-ssp)) CFLAGS-libresolv += -fstack-protector endif @@ -3165,8 +3116,8 @@ # The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings ---- glibc-2.14-394-g8f3b1ff/resolv/res_query.c -+++ glibc-2.14.90-13/resolv/res_query.c +--- glibc-2.14-418-gb2ea1df/resolv/res_query.c ++++ /resolv/res_query.c @@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, && *resplen2 > (int) sizeof (HEADER)) { @@ -3176,8 +3127,8 @@ hp = hp2; } else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) ---- glibc-2.14-394-g8f3b1ff/resource/getrlimit.c -+++ glibc-2.14.90-13/resource/getrlimit.c +--- glibc-2.14-418-gb2ea1df/resource/getrlimit.c ++++ /resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -3186,19 +3137,19 @@ weak_alias (__getrlimit, getrlimit) stub_warning (getrlimit) ---- glibc-2.14-394-g8f3b1ff/scripts/check-local-headers.sh -+++ glibc-2.14.90-13/scripts/check-local-headers.sh +--- glibc-2.14-418-gb2ea1df/scripts/check-local-headers.sh ++++ /scripts/check-local-headers.sh @@ -29,7 +29,7 @@ exec ${AWK} -v includedir="$includedir" ' BEGIN { status = 0 exclude = "^" includedir \ -- "/(asm[-/]|linux/|selinux/|gd|nss3/|sys/capability\\.h)" -+ "/(asm[-/]|linux/|selinux/|gd|nss3/|sys/capability\\.h|sys/sdt(-config)?\\.h)" +- "/(asm[-/]|linux/|selinux/|gd|nss3/|sys/capability\\.h|libaudit\\.h)" ++ "/(asm[-/]|linux/|selinux/|gd|nss3/|sys/capability\\.h|libaudit\\.h|sys/sdt(-config)?\\.h)" } /^[^ ]/ && $1 ~ /.*:/ { obj = $1 } { ---- glibc-2.14-394-g8f3b1ff/stdio-common/vfprintf.c -+++ glibc-2.14.90-13/stdio-common/vfprintf.c +--- glibc-2.14-418-gb2ea1df/stdio-common/vfprintf.c ++++ /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')) \ { \ @@ -3244,8 +3195,8 @@ else \ len = strlen (string); \ } \ ---- glibc-2.14-394-g8f3b1ff/streams/Makefile -+++ glibc-2.14.90-13/streams/Makefile +--- glibc-2.14-418-gb2ea1df/streams/Makefile ++++ /streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -3255,8 +3206,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.14-394-g8f3b1ff/sunrpc/Makefile -+++ glibc-2.14.90-13/sunrpc/Makefile +--- glibc-2.14-418-gb2ea1df/sunrpc/Makefile ++++ /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) \ @@ -3277,8 +3228,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-394-g8f3b1ff/sysdeps/generic/dl-cache.h -+++ glibc-2.14.90-13/sysdeps/generic/dl-cache.h +--- glibc-2.14-418-gb2ea1df/sysdeps/generic/dl-cache.h ++++ /sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -3294,8 +3245,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-394-g8f3b1ff/sysdeps/i386/Makefile -+++ glibc-2.14.90-13/sysdeps/i386/Makefile +--- glibc-2.14-418-gb2ea1df/sysdeps/i386/Makefile ++++ /sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -3320,8 +3271,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-394-g8f3b1ff/sysdeps/i386/__longjmp.S -+++ glibc-2.14.90-13/sysdeps/i386/__longjmp.S +--- glibc-2.14-418-gb2ea1df/sysdeps/i386/__longjmp.S ++++ /sysdeps/i386/__longjmp.S @@ -1,5 +1,5 @@ /* longjmp for i386. - Copyright (C) 1995-1998,2000,2002,2005,2006,2009 @@ -3368,8 +3319,8 @@ #endif /* Jump to saved PC. */ jmp *%edx ---- glibc-2.14-394-g8f3b1ff/sysdeps/i386/bsd-_setjmp.S -+++ glibc-2.14.90-13/sysdeps/i386/bsd-_setjmp.S +--- glibc-2.14-418-gb2ea1df/sysdeps/i386/bsd-_setjmp.S ++++ /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. @@ -3394,8 +3345,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-394-g8f3b1ff/sysdeps/i386/bsd-setjmp.S -+++ glibc-2.14.90-13/sysdeps/i386/bsd-setjmp.S +--- glibc-2.14-418-gb2ea1df/sysdeps/i386/bsd-setjmp.S ++++ /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. @@ -3420,8 +3371,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-394-g8f3b1ff/sysdeps/i386/i686/Makefile -+++ glibc-2.14.90-13/sysdeps/i386/i686/Makefile +--- glibc-2.14-418-gb2ea1df/sysdeps/i386/i686/Makefile ++++ /sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -3442,8 +3393,8 @@ -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif ---- glibc-2.14-394-g8f3b1ff/sysdeps/i386/setjmp.S -+++ glibc-2.14.90-13/sysdeps/i386/setjmp.S +--- glibc-2.14-418-gb2ea1df/sysdeps/i386/setjmp.S ++++ /sysdeps/i386/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for i386. - Copyright (C) 1995,1996,1997,2000,2001,2005,2006 @@ -3467,8 +3418,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-394-g8f3b1ff/sysdeps/ia64/Makefile -+++ glibc-2.14.90-13/sysdeps/ia64/Makefile +--- glibc-2.14-418-gb2ea1df/sysdeps/ia64/Makefile ++++ /sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -3480,8 +3431,8 @@ endif endif ---- glibc-2.14-394-g8f3b1ff/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.14.90-13/sysdeps/ia64/ia64libgcc.S +--- glibc-2.14-418-gb2ea1df/sysdeps/ia64/ia64libgcc.S ++++ /sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -3833,8 +3784,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.14-394-g8f3b1ff/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.14.90-13/sysdeps/ia64/libgcc-compat.c +--- glibc-2.14-418-gb2ea1df/sysdeps/ia64/libgcc-compat.c ++++ /sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -3920,16 +3871,16 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.14-394-g8f3b1ff/sysdeps/mach/hurd/getrlimit.c -+++ glibc-2.14.90-13/sysdeps/mach/hurd/getrlimit.c +--- glibc-2.14-418-gb2ea1df/sysdeps/mach/hurd/getrlimit.c ++++ /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-394-g8f3b1ff/sysdeps/posix/getaddrinfo.c -+++ glibc-2.14.90-13/sysdeps/posix/getaddrinfo.c +--- glibc-2.14-418-gb2ea1df/sysdeps/posix/getaddrinfo.c ++++ /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 @@ -4054,8 +4005,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.14-394-g8f3b1ff/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.14.90-13/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.14-418-gb2ea1df/sysdeps/powerpc/powerpc64/Makefile ++++ /sysdeps/powerpc/powerpc64/Makefile @@ -33,6 +33,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -4064,16 +4015,16 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-394-g8f3b1ff/sysdeps/powerpc/powerpc64/elf/Makefile -+++ glibc-2.14.90-13/sysdeps/powerpc/powerpc64/elf/Makefile +--- glibc-2.14-418-gb2ea1df/sysdeps/powerpc/powerpc64/elf/Makefile ++++ /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-394-g8f3b1ff/sysdeps/s390/s390-64/utf16-utf32-z9.c -+++ glibc-2.14.90-13/sysdeps/s390/s390-64/utf16-utf32-z9.c +--- glibc-2.14-418-gb2ea1df/sysdeps/s390/s390-64/utf16-utf32-z9.c ++++ /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; \ @@ -4086,8 +4037,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-394-g8f3b1ff/sysdeps/s390/s390-64/utf8-utf16-z9.c -+++ glibc-2.14.90-13/sysdeps/s390/s390-64/utf8-utf16-z9.c +--- glibc-2.14-418-gb2ea1df/sysdeps/s390/s390-64/utf8-utf16-z9.c ++++ /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; \ @@ -4100,8 +4051,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-394-g8f3b1ff/sysdeps/s390/s390-64/utf8-utf32-z9.c -+++ glibc-2.14.90-13/sysdeps/s390/s390-64/utf8-utf32-z9.c +--- glibc-2.14-418-gb2ea1df/sysdeps/s390/s390-64/utf8-utf32-z9.c ++++ /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; \ @@ -4114,8 +4065,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-394-g8f3b1ff/sysdeps/unix/nice.c -+++ glibc-2.14.90-13/sysdeps/unix/nice.c +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/nice.c ++++ /sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -4130,25 +4081,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/check_pf.c -@@ -27,13 +27,10 @@ - #include - #include - --#include --#include --#include -- - #include - #include - -+#include "netlinkaccess.h" - - #ifndef IFA_F_HOMEADDRESS - # define IFA_F_HOMEADDRESS 0 ---- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/futimesat.c ++++ /sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -4191,8 +4125,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S -+++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S ++++ /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 +4160,8 @@ + LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx) jmp *%edx END (____longjmp_chk) ---- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ /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 +4222,16 @@ + } while (0) + +#include_next ---- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ /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-394-g8f3b1ff/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ /sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -4330,56 +4264,29 @@ + } while (0) + #include_next ---- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ /sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ /sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ /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-394-g8f3b1ff/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/netlinkaccess.h -@@ -25,6 +25,24 @@ - - #include - -+#ifndef IFA_MAX -+/* 2.6.19 kernel headers helpfully removed some macros and -+ moved lots of stuff into new headers, some of which aren't -+ included by linux/rtnetlink.h. */ -+#include -+#endif -+ -+#ifndef IFA_RTA -+# define IFA_RTA(r) \ -+ ((struct rtattr*) ((char*)(r) + NLMSG_ALIGN (sizeof (struct ifaddrmsg)))) -+# define IFA_PAYLOAD(n) NLMSG_PAYLOAD (n, sizeof (struct ifaddrmsg)) -+#endif -+ -+#ifndef IFLA_RTA -+# define IFLA_RTA(r) \ -+ ((struct rtattr*) ((char*)(r) + NLMSG_ALIGN (sizeof (struct ifinfomsg)))) -+# define IFLA_PAYLOAD(n) NLMSG_PAYLOAD (n, sizeof (struct ifinfomsg)) -+#endif - - struct netlink_res - { ---- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/paths.h ++++ /sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -4389,8 +4296,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/tcsetattr.c ++++ /sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -4436,8 +4343,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S -+++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S ++++ /sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S @@ -19,6 +19,7 @@ #include #include @@ -4464,8 +4371,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (____longjmp_chk) ---- glibc-2.14-394-g8f3b1ff/sysdeps/x86_64/__longjmp.S -+++ glibc-2.14.90-13/sysdeps/x86_64/__longjmp.S +--- glibc-2.14-418-gb2ea1df/sysdeps/x86_64/__longjmp.S ++++ /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 +4402,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (__longjmp) ---- glibc-2.14-394-g8f3b1ff/sysdeps/x86_64/setjmp.S -+++ glibc-2.14.90-13/sysdeps/x86_64/setjmp.S +--- glibc-2.14-418-gb2ea1df/sysdeps/x86_64/setjmp.S ++++ /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 +4427,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%rax) #endif ---- glibc-2.14-394-g8f3b1ff/timezone/zic.c -+++ glibc-2.14.90-13/timezone/zic.c +--- glibc-2.14-418-gb2ea1df/timezone/zic.c ++++ /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 1aebfee..ac5ed25 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.14-394-g8f3b1ff +%define glibcsrcdir glibc-2.14-418-gb2ea1df %define glibcversion 2.14.90 -%define glibcportsdir glibc-ports-2.14-25-gd3d9bde +%define glibcportsdir glibc-ports-2.14-43-gf335e01 ### glibc.spec.in follows: %define run_glibc_tests 1 %define auxarches athlon alphaev6 @@ -28,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 13 +Release: 14 # 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 @@ -1112,6 +1112,22 @@ rm -f *.filelist* %endif %changelog +* Tue Nov 8 2011 Andreas Schwab - 2.4.90-14 +- Update from master + - Fix locking in _IO_flush_all_lockp + - Fix buffer allocation in files initgroups handler + - Don't start AVC thread until credentials are installed + - Don't fail in makedb if SELinux is disabled + - New Linux syscalls process_vm_readv and process_vm_writev + - Unify getent output for initgroups database (BZ#13367) + - Avoid assertion in processes with VM in bad shape (BZ#13276) + - Don't mark memory synchronisation functions as leaf (#747377, BZ#13344) + - Add missing register initialization in x86-64 + pthread_cond_timedwait (BZ#13358) + - Correctly NUL-terminate link name in sprof (BZ#13337) + - Fix readlink call in ldconfig's chroot handling (BZ#13335) + - Preserve link time dependencies over relocation dependencies (BZ#12892) + * Wed Oct 19 2011 Andreas Schwab - 2.14.90-13 - Update from master - Fix linkage conflict with feraiseexcept (#746753) diff --git a/sources b/sources index c990b62..eca8595 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -6cb0f013d410bf40e1a1d28a5d9f95b9 glibc-2.14-394-g8f3b1ff-fedora.tar.xz -860f193936a67a1fd1e06c2b85912477 glibc-2.14-394-g8f3b1ff.tar.xz -9673adaacae3ac645748827a62876ce9 glibc-ports-2.14-25-gd3d9bde.tar.xz +bce89b90d75eb65d573c89d231128a45 glibc-2.14-418-gb2ea1df-fedora.tar.xz +a1c214925f0f2dabf4f88bddb1fcf39e glibc-2.14-418-gb2ea1df.tar.xz +b89c04e859de608e0c6b33ab77923527 glibc-ports-2.14-43-gf335e01.tar.xz From f3f8dee31610f286e44291da9a3670aebccf699e Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 11 Nov 2011 15:43:03 +0100 Subject: [PATCH 02/15] 2.14.90-15 --- .gitignore | 4 +- glibc-fedora.patch | 590 ++++++++++++++++++++++----------------------- glibc.spec | 26 +- sources | 4 +- 4 files changed, 320 insertions(+), 304 deletions(-) diff --git a/.gitignore b/.gitignore index b064741..4b5489d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/glibc-2.14-418-gb2ea1df-fedora.tar.xz -/glibc-2.14-418-gb2ea1df.tar.xz /glibc-ports-2.14-43-gf335e01.tar.xz +/glibc-2.14-498-g98591e5-fedora.tar.xz +/glibc-2.14-498-g98591e5.tar.xz diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 52804b5..a4f706a 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,6 @@ ---- glibc-2.14-418-gb2ea1df/ChangeLog -+++ /ChangeLog -@@ -1694,6 +1694,15 @@ +--- glibc-2.14-498-g98591e5/ChangeLog ++++ glibc-2.14.90-15/ChangeLog +@@ -2217,6 +2217,15 @@ * sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi directive. @@ -16,7 +16,7 @@ 2011-08-24 David S. Miller * sysdeps/sparc/sparc64/strcmp.S: Rewrite. -@@ -2499,6 +2508,14 @@ +@@ -3022,6 +3031,14 @@ * config.make.in: Likewise. * malloc/Makefile: Likewise. @@ -31,7 +31,7 @@ 2011-06-27 Andreas Schwab * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP -@@ -2630,6 +2647,10 @@ +@@ -3153,6 +3170,10 @@ * inet/getnetgrent_r.c: Use DL_CALL_FCT in several places. @@ -42,7 +42,7 @@ 2011-06-20 David S. Miller * sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple -@@ -3252,6 +3273,13 @@ +@@ -3775,6 +3796,13 @@ * libio/Makefile (tests): Add bug-fclose1. * libio/bug-fclose1.c: New file. @@ -56,7 +56,7 @@ 2011-05-12 Ulrich Drepper [BZ #12511] -@@ -3529,13 +3557,6 @@ +@@ -4052,13 +4080,6 @@ * stdlib/bug-getcontext.c: New file. * stdlib/Makefile: Add rules to build and run bug-getcontext. @@ -70,7 +70,7 @@ 2011-04-11 Andreas Krebbel * sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes -@@ -3773,6 +3794,31 @@ +@@ -4296,6 +4317,31 @@ * sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime): Export. @@ -102,7 +102,7 @@ 2011-03-22 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment -@@ -3833,6 +3879,16 @@ +@@ -4356,6 +4402,16 @@ $LDFLAGS and -nostdlib -nostartfiles to linking step. Change main to _start. @@ -119,7 +119,7 @@ 2011-03-06 Ulrich Drepper * elf/dl-load.c (_dl_map_object): If we are looking for the first -@@ -4049,6 +4105,12 @@ +@@ -4572,6 +4628,12 @@ * shadow/sgetspent.c: Check return value of __sgetspent_r instead of errno. @@ -132,7 +132,7 @@ 2011-01-19 Ulrich Drepper [BZ #11724] -@@ -4736,6 +4798,26 @@ +@@ -5259,6 +5321,26 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid. @@ -159,7 +159,7 @@ 2010-09-24 Petr Baudis * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -5528,6 +5610,17 @@ +@@ -6051,6 +6133,17 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -177,7 +177,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -5580,6 +5673,21 @@ +@@ -6103,6 +6196,21 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -199,8 +199,8 @@ 2010-05-28 Luis Machado * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.14-418-gb2ea1df/ChangeLog.15 -+++ /ChangeLog.15 +--- glibc-2.14-498-g98591e5/ChangeLog.15 ++++ glibc-2.14.90-15/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -266,8 +266,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.14-418-gb2ea1df/ChangeLog.16 -+++ /ChangeLog.16 +--- glibc-2.14-498-g98591e5/ChangeLog.16 ++++ glibc-2.14.90-15/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -290,8 +290,8 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . ---- glibc-2.14-418-gb2ea1df/ChangeLog.17 -+++ /ChangeLog.17 +--- glibc-2.14-498-g98591e5/ChangeLog.17 ++++ glibc-2.14.90-15/ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -340,8 +340,8 @@ 2007-04-16 Ulrich Drepper [BZ #4364] ---- glibc-2.14-418-gb2ea1df/Makeconfig -+++ /Makeconfig +--- glibc-2.14-498-g98591e5/Makeconfig ++++ glibc-2.14.90-15/Makeconfig @@ -803,12 +803,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -358,9 +358,9 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.14-418-gb2ea1df/NEWS -+++ /NEWS -@@ -63,16 +63,6 @@ Version 2.14 +--- glibc-2.14-498-g98591e5/NEWS ++++ glibc-2.14.90-15/NEWS +@@ -72,16 +72,6 @@ Version 2.14 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, 12795, 12811, 12813, 12814, 12841 @@ -377,9 +377,9 @@ * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at, syncfs, setns, sendmmsg ---- glibc-2.14-418-gb2ea1df/config.h.in -+++ /config.h.in -@@ -184,6 +184,9 @@ +--- glibc-2.14-498-g98591e5/config.h.in ++++ glibc-2.14.90-15/config.h.in +@@ -187,6 +187,9 @@ /* Define if `.ctors' and `.dtors' sections shouldn't be used. */ #undef NO_CTORS_DTORS_SECTIONS @@ -389,9 +389,9 @@ /* */ ---- glibc-2.14-418-gb2ea1df/configure -+++ /configure -@@ -791,6 +791,7 @@ enable_kernel +--- glibc-2.14-498-g98591e5/configure ++++ glibc-2.14.90-15/configure +@@ -792,6 +792,7 @@ enable_kernel enable_all_warnings enable_multi_arch enable_nss_crypt @@ -399,7 +399,7 @@ with_cpu ' ac_precious_vars='build_alias -@@ -1450,6 +1451,7 @@ Optional Features: +@@ -1451,6 +1452,7 @@ Optional Features: --enable-multi-arch enable single DSO with optimizations for multiple architectures --enable-nss-crypt enable libcrypt to use nss @@ -407,7 +407,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -3804,6 +3806,51 @@ else +@@ -3805,6 +3807,51 @@ else fi @@ -459,8 +459,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-418-gb2ea1df/configure.in -+++ /configure.in +--- glibc-2.14-498-g98591e5/configure.in ++++ glibc-2.14.90-15/configure.in @@ -291,6 +291,29 @@ else fi AC_SUBST(libc_cv_nss_crypt) @@ -491,8 +491,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-418-gb2ea1df/csu/Makefile -+++ /csu/Makefile +--- glibc-2.14-498-g98591e5/csu/Makefile ++++ glibc-2.14.90-15/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -503,8 +503,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.14-418-gb2ea1df/csu/elf-init.c -+++ /csu/elf-init.c +--- glibc-2.14-498-g98591e5/csu/elf-init.c ++++ glibc-2.14.90-15/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; @@ -529,8 +529,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.14-418-gb2ea1df/debug/tst-chk1.c -+++ /debug/tst-chk1.c +--- glibc-2.14-498-g98591e5/debug/tst-chk1.c ++++ glibc-2.14.90-15/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -559,8 +559,8 @@ # define O 0 # else # define O 1 ---- glibc-2.14-418-gb2ea1df/elf/Makefile -+++ /elf/Makefile +--- glibc-2.14-498-g98591e5/elf/Makefile ++++ glibc-2.14.90-15/elf/Makefile @@ -135,6 +135,7 @@ include ../Makeconfig ifeq ($(unwind-find-fde),yes) routines += unwind-dw2-fde-glibc @@ -579,8 +579,8 @@ test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names)))) generated += $(addsuffix .so,$(strip $(modules-names))) ---- glibc-2.14-418-gb2ea1df/elf/dl-close.c -+++ /elf/dl-close.c +--- glibc-2.14-498-g98591e5/elf/dl-close.c ++++ glibc-2.14.90-15/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) @@ -601,8 +601,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-418-gb2ea1df/elf/dl-deps.c -+++ /elf/dl-deps.c +--- glibc-2.14-498-g98591e5/elf/dl-deps.c ++++ glibc-2.14.90-15/elf/dl-deps.c @@ -489,6 +489,7 @@ _dl_map_object_deps (struct link_map *map, nneeded * sizeof needed[0]); atomic_write_barrier (); @@ -628,8 +628,8 @@ if (errno_reason) _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, ---- glibc-2.14-418-gb2ea1df/elf/dl-init.c -+++ /elf/dl-init.c +--- glibc-2.14-498-g98591e5/elf/dl-init.c ++++ glibc-2.14.90-15/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -652,8 +652,8 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.14-418-gb2ea1df/elf/dl-libc.c -+++ /elf/dl-libc.c +--- glibc-2.14-498-g98591e5/elf/dl-libc.c ++++ glibc-2.14.90-15/elf/dl-libc.c @@ -270,13 +270,13 @@ libc_freeres_fn (free_mem) for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) @@ -680,8 +680,8 @@ } if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 ---- glibc-2.14-418-gb2ea1df/elf/dl-load.c -+++ /elf/dl-load.c +--- glibc-2.14-498-g98591e5/elf/dl-load.c ++++ glibc-2.14.90-15/elf/dl-load.c @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len) @@ -761,8 +761,8 @@ } else /* No DST we recognize. */ ---- glibc-2.14-418-gb2ea1df/elf/dl-support.c -+++ /elf/dl-support.c +--- glibc-2.14-498-g98591e5/elf/dl-support.c ++++ glibc-2.14.90-15/elf/dl-support.c @@ -82,10 +82,8 @@ unsigned long long _dl_load_adds; create a fake scope containing nothing. */ struct r_scope_elem _dl_initial_searchlist; @@ -774,8 +774,8 @@ /* Random data provided by the kernel. */ void *_dl_random; ---- glibc-2.14-418-gb2ea1df/elf/ldconfig.c -+++ /elf/ldconfig.c +--- glibc-2.14-498-g98591e5/elf/ldconfig.c ++++ glibc-2.14.90-15/elf/ldconfig.c @@ -1034,17 +1034,19 @@ search_dirs (void) @@ -857,8 +857,8 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.14-418-gb2ea1df/elf/ldd.bash.in -+++ /elf/ldd.bash.in +--- glibc-2.14-498-g98591e5/elf/ldd.bash.in ++++ glibc-2.14.90-15/elf/ldd.bash.in @@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2 fi done @@ -887,8 +887,8 @@ try_trace "$RTLD" "$file" || result=1 ;; *) ---- glibc-2.14-418-gb2ea1df/elf/rtld-Rules -+++ /elf/rtld-Rules +--- glibc-2.14-498-g98591e5/elf/rtld-Rules ++++ glibc-2.14.90-15/elf/rtld-Rules @@ -1,7 +1,7 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker. @@ -906,8 +906,8 @@ +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld endif ---- glibc-2.14-418-gb2ea1df/elf/rtld.c -+++ /elf/rtld.c +--- glibc-2.14-498-g98591e5/elf/rtld.c ++++ glibc-2.14.90-15/elf/rtld.c @@ -107,7 +107,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -962,24 +962,24 @@ if (! prelinked && rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. ---- glibc-2.14-418-gb2ea1df/extra-lib.mk -+++ /extra-lib.mk +--- glibc-2.14-498-g98591e5/extra-lib.mk ++++ glibc-2.14.90-15/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-418-gb2ea1df/include/bits/stdlib-ldbl.h -+++ /include/bits/stdlib-ldbl.h +--- glibc-2.14-498-g98591e5/include/bits/stdlib-ldbl.h ++++ glibc-2.14.90-15/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-418-gb2ea1df/include/bits/wchar-ldbl.h -+++ /include/bits/wchar-ldbl.h +--- glibc-2.14-498-g98591e5/include/bits/wchar-ldbl.h ++++ glibc-2.14.90-15/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-418-gb2ea1df/include/features.h -+++ /include/features.h +--- glibc-2.14-498-g98591e5/include/features.h ++++ glibc-2.14.90-15/include/features.h @@ -310,8 +310,13 @@ #endif @@ -996,8 +996,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.14-418-gb2ea1df/include/libc-symbols.h -+++ /include/libc-symbols.h +--- glibc-2.14-498-g98591e5/include/libc-symbols.h ++++ glibc-2.14.90-15/include/libc-symbols.h @@ -626,7 +626,7 @@ for linking") # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libc_hidden_def(name) hidden_def (name) @@ -1007,8 +1007,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-418-gb2ea1df/include/link.h -+++ /include/link.h +--- glibc-2.14-498-g98591e5/include/link.h ++++ glibc-2.14.90-15/include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. @@ -1046,8 +1046,8 @@ # elif NO_TLS_OFFSET == -1 # define FORCED_DYNAMIC_TLS_OFFSET -2 # else ---- glibc-2.14-418-gb2ea1df/include/stap-probe.h -+++ /include/stap-probe.h +--- glibc-2.14-498-g98591e5/include/stap-probe.h ++++ glibc-2.14.90-15/include/stap-probe.h @@ -0,0 +1,140 @@ +/* Macros for defining Systemtap static probe points. + Copyright (C) 2011 Free Software Foundation, Inc. @@ -1189,16 +1189,16 @@ +#endif /* USE_STAP_PROBE. */ + +#endif /* stap-probe.h */ ---- glibc-2.14-418-gb2ea1df/include/sys/resource.h -+++ /include/sys/resource.h +--- glibc-2.14-498-g98591e5/include/sys/resource.h ++++ glibc-2.14.90-15/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-418-gb2ea1df/inet/Makefile -+++ /inet/Makefile +--- glibc-2.14-498-g98591e5/inet/Makefile ++++ glibc-2.14.90-15/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -1208,8 +1208,8 @@ ifeq ($(have-thread-library),yes) CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions ---- glibc-2.14-418-gb2ea1df/intl/locale.alias -+++ /intl/locale.alias +--- glibc-2.14-498-g98591e5/intl/locale.alias ++++ glibc-2.14.90-15/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -1219,8 +1219,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.14-418-gb2ea1df/libio/stdio.h -+++ /libio/stdio.h +--- glibc-2.14-498-g98591e5/libio/stdio.h ++++ glibc-2.14.90-15/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. */ @@ -1234,8 +1234,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.14-418-gb2ea1df/locale/iso-4217.def -+++ /locale/iso-4217.def +--- glibc-2.14-498-g98591e5/locale/iso-4217.def ++++ glibc-2.14.90-15/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1327,8 +1327,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.14-418-gb2ea1df/locale/programs/locarchive.c -+++ /locale/programs/locarchive.c +--- glibc-2.14-498-g98591e5/locale/programs/locarchive.c ++++ glibc-2.14.90-15/locale/programs/locarchive.c @@ -253,9 +253,9 @@ oldlocrecentcmp (const void *a, const void *b) /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -1360,8 +1360,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.14-418-gb2ea1df/localedata/ChangeLog -+++ /localedata/ChangeLog +--- glibc-2.14-498-g98591e5/localedata/ChangeLog ++++ glibc-2.14.90-15/localedata/ChangeLog @@ -10,6 +10,14 @@ * tests-mbwc/tst_funcs.h (TST_DECL_VARS, TST_HEAD_LOCALE): Remove unused variable. @@ -1377,8 +1377,8 @@ 2011-05-21 Ulrich Drepper [BZ #12788] ---- glibc-2.14-418-gb2ea1df/localedata/Makefile -+++ /localedata/Makefile +--- glibc-2.14-498-g98591e5/localedata/Makefile ++++ glibc-2.14.90-15/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1387,8 +1387,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.14-418-gb2ea1df/localedata/SUPPORTED -+++ /localedata/SUPPORTED +--- glibc-2.14-498-g98591e5/localedata/SUPPORTED ++++ glibc-2.14.90-15/localedata/SUPPORTED @@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1430,8 +1430,8 @@ sw_KE/UTF-8 \ sw_TZ/UTF-8 \ ta_IN/UTF-8 \ ---- glibc-2.14-418-gb2ea1df/localedata/locales/cy_GB -+++ /localedata/locales/cy_GB +--- glibc-2.14-498-g98591e5/localedata/locales/cy_GB ++++ glibc-2.14.90-15/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1446,8 +1446,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.14-418-gb2ea1df/localedata/locales/en_GB -+++ /localedata/locales/en_GB +--- glibc-2.14-498-g98591e5/localedata/locales/en_GB ++++ glibc-2.14.90-15/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1459,8 +1459,8 @@ date_fmt "/ / " ---- glibc-2.14-418-gb2ea1df/localedata/locales/no_NO -+++ /localedata/locales/no_NO +--- glibc-2.14-498-g98591e5/localedata/locales/no_NO ++++ glibc-2.14.90-15/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1531,8 +1531,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.14-418-gb2ea1df/localedata/locales/zh_TW -+++ /localedata/locales/zh_TW +--- glibc-2.14-498-g98591e5/localedata/locales/zh_TW ++++ glibc-2.14.90-15/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1560,8 +1560,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.14-418-gb2ea1df/login/programs/pt_chown.c -+++ /login/programs/pt_chown.c +--- glibc-2.14-498-g98591e5/login/programs/pt_chown.c ++++ glibc-2.14.90-15/login/programs/pt_chown.c @@ -29,6 +29,7 @@ #include #include @@ -1603,8 +1603,8 @@ - return EXIT_SUCCESS; } ---- glibc-2.14-418-gb2ea1df/malloc/mcheck.c -+++ /malloc/mcheck.c +--- glibc-2.14-498-g98591e5/malloc/mcheck.c ++++ glibc-2.14.90-15/malloc/mcheck.c @@ -25,10 +25,26 @@ # include # include @@ -1681,8 +1681,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.14-418-gb2ea1df/manual/libc.texinfo -+++ /manual/libc.texinfo +--- glibc-2.14-498-g98591e5/manual/libc.texinfo ++++ glibc-2.14.90-15/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1692,8 +1692,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.14-418-gb2ea1df/misc/sys/cdefs.h -+++ /misc/sys/cdefs.h +--- glibc-2.14-498-g98591e5/misc/sys/cdefs.h ++++ glibc-2.14.90-15/misc/sys/cdefs.h @@ -146,7 +146,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -1706,7 +1706,7 @@ # define __warndecl(name, msg) \ extern void name (void) __attribute__((__warning__ (msg))) # define __warnattr(msg) __attribute__((__warning__ (msg))) -@@ -312,10 +315,16 @@ +@@ -316,10 +319,16 @@ /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 inline semantics, unless -fgnu89-inline is used. */ @@ -1725,7 +1725,7 @@ # define __extern_always_inline \ extern __always_inline __attribute__ ((__gnu_inline__, __artificial__)) # else -@@ -335,7 +344,10 @@ +@@ -339,7 +348,10 @@ /* GCC 4.3 and above allow passing all anonymous arguments of an __extern_always_inline function to some other vararg function. */ @@ -1737,8 +1737,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.14-418-gb2ea1df/nis/Makefile -+++ /nis/Makefile +--- glibc-2.14-498-g98591e5/nis/Makefile ++++ glibc-2.14.90-15/nis/Makefile @@ -23,9 +23,9 @@ subdir := nis aux := nis_hash @@ -1760,8 +1760,8 @@ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ ---- glibc-2.14-418-gb2ea1df/nis/nss -+++ /nis/nss +--- glibc-2.14-498-g98591e5/nis/nss ++++ glibc-2.14.90-15/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 @@ -1771,9 +1771,9 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.14-418-gb2ea1df/nptl/ChangeLog -+++ /nptl/ChangeLog -@@ -158,6 +158,51 @@ +--- glibc-2.14-498-g98591e5/nptl/ChangeLog ++++ glibc-2.14.90-15/nptl/ChangeLog +@@ -169,6 +169,51 @@ clearing memory. Patch partly by Robert Rex . @@ -1825,7 +1825,7 @@ 2011-01-19 Roland McGrath * pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo. -@@ -4887,6 +4932,11 @@ +@@ -4898,6 +4943,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1837,7 +1837,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6961,6 +7011,11 @@ +@@ -6972,6 +7022,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1849,8 +1849,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.14-418-gb2ea1df/nptl/DESIGN-systemtap-probes.txt -+++ /nptl/DESIGN-systemtap-probes.txt +--- glibc-2.14-498-g98591e5/nptl/DESIGN-systemtap-probes.txt ++++ glibc-2.14.90-15/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. @@ -1941,8 +1941,8 @@ + arg1 = condition +cond_broadcast - probe for pthread_cond_broadcast + arg1 = condition ---- glibc-2.14-418-gb2ea1df/nptl/Makefile -+++ /nptl/Makefile +--- glibc-2.14-498-g98591e5/nptl/Makefile ++++ glibc-2.14.90-15/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1975,8 +1975,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.14-418-gb2ea1df/nptl/Versions -+++ /nptl/Versions +--- glibc-2.14-498-g98591e5/nptl/Versions ++++ glibc-2.14.90-15/nptl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; # Internal libc interface to libpthread @@ -1985,8 +1985,8 @@ } } ---- glibc-2.14-418-gb2ea1df/nptl/nptl-init.c -+++ /nptl/nptl-init.c +--- glibc-2.14-498-g98591e5/nptl/nptl-init.c ++++ glibc-2.14.90-15/nptl/nptl-init.c @@ -415,7 +415,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. */ @@ -1996,8 +1996,8 @@ || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ ---- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_broadcast.c -+++ /nptl/pthread_cond_broadcast.c +--- glibc-2.14-498-g98591e5/nptl/pthread_cond_broadcast.c ++++ glibc-2.14.90-15/nptl/pthread_cond_broadcast.c @@ -23,6 +23,7 @@ #include #include @@ -2015,8 +2015,8 @@ int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; /* Make sure we are alone. */ ---- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_destroy.c -+++ /nptl/pthread_cond_destroy.c +--- glibc-2.14-498-g98591e5/nptl/pthread_cond_destroy.c ++++ glibc-2.14.90-15/nptl/pthread_cond_destroy.c @@ -20,6 +20,7 @@ #include #include @@ -2034,8 +2034,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_init.c -+++ /nptl/pthread_cond_init.c +--- glibc-2.14-498-g98591e5/nptl/pthread_cond_init.c ++++ glibc-2.14.90-15/nptl/pthread_cond_init.c @@ -20,6 +20,7 @@ #include @@ -2053,8 +2053,8 @@ return 0; } versioned_symbol (libpthread, __pthread_cond_init, ---- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_signal.c -+++ /nptl/pthread_cond_signal.c +--- glibc-2.14-498-g98591e5/nptl/pthread_cond_signal.c ++++ glibc-2.14.90-15/nptl/pthread_cond_signal.c @@ -26,6 +26,7 @@ #include @@ -2072,8 +2072,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_wait.c -+++ /nptl/pthread_cond_wait.c +--- glibc-2.14-498-g98591e5/nptl/pthread_cond_wait.c ++++ glibc-2.14.90-15/nptl/pthread_cond_wait.c @@ -25,6 +25,7 @@ #include @@ -2091,8 +2091,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-418-gb2ea1df/nptl/pthread_create.c -+++ /nptl/pthread_create.c +--- glibc-2.14-498-g98591e5/nptl/pthread_create.c ++++ glibc-2.14.90-15/nptl/pthread_create.c @@ -32,6 +32,8 @@ #include @@ -2120,8 +2120,8 @@ /* Start the thread. */ return create_thread (pd, iattr, STACK_VARIABLES_ARGS); } ---- glibc-2.14-418-gb2ea1df/nptl/pthread_join.c -+++ /nptl/pthread_join.c +--- glibc-2.14-498-g98591e5/nptl/pthread_join.c ++++ glibc-2.14.90-15/nptl/pthread_join.c @@ -23,6 +23,8 @@ #include #include "pthreadP.h" @@ -2148,8 +2148,8 @@ + return result; } ---- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_destroy.c -+++ /nptl/pthread_mutex_destroy.c +--- glibc-2.14-498-g98591e5/nptl/pthread_mutex_destroy.c ++++ glibc-2.14.90-15/nptl/pthread_mutex_destroy.c @@ -20,11 +20,15 @@ #include #include "pthreadP.h" @@ -2166,8 +2166,8 @@ if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0 && mutex->__data.__nusers != 0) return EBUSY; ---- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_init.c -+++ /nptl/pthread_mutex_init.c +--- glibc-2.14-498-g98591e5/nptl/pthread_mutex_init.c ++++ glibc-2.14.90-15/nptl/pthread_mutex_init.c @@ -24,6 +24,8 @@ #include #include "pthreadP.h" @@ -2186,8 +2186,8 @@ return 0; } strong_alias (__pthread_mutex_init, pthread_mutex_init) ---- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_lock.c -+++ /nptl/pthread_mutex_lock.c +--- glibc-2.14-498-g98591e5/nptl/pthread_mutex_lock.c ++++ glibc-2.14.90-15/nptl/pthread_mutex_lock.c @@ -24,6 +24,7 @@ #include #include "pthreadP.h" @@ -2224,8 +2224,8 @@ return 0; } #ifndef __pthread_mutex_lock ---- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_timedlock.c -+++ /nptl/pthread_mutex_timedlock.c +--- glibc-2.14-498-g98591e5/nptl/pthread_mutex_timedlock.c ++++ glibc-2.14.90-15/nptl/pthread_mutex_timedlock.c @@ -24,6 +24,8 @@ #include #include @@ -2280,8 +2280,8 @@ } out: ---- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_unlock.c -+++ /nptl/pthread_mutex_unlock.c +--- glibc-2.14-498-g98591e5/nptl/pthread_mutex_unlock.c ++++ glibc-2.14.90-15/nptl/pthread_mutex_unlock.c @@ -22,6 +22,7 @@ #include #include "pthreadP.h" @@ -2318,8 +2318,8 @@ return 0; } ---- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_destroy.c -+++ /nptl/pthread_rwlock_destroy.c +--- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_destroy.c ++++ glibc-2.14.90-15/nptl/pthread_rwlock_destroy.c @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -2336,8 +2336,8 @@ /* Nothing to be done. For now. */ return 0; } ---- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_rdlock.c -+++ /nptl/pthread_rwlock_rdlock.c +--- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_rdlock.c ++++ glibc-2.14.90-15/nptl/pthread_rwlock_rdlock.c @@ -22,6 +22,7 @@ #include #include @@ -2364,8 +2364,8 @@ break; } ---- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_unlock.c -+++ /nptl/pthread_rwlock_unlock.c +--- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_unlock.c ++++ glibc-2.14.90-15/nptl/pthread_rwlock_unlock.c @@ -22,11 +22,14 @@ #include #include @@ -2381,8 +2381,8 @@ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); if (rwlock->__data.__writer) rwlock->__data.__writer = 0; ---- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_wrlock.c -+++ /nptl/pthread_rwlock_wrlock.c +--- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_wrlock.c ++++ glibc-2.14.90-15/nptl/pthread_rwlock_wrlock.c @@ -22,6 +22,7 @@ #include #include @@ -2409,8 +2409,8 @@ break; } ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ /nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.14.90-15/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 @@ -2419,8 +2419,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ /nptl/sysdeps/unix/sysv/linux/i386/Versions +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -2428,8 +2428,8 @@ + __uname; + } +} ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S -+++ /nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2449,8 +2449,8 @@ ENTER_KERNEL 2: movl %edx, %eax ---- glibc-2.14-418-gb2ea1df/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-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S @@ -24,6 +24,7 @@ #include #include @@ -2468,8 +2468,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-418-gb2ea1df/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-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S @@ -24,7 +24,7 @@ #include #include @@ -2488,8 +2488,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-418-gb2ea1df/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-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S @@ -24,7 +24,7 @@ #include #include @@ -2508,8 +2508,8 @@ cmpl $1000000000, 4(%ebp) movl $EINVAL, %eax jae 18f ---- glibc-2.14-418-gb2ea1df/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-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S @@ -25,6 +25,7 @@ #include #include @@ -2527,8 +2527,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-418-gb2ea1df/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-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S @@ -23,6 +23,7 @@ #include #include @@ -2546,8 +2546,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-418-gb2ea1df/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-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S @@ -23,6 +23,7 @@ #include #include @@ -2565,8 +2565,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h -+++ /nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2584,8 +2584,8 @@ __asm __volatile (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ /nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -2595,8 +2595,8 @@ cp = u.uts.version; else { ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ /nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -2604,8 +2604,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S -+++ /nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2635,8 +2635,8 @@ syscall 2: movl %edx, %eax ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h -+++ /nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2654,8 +2654,8 @@ __asm __volatile ("syscall" \ : "=a" (__ignore) \ : "0" (SYS_futex), "D" (futex), \ ---- glibc-2.14-418-gb2ea1df/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-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S @@ -25,7 +25,7 @@ #include #include @@ -2674,8 +2674,8 @@ /* Get internal lock. */ movl $1, %esi xorl %eax, %eax ---- glibc-2.14-418-gb2ea1df/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-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S @@ -24,6 +24,7 @@ #include #include @@ -2693,8 +2693,8 @@ /* Get internal lock. */ movq %rdi, %r8 movl $1, %esi ---- glibc-2.14-418-gb2ea1df/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-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -23,6 +23,7 @@ #include #include @@ -2712,8 +2712,8 @@ cmpq $1000000000, 8(%rdx) movl $EINVAL, %eax jae 48f ---- glibc-2.14-418-gb2ea1df/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-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S @@ -23,6 +23,7 @@ #include #include @@ -2731,8 +2731,8 @@ cmpq $-1, dep_mutex(%rdi) /* Prepare structure passed to cancellation handler. */ ---- glibc-2.14-418-gb2ea1df/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-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S @@ -22,7 +22,7 @@ #include #include @@ -2752,8 +2752,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-418-gb2ea1df/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-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S @@ -22,7 +22,7 @@ #include #include @@ -2773,8 +2773,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-418-gb2ea1df/nscd/nscd.conf -+++ /nscd/nscd.conf +--- glibc-2.14-498-g98591e5/nscd/nscd.conf ++++ glibc-2.14.90-15/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -2784,8 +2784,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.14-418-gb2ea1df/nscd/nscd.init -+++ /nscd/nscd.init +--- glibc-2.14-498-g98591e5/nscd/nscd.init ++++ glibc-2.14.90-15/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -2862,8 +2862,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.14-418-gb2ea1df/nss/Makefile -+++ /nss/Makefile +--- glibc-2.14-498-g98591e5/nss/Makefile ++++ glibc-2.14.90-15/nss/Makefile @@ -88,6 +88,7 @@ endif include ../Rules @@ -2872,8 +2872,8 @@ ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a ---- glibc-2.14-418-gb2ea1df/nss/nss_files/files-XXX.c -+++ /nss/nss_files/files-XXX.c +--- glibc-2.14-498-g98591e5/nss/nss_files/files-XXX.c ++++ glibc-2.14.90-15/nss/nss_files/files-XXX.c @@ -190,7 +190,7 @@ internal_getent (struct STRUCTURE *result, { char *p; @@ -2883,8 +2883,8 @@ int parse_result; if (buflen < sizeof *data + 2) ---- glibc-2.14-418-gb2ea1df/posix/Makefile -+++ /posix/Makefile +--- glibc-2.14-498-g98591e5/posix/Makefile ++++ glibc-2.14.90-15/posix/Makefile @@ -320,15 +320,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -2905,8 +2905,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.14-418-gb2ea1df/posix/gai.conf -+++ /posix/gai.conf +--- glibc-2.14-498-g98591e5/posix/gai.conf ++++ glibc-2.14.90-15/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -2931,8 +2931,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.14-418-gb2ea1df/posix/getconf.speclist.h -+++ /posix/getconf.speclist.h +--- glibc-2.14-498-g98591e5/posix/getconf.speclist.h ++++ glibc-2.14.90-15/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -2973,8 +2973,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.14-418-gb2ea1df/posix/regcomp.c -+++ /posix/regcomp.c +--- glibc-2.14-498-g98591e5/posix/regcomp.c ++++ glibc-2.14.90-15/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. @@ -3106,8 +3106,8 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.14-418-gb2ea1df/resolv/Makefile -+++ /resolv/Makefile +--- glibc-2.14-498-g98591e5/resolv/Makefile ++++ glibc-2.14.90-15/resolv/Makefile @@ -81,6 +81,7 @@ ifeq (yes,$(have-ssp)) CFLAGS-libresolv += -fstack-protector endif @@ -3116,8 +3116,8 @@ # The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings ---- glibc-2.14-418-gb2ea1df/resolv/res_query.c -+++ /resolv/res_query.c +--- glibc-2.14-498-g98591e5/resolv/res_query.c ++++ glibc-2.14.90-15/resolv/res_query.c @@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, && *resplen2 > (int) sizeof (HEADER)) { @@ -3127,8 +3127,8 @@ hp = hp2; } else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) ---- glibc-2.14-418-gb2ea1df/resource/getrlimit.c -+++ /resource/getrlimit.c +--- glibc-2.14-498-g98591e5/resource/getrlimit.c ++++ glibc-2.14.90-15/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -3137,8 +3137,8 @@ weak_alias (__getrlimit, getrlimit) stub_warning (getrlimit) ---- glibc-2.14-418-gb2ea1df/scripts/check-local-headers.sh -+++ /scripts/check-local-headers.sh +--- glibc-2.14-498-g98591e5/scripts/check-local-headers.sh ++++ glibc-2.14.90-15/scripts/check-local-headers.sh @@ -29,7 +29,7 @@ exec ${AWK} -v includedir="$includedir" ' BEGIN { status = 0 @@ -3148,8 +3148,8 @@ } /^[^ ]/ && $1 ~ /.*:/ { obj = $1 } { ---- glibc-2.14-418-gb2ea1df/stdio-common/vfprintf.c -+++ /stdio-common/vfprintf.c +--- glibc-2.14-498-g98591e5/stdio-common/vfprintf.c ++++ glibc-2.14.90-15/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')) \ { \ @@ -3195,8 +3195,8 @@ else \ len = strlen (string); \ } \ ---- glibc-2.14-418-gb2ea1df/streams/Makefile -+++ /streams/Makefile +--- glibc-2.14-498-g98591e5/streams/Makefile ++++ glibc-2.14.90-15/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -3206,8 +3206,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.14-418-gb2ea1df/sunrpc/Makefile -+++ /sunrpc/Makefile +--- glibc-2.14-498-g98591e5/sunrpc/Makefile ++++ glibc-2.14.90-15/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) \ @@ -3228,8 +3228,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-418-gb2ea1df/sysdeps/generic/dl-cache.h -+++ /sysdeps/generic/dl-cache.h +--- glibc-2.14-498-g98591e5/sysdeps/generic/dl-cache.h ++++ glibc-2.14.90-15/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -3245,8 +3245,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-418-gb2ea1df/sysdeps/i386/Makefile -+++ /sysdeps/i386/Makefile +--- glibc-2.14-498-g98591e5/sysdeps/i386/Makefile ++++ glibc-2.14.90-15/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -3271,8 +3271,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-418-gb2ea1df/sysdeps/i386/__longjmp.S -+++ /sysdeps/i386/__longjmp.S +--- glibc-2.14-498-g98591e5/sysdeps/i386/__longjmp.S ++++ glibc-2.14.90-15/sysdeps/i386/__longjmp.S @@ -1,5 +1,5 @@ /* longjmp for i386. - Copyright (C) 1995-1998,2000,2002,2005,2006,2009 @@ -3319,8 +3319,8 @@ #endif /* Jump to saved PC. */ jmp *%edx ---- glibc-2.14-418-gb2ea1df/sysdeps/i386/bsd-_setjmp.S -+++ /sysdeps/i386/bsd-_setjmp.S +--- glibc-2.14-498-g98591e5/sysdeps/i386/bsd-_setjmp.S ++++ glibc-2.14.90-15/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. @@ -3345,8 +3345,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-418-gb2ea1df/sysdeps/i386/bsd-setjmp.S -+++ /sysdeps/i386/bsd-setjmp.S +--- glibc-2.14-498-g98591e5/sysdeps/i386/bsd-setjmp.S ++++ glibc-2.14.90-15/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. @@ -3371,8 +3371,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-418-gb2ea1df/sysdeps/i386/i686/Makefile -+++ /sysdeps/i386/i686/Makefile +--- glibc-2.14-498-g98591e5/sysdeps/i386/i686/Makefile ++++ glibc-2.14.90-15/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -3393,8 +3393,8 @@ -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif ---- glibc-2.14-418-gb2ea1df/sysdeps/i386/setjmp.S -+++ /sysdeps/i386/setjmp.S +--- glibc-2.14-498-g98591e5/sysdeps/i386/setjmp.S ++++ glibc-2.14.90-15/sysdeps/i386/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for i386. - Copyright (C) 1995,1996,1997,2000,2001,2005,2006 @@ -3418,8 +3418,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-418-gb2ea1df/sysdeps/ia64/Makefile -+++ /sysdeps/ia64/Makefile +--- glibc-2.14-498-g98591e5/sysdeps/ia64/Makefile ++++ glibc-2.14.90-15/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -3431,8 +3431,8 @@ endif endif ---- glibc-2.14-418-gb2ea1df/sysdeps/ia64/ia64libgcc.S -+++ /sysdeps/ia64/ia64libgcc.S +--- glibc-2.14-498-g98591e5/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.14.90-15/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -3784,8 +3784,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.14-418-gb2ea1df/sysdeps/ia64/libgcc-compat.c -+++ /sysdeps/ia64/libgcc-compat.c +--- glibc-2.14-498-g98591e5/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.14.90-15/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -3871,16 +3871,16 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.14-418-gb2ea1df/sysdeps/mach/hurd/getrlimit.c -+++ /sysdeps/mach/hurd/getrlimit.c +--- glibc-2.14-498-g98591e5/sysdeps/mach/hurd/getrlimit.c ++++ glibc-2.14.90-15/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-418-gb2ea1df/sysdeps/posix/getaddrinfo.c -+++ /sysdeps/posix/getaddrinfo.c +--- glibc-2.14-498-g98591e5/sysdeps/posix/getaddrinfo.c ++++ glibc-2.14.90-15/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 @@ -4005,8 +4005,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.14-418-gb2ea1df/sysdeps/powerpc/powerpc64/Makefile -+++ /sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.14-498-g98591e5/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.14.90-15/sysdeps/powerpc/powerpc64/Makefile @@ -33,6 +33,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -4015,16 +4015,16 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-418-gb2ea1df/sysdeps/powerpc/powerpc64/elf/Makefile -+++ /sysdeps/powerpc/powerpc64/elf/Makefile +--- glibc-2.14-498-g98591e5/sysdeps/powerpc/powerpc64/elf/Makefile ++++ glibc-2.14.90-15/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-418-gb2ea1df/sysdeps/s390/s390-64/utf16-utf32-z9.c -+++ /sysdeps/s390/s390-64/utf16-utf32-z9.c +--- glibc-2.14-498-g98591e5/sysdeps/s390/s390-64/utf16-utf32-z9.c ++++ glibc-2.14.90-15/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; \ @@ -4037,8 +4037,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-418-gb2ea1df/sysdeps/s390/s390-64/utf8-utf16-z9.c -+++ /sysdeps/s390/s390-64/utf8-utf16-z9.c +--- glibc-2.14-498-g98591e5/sysdeps/s390/s390-64/utf8-utf16-z9.c ++++ glibc-2.14.90-15/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; \ @@ -4051,8 +4051,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-418-gb2ea1df/sysdeps/s390/s390-64/utf8-utf32-z9.c -+++ /sysdeps/s390/s390-64/utf8-utf32-z9.c +--- glibc-2.14-498-g98591e5/sysdeps/s390/s390-64/utf8-utf32-z9.c ++++ glibc-2.14.90-15/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; \ @@ -4065,8 +4065,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/nice.c -+++ /sysdeps/unix/nice.c +--- glibc-2.14-498-g98591e5/sysdeps/unix/nice.c ++++ glibc-2.14.90-15/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -4081,8 +4081,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/futimesat.c -+++ /sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -4125,8 +4125,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S -+++ /sysdeps/unix/sysv/linux/i386/____longjmp_chk.S +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S ++++ glibc-2.14.90-15/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 @@ -4160,8 +4160,8 @@ + LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx) jmp *%edx END (____longjmp_chk) ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ /sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.14.90-15/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. @@ -4222,16 +4222,16 @@ + } while (0) + +#include_next ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ /sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ glibc-2.14.90-15/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-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ /sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -4264,29 +4264,29 @@ + } while (0) + #include_next ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ /sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ /sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ /sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.14.90-15/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-418-gb2ea1df/sysdeps/unix/sysv/linux/paths.h -+++ /sysdeps/unix/sysv/linux/paths.h +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -4296,8 +4296,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/tcsetattr.c -+++ /sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -4343,8 +4343,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S -+++ /sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S ++++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S @@ -19,6 +19,7 @@ #include #include @@ -4371,8 +4371,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (____longjmp_chk) ---- glibc-2.14-418-gb2ea1df/sysdeps/x86_64/__longjmp.S -+++ /sysdeps/x86_64/__longjmp.S +--- glibc-2.14-498-g98591e5/sysdeps/x86_64/__longjmp.S ++++ glibc-2.14.90-15/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. @@ -4402,8 +4402,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (__longjmp) ---- glibc-2.14-418-gb2ea1df/sysdeps/x86_64/setjmp.S -+++ /sysdeps/x86_64/setjmp.S +--- glibc-2.14-498-g98591e5/sysdeps/x86_64/setjmp.S ++++ glibc-2.14.90-15/sysdeps/x86_64/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for x86-64. - Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc. @@ -4427,8 +4427,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%rax) #endif ---- glibc-2.14-418-gb2ea1df/timezone/zic.c -+++ /timezone/zic.c +--- glibc-2.14-498-g98591e5/timezone/zic.c ++++ glibc-2.14.90-15/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 1c5a133..e3f836f 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.14-418-gb2ea1df +%define glibcsrcdir glibc-2.14-498-g98591e5 %define glibcversion 2.14.90 %define glibcportsdir glibc-ports-2.14-43-gf335e01 ### glibc.spec.in follows: @@ -28,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 15.1 +Release: 15.2 # 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 @@ -1112,21 +1112,37 @@ rm -f *.filelist* %endif %changelog -* Tue Nov 8 2011 Andreas Schwab - 2.4.90-14 +* Fri Nov 11 2011 Andreas Schwab - 2.14.90-15 +- Update from master + - Fix db makefile rule for group.db + - Mark setjmp and ucontext functions as non-leaf (#752905) + - Check malloc arana limit atomically + +* Tue Nov 8 2011 Andreas Schwab - 2.14.90-14 - Update from master - Fix locking in _IO_flush_all_lockp - - Fix buffer allocation in files initgroups handler + - Fix buffer allocation in files initgroups handler (#750361) - Don't start AVC thread until credentials are installed - - Don't fail in makedb if SELinux is disabled + - Don't fail in makedb if SELinux is disabled (#750858) - New Linux syscalls process_vm_readv and process_vm_writev - Unify getent output for initgroups database (BZ#13367) + - Cache network interface information - Avoid assertion in processes with VM in bad shape (BZ#13276) - Don't mark memory synchronisation functions as leaf (#747377, BZ#13344) - Add missing register initialization in x86-64 pthread_cond_timedwait (BZ#13358) + - Fix accuracy problem in generic sin (BZ#10709) - Correctly NUL-terminate link name in sprof (BZ#13337) - Fix readlink call in ldconfig's chroot handling (BZ#13335) + - Optimize accurate 64-bit routines for FMA4 on x86-64 + - Optimized remquo for 64-bit platforms + - Optimize fmod + - Add optimized wcslen and strnlen for x86-32 + - Optimized strnlen and wcscmp for x86-64 + - Improve x86-32 SSSE3 memcpy - Preserve link time dependencies over relocation dependencies (BZ#12892) + - Optimize x86-64 rawmemchr + - Add optimized str{,n}casecmp for AVX on x86-64 * Wed Oct 19 2011 Andreas Schwab - 2.14.90-13 - Update from master diff --git a/sources b/sources index eca8595..966759a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -bce89b90d75eb65d573c89d231128a45 glibc-2.14-418-gb2ea1df-fedora.tar.xz -a1c214925f0f2dabf4f88bddb1fcf39e glibc-2.14-418-gb2ea1df.tar.xz +2ca57c728649b2d33580f97f9f3545f3 glibc-2.14-498-g98591e5-fedora.tar.xz +49bd20c056b1ae61985a099e791dc79a glibc-2.14-498-g98591e5.tar.xz b89c04e859de608e0c6b33ab77923527 glibc-ports-2.14-43-gf335e01.tar.xz From 2cda9c699b4edfcd5e611559b6b1bba069b1db03 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 14 Nov 2011 14:11:05 +0100 Subject: [PATCH 03/15] 2.14.90-16 --- .gitignore | 6 +- glibc-fedora.patch | 572 ++++++++++++++++++++++----------------------- glibc.spec | 11 +- sources | 6 +- 4 files changed, 300 insertions(+), 295 deletions(-) diff --git a/.gitignore b/.gitignore index 4b5489d..ed8bca0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/glibc-ports-2.14-43-gf335e01.tar.xz -/glibc-2.14-498-g98591e5-fedora.tar.xz -/glibc-2.14-498-g98591e5.tar.xz +/glibc-2.14-518-ga5fb313-fedora.tar.xz +/glibc-2.14-518-ga5fb313.tar.xz +/glibc-ports-2.14-44-ga9ff872.tar.xz diff --git a/glibc-fedora.patch b/glibc-fedora.patch index a4f706a..304c4f7 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,6 @@ ---- glibc-2.14-498-g98591e5/ChangeLog -+++ glibc-2.14.90-15/ChangeLog -@@ -2217,6 +2217,15 @@ +--- glibc-2.14-518-ga5fb313/ChangeLog ++++ glibc-2.14.90-16/ChangeLog +@@ -2289,6 +2289,15 @@ * sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi directive. @@ -16,7 +16,7 @@ 2011-08-24 David S. Miller * sysdeps/sparc/sparc64/strcmp.S: Rewrite. -@@ -3022,6 +3031,14 @@ +@@ -3094,6 +3103,14 @@ * config.make.in: Likewise. * malloc/Makefile: Likewise. @@ -31,7 +31,7 @@ 2011-06-27 Andreas Schwab * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP -@@ -3153,6 +3170,10 @@ +@@ -3225,6 +3242,10 @@ * inet/getnetgrent_r.c: Use DL_CALL_FCT in several places. @@ -42,7 +42,7 @@ 2011-06-20 David S. Miller * sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple -@@ -3775,6 +3796,13 @@ +@@ -3847,6 +3868,13 @@ * libio/Makefile (tests): Add bug-fclose1. * libio/bug-fclose1.c: New file. @@ -56,7 +56,7 @@ 2011-05-12 Ulrich Drepper [BZ #12511] -@@ -4052,13 +4080,6 @@ +@@ -4124,13 +4152,6 @@ * stdlib/bug-getcontext.c: New file. * stdlib/Makefile: Add rules to build and run bug-getcontext. @@ -70,7 +70,7 @@ 2011-04-11 Andreas Krebbel * sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes -@@ -4296,6 +4317,31 @@ +@@ -4368,6 +4389,31 @@ * sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime): Export. @@ -102,7 +102,7 @@ 2011-03-22 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment -@@ -4356,6 +4402,16 @@ +@@ -4428,6 +4474,16 @@ $LDFLAGS and -nostdlib -nostartfiles to linking step. Change main to _start. @@ -119,7 +119,7 @@ 2011-03-06 Ulrich Drepper * elf/dl-load.c (_dl_map_object): If we are looking for the first -@@ -4572,6 +4628,12 @@ +@@ -4644,6 +4700,12 @@ * shadow/sgetspent.c: Check return value of __sgetspent_r instead of errno. @@ -132,7 +132,7 @@ 2011-01-19 Ulrich Drepper [BZ #11724] -@@ -5259,6 +5321,26 @@ +@@ -5331,6 +5393,26 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid. @@ -159,7 +159,7 @@ 2010-09-24 Petr Baudis * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -6051,6 +6133,17 @@ +@@ -6123,6 +6205,17 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -177,7 +177,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -6103,6 +6196,21 @@ +@@ -6175,6 +6268,21 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -199,8 +199,8 @@ 2010-05-28 Luis Machado * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.14-498-g98591e5/ChangeLog.15 -+++ glibc-2.14.90-15/ChangeLog.15 +--- glibc-2.14-518-ga5fb313/ChangeLog.15 ++++ glibc-2.14.90-16/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -266,8 +266,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.14-498-g98591e5/ChangeLog.16 -+++ glibc-2.14.90-15/ChangeLog.16 +--- glibc-2.14-518-ga5fb313/ChangeLog.16 ++++ glibc-2.14.90-16/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -290,8 +290,8 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . ---- glibc-2.14-498-g98591e5/ChangeLog.17 -+++ glibc-2.14.90-15/ChangeLog.17 +--- glibc-2.14-518-ga5fb313/ChangeLog.17 ++++ glibc-2.14.90-16/ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -340,8 +340,8 @@ 2007-04-16 Ulrich Drepper [BZ #4364] ---- glibc-2.14-498-g98591e5/Makeconfig -+++ glibc-2.14.90-15/Makeconfig +--- glibc-2.14-518-ga5fb313/Makeconfig ++++ glibc-2.14.90-16/Makeconfig @@ -803,12 +803,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -358,8 +358,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.14-498-g98591e5/NEWS -+++ glibc-2.14.90-15/NEWS +--- glibc-2.14-518-ga5fb313/NEWS ++++ glibc-2.14.90-16/NEWS @@ -72,16 +72,6 @@ Version 2.14 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, 12795, 12811, 12813, 12814, 12841 @@ -377,8 +377,8 @@ * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at, syncfs, setns, sendmmsg ---- glibc-2.14-498-g98591e5/config.h.in -+++ glibc-2.14.90-15/config.h.in +--- glibc-2.14-518-ga5fb313/config.h.in ++++ glibc-2.14.90-16/config.h.in @@ -187,6 +187,9 @@ /* Define if `.ctors' and `.dtors' sections shouldn't be used. */ #undef NO_CTORS_DTORS_SECTIONS @@ -389,8 +389,8 @@ /* */ ---- glibc-2.14-498-g98591e5/configure -+++ glibc-2.14.90-15/configure +--- glibc-2.14-518-ga5fb313/configure ++++ glibc-2.14.90-16/configure @@ -792,6 +792,7 @@ enable_kernel enable_all_warnings enable_multi_arch @@ -459,8 +459,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-498-g98591e5/configure.in -+++ glibc-2.14.90-15/configure.in +--- glibc-2.14-518-ga5fb313/configure.in ++++ glibc-2.14.90-16/configure.in @@ -291,6 +291,29 @@ else fi AC_SUBST(libc_cv_nss_crypt) @@ -491,8 +491,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-498-g98591e5/csu/Makefile -+++ glibc-2.14.90-15/csu/Makefile +--- glibc-2.14-518-ga5fb313/csu/Makefile ++++ glibc-2.14.90-16/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -503,8 +503,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.14-498-g98591e5/csu/elf-init.c -+++ glibc-2.14.90-15/csu/elf-init.c +--- glibc-2.14-518-ga5fb313/csu/elf-init.c ++++ glibc-2.14.90-16/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; @@ -529,8 +529,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.14-498-g98591e5/debug/tst-chk1.c -+++ glibc-2.14.90-15/debug/tst-chk1.c +--- glibc-2.14-518-ga5fb313/debug/tst-chk1.c ++++ glibc-2.14.90-16/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -559,8 +559,8 @@ # define O 0 # else # define O 1 ---- glibc-2.14-498-g98591e5/elf/Makefile -+++ glibc-2.14.90-15/elf/Makefile +--- glibc-2.14-518-ga5fb313/elf/Makefile ++++ glibc-2.14.90-16/elf/Makefile @@ -135,6 +135,7 @@ include ../Makeconfig ifeq ($(unwind-find-fde),yes) routines += unwind-dw2-fde-glibc @@ -579,8 +579,8 @@ test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names)))) generated += $(addsuffix .so,$(strip $(modules-names))) ---- glibc-2.14-498-g98591e5/elf/dl-close.c -+++ glibc-2.14.90-15/elf/dl-close.c +--- glibc-2.14-518-ga5fb313/elf/dl-close.c ++++ glibc-2.14.90-16/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) @@ -601,8 +601,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-498-g98591e5/elf/dl-deps.c -+++ glibc-2.14.90-15/elf/dl-deps.c +--- glibc-2.14-518-ga5fb313/elf/dl-deps.c ++++ glibc-2.14.90-16/elf/dl-deps.c @@ -489,6 +489,7 @@ _dl_map_object_deps (struct link_map *map, nneeded * sizeof needed[0]); atomic_write_barrier (); @@ -628,8 +628,8 @@ if (errno_reason) _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, ---- glibc-2.14-498-g98591e5/elf/dl-init.c -+++ glibc-2.14.90-15/elf/dl-init.c +--- glibc-2.14-518-ga5fb313/elf/dl-init.c ++++ glibc-2.14.90-16/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -652,8 +652,8 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.14-498-g98591e5/elf/dl-libc.c -+++ glibc-2.14.90-15/elf/dl-libc.c +--- glibc-2.14-518-ga5fb313/elf/dl-libc.c ++++ glibc-2.14.90-16/elf/dl-libc.c @@ -270,13 +270,13 @@ libc_freeres_fn (free_mem) for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) @@ -680,8 +680,8 @@ } if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 ---- glibc-2.14-498-g98591e5/elf/dl-load.c -+++ glibc-2.14.90-15/elf/dl-load.c +--- glibc-2.14-518-ga5fb313/elf/dl-load.c ++++ glibc-2.14.90-16/elf/dl-load.c @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len) @@ -761,8 +761,8 @@ } else /* No DST we recognize. */ ---- glibc-2.14-498-g98591e5/elf/dl-support.c -+++ glibc-2.14.90-15/elf/dl-support.c +--- glibc-2.14-518-ga5fb313/elf/dl-support.c ++++ glibc-2.14.90-16/elf/dl-support.c @@ -82,10 +82,8 @@ unsigned long long _dl_load_adds; create a fake scope containing nothing. */ struct r_scope_elem _dl_initial_searchlist; @@ -774,8 +774,8 @@ /* Random data provided by the kernel. */ void *_dl_random; ---- glibc-2.14-498-g98591e5/elf/ldconfig.c -+++ glibc-2.14.90-15/elf/ldconfig.c +--- glibc-2.14-518-ga5fb313/elf/ldconfig.c ++++ glibc-2.14.90-16/elf/ldconfig.c @@ -1034,17 +1034,19 @@ search_dirs (void) @@ -857,8 +857,8 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.14-498-g98591e5/elf/ldd.bash.in -+++ glibc-2.14.90-15/elf/ldd.bash.in +--- glibc-2.14-518-ga5fb313/elf/ldd.bash.in ++++ glibc-2.14.90-16/elf/ldd.bash.in @@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2 fi done @@ -887,8 +887,8 @@ try_trace "$RTLD" "$file" || result=1 ;; *) ---- glibc-2.14-498-g98591e5/elf/rtld-Rules -+++ glibc-2.14.90-15/elf/rtld-Rules +--- glibc-2.14-518-ga5fb313/elf/rtld-Rules ++++ glibc-2.14.90-16/elf/rtld-Rules @@ -1,7 +1,7 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker. @@ -906,8 +906,8 @@ +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld endif ---- glibc-2.14-498-g98591e5/elf/rtld.c -+++ glibc-2.14.90-15/elf/rtld.c +--- glibc-2.14-518-ga5fb313/elf/rtld.c ++++ glibc-2.14.90-16/elf/rtld.c @@ -107,7 +107,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -962,24 +962,24 @@ if (! prelinked && rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. ---- glibc-2.14-498-g98591e5/extra-lib.mk -+++ glibc-2.14.90-15/extra-lib.mk +--- glibc-2.14-518-ga5fb313/extra-lib.mk ++++ glibc-2.14.90-16/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-498-g98591e5/include/bits/stdlib-ldbl.h -+++ glibc-2.14.90-15/include/bits/stdlib-ldbl.h +--- glibc-2.14-518-ga5fb313/include/bits/stdlib-ldbl.h ++++ glibc-2.14.90-16/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-498-g98591e5/include/bits/wchar-ldbl.h -+++ glibc-2.14.90-15/include/bits/wchar-ldbl.h +--- glibc-2.14-518-ga5fb313/include/bits/wchar-ldbl.h ++++ glibc-2.14.90-16/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-498-g98591e5/include/features.h -+++ glibc-2.14.90-15/include/features.h +--- glibc-2.14-518-ga5fb313/include/features.h ++++ glibc-2.14.90-16/include/features.h @@ -310,8 +310,13 @@ #endif @@ -996,8 +996,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.14-498-g98591e5/include/libc-symbols.h -+++ glibc-2.14.90-15/include/libc-symbols.h +--- glibc-2.14-518-ga5fb313/include/libc-symbols.h ++++ glibc-2.14.90-16/include/libc-symbols.h @@ -626,7 +626,7 @@ for linking") # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libc_hidden_def(name) hidden_def (name) @@ -1007,8 +1007,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-498-g98591e5/include/link.h -+++ glibc-2.14.90-15/include/link.h +--- glibc-2.14-518-ga5fb313/include/link.h ++++ glibc-2.14.90-16/include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. @@ -1046,8 +1046,8 @@ # elif NO_TLS_OFFSET == -1 # define FORCED_DYNAMIC_TLS_OFFSET -2 # else ---- glibc-2.14-498-g98591e5/include/stap-probe.h -+++ glibc-2.14.90-15/include/stap-probe.h +--- glibc-2.14-518-ga5fb313/include/stap-probe.h ++++ glibc-2.14.90-16/include/stap-probe.h @@ -0,0 +1,140 @@ +/* Macros for defining Systemtap static probe points. + Copyright (C) 2011 Free Software Foundation, Inc. @@ -1189,16 +1189,16 @@ +#endif /* USE_STAP_PROBE. */ + +#endif /* stap-probe.h */ ---- glibc-2.14-498-g98591e5/include/sys/resource.h -+++ glibc-2.14.90-15/include/sys/resource.h +--- glibc-2.14-518-ga5fb313/include/sys/resource.h ++++ glibc-2.14.90-16/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-498-g98591e5/inet/Makefile -+++ glibc-2.14.90-15/inet/Makefile +--- glibc-2.14-518-ga5fb313/inet/Makefile ++++ glibc-2.14.90-16/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -1208,8 +1208,8 @@ ifeq ($(have-thread-library),yes) CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions ---- glibc-2.14-498-g98591e5/intl/locale.alias -+++ glibc-2.14.90-15/intl/locale.alias +--- glibc-2.14-518-ga5fb313/intl/locale.alias ++++ glibc-2.14.90-16/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -1219,8 +1219,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.14-498-g98591e5/libio/stdio.h -+++ glibc-2.14.90-15/libio/stdio.h +--- glibc-2.14-518-ga5fb313/libio/stdio.h ++++ glibc-2.14.90-16/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. */ @@ -1234,8 +1234,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.14-498-g98591e5/locale/iso-4217.def -+++ glibc-2.14.90-15/locale/iso-4217.def +--- glibc-2.14-518-ga5fb313/locale/iso-4217.def ++++ glibc-2.14.90-16/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1327,8 +1327,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.14-498-g98591e5/locale/programs/locarchive.c -+++ glibc-2.14.90-15/locale/programs/locarchive.c +--- glibc-2.14-518-ga5fb313/locale/programs/locarchive.c ++++ glibc-2.14.90-16/locale/programs/locarchive.c @@ -253,9 +253,9 @@ oldlocrecentcmp (const void *a, const void *b) /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -1360,9 +1360,9 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.14-498-g98591e5/localedata/ChangeLog -+++ glibc-2.14.90-15/localedata/ChangeLog -@@ -10,6 +10,14 @@ +--- glibc-2.14-518-ga5fb313/localedata/ChangeLog ++++ glibc-2.14.90-16/localedata/ChangeLog +@@ -37,6 +37,14 @@ * tests-mbwc/tst_funcs.h (TST_DECL_VARS, TST_HEAD_LOCALE): Remove unused variable. @@ -1377,8 +1377,8 @@ 2011-05-21 Ulrich Drepper [BZ #12788] ---- glibc-2.14-498-g98591e5/localedata/Makefile -+++ glibc-2.14.90-15/localedata/Makefile +--- glibc-2.14-518-ga5fb313/localedata/Makefile ++++ glibc-2.14.90-16/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1387,8 +1387,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.14-498-g98591e5/localedata/SUPPORTED -+++ glibc-2.14.90-15/localedata/SUPPORTED +--- glibc-2.14-518-ga5fb313/localedata/SUPPORTED ++++ glibc-2.14.90-16/localedata/SUPPORTED @@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1430,8 +1430,8 @@ sw_KE/UTF-8 \ sw_TZ/UTF-8 \ ta_IN/UTF-8 \ ---- glibc-2.14-498-g98591e5/localedata/locales/cy_GB -+++ glibc-2.14.90-15/localedata/locales/cy_GB +--- glibc-2.14-518-ga5fb313/localedata/locales/cy_GB ++++ glibc-2.14.90-16/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1446,8 +1446,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.14-498-g98591e5/localedata/locales/en_GB -+++ glibc-2.14.90-15/localedata/locales/en_GB +--- glibc-2.14-518-ga5fb313/localedata/locales/en_GB ++++ glibc-2.14.90-16/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1459,8 +1459,8 @@ date_fmt "/ / " ---- glibc-2.14-498-g98591e5/localedata/locales/no_NO -+++ glibc-2.14.90-15/localedata/locales/no_NO +--- glibc-2.14-518-ga5fb313/localedata/locales/no_NO ++++ glibc-2.14.90-16/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1531,8 +1531,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.14-498-g98591e5/localedata/locales/zh_TW -+++ glibc-2.14.90-15/localedata/locales/zh_TW +--- glibc-2.14-518-ga5fb313/localedata/locales/zh_TW ++++ glibc-2.14.90-16/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1560,8 +1560,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.14-498-g98591e5/login/programs/pt_chown.c -+++ glibc-2.14.90-15/login/programs/pt_chown.c +--- glibc-2.14-518-ga5fb313/login/programs/pt_chown.c ++++ glibc-2.14.90-16/login/programs/pt_chown.c @@ -29,6 +29,7 @@ #include #include @@ -1603,8 +1603,8 @@ - return EXIT_SUCCESS; } ---- glibc-2.14-498-g98591e5/malloc/mcheck.c -+++ glibc-2.14.90-15/malloc/mcheck.c +--- glibc-2.14-518-ga5fb313/malloc/mcheck.c ++++ glibc-2.14.90-16/malloc/mcheck.c @@ -25,10 +25,26 @@ # include # include @@ -1681,8 +1681,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.14-498-g98591e5/manual/libc.texinfo -+++ glibc-2.14.90-15/manual/libc.texinfo +--- glibc-2.14-518-ga5fb313/manual/libc.texinfo ++++ glibc-2.14.90-16/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1692,8 +1692,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.14-498-g98591e5/misc/sys/cdefs.h -+++ glibc-2.14.90-15/misc/sys/cdefs.h +--- glibc-2.14-518-ga5fb313/misc/sys/cdefs.h ++++ glibc-2.14.90-16/misc/sys/cdefs.h @@ -146,7 +146,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -1737,8 +1737,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.14-498-g98591e5/nis/Makefile -+++ glibc-2.14.90-15/nis/Makefile +--- glibc-2.14-518-ga5fb313/nis/Makefile ++++ glibc-2.14.90-16/nis/Makefile @@ -23,9 +23,9 @@ subdir := nis aux := nis_hash @@ -1760,8 +1760,8 @@ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ ---- glibc-2.14-498-g98591e5/nis/nss -+++ glibc-2.14.90-15/nis/nss +--- glibc-2.14-518-ga5fb313/nis/nss ++++ glibc-2.14.90-16/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 @@ -1771,8 +1771,8 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.14-498-g98591e5/nptl/ChangeLog -+++ glibc-2.14.90-15/nptl/ChangeLog +--- glibc-2.14-518-ga5fb313/nptl/ChangeLog ++++ glibc-2.14.90-16/nptl/ChangeLog @@ -169,6 +169,51 @@ clearing memory. Patch partly by Robert Rex . @@ -1849,8 +1849,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.14-498-g98591e5/nptl/DESIGN-systemtap-probes.txt -+++ glibc-2.14.90-15/nptl/DESIGN-systemtap-probes.txt +--- glibc-2.14-518-ga5fb313/nptl/DESIGN-systemtap-probes.txt ++++ glibc-2.14.90-16/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. @@ -1941,8 +1941,8 @@ + arg1 = condition +cond_broadcast - probe for pthread_cond_broadcast + arg1 = condition ---- glibc-2.14-498-g98591e5/nptl/Makefile -+++ glibc-2.14.90-15/nptl/Makefile +--- glibc-2.14-518-ga5fb313/nptl/Makefile ++++ glibc-2.14.90-16/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1975,8 +1975,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.14-498-g98591e5/nptl/Versions -+++ glibc-2.14.90-15/nptl/Versions +--- glibc-2.14-518-ga5fb313/nptl/Versions ++++ glibc-2.14.90-16/nptl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; # Internal libc interface to libpthread @@ -1985,8 +1985,8 @@ } } ---- glibc-2.14-498-g98591e5/nptl/nptl-init.c -+++ glibc-2.14.90-15/nptl/nptl-init.c +--- glibc-2.14-518-ga5fb313/nptl/nptl-init.c ++++ glibc-2.14.90-16/nptl/nptl-init.c @@ -415,7 +415,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. */ @@ -1996,8 +1996,8 @@ || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ ---- glibc-2.14-498-g98591e5/nptl/pthread_cond_broadcast.c -+++ glibc-2.14.90-15/nptl/pthread_cond_broadcast.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_cond_broadcast.c ++++ glibc-2.14.90-16/nptl/pthread_cond_broadcast.c @@ -23,6 +23,7 @@ #include #include @@ -2015,8 +2015,8 @@ int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; /* Make sure we are alone. */ ---- glibc-2.14-498-g98591e5/nptl/pthread_cond_destroy.c -+++ glibc-2.14.90-15/nptl/pthread_cond_destroy.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_cond_destroy.c ++++ glibc-2.14.90-16/nptl/pthread_cond_destroy.c @@ -20,6 +20,7 @@ #include #include @@ -2034,8 +2034,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-498-g98591e5/nptl/pthread_cond_init.c -+++ glibc-2.14.90-15/nptl/pthread_cond_init.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_cond_init.c ++++ glibc-2.14.90-16/nptl/pthread_cond_init.c @@ -20,6 +20,7 @@ #include @@ -2053,8 +2053,8 @@ return 0; } versioned_symbol (libpthread, __pthread_cond_init, ---- glibc-2.14-498-g98591e5/nptl/pthread_cond_signal.c -+++ glibc-2.14.90-15/nptl/pthread_cond_signal.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_cond_signal.c ++++ glibc-2.14.90-16/nptl/pthread_cond_signal.c @@ -26,6 +26,7 @@ #include @@ -2072,8 +2072,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-498-g98591e5/nptl/pthread_cond_wait.c -+++ glibc-2.14.90-15/nptl/pthread_cond_wait.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_cond_wait.c ++++ glibc-2.14.90-16/nptl/pthread_cond_wait.c @@ -25,6 +25,7 @@ #include @@ -2091,8 +2091,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-498-g98591e5/nptl/pthread_create.c -+++ glibc-2.14.90-15/nptl/pthread_create.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_create.c ++++ glibc-2.14.90-16/nptl/pthread_create.c @@ -32,6 +32,8 @@ #include @@ -2120,8 +2120,8 @@ /* Start the thread. */ return create_thread (pd, iattr, STACK_VARIABLES_ARGS); } ---- glibc-2.14-498-g98591e5/nptl/pthread_join.c -+++ glibc-2.14.90-15/nptl/pthread_join.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_join.c ++++ glibc-2.14.90-16/nptl/pthread_join.c @@ -23,6 +23,8 @@ #include #include "pthreadP.h" @@ -2148,8 +2148,8 @@ + return result; } ---- glibc-2.14-498-g98591e5/nptl/pthread_mutex_destroy.c -+++ glibc-2.14.90-15/nptl/pthread_mutex_destroy.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_mutex_destroy.c ++++ glibc-2.14.90-16/nptl/pthread_mutex_destroy.c @@ -20,11 +20,15 @@ #include #include "pthreadP.h" @@ -2166,8 +2166,8 @@ if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0 && mutex->__data.__nusers != 0) return EBUSY; ---- glibc-2.14-498-g98591e5/nptl/pthread_mutex_init.c -+++ glibc-2.14.90-15/nptl/pthread_mutex_init.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_mutex_init.c ++++ glibc-2.14.90-16/nptl/pthread_mutex_init.c @@ -24,6 +24,8 @@ #include #include "pthreadP.h" @@ -2186,8 +2186,8 @@ return 0; } strong_alias (__pthread_mutex_init, pthread_mutex_init) ---- glibc-2.14-498-g98591e5/nptl/pthread_mutex_lock.c -+++ glibc-2.14.90-15/nptl/pthread_mutex_lock.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_mutex_lock.c ++++ glibc-2.14.90-16/nptl/pthread_mutex_lock.c @@ -24,6 +24,7 @@ #include #include "pthreadP.h" @@ -2224,8 +2224,8 @@ return 0; } #ifndef __pthread_mutex_lock ---- glibc-2.14-498-g98591e5/nptl/pthread_mutex_timedlock.c -+++ glibc-2.14.90-15/nptl/pthread_mutex_timedlock.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_mutex_timedlock.c ++++ glibc-2.14.90-16/nptl/pthread_mutex_timedlock.c @@ -24,6 +24,8 @@ #include #include @@ -2280,8 +2280,8 @@ } out: ---- glibc-2.14-498-g98591e5/nptl/pthread_mutex_unlock.c -+++ glibc-2.14.90-15/nptl/pthread_mutex_unlock.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_mutex_unlock.c ++++ glibc-2.14.90-16/nptl/pthread_mutex_unlock.c @@ -22,6 +22,7 @@ #include #include "pthreadP.h" @@ -2318,8 +2318,8 @@ return 0; } ---- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_destroy.c -+++ glibc-2.14.90-15/nptl/pthread_rwlock_destroy.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_rwlock_destroy.c ++++ glibc-2.14.90-16/nptl/pthread_rwlock_destroy.c @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -2336,8 +2336,8 @@ /* Nothing to be done. For now. */ return 0; } ---- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_rdlock.c -+++ glibc-2.14.90-15/nptl/pthread_rwlock_rdlock.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_rwlock_rdlock.c ++++ glibc-2.14.90-16/nptl/pthread_rwlock_rdlock.c @@ -22,6 +22,7 @@ #include #include @@ -2364,8 +2364,8 @@ break; } ---- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_unlock.c -+++ glibc-2.14.90-15/nptl/pthread_rwlock_unlock.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_rwlock_unlock.c ++++ glibc-2.14.90-16/nptl/pthread_rwlock_unlock.c @@ -22,11 +22,14 @@ #include #include @@ -2381,8 +2381,8 @@ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); if (rwlock->__data.__writer) rwlock->__data.__writer = 0; ---- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_wrlock.c -+++ glibc-2.14.90-15/nptl/pthread_rwlock_wrlock.c +--- glibc-2.14-518-ga5fb313/nptl/pthread_rwlock_wrlock.c ++++ glibc-2.14.90-16/nptl/pthread_rwlock_wrlock.c @@ -22,6 +22,7 @@ #include #include @@ -2409,8 +2409,8 @@ break; } ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.14.90-16/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 @@ -2419,8 +2419,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/Versions +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -2428,8 +2428,8 @@ + __uname; + } +} ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2449,8 +2449,8 @@ ENTER_KERNEL 2: movl %edx, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S @@ -24,6 +24,7 @@ #include #include @@ -2468,8 +2468,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S @@ -24,7 +24,7 @@ #include #include @@ -2488,8 +2488,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S @@ -24,7 +24,7 @@ #include #include @@ -2508,8 +2508,8 @@ cmpl $1000000000, 4(%ebp) movl $EINVAL, %eax jae 18f ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S @@ -25,6 +25,7 @@ #include #include @@ -2527,8 +2527,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S @@ -23,6 +23,7 @@ #include #include @@ -2546,8 +2546,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S @@ -23,6 +23,7 @@ #include #include @@ -2565,8 +2565,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2584,8 +2584,8 @@ __asm __volatile (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -2595,8 +2595,8 @@ cp = u.uts.version; else { ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -2604,8 +2604,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2635,8 +2635,8 @@ syscall 2: movl %edx, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2654,8 +2654,8 @@ __asm __volatile ("syscall" \ : "=a" (__ignore) \ : "0" (SYS_futex), "D" (futex), \ ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S @@ -25,7 +25,7 @@ #include #include @@ -2674,8 +2674,8 @@ /* Get internal lock. */ movl $1, %esi xorl %eax, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S @@ -24,6 +24,7 @@ #include #include @@ -2693,8 +2693,8 @@ /* Get internal lock. */ movq %rdi, %r8 movl $1, %esi ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -23,6 +23,7 @@ #include #include @@ -2712,8 +2712,8 @@ cmpq $1000000000, 8(%rdx) movl $EINVAL, %eax jae 48f ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S @@ -23,6 +23,7 @@ #include #include @@ -2731,8 +2731,8 @@ cmpq $-1, dep_mutex(%rdi) /* Prepare structure passed to cancellation handler. */ ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S @@ -22,7 +22,7 @@ #include #include @@ -2752,8 +2752,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S +--- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S ++++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S @@ -22,7 +22,7 @@ #include #include @@ -2773,8 +2773,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-498-g98591e5/nscd/nscd.conf -+++ glibc-2.14.90-15/nscd/nscd.conf +--- glibc-2.14-518-ga5fb313/nscd/nscd.conf ++++ glibc-2.14.90-16/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -2784,8 +2784,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.14-498-g98591e5/nscd/nscd.init -+++ glibc-2.14.90-15/nscd/nscd.init +--- glibc-2.14-518-ga5fb313/nscd/nscd.init ++++ glibc-2.14.90-16/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -2862,8 +2862,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.14-498-g98591e5/nss/Makefile -+++ glibc-2.14.90-15/nss/Makefile +--- glibc-2.14-518-ga5fb313/nss/Makefile ++++ glibc-2.14.90-16/nss/Makefile @@ -88,6 +88,7 @@ endif include ../Rules @@ -2872,8 +2872,8 @@ ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a ---- glibc-2.14-498-g98591e5/nss/nss_files/files-XXX.c -+++ glibc-2.14.90-15/nss/nss_files/files-XXX.c +--- glibc-2.14-518-ga5fb313/nss/nss_files/files-XXX.c ++++ glibc-2.14.90-16/nss/nss_files/files-XXX.c @@ -190,7 +190,7 @@ internal_getent (struct STRUCTURE *result, { char *p; @@ -2883,8 +2883,8 @@ int parse_result; if (buflen < sizeof *data + 2) ---- glibc-2.14-498-g98591e5/posix/Makefile -+++ glibc-2.14.90-15/posix/Makefile +--- glibc-2.14-518-ga5fb313/posix/Makefile ++++ glibc-2.14.90-16/posix/Makefile @@ -320,15 +320,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -2905,8 +2905,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.14-498-g98591e5/posix/gai.conf -+++ glibc-2.14.90-15/posix/gai.conf +--- glibc-2.14-518-ga5fb313/posix/gai.conf ++++ glibc-2.14.90-16/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -2931,8 +2931,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.14-498-g98591e5/posix/getconf.speclist.h -+++ glibc-2.14.90-15/posix/getconf.speclist.h +--- glibc-2.14-518-ga5fb313/posix/getconf.speclist.h ++++ glibc-2.14.90-16/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -2973,8 +2973,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.14-498-g98591e5/posix/regcomp.c -+++ glibc-2.14.90-15/posix/regcomp.c +--- glibc-2.14-518-ga5fb313/posix/regcomp.c ++++ glibc-2.14.90-16/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. @@ -3106,8 +3106,8 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.14-498-g98591e5/resolv/Makefile -+++ glibc-2.14.90-15/resolv/Makefile +--- glibc-2.14-518-ga5fb313/resolv/Makefile ++++ glibc-2.14.90-16/resolv/Makefile @@ -81,6 +81,7 @@ ifeq (yes,$(have-ssp)) CFLAGS-libresolv += -fstack-protector endif @@ -3116,8 +3116,8 @@ # The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings ---- glibc-2.14-498-g98591e5/resolv/res_query.c -+++ glibc-2.14.90-15/resolv/res_query.c +--- glibc-2.14-518-ga5fb313/resolv/res_query.c ++++ glibc-2.14.90-16/resolv/res_query.c @@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, && *resplen2 > (int) sizeof (HEADER)) { @@ -3127,8 +3127,8 @@ hp = hp2; } else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) ---- glibc-2.14-498-g98591e5/resource/getrlimit.c -+++ glibc-2.14.90-15/resource/getrlimit.c +--- glibc-2.14-518-ga5fb313/resource/getrlimit.c ++++ glibc-2.14.90-16/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -3137,8 +3137,8 @@ weak_alias (__getrlimit, getrlimit) stub_warning (getrlimit) ---- glibc-2.14-498-g98591e5/scripts/check-local-headers.sh -+++ glibc-2.14.90-15/scripts/check-local-headers.sh +--- glibc-2.14-518-ga5fb313/scripts/check-local-headers.sh ++++ glibc-2.14.90-16/scripts/check-local-headers.sh @@ -29,7 +29,7 @@ exec ${AWK} -v includedir="$includedir" ' BEGIN { status = 0 @@ -3148,8 +3148,8 @@ } /^[^ ]/ && $1 ~ /.*:/ { obj = $1 } { ---- glibc-2.14-498-g98591e5/stdio-common/vfprintf.c -+++ glibc-2.14.90-15/stdio-common/vfprintf.c +--- glibc-2.14-518-ga5fb313/stdio-common/vfprintf.c ++++ glibc-2.14.90-16/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')) \ { \ @@ -3195,8 +3195,8 @@ else \ len = strlen (string); \ } \ ---- glibc-2.14-498-g98591e5/streams/Makefile -+++ glibc-2.14.90-15/streams/Makefile +--- glibc-2.14-518-ga5fb313/streams/Makefile ++++ glibc-2.14.90-16/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -3206,8 +3206,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.14-498-g98591e5/sunrpc/Makefile -+++ glibc-2.14.90-15/sunrpc/Makefile +--- glibc-2.14-518-ga5fb313/sunrpc/Makefile ++++ glibc-2.14.90-16/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) \ @@ -3228,8 +3228,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-498-g98591e5/sysdeps/generic/dl-cache.h -+++ glibc-2.14.90-15/sysdeps/generic/dl-cache.h +--- glibc-2.14-518-ga5fb313/sysdeps/generic/dl-cache.h ++++ glibc-2.14.90-16/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -3245,8 +3245,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-498-g98591e5/sysdeps/i386/Makefile -+++ glibc-2.14.90-15/sysdeps/i386/Makefile +--- glibc-2.14-518-ga5fb313/sysdeps/i386/Makefile ++++ glibc-2.14.90-16/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -3271,8 +3271,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-498-g98591e5/sysdeps/i386/__longjmp.S -+++ glibc-2.14.90-15/sysdeps/i386/__longjmp.S +--- glibc-2.14-518-ga5fb313/sysdeps/i386/__longjmp.S ++++ glibc-2.14.90-16/sysdeps/i386/__longjmp.S @@ -1,5 +1,5 @@ /* longjmp for i386. - Copyright (C) 1995-1998,2000,2002,2005,2006,2009 @@ -3319,8 +3319,8 @@ #endif /* Jump to saved PC. */ jmp *%edx ---- glibc-2.14-498-g98591e5/sysdeps/i386/bsd-_setjmp.S -+++ glibc-2.14.90-15/sysdeps/i386/bsd-_setjmp.S +--- glibc-2.14-518-ga5fb313/sysdeps/i386/bsd-_setjmp.S ++++ glibc-2.14.90-16/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. @@ -3345,8 +3345,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-498-g98591e5/sysdeps/i386/bsd-setjmp.S -+++ glibc-2.14.90-15/sysdeps/i386/bsd-setjmp.S +--- glibc-2.14-518-ga5fb313/sysdeps/i386/bsd-setjmp.S ++++ glibc-2.14.90-16/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. @@ -3371,8 +3371,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-498-g98591e5/sysdeps/i386/i686/Makefile -+++ glibc-2.14.90-15/sysdeps/i386/i686/Makefile +--- glibc-2.14-518-ga5fb313/sysdeps/i386/i686/Makefile ++++ glibc-2.14.90-16/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -3393,8 +3393,8 @@ -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif ---- glibc-2.14-498-g98591e5/sysdeps/i386/setjmp.S -+++ glibc-2.14.90-15/sysdeps/i386/setjmp.S +--- glibc-2.14-518-ga5fb313/sysdeps/i386/setjmp.S ++++ glibc-2.14.90-16/sysdeps/i386/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for i386. - Copyright (C) 1995,1996,1997,2000,2001,2005,2006 @@ -3418,8 +3418,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-498-g98591e5/sysdeps/ia64/Makefile -+++ glibc-2.14.90-15/sysdeps/ia64/Makefile +--- glibc-2.14-518-ga5fb313/sysdeps/ia64/Makefile ++++ glibc-2.14.90-16/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -3431,8 +3431,8 @@ endif endif ---- glibc-2.14-498-g98591e5/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.14.90-15/sysdeps/ia64/ia64libgcc.S +--- glibc-2.14-518-ga5fb313/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.14.90-16/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -3784,8 +3784,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.14-498-g98591e5/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.14.90-15/sysdeps/ia64/libgcc-compat.c +--- glibc-2.14-518-ga5fb313/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.14.90-16/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -3871,16 +3871,16 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.14-498-g98591e5/sysdeps/mach/hurd/getrlimit.c -+++ glibc-2.14.90-15/sysdeps/mach/hurd/getrlimit.c +--- glibc-2.14-518-ga5fb313/sysdeps/mach/hurd/getrlimit.c ++++ glibc-2.14.90-16/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-498-g98591e5/sysdeps/posix/getaddrinfo.c -+++ glibc-2.14.90-15/sysdeps/posix/getaddrinfo.c +--- glibc-2.14-518-ga5fb313/sysdeps/posix/getaddrinfo.c ++++ glibc-2.14.90-16/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 @@ -4005,8 +4005,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.14-498-g98591e5/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.14.90-15/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.14-518-ga5fb313/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.14.90-16/sysdeps/powerpc/powerpc64/Makefile @@ -33,6 +33,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -4015,16 +4015,16 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-498-g98591e5/sysdeps/powerpc/powerpc64/elf/Makefile -+++ glibc-2.14.90-15/sysdeps/powerpc/powerpc64/elf/Makefile +--- glibc-2.14-518-ga5fb313/sysdeps/powerpc/powerpc64/elf/Makefile ++++ glibc-2.14.90-16/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-498-g98591e5/sysdeps/s390/s390-64/utf16-utf32-z9.c -+++ glibc-2.14.90-15/sysdeps/s390/s390-64/utf16-utf32-z9.c +--- glibc-2.14-518-ga5fb313/sysdeps/s390/s390-64/utf16-utf32-z9.c ++++ glibc-2.14.90-16/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; \ @@ -4037,8 +4037,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-498-g98591e5/sysdeps/s390/s390-64/utf8-utf16-z9.c -+++ glibc-2.14.90-15/sysdeps/s390/s390-64/utf8-utf16-z9.c +--- glibc-2.14-518-ga5fb313/sysdeps/s390/s390-64/utf8-utf16-z9.c ++++ glibc-2.14.90-16/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; \ @@ -4051,8 +4051,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-498-g98591e5/sysdeps/s390/s390-64/utf8-utf32-z9.c -+++ glibc-2.14.90-15/sysdeps/s390/s390-64/utf8-utf32-z9.c +--- glibc-2.14-518-ga5fb313/sysdeps/s390/s390-64/utf8-utf32-z9.c ++++ glibc-2.14.90-16/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; \ @@ -4065,8 +4065,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-498-g98591e5/sysdeps/unix/nice.c -+++ glibc-2.14.90-15/sysdeps/unix/nice.c +--- glibc-2.14-518-ga5fb313/sysdeps/unix/nice.c ++++ glibc-2.14.90-16/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -4081,8 +4081,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -4125,8 +4125,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S +--- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S ++++ glibc-2.14.90-16/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 @@ -4160,8 +4160,8 @@ + LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx) jmp *%edx END (____longjmp_chk) ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.14.90-16/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. @@ -4222,16 +4222,16 @@ + } while (0) + +#include_next ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ glibc-2.14.90-16/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-498-g98591e5/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -4264,29 +4264,29 @@ + } while (0) + #include_next ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.14.90-16/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-498-g98591e5/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -4296,8 +4296,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -4343,8 +4343,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +--- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S ++++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S @@ -19,6 +19,7 @@ #include #include @@ -4371,8 +4371,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (____longjmp_chk) ---- glibc-2.14-498-g98591e5/sysdeps/x86_64/__longjmp.S -+++ glibc-2.14.90-15/sysdeps/x86_64/__longjmp.S +--- glibc-2.14-518-ga5fb313/sysdeps/x86_64/__longjmp.S ++++ glibc-2.14.90-16/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. @@ -4402,8 +4402,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (__longjmp) ---- glibc-2.14-498-g98591e5/sysdeps/x86_64/setjmp.S -+++ glibc-2.14.90-15/sysdeps/x86_64/setjmp.S +--- glibc-2.14-518-ga5fb313/sysdeps/x86_64/setjmp.S ++++ glibc-2.14.90-16/sysdeps/x86_64/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for x86-64. - Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc. @@ -4427,8 +4427,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%rax) #endif ---- glibc-2.14-498-g98591e5/timezone/zic.c -+++ glibc-2.14.90-15/timezone/zic.c +--- glibc-2.14-518-ga5fb313/timezone/zic.c ++++ glibc-2.14.90-16/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 e3f836f..f861eca 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.14-498-g98591e5 +%define glibcsrcdir glibc-2.14-518-ga5fb313 %define glibcversion 2.14.90 -%define glibcportsdir glibc-ports-2.14-43-gf335e01 +%define glibcportsdir glibc-ports-2.14-44-ga9ff872 ### glibc.spec.in follows: %define run_glibc_tests 1 %define auxarches athlon alphaev6 @@ -28,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 15.2 +Release: 16 # 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 @@ -1112,6 +1112,11 @@ rm -f *.filelist* %endif %changelog +* Mon Nov 14 2011 Andreas Schwab - 2.14.90-16 +- Update from master + - Don't call reused_arena when _int_new_arena failed (#753601) + - Fix grouping and reuse other locales in various locales (BZ#13147) + * Fri Nov 11 2011 Andreas Schwab - 2.14.90-15 - Update from master - Fix db makefile rule for group.db diff --git a/sources b/sources index 966759a..5b8c555 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -2ca57c728649b2d33580f97f9f3545f3 glibc-2.14-498-g98591e5-fedora.tar.xz -49bd20c056b1ae61985a099e791dc79a glibc-2.14-498-g98591e5.tar.xz -b89c04e859de608e0c6b33ab77923527 glibc-ports-2.14-43-gf335e01.tar.xz +e87247cdc2403714be8d3b457545a4d4 glibc-2.14-518-ga5fb313-fedora.tar.xz +3e39ac426f94a458b6831875a479fe23 glibc-2.14-518-ga5fb313.tar.xz +b16d4eccea9a93abaacddac422720e3f glibc-ports-2.14-44-ga9ff872.tar.xz From 654ac9924cf9131f756c873bd4084ead328fa64f Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 15 Nov 2011 22:01:20 -0700 Subject: [PATCH 04/15] Revert "2.14.90-16" This reverts commit 2cda9c699b4edfcd5e611559b6b1bba069b1db03. Removing rebase and related commits. --- .gitignore | 6 +- glibc-fedora.patch | 572 ++++++++++++++++++++++----------------------- glibc.spec | 11 +- sources | 6 +- 4 files changed, 295 insertions(+), 300 deletions(-) diff --git a/.gitignore b/.gitignore index ed8bca0..4b5489d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/glibc-2.14-518-ga5fb313-fedora.tar.xz -/glibc-2.14-518-ga5fb313.tar.xz -/glibc-ports-2.14-44-ga9ff872.tar.xz +/glibc-ports-2.14-43-gf335e01.tar.xz +/glibc-2.14-498-g98591e5-fedora.tar.xz +/glibc-2.14-498-g98591e5.tar.xz diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 304c4f7..a4f706a 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,6 @@ ---- glibc-2.14-518-ga5fb313/ChangeLog -+++ glibc-2.14.90-16/ChangeLog -@@ -2289,6 +2289,15 @@ +--- glibc-2.14-498-g98591e5/ChangeLog ++++ glibc-2.14.90-15/ChangeLog +@@ -2217,6 +2217,15 @@ * sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi directive. @@ -16,7 +16,7 @@ 2011-08-24 David S. Miller * sysdeps/sparc/sparc64/strcmp.S: Rewrite. -@@ -3094,6 +3103,14 @@ +@@ -3022,6 +3031,14 @@ * config.make.in: Likewise. * malloc/Makefile: Likewise. @@ -31,7 +31,7 @@ 2011-06-27 Andreas Schwab * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP -@@ -3225,6 +3242,10 @@ +@@ -3153,6 +3170,10 @@ * inet/getnetgrent_r.c: Use DL_CALL_FCT in several places. @@ -42,7 +42,7 @@ 2011-06-20 David S. Miller * sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple -@@ -3847,6 +3868,13 @@ +@@ -3775,6 +3796,13 @@ * libio/Makefile (tests): Add bug-fclose1. * libio/bug-fclose1.c: New file. @@ -56,7 +56,7 @@ 2011-05-12 Ulrich Drepper [BZ #12511] -@@ -4124,13 +4152,6 @@ +@@ -4052,13 +4080,6 @@ * stdlib/bug-getcontext.c: New file. * stdlib/Makefile: Add rules to build and run bug-getcontext. @@ -70,7 +70,7 @@ 2011-04-11 Andreas Krebbel * sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes -@@ -4368,6 +4389,31 @@ +@@ -4296,6 +4317,31 @@ * sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime): Export. @@ -102,7 +102,7 @@ 2011-03-22 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment -@@ -4428,6 +4474,16 @@ +@@ -4356,6 +4402,16 @@ $LDFLAGS and -nostdlib -nostartfiles to linking step. Change main to _start. @@ -119,7 +119,7 @@ 2011-03-06 Ulrich Drepper * elf/dl-load.c (_dl_map_object): If we are looking for the first -@@ -4644,6 +4700,12 @@ +@@ -4572,6 +4628,12 @@ * shadow/sgetspent.c: Check return value of __sgetspent_r instead of errno. @@ -132,7 +132,7 @@ 2011-01-19 Ulrich Drepper [BZ #11724] -@@ -5331,6 +5393,26 @@ +@@ -5259,6 +5321,26 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid. @@ -159,7 +159,7 @@ 2010-09-24 Petr Baudis * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -6123,6 +6205,17 @@ +@@ -6051,6 +6133,17 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -177,7 +177,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -6175,6 +6268,21 @@ +@@ -6103,6 +6196,21 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -199,8 +199,8 @@ 2010-05-28 Luis Machado * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.14-518-ga5fb313/ChangeLog.15 -+++ glibc-2.14.90-16/ChangeLog.15 +--- glibc-2.14-498-g98591e5/ChangeLog.15 ++++ glibc-2.14.90-15/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -266,8 +266,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.14-518-ga5fb313/ChangeLog.16 -+++ glibc-2.14.90-16/ChangeLog.16 +--- glibc-2.14-498-g98591e5/ChangeLog.16 ++++ glibc-2.14.90-15/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -290,8 +290,8 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . ---- glibc-2.14-518-ga5fb313/ChangeLog.17 -+++ glibc-2.14.90-16/ChangeLog.17 +--- glibc-2.14-498-g98591e5/ChangeLog.17 ++++ glibc-2.14.90-15/ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -340,8 +340,8 @@ 2007-04-16 Ulrich Drepper [BZ #4364] ---- glibc-2.14-518-ga5fb313/Makeconfig -+++ glibc-2.14.90-16/Makeconfig +--- glibc-2.14-498-g98591e5/Makeconfig ++++ glibc-2.14.90-15/Makeconfig @@ -803,12 +803,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -358,8 +358,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.14-518-ga5fb313/NEWS -+++ glibc-2.14.90-16/NEWS +--- glibc-2.14-498-g98591e5/NEWS ++++ glibc-2.14.90-15/NEWS @@ -72,16 +72,6 @@ Version 2.14 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, 12795, 12811, 12813, 12814, 12841 @@ -377,8 +377,8 @@ * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at, syncfs, setns, sendmmsg ---- glibc-2.14-518-ga5fb313/config.h.in -+++ glibc-2.14.90-16/config.h.in +--- glibc-2.14-498-g98591e5/config.h.in ++++ glibc-2.14.90-15/config.h.in @@ -187,6 +187,9 @@ /* Define if `.ctors' and `.dtors' sections shouldn't be used. */ #undef NO_CTORS_DTORS_SECTIONS @@ -389,8 +389,8 @@ /* */ ---- glibc-2.14-518-ga5fb313/configure -+++ glibc-2.14.90-16/configure +--- glibc-2.14-498-g98591e5/configure ++++ glibc-2.14.90-15/configure @@ -792,6 +792,7 @@ enable_kernel enable_all_warnings enable_multi_arch @@ -459,8 +459,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-518-ga5fb313/configure.in -+++ glibc-2.14.90-16/configure.in +--- glibc-2.14-498-g98591e5/configure.in ++++ glibc-2.14.90-15/configure.in @@ -291,6 +291,29 @@ else fi AC_SUBST(libc_cv_nss_crypt) @@ -491,8 +491,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-518-ga5fb313/csu/Makefile -+++ glibc-2.14.90-16/csu/Makefile +--- glibc-2.14-498-g98591e5/csu/Makefile ++++ glibc-2.14.90-15/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -503,8 +503,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.14-518-ga5fb313/csu/elf-init.c -+++ glibc-2.14.90-16/csu/elf-init.c +--- glibc-2.14-498-g98591e5/csu/elf-init.c ++++ glibc-2.14.90-15/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; @@ -529,8 +529,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.14-518-ga5fb313/debug/tst-chk1.c -+++ glibc-2.14.90-16/debug/tst-chk1.c +--- glibc-2.14-498-g98591e5/debug/tst-chk1.c ++++ glibc-2.14.90-15/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -559,8 +559,8 @@ # define O 0 # else # define O 1 ---- glibc-2.14-518-ga5fb313/elf/Makefile -+++ glibc-2.14.90-16/elf/Makefile +--- glibc-2.14-498-g98591e5/elf/Makefile ++++ glibc-2.14.90-15/elf/Makefile @@ -135,6 +135,7 @@ include ../Makeconfig ifeq ($(unwind-find-fde),yes) routines += unwind-dw2-fde-glibc @@ -579,8 +579,8 @@ test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names)))) generated += $(addsuffix .so,$(strip $(modules-names))) ---- glibc-2.14-518-ga5fb313/elf/dl-close.c -+++ glibc-2.14.90-16/elf/dl-close.c +--- glibc-2.14-498-g98591e5/elf/dl-close.c ++++ glibc-2.14.90-15/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) @@ -601,8 +601,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-518-ga5fb313/elf/dl-deps.c -+++ glibc-2.14.90-16/elf/dl-deps.c +--- glibc-2.14-498-g98591e5/elf/dl-deps.c ++++ glibc-2.14.90-15/elf/dl-deps.c @@ -489,6 +489,7 @@ _dl_map_object_deps (struct link_map *map, nneeded * sizeof needed[0]); atomic_write_barrier (); @@ -628,8 +628,8 @@ if (errno_reason) _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, ---- glibc-2.14-518-ga5fb313/elf/dl-init.c -+++ glibc-2.14.90-16/elf/dl-init.c +--- glibc-2.14-498-g98591e5/elf/dl-init.c ++++ glibc-2.14.90-15/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -652,8 +652,8 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.14-518-ga5fb313/elf/dl-libc.c -+++ glibc-2.14.90-16/elf/dl-libc.c +--- glibc-2.14-498-g98591e5/elf/dl-libc.c ++++ glibc-2.14.90-15/elf/dl-libc.c @@ -270,13 +270,13 @@ libc_freeres_fn (free_mem) for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) @@ -680,8 +680,8 @@ } if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 ---- glibc-2.14-518-ga5fb313/elf/dl-load.c -+++ glibc-2.14.90-16/elf/dl-load.c +--- glibc-2.14-498-g98591e5/elf/dl-load.c ++++ glibc-2.14.90-15/elf/dl-load.c @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len) @@ -761,8 +761,8 @@ } else /* No DST we recognize. */ ---- glibc-2.14-518-ga5fb313/elf/dl-support.c -+++ glibc-2.14.90-16/elf/dl-support.c +--- glibc-2.14-498-g98591e5/elf/dl-support.c ++++ glibc-2.14.90-15/elf/dl-support.c @@ -82,10 +82,8 @@ unsigned long long _dl_load_adds; create a fake scope containing nothing. */ struct r_scope_elem _dl_initial_searchlist; @@ -774,8 +774,8 @@ /* Random data provided by the kernel. */ void *_dl_random; ---- glibc-2.14-518-ga5fb313/elf/ldconfig.c -+++ glibc-2.14.90-16/elf/ldconfig.c +--- glibc-2.14-498-g98591e5/elf/ldconfig.c ++++ glibc-2.14.90-15/elf/ldconfig.c @@ -1034,17 +1034,19 @@ search_dirs (void) @@ -857,8 +857,8 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.14-518-ga5fb313/elf/ldd.bash.in -+++ glibc-2.14.90-16/elf/ldd.bash.in +--- glibc-2.14-498-g98591e5/elf/ldd.bash.in ++++ glibc-2.14.90-15/elf/ldd.bash.in @@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2 fi done @@ -887,8 +887,8 @@ try_trace "$RTLD" "$file" || result=1 ;; *) ---- glibc-2.14-518-ga5fb313/elf/rtld-Rules -+++ glibc-2.14.90-16/elf/rtld-Rules +--- glibc-2.14-498-g98591e5/elf/rtld-Rules ++++ glibc-2.14.90-15/elf/rtld-Rules @@ -1,7 +1,7 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker. @@ -906,8 +906,8 @@ +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld endif ---- glibc-2.14-518-ga5fb313/elf/rtld.c -+++ glibc-2.14.90-16/elf/rtld.c +--- glibc-2.14-498-g98591e5/elf/rtld.c ++++ glibc-2.14.90-15/elf/rtld.c @@ -107,7 +107,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -962,24 +962,24 @@ if (! prelinked && rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. ---- glibc-2.14-518-ga5fb313/extra-lib.mk -+++ glibc-2.14.90-16/extra-lib.mk +--- glibc-2.14-498-g98591e5/extra-lib.mk ++++ glibc-2.14.90-15/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-518-ga5fb313/include/bits/stdlib-ldbl.h -+++ glibc-2.14.90-16/include/bits/stdlib-ldbl.h +--- glibc-2.14-498-g98591e5/include/bits/stdlib-ldbl.h ++++ glibc-2.14.90-15/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-518-ga5fb313/include/bits/wchar-ldbl.h -+++ glibc-2.14.90-16/include/bits/wchar-ldbl.h +--- glibc-2.14-498-g98591e5/include/bits/wchar-ldbl.h ++++ glibc-2.14.90-15/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-518-ga5fb313/include/features.h -+++ glibc-2.14.90-16/include/features.h +--- glibc-2.14-498-g98591e5/include/features.h ++++ glibc-2.14.90-15/include/features.h @@ -310,8 +310,13 @@ #endif @@ -996,8 +996,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.14-518-ga5fb313/include/libc-symbols.h -+++ glibc-2.14.90-16/include/libc-symbols.h +--- glibc-2.14-498-g98591e5/include/libc-symbols.h ++++ glibc-2.14.90-15/include/libc-symbols.h @@ -626,7 +626,7 @@ for linking") # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libc_hidden_def(name) hidden_def (name) @@ -1007,8 +1007,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-518-ga5fb313/include/link.h -+++ glibc-2.14.90-16/include/link.h +--- glibc-2.14-498-g98591e5/include/link.h ++++ glibc-2.14.90-15/include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. @@ -1046,8 +1046,8 @@ # elif NO_TLS_OFFSET == -1 # define FORCED_DYNAMIC_TLS_OFFSET -2 # else ---- glibc-2.14-518-ga5fb313/include/stap-probe.h -+++ glibc-2.14.90-16/include/stap-probe.h +--- glibc-2.14-498-g98591e5/include/stap-probe.h ++++ glibc-2.14.90-15/include/stap-probe.h @@ -0,0 +1,140 @@ +/* Macros for defining Systemtap static probe points. + Copyright (C) 2011 Free Software Foundation, Inc. @@ -1189,16 +1189,16 @@ +#endif /* USE_STAP_PROBE. */ + +#endif /* stap-probe.h */ ---- glibc-2.14-518-ga5fb313/include/sys/resource.h -+++ glibc-2.14.90-16/include/sys/resource.h +--- glibc-2.14-498-g98591e5/include/sys/resource.h ++++ glibc-2.14.90-15/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-518-ga5fb313/inet/Makefile -+++ glibc-2.14.90-16/inet/Makefile +--- glibc-2.14-498-g98591e5/inet/Makefile ++++ glibc-2.14.90-15/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -1208,8 +1208,8 @@ ifeq ($(have-thread-library),yes) CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions ---- glibc-2.14-518-ga5fb313/intl/locale.alias -+++ glibc-2.14.90-16/intl/locale.alias +--- glibc-2.14-498-g98591e5/intl/locale.alias ++++ glibc-2.14.90-15/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -1219,8 +1219,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.14-518-ga5fb313/libio/stdio.h -+++ glibc-2.14.90-16/libio/stdio.h +--- glibc-2.14-498-g98591e5/libio/stdio.h ++++ glibc-2.14.90-15/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. */ @@ -1234,8 +1234,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.14-518-ga5fb313/locale/iso-4217.def -+++ glibc-2.14.90-16/locale/iso-4217.def +--- glibc-2.14-498-g98591e5/locale/iso-4217.def ++++ glibc-2.14.90-15/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1327,8 +1327,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.14-518-ga5fb313/locale/programs/locarchive.c -+++ glibc-2.14.90-16/locale/programs/locarchive.c +--- glibc-2.14-498-g98591e5/locale/programs/locarchive.c ++++ glibc-2.14.90-15/locale/programs/locarchive.c @@ -253,9 +253,9 @@ oldlocrecentcmp (const void *a, const void *b) /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -1360,9 +1360,9 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.14-518-ga5fb313/localedata/ChangeLog -+++ glibc-2.14.90-16/localedata/ChangeLog -@@ -37,6 +37,14 @@ +--- glibc-2.14-498-g98591e5/localedata/ChangeLog ++++ glibc-2.14.90-15/localedata/ChangeLog +@@ -10,6 +10,14 @@ * tests-mbwc/tst_funcs.h (TST_DECL_VARS, TST_HEAD_LOCALE): Remove unused variable. @@ -1377,8 +1377,8 @@ 2011-05-21 Ulrich Drepper [BZ #12788] ---- glibc-2.14-518-ga5fb313/localedata/Makefile -+++ glibc-2.14.90-16/localedata/Makefile +--- glibc-2.14-498-g98591e5/localedata/Makefile ++++ glibc-2.14.90-15/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1387,8 +1387,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.14-518-ga5fb313/localedata/SUPPORTED -+++ glibc-2.14.90-16/localedata/SUPPORTED +--- glibc-2.14-498-g98591e5/localedata/SUPPORTED ++++ glibc-2.14.90-15/localedata/SUPPORTED @@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1430,8 +1430,8 @@ sw_KE/UTF-8 \ sw_TZ/UTF-8 \ ta_IN/UTF-8 \ ---- glibc-2.14-518-ga5fb313/localedata/locales/cy_GB -+++ glibc-2.14.90-16/localedata/locales/cy_GB +--- glibc-2.14-498-g98591e5/localedata/locales/cy_GB ++++ glibc-2.14.90-15/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1446,8 +1446,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.14-518-ga5fb313/localedata/locales/en_GB -+++ glibc-2.14.90-16/localedata/locales/en_GB +--- glibc-2.14-498-g98591e5/localedata/locales/en_GB ++++ glibc-2.14.90-15/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1459,8 +1459,8 @@ date_fmt "/ / " ---- glibc-2.14-518-ga5fb313/localedata/locales/no_NO -+++ glibc-2.14.90-16/localedata/locales/no_NO +--- glibc-2.14-498-g98591e5/localedata/locales/no_NO ++++ glibc-2.14.90-15/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1531,8 +1531,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.14-518-ga5fb313/localedata/locales/zh_TW -+++ glibc-2.14.90-16/localedata/locales/zh_TW +--- glibc-2.14-498-g98591e5/localedata/locales/zh_TW ++++ glibc-2.14.90-15/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1560,8 +1560,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.14-518-ga5fb313/login/programs/pt_chown.c -+++ glibc-2.14.90-16/login/programs/pt_chown.c +--- glibc-2.14-498-g98591e5/login/programs/pt_chown.c ++++ glibc-2.14.90-15/login/programs/pt_chown.c @@ -29,6 +29,7 @@ #include #include @@ -1603,8 +1603,8 @@ - return EXIT_SUCCESS; } ---- glibc-2.14-518-ga5fb313/malloc/mcheck.c -+++ glibc-2.14.90-16/malloc/mcheck.c +--- glibc-2.14-498-g98591e5/malloc/mcheck.c ++++ glibc-2.14.90-15/malloc/mcheck.c @@ -25,10 +25,26 @@ # include # include @@ -1681,8 +1681,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.14-518-ga5fb313/manual/libc.texinfo -+++ glibc-2.14.90-16/manual/libc.texinfo +--- glibc-2.14-498-g98591e5/manual/libc.texinfo ++++ glibc-2.14.90-15/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1692,8 +1692,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.14-518-ga5fb313/misc/sys/cdefs.h -+++ glibc-2.14.90-16/misc/sys/cdefs.h +--- glibc-2.14-498-g98591e5/misc/sys/cdefs.h ++++ glibc-2.14.90-15/misc/sys/cdefs.h @@ -146,7 +146,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -1737,8 +1737,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.14-518-ga5fb313/nis/Makefile -+++ glibc-2.14.90-16/nis/Makefile +--- glibc-2.14-498-g98591e5/nis/Makefile ++++ glibc-2.14.90-15/nis/Makefile @@ -23,9 +23,9 @@ subdir := nis aux := nis_hash @@ -1760,8 +1760,8 @@ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ ---- glibc-2.14-518-ga5fb313/nis/nss -+++ glibc-2.14.90-16/nis/nss +--- glibc-2.14-498-g98591e5/nis/nss ++++ glibc-2.14.90-15/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 @@ -1771,8 +1771,8 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.14-518-ga5fb313/nptl/ChangeLog -+++ glibc-2.14.90-16/nptl/ChangeLog +--- glibc-2.14-498-g98591e5/nptl/ChangeLog ++++ glibc-2.14.90-15/nptl/ChangeLog @@ -169,6 +169,51 @@ clearing memory. Patch partly by Robert Rex . @@ -1849,8 +1849,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.14-518-ga5fb313/nptl/DESIGN-systemtap-probes.txt -+++ glibc-2.14.90-16/nptl/DESIGN-systemtap-probes.txt +--- glibc-2.14-498-g98591e5/nptl/DESIGN-systemtap-probes.txt ++++ glibc-2.14.90-15/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. @@ -1941,8 +1941,8 @@ + arg1 = condition +cond_broadcast - probe for pthread_cond_broadcast + arg1 = condition ---- glibc-2.14-518-ga5fb313/nptl/Makefile -+++ glibc-2.14.90-16/nptl/Makefile +--- glibc-2.14-498-g98591e5/nptl/Makefile ++++ glibc-2.14.90-15/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1975,8 +1975,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.14-518-ga5fb313/nptl/Versions -+++ glibc-2.14.90-16/nptl/Versions +--- glibc-2.14-498-g98591e5/nptl/Versions ++++ glibc-2.14.90-15/nptl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; # Internal libc interface to libpthread @@ -1985,8 +1985,8 @@ } } ---- glibc-2.14-518-ga5fb313/nptl/nptl-init.c -+++ glibc-2.14.90-16/nptl/nptl-init.c +--- glibc-2.14-498-g98591e5/nptl/nptl-init.c ++++ glibc-2.14.90-15/nptl/nptl-init.c @@ -415,7 +415,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. */ @@ -1996,8 +1996,8 @@ || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ ---- glibc-2.14-518-ga5fb313/nptl/pthread_cond_broadcast.c -+++ glibc-2.14.90-16/nptl/pthread_cond_broadcast.c +--- glibc-2.14-498-g98591e5/nptl/pthread_cond_broadcast.c ++++ glibc-2.14.90-15/nptl/pthread_cond_broadcast.c @@ -23,6 +23,7 @@ #include #include @@ -2015,8 +2015,8 @@ int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; /* Make sure we are alone. */ ---- glibc-2.14-518-ga5fb313/nptl/pthread_cond_destroy.c -+++ glibc-2.14.90-16/nptl/pthread_cond_destroy.c +--- glibc-2.14-498-g98591e5/nptl/pthread_cond_destroy.c ++++ glibc-2.14.90-15/nptl/pthread_cond_destroy.c @@ -20,6 +20,7 @@ #include #include @@ -2034,8 +2034,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-518-ga5fb313/nptl/pthread_cond_init.c -+++ glibc-2.14.90-16/nptl/pthread_cond_init.c +--- glibc-2.14-498-g98591e5/nptl/pthread_cond_init.c ++++ glibc-2.14.90-15/nptl/pthread_cond_init.c @@ -20,6 +20,7 @@ #include @@ -2053,8 +2053,8 @@ return 0; } versioned_symbol (libpthread, __pthread_cond_init, ---- glibc-2.14-518-ga5fb313/nptl/pthread_cond_signal.c -+++ glibc-2.14.90-16/nptl/pthread_cond_signal.c +--- glibc-2.14-498-g98591e5/nptl/pthread_cond_signal.c ++++ glibc-2.14.90-15/nptl/pthread_cond_signal.c @@ -26,6 +26,7 @@ #include @@ -2072,8 +2072,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-518-ga5fb313/nptl/pthread_cond_wait.c -+++ glibc-2.14.90-16/nptl/pthread_cond_wait.c +--- glibc-2.14-498-g98591e5/nptl/pthread_cond_wait.c ++++ glibc-2.14.90-15/nptl/pthread_cond_wait.c @@ -25,6 +25,7 @@ #include @@ -2091,8 +2091,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-518-ga5fb313/nptl/pthread_create.c -+++ glibc-2.14.90-16/nptl/pthread_create.c +--- glibc-2.14-498-g98591e5/nptl/pthread_create.c ++++ glibc-2.14.90-15/nptl/pthread_create.c @@ -32,6 +32,8 @@ #include @@ -2120,8 +2120,8 @@ /* Start the thread. */ return create_thread (pd, iattr, STACK_VARIABLES_ARGS); } ---- glibc-2.14-518-ga5fb313/nptl/pthread_join.c -+++ glibc-2.14.90-16/nptl/pthread_join.c +--- glibc-2.14-498-g98591e5/nptl/pthread_join.c ++++ glibc-2.14.90-15/nptl/pthread_join.c @@ -23,6 +23,8 @@ #include #include "pthreadP.h" @@ -2148,8 +2148,8 @@ + return result; } ---- glibc-2.14-518-ga5fb313/nptl/pthread_mutex_destroy.c -+++ glibc-2.14.90-16/nptl/pthread_mutex_destroy.c +--- glibc-2.14-498-g98591e5/nptl/pthread_mutex_destroy.c ++++ glibc-2.14.90-15/nptl/pthread_mutex_destroy.c @@ -20,11 +20,15 @@ #include #include "pthreadP.h" @@ -2166,8 +2166,8 @@ if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0 && mutex->__data.__nusers != 0) return EBUSY; ---- glibc-2.14-518-ga5fb313/nptl/pthread_mutex_init.c -+++ glibc-2.14.90-16/nptl/pthread_mutex_init.c +--- glibc-2.14-498-g98591e5/nptl/pthread_mutex_init.c ++++ glibc-2.14.90-15/nptl/pthread_mutex_init.c @@ -24,6 +24,8 @@ #include #include "pthreadP.h" @@ -2186,8 +2186,8 @@ return 0; } strong_alias (__pthread_mutex_init, pthread_mutex_init) ---- glibc-2.14-518-ga5fb313/nptl/pthread_mutex_lock.c -+++ glibc-2.14.90-16/nptl/pthread_mutex_lock.c +--- glibc-2.14-498-g98591e5/nptl/pthread_mutex_lock.c ++++ glibc-2.14.90-15/nptl/pthread_mutex_lock.c @@ -24,6 +24,7 @@ #include #include "pthreadP.h" @@ -2224,8 +2224,8 @@ return 0; } #ifndef __pthread_mutex_lock ---- glibc-2.14-518-ga5fb313/nptl/pthread_mutex_timedlock.c -+++ glibc-2.14.90-16/nptl/pthread_mutex_timedlock.c +--- glibc-2.14-498-g98591e5/nptl/pthread_mutex_timedlock.c ++++ glibc-2.14.90-15/nptl/pthread_mutex_timedlock.c @@ -24,6 +24,8 @@ #include #include @@ -2280,8 +2280,8 @@ } out: ---- glibc-2.14-518-ga5fb313/nptl/pthread_mutex_unlock.c -+++ glibc-2.14.90-16/nptl/pthread_mutex_unlock.c +--- glibc-2.14-498-g98591e5/nptl/pthread_mutex_unlock.c ++++ glibc-2.14.90-15/nptl/pthread_mutex_unlock.c @@ -22,6 +22,7 @@ #include #include "pthreadP.h" @@ -2318,8 +2318,8 @@ return 0; } ---- glibc-2.14-518-ga5fb313/nptl/pthread_rwlock_destroy.c -+++ glibc-2.14.90-16/nptl/pthread_rwlock_destroy.c +--- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_destroy.c ++++ glibc-2.14.90-15/nptl/pthread_rwlock_destroy.c @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -2336,8 +2336,8 @@ /* Nothing to be done. For now. */ return 0; } ---- glibc-2.14-518-ga5fb313/nptl/pthread_rwlock_rdlock.c -+++ glibc-2.14.90-16/nptl/pthread_rwlock_rdlock.c +--- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_rdlock.c ++++ glibc-2.14.90-15/nptl/pthread_rwlock_rdlock.c @@ -22,6 +22,7 @@ #include #include @@ -2364,8 +2364,8 @@ break; } ---- glibc-2.14-518-ga5fb313/nptl/pthread_rwlock_unlock.c -+++ glibc-2.14.90-16/nptl/pthread_rwlock_unlock.c +--- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_unlock.c ++++ glibc-2.14.90-15/nptl/pthread_rwlock_unlock.c @@ -22,11 +22,14 @@ #include #include @@ -2381,8 +2381,8 @@ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); if (rwlock->__data.__writer) rwlock->__data.__writer = 0; ---- glibc-2.14-518-ga5fb313/nptl/pthread_rwlock_wrlock.c -+++ glibc-2.14.90-16/nptl/pthread_rwlock_wrlock.c +--- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_wrlock.c ++++ glibc-2.14.90-15/nptl/pthread_rwlock_wrlock.c @@ -22,6 +22,7 @@ #include #include @@ -2409,8 +2409,8 @@ break; } ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.14.90-15/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 @@ -2419,8 +2419,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/Versions +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -2428,8 +2428,8 @@ + __uname; + } +} ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2449,8 +2449,8 @@ ENTER_KERNEL 2: movl %edx, %eax ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S @@ -24,6 +24,7 @@ #include #include @@ -2468,8 +2468,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S @@ -24,7 +24,7 @@ #include #include @@ -2488,8 +2488,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S @@ -24,7 +24,7 @@ #include #include @@ -2508,8 +2508,8 @@ cmpl $1000000000, 4(%ebp) movl $EINVAL, %eax jae 18f ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S @@ -25,6 +25,7 @@ #include #include @@ -2527,8 +2527,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S @@ -23,6 +23,7 @@ #include #include @@ -2546,8 +2546,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S @@ -23,6 +23,7 @@ #include #include @@ -2565,8 +2565,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2584,8 +2584,8 @@ __asm __volatile (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -2595,8 +2595,8 @@ cp = u.uts.version; else { ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -2604,8 +2604,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2635,8 +2635,8 @@ syscall 2: movl %edx, %eax ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2654,8 +2654,8 @@ __asm __volatile ("syscall" \ : "=a" (__ignore) \ : "0" (SYS_futex), "D" (futex), \ ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S @@ -25,7 +25,7 @@ #include #include @@ -2674,8 +2674,8 @@ /* Get internal lock. */ movl $1, %esi xorl %eax, %eax ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S @@ -24,6 +24,7 @@ #include #include @@ -2693,8 +2693,8 @@ /* Get internal lock. */ movq %rdi, %r8 movl $1, %esi ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -23,6 +23,7 @@ #include #include @@ -2712,8 +2712,8 @@ cmpq $1000000000, 8(%rdx) movl $EINVAL, %eax jae 48f ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S @@ -23,6 +23,7 @@ #include #include @@ -2731,8 +2731,8 @@ cmpq $-1, dep_mutex(%rdi) /* Prepare structure passed to cancellation handler. */ ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S @@ -22,7 +22,7 @@ #include #include @@ -2752,8 +2752,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-518-ga5fb313/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S -+++ glibc-2.14.90-16/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S +--- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S ++++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S @@ -22,7 +22,7 @@ #include #include @@ -2773,8 +2773,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-518-ga5fb313/nscd/nscd.conf -+++ glibc-2.14.90-16/nscd/nscd.conf +--- glibc-2.14-498-g98591e5/nscd/nscd.conf ++++ glibc-2.14.90-15/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -2784,8 +2784,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.14-518-ga5fb313/nscd/nscd.init -+++ glibc-2.14.90-16/nscd/nscd.init +--- glibc-2.14-498-g98591e5/nscd/nscd.init ++++ glibc-2.14.90-15/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -2862,8 +2862,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.14-518-ga5fb313/nss/Makefile -+++ glibc-2.14.90-16/nss/Makefile +--- glibc-2.14-498-g98591e5/nss/Makefile ++++ glibc-2.14.90-15/nss/Makefile @@ -88,6 +88,7 @@ endif include ../Rules @@ -2872,8 +2872,8 @@ ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a ---- glibc-2.14-518-ga5fb313/nss/nss_files/files-XXX.c -+++ glibc-2.14.90-16/nss/nss_files/files-XXX.c +--- glibc-2.14-498-g98591e5/nss/nss_files/files-XXX.c ++++ glibc-2.14.90-15/nss/nss_files/files-XXX.c @@ -190,7 +190,7 @@ internal_getent (struct STRUCTURE *result, { char *p; @@ -2883,8 +2883,8 @@ int parse_result; if (buflen < sizeof *data + 2) ---- glibc-2.14-518-ga5fb313/posix/Makefile -+++ glibc-2.14.90-16/posix/Makefile +--- glibc-2.14-498-g98591e5/posix/Makefile ++++ glibc-2.14.90-15/posix/Makefile @@ -320,15 +320,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -2905,8 +2905,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.14-518-ga5fb313/posix/gai.conf -+++ glibc-2.14.90-16/posix/gai.conf +--- glibc-2.14-498-g98591e5/posix/gai.conf ++++ glibc-2.14.90-15/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -2931,8 +2931,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.14-518-ga5fb313/posix/getconf.speclist.h -+++ glibc-2.14.90-16/posix/getconf.speclist.h +--- glibc-2.14-498-g98591e5/posix/getconf.speclist.h ++++ glibc-2.14.90-15/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -2973,8 +2973,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.14-518-ga5fb313/posix/regcomp.c -+++ glibc-2.14.90-16/posix/regcomp.c +--- glibc-2.14-498-g98591e5/posix/regcomp.c ++++ glibc-2.14.90-15/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. @@ -3106,8 +3106,8 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.14-518-ga5fb313/resolv/Makefile -+++ glibc-2.14.90-16/resolv/Makefile +--- glibc-2.14-498-g98591e5/resolv/Makefile ++++ glibc-2.14.90-15/resolv/Makefile @@ -81,6 +81,7 @@ ifeq (yes,$(have-ssp)) CFLAGS-libresolv += -fstack-protector endif @@ -3116,8 +3116,8 @@ # The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings ---- glibc-2.14-518-ga5fb313/resolv/res_query.c -+++ glibc-2.14.90-16/resolv/res_query.c +--- glibc-2.14-498-g98591e5/resolv/res_query.c ++++ glibc-2.14.90-15/resolv/res_query.c @@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, && *resplen2 > (int) sizeof (HEADER)) { @@ -3127,8 +3127,8 @@ hp = hp2; } else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) ---- glibc-2.14-518-ga5fb313/resource/getrlimit.c -+++ glibc-2.14.90-16/resource/getrlimit.c +--- glibc-2.14-498-g98591e5/resource/getrlimit.c ++++ glibc-2.14.90-15/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -3137,8 +3137,8 @@ weak_alias (__getrlimit, getrlimit) stub_warning (getrlimit) ---- glibc-2.14-518-ga5fb313/scripts/check-local-headers.sh -+++ glibc-2.14.90-16/scripts/check-local-headers.sh +--- glibc-2.14-498-g98591e5/scripts/check-local-headers.sh ++++ glibc-2.14.90-15/scripts/check-local-headers.sh @@ -29,7 +29,7 @@ exec ${AWK} -v includedir="$includedir" ' BEGIN { status = 0 @@ -3148,8 +3148,8 @@ } /^[^ ]/ && $1 ~ /.*:/ { obj = $1 } { ---- glibc-2.14-518-ga5fb313/stdio-common/vfprintf.c -+++ glibc-2.14.90-16/stdio-common/vfprintf.c +--- glibc-2.14-498-g98591e5/stdio-common/vfprintf.c ++++ glibc-2.14.90-15/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')) \ { \ @@ -3195,8 +3195,8 @@ else \ len = strlen (string); \ } \ ---- glibc-2.14-518-ga5fb313/streams/Makefile -+++ glibc-2.14.90-16/streams/Makefile +--- glibc-2.14-498-g98591e5/streams/Makefile ++++ glibc-2.14.90-15/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -3206,8 +3206,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.14-518-ga5fb313/sunrpc/Makefile -+++ glibc-2.14.90-16/sunrpc/Makefile +--- glibc-2.14-498-g98591e5/sunrpc/Makefile ++++ glibc-2.14.90-15/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) \ @@ -3228,8 +3228,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-518-ga5fb313/sysdeps/generic/dl-cache.h -+++ glibc-2.14.90-16/sysdeps/generic/dl-cache.h +--- glibc-2.14-498-g98591e5/sysdeps/generic/dl-cache.h ++++ glibc-2.14.90-15/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -3245,8 +3245,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-518-ga5fb313/sysdeps/i386/Makefile -+++ glibc-2.14.90-16/sysdeps/i386/Makefile +--- glibc-2.14-498-g98591e5/sysdeps/i386/Makefile ++++ glibc-2.14.90-15/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -3271,8 +3271,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-518-ga5fb313/sysdeps/i386/__longjmp.S -+++ glibc-2.14.90-16/sysdeps/i386/__longjmp.S +--- glibc-2.14-498-g98591e5/sysdeps/i386/__longjmp.S ++++ glibc-2.14.90-15/sysdeps/i386/__longjmp.S @@ -1,5 +1,5 @@ /* longjmp for i386. - Copyright (C) 1995-1998,2000,2002,2005,2006,2009 @@ -3319,8 +3319,8 @@ #endif /* Jump to saved PC. */ jmp *%edx ---- glibc-2.14-518-ga5fb313/sysdeps/i386/bsd-_setjmp.S -+++ glibc-2.14.90-16/sysdeps/i386/bsd-_setjmp.S +--- glibc-2.14-498-g98591e5/sysdeps/i386/bsd-_setjmp.S ++++ glibc-2.14.90-15/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. @@ -3345,8 +3345,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-518-ga5fb313/sysdeps/i386/bsd-setjmp.S -+++ glibc-2.14.90-16/sysdeps/i386/bsd-setjmp.S +--- glibc-2.14-498-g98591e5/sysdeps/i386/bsd-setjmp.S ++++ glibc-2.14.90-15/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. @@ -3371,8 +3371,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-518-ga5fb313/sysdeps/i386/i686/Makefile -+++ glibc-2.14.90-16/sysdeps/i386/i686/Makefile +--- glibc-2.14-498-g98591e5/sysdeps/i386/i686/Makefile ++++ glibc-2.14.90-15/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -3393,8 +3393,8 @@ -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif ---- glibc-2.14-518-ga5fb313/sysdeps/i386/setjmp.S -+++ glibc-2.14.90-16/sysdeps/i386/setjmp.S +--- glibc-2.14-498-g98591e5/sysdeps/i386/setjmp.S ++++ glibc-2.14.90-15/sysdeps/i386/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for i386. - Copyright (C) 1995,1996,1997,2000,2001,2005,2006 @@ -3418,8 +3418,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-518-ga5fb313/sysdeps/ia64/Makefile -+++ glibc-2.14.90-16/sysdeps/ia64/Makefile +--- glibc-2.14-498-g98591e5/sysdeps/ia64/Makefile ++++ glibc-2.14.90-15/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -3431,8 +3431,8 @@ endif endif ---- glibc-2.14-518-ga5fb313/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.14.90-16/sysdeps/ia64/ia64libgcc.S +--- glibc-2.14-498-g98591e5/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.14.90-15/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -3784,8 +3784,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.14-518-ga5fb313/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.14.90-16/sysdeps/ia64/libgcc-compat.c +--- glibc-2.14-498-g98591e5/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.14.90-15/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -3871,16 +3871,16 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.14-518-ga5fb313/sysdeps/mach/hurd/getrlimit.c -+++ glibc-2.14.90-16/sysdeps/mach/hurd/getrlimit.c +--- glibc-2.14-498-g98591e5/sysdeps/mach/hurd/getrlimit.c ++++ glibc-2.14.90-15/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-518-ga5fb313/sysdeps/posix/getaddrinfo.c -+++ glibc-2.14.90-16/sysdeps/posix/getaddrinfo.c +--- glibc-2.14-498-g98591e5/sysdeps/posix/getaddrinfo.c ++++ glibc-2.14.90-15/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 @@ -4005,8 +4005,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.14-518-ga5fb313/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.14.90-16/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.14-498-g98591e5/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.14.90-15/sysdeps/powerpc/powerpc64/Makefile @@ -33,6 +33,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -4015,16 +4015,16 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-518-ga5fb313/sysdeps/powerpc/powerpc64/elf/Makefile -+++ glibc-2.14.90-16/sysdeps/powerpc/powerpc64/elf/Makefile +--- glibc-2.14-498-g98591e5/sysdeps/powerpc/powerpc64/elf/Makefile ++++ glibc-2.14.90-15/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-518-ga5fb313/sysdeps/s390/s390-64/utf16-utf32-z9.c -+++ glibc-2.14.90-16/sysdeps/s390/s390-64/utf16-utf32-z9.c +--- glibc-2.14-498-g98591e5/sysdeps/s390/s390-64/utf16-utf32-z9.c ++++ glibc-2.14.90-15/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; \ @@ -4037,8 +4037,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-518-ga5fb313/sysdeps/s390/s390-64/utf8-utf16-z9.c -+++ glibc-2.14.90-16/sysdeps/s390/s390-64/utf8-utf16-z9.c +--- glibc-2.14-498-g98591e5/sysdeps/s390/s390-64/utf8-utf16-z9.c ++++ glibc-2.14.90-15/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; \ @@ -4051,8 +4051,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-518-ga5fb313/sysdeps/s390/s390-64/utf8-utf32-z9.c -+++ glibc-2.14.90-16/sysdeps/s390/s390-64/utf8-utf32-z9.c +--- glibc-2.14-498-g98591e5/sysdeps/s390/s390-64/utf8-utf32-z9.c ++++ glibc-2.14.90-15/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; \ @@ -4065,8 +4065,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-518-ga5fb313/sysdeps/unix/nice.c -+++ glibc-2.14.90-16/sysdeps/unix/nice.c +--- glibc-2.14-498-g98591e5/sysdeps/unix/nice.c ++++ glibc-2.14.90-15/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -4081,8 +4081,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -4125,8 +4125,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S -+++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S ++++ glibc-2.14.90-15/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 @@ -4160,8 +4160,8 @@ + LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx) jmp *%edx END (____longjmp_chk) ---- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.14.90-15/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. @@ -4222,16 +4222,16 @@ + } while (0) + +#include_next ---- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ glibc-2.14.90-15/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-518-ga5fb313/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -4264,29 +4264,29 @@ + } while (0) + #include_next ---- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.14.90-15/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-518-ga5fb313/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -4296,8 +4296,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -4343,8 +4343,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.14-518-ga5fb313/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S -+++ glibc-2.14.90-16/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +--- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S ++++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S @@ -19,6 +19,7 @@ #include #include @@ -4371,8 +4371,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (____longjmp_chk) ---- glibc-2.14-518-ga5fb313/sysdeps/x86_64/__longjmp.S -+++ glibc-2.14.90-16/sysdeps/x86_64/__longjmp.S +--- glibc-2.14-498-g98591e5/sysdeps/x86_64/__longjmp.S ++++ glibc-2.14.90-15/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. @@ -4402,8 +4402,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (__longjmp) ---- glibc-2.14-518-ga5fb313/sysdeps/x86_64/setjmp.S -+++ glibc-2.14.90-16/sysdeps/x86_64/setjmp.S +--- glibc-2.14-498-g98591e5/sysdeps/x86_64/setjmp.S ++++ glibc-2.14.90-15/sysdeps/x86_64/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for x86-64. - Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc. @@ -4427,8 +4427,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%rax) #endif ---- glibc-2.14-518-ga5fb313/timezone/zic.c -+++ glibc-2.14.90-16/timezone/zic.c +--- glibc-2.14-498-g98591e5/timezone/zic.c ++++ glibc-2.14.90-15/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 f861eca..e3f836f 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.14-518-ga5fb313 +%define glibcsrcdir glibc-2.14-498-g98591e5 %define glibcversion 2.14.90 -%define glibcportsdir glibc-ports-2.14-44-ga9ff872 +%define glibcportsdir glibc-ports-2.14-43-gf335e01 ### glibc.spec.in follows: %define run_glibc_tests 1 %define auxarches athlon alphaev6 @@ -28,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 16 +Release: 15.2 # 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 @@ -1112,11 +1112,6 @@ rm -f *.filelist* %endif %changelog -* Mon Nov 14 2011 Andreas Schwab - 2.14.90-16 -- Update from master - - Don't call reused_arena when _int_new_arena failed (#753601) - - Fix grouping and reuse other locales in various locales (BZ#13147) - * Fri Nov 11 2011 Andreas Schwab - 2.14.90-15 - Update from master - Fix db makefile rule for group.db diff --git a/sources b/sources index 5b8c555..966759a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -e87247cdc2403714be8d3b457545a4d4 glibc-2.14-518-ga5fb313-fedora.tar.xz -3e39ac426f94a458b6831875a479fe23 glibc-2.14-518-ga5fb313.tar.xz -b16d4eccea9a93abaacddac422720e3f glibc-ports-2.14-44-ga9ff872.tar.xz +2ca57c728649b2d33580f97f9f3545f3 glibc-2.14-498-g98591e5-fedora.tar.xz +49bd20c056b1ae61985a099e791dc79a glibc-2.14-498-g98591e5.tar.xz +b89c04e859de608e0c6b33ab77923527 glibc-ports-2.14-43-gf335e01.tar.xz From e5b54e6a8224f6a10413357077a05e462045b8d1 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 15 Nov 2011 22:02:14 -0700 Subject: [PATCH 05/15] Revert "2.14.90-15" This reverts commit f3f8dee31610f286e44291da9a3670aebccf699e. Removing rebase and related commits --- .gitignore | 4 +- glibc-fedora.patch | 590 ++++++++++++++++++++++----------------------- glibc.spec | 26 +- sources | 4 +- 4 files changed, 304 insertions(+), 320 deletions(-) diff --git a/.gitignore b/.gitignore index 4b5489d..b064741 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ +/glibc-2.14-418-gb2ea1df-fedora.tar.xz +/glibc-2.14-418-gb2ea1df.tar.xz /glibc-ports-2.14-43-gf335e01.tar.xz -/glibc-2.14-498-g98591e5-fedora.tar.xz -/glibc-2.14-498-g98591e5.tar.xz diff --git a/glibc-fedora.patch b/glibc-fedora.patch index a4f706a..52804b5 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,6 @@ ---- glibc-2.14-498-g98591e5/ChangeLog -+++ glibc-2.14.90-15/ChangeLog -@@ -2217,6 +2217,15 @@ +--- glibc-2.14-418-gb2ea1df/ChangeLog ++++ /ChangeLog +@@ -1694,6 +1694,15 @@ * sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi directive. @@ -16,7 +16,7 @@ 2011-08-24 David S. Miller * sysdeps/sparc/sparc64/strcmp.S: Rewrite. -@@ -3022,6 +3031,14 @@ +@@ -2499,6 +2508,14 @@ * config.make.in: Likewise. * malloc/Makefile: Likewise. @@ -31,7 +31,7 @@ 2011-06-27 Andreas Schwab * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP -@@ -3153,6 +3170,10 @@ +@@ -2630,6 +2647,10 @@ * inet/getnetgrent_r.c: Use DL_CALL_FCT in several places. @@ -42,7 +42,7 @@ 2011-06-20 David S. Miller * sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple -@@ -3775,6 +3796,13 @@ +@@ -3252,6 +3273,13 @@ * libio/Makefile (tests): Add bug-fclose1. * libio/bug-fclose1.c: New file. @@ -56,7 +56,7 @@ 2011-05-12 Ulrich Drepper [BZ #12511] -@@ -4052,13 +4080,6 @@ +@@ -3529,13 +3557,6 @@ * stdlib/bug-getcontext.c: New file. * stdlib/Makefile: Add rules to build and run bug-getcontext. @@ -70,7 +70,7 @@ 2011-04-11 Andreas Krebbel * sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes -@@ -4296,6 +4317,31 @@ +@@ -3773,6 +3794,31 @@ * sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime): Export. @@ -102,7 +102,7 @@ 2011-03-22 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment -@@ -4356,6 +4402,16 @@ +@@ -3833,6 +3879,16 @@ $LDFLAGS and -nostdlib -nostartfiles to linking step. Change main to _start. @@ -119,7 +119,7 @@ 2011-03-06 Ulrich Drepper * elf/dl-load.c (_dl_map_object): If we are looking for the first -@@ -4572,6 +4628,12 @@ +@@ -4049,6 +4105,12 @@ * shadow/sgetspent.c: Check return value of __sgetspent_r instead of errno. @@ -132,7 +132,7 @@ 2011-01-19 Ulrich Drepper [BZ #11724] -@@ -5259,6 +5321,26 @@ +@@ -4736,6 +4798,26 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid. @@ -159,7 +159,7 @@ 2010-09-24 Petr Baudis * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -6051,6 +6133,17 @@ +@@ -5528,6 +5610,17 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -177,7 +177,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -6103,6 +6196,21 @@ +@@ -5580,6 +5673,21 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -199,8 +199,8 @@ 2010-05-28 Luis Machado * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.14-498-g98591e5/ChangeLog.15 -+++ glibc-2.14.90-15/ChangeLog.15 +--- glibc-2.14-418-gb2ea1df/ChangeLog.15 ++++ /ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -266,8 +266,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.14-498-g98591e5/ChangeLog.16 -+++ glibc-2.14.90-15/ChangeLog.16 +--- glibc-2.14-418-gb2ea1df/ChangeLog.16 ++++ /ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -290,8 +290,8 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . ---- glibc-2.14-498-g98591e5/ChangeLog.17 -+++ glibc-2.14.90-15/ChangeLog.17 +--- glibc-2.14-418-gb2ea1df/ChangeLog.17 ++++ /ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -340,8 +340,8 @@ 2007-04-16 Ulrich Drepper [BZ #4364] ---- glibc-2.14-498-g98591e5/Makeconfig -+++ glibc-2.14.90-15/Makeconfig +--- glibc-2.14-418-gb2ea1df/Makeconfig ++++ /Makeconfig @@ -803,12 +803,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -358,9 +358,9 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.14-498-g98591e5/NEWS -+++ glibc-2.14.90-15/NEWS -@@ -72,16 +72,6 @@ Version 2.14 +--- glibc-2.14-418-gb2ea1df/NEWS ++++ /NEWS +@@ -63,16 +63,6 @@ Version 2.14 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, 12795, 12811, 12813, 12814, 12841 @@ -377,9 +377,9 @@ * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at, syncfs, setns, sendmmsg ---- glibc-2.14-498-g98591e5/config.h.in -+++ glibc-2.14.90-15/config.h.in -@@ -187,6 +187,9 @@ +--- glibc-2.14-418-gb2ea1df/config.h.in ++++ /config.h.in +@@ -184,6 +184,9 @@ /* Define if `.ctors' and `.dtors' sections shouldn't be used. */ #undef NO_CTORS_DTORS_SECTIONS @@ -389,9 +389,9 @@ /* */ ---- glibc-2.14-498-g98591e5/configure -+++ glibc-2.14.90-15/configure -@@ -792,6 +792,7 @@ enable_kernel +--- glibc-2.14-418-gb2ea1df/configure ++++ /configure +@@ -791,6 +791,7 @@ enable_kernel enable_all_warnings enable_multi_arch enable_nss_crypt @@ -399,7 +399,7 @@ with_cpu ' ac_precious_vars='build_alias -@@ -1451,6 +1452,7 @@ Optional Features: +@@ -1450,6 +1451,7 @@ Optional Features: --enable-multi-arch enable single DSO with optimizations for multiple architectures --enable-nss-crypt enable libcrypt to use nss @@ -407,7 +407,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -3805,6 +3807,51 @@ else +@@ -3804,6 +3806,51 @@ else fi @@ -459,8 +459,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-498-g98591e5/configure.in -+++ glibc-2.14.90-15/configure.in +--- glibc-2.14-418-gb2ea1df/configure.in ++++ /configure.in @@ -291,6 +291,29 @@ else fi AC_SUBST(libc_cv_nss_crypt) @@ -491,8 +491,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-498-g98591e5/csu/Makefile -+++ glibc-2.14.90-15/csu/Makefile +--- glibc-2.14-418-gb2ea1df/csu/Makefile ++++ /csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -503,8 +503,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.14-498-g98591e5/csu/elf-init.c -+++ glibc-2.14.90-15/csu/elf-init.c +--- glibc-2.14-418-gb2ea1df/csu/elf-init.c ++++ /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; @@ -529,8 +529,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.14-498-g98591e5/debug/tst-chk1.c -+++ glibc-2.14.90-15/debug/tst-chk1.c +--- glibc-2.14-418-gb2ea1df/debug/tst-chk1.c ++++ /debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -559,8 +559,8 @@ # define O 0 # else # define O 1 ---- glibc-2.14-498-g98591e5/elf/Makefile -+++ glibc-2.14.90-15/elf/Makefile +--- glibc-2.14-418-gb2ea1df/elf/Makefile ++++ /elf/Makefile @@ -135,6 +135,7 @@ include ../Makeconfig ifeq ($(unwind-find-fde),yes) routines += unwind-dw2-fde-glibc @@ -579,8 +579,8 @@ test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names)))) generated += $(addsuffix .so,$(strip $(modules-names))) ---- glibc-2.14-498-g98591e5/elf/dl-close.c -+++ glibc-2.14.90-15/elf/dl-close.c +--- glibc-2.14-418-gb2ea1df/elf/dl-close.c ++++ /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) @@ -601,8 +601,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-498-g98591e5/elf/dl-deps.c -+++ glibc-2.14.90-15/elf/dl-deps.c +--- glibc-2.14-418-gb2ea1df/elf/dl-deps.c ++++ /elf/dl-deps.c @@ -489,6 +489,7 @@ _dl_map_object_deps (struct link_map *map, nneeded * sizeof needed[0]); atomic_write_barrier (); @@ -628,8 +628,8 @@ if (errno_reason) _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, ---- glibc-2.14-498-g98591e5/elf/dl-init.c -+++ glibc-2.14.90-15/elf/dl-init.c +--- glibc-2.14-418-gb2ea1df/elf/dl-init.c ++++ /elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -652,8 +652,8 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.14-498-g98591e5/elf/dl-libc.c -+++ glibc-2.14.90-15/elf/dl-libc.c +--- glibc-2.14-418-gb2ea1df/elf/dl-libc.c ++++ /elf/dl-libc.c @@ -270,13 +270,13 @@ libc_freeres_fn (free_mem) for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) @@ -680,8 +680,8 @@ } if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 ---- glibc-2.14-498-g98591e5/elf/dl-load.c -+++ glibc-2.14.90-15/elf/dl-load.c +--- glibc-2.14-418-gb2ea1df/elf/dl-load.c ++++ /elf/dl-load.c @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len) @@ -761,8 +761,8 @@ } else /* No DST we recognize. */ ---- glibc-2.14-498-g98591e5/elf/dl-support.c -+++ glibc-2.14.90-15/elf/dl-support.c +--- glibc-2.14-418-gb2ea1df/elf/dl-support.c ++++ /elf/dl-support.c @@ -82,10 +82,8 @@ unsigned long long _dl_load_adds; create a fake scope containing nothing. */ struct r_scope_elem _dl_initial_searchlist; @@ -774,8 +774,8 @@ /* Random data provided by the kernel. */ void *_dl_random; ---- glibc-2.14-498-g98591e5/elf/ldconfig.c -+++ glibc-2.14.90-15/elf/ldconfig.c +--- glibc-2.14-418-gb2ea1df/elf/ldconfig.c ++++ /elf/ldconfig.c @@ -1034,17 +1034,19 @@ search_dirs (void) @@ -857,8 +857,8 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.14-498-g98591e5/elf/ldd.bash.in -+++ glibc-2.14.90-15/elf/ldd.bash.in +--- glibc-2.14-418-gb2ea1df/elf/ldd.bash.in ++++ /elf/ldd.bash.in @@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2 fi done @@ -887,8 +887,8 @@ try_trace "$RTLD" "$file" || result=1 ;; *) ---- glibc-2.14-498-g98591e5/elf/rtld-Rules -+++ glibc-2.14.90-15/elf/rtld-Rules +--- glibc-2.14-418-gb2ea1df/elf/rtld-Rules ++++ /elf/rtld-Rules @@ -1,7 +1,7 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker. @@ -906,8 +906,8 @@ +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld endif ---- glibc-2.14-498-g98591e5/elf/rtld.c -+++ glibc-2.14.90-15/elf/rtld.c +--- glibc-2.14-418-gb2ea1df/elf/rtld.c ++++ /elf/rtld.c @@ -107,7 +107,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -962,24 +962,24 @@ if (! prelinked && rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. ---- glibc-2.14-498-g98591e5/extra-lib.mk -+++ glibc-2.14.90-15/extra-lib.mk +--- glibc-2.14-418-gb2ea1df/extra-lib.mk ++++ /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-498-g98591e5/include/bits/stdlib-ldbl.h -+++ glibc-2.14.90-15/include/bits/stdlib-ldbl.h +--- glibc-2.14-418-gb2ea1df/include/bits/stdlib-ldbl.h ++++ /include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-498-g98591e5/include/bits/wchar-ldbl.h -+++ glibc-2.14.90-15/include/bits/wchar-ldbl.h +--- glibc-2.14-418-gb2ea1df/include/bits/wchar-ldbl.h ++++ /include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-498-g98591e5/include/features.h -+++ glibc-2.14.90-15/include/features.h +--- glibc-2.14-418-gb2ea1df/include/features.h ++++ /include/features.h @@ -310,8 +310,13 @@ #endif @@ -996,8 +996,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.14-498-g98591e5/include/libc-symbols.h -+++ glibc-2.14.90-15/include/libc-symbols.h +--- glibc-2.14-418-gb2ea1df/include/libc-symbols.h ++++ /include/libc-symbols.h @@ -626,7 +626,7 @@ for linking") # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libc_hidden_def(name) hidden_def (name) @@ -1007,8 +1007,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-498-g98591e5/include/link.h -+++ glibc-2.14.90-15/include/link.h +--- glibc-2.14-418-gb2ea1df/include/link.h ++++ /include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. @@ -1046,8 +1046,8 @@ # elif NO_TLS_OFFSET == -1 # define FORCED_DYNAMIC_TLS_OFFSET -2 # else ---- glibc-2.14-498-g98591e5/include/stap-probe.h -+++ glibc-2.14.90-15/include/stap-probe.h +--- glibc-2.14-418-gb2ea1df/include/stap-probe.h ++++ /include/stap-probe.h @@ -0,0 +1,140 @@ +/* Macros for defining Systemtap static probe points. + Copyright (C) 2011 Free Software Foundation, Inc. @@ -1189,16 +1189,16 @@ +#endif /* USE_STAP_PROBE. */ + +#endif /* stap-probe.h */ ---- glibc-2.14-498-g98591e5/include/sys/resource.h -+++ glibc-2.14.90-15/include/sys/resource.h +--- glibc-2.14-418-gb2ea1df/include/sys/resource.h ++++ /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-498-g98591e5/inet/Makefile -+++ glibc-2.14.90-15/inet/Makefile +--- glibc-2.14-418-gb2ea1df/inet/Makefile ++++ /inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -1208,8 +1208,8 @@ ifeq ($(have-thread-library),yes) CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions ---- glibc-2.14-498-g98591e5/intl/locale.alias -+++ glibc-2.14.90-15/intl/locale.alias +--- glibc-2.14-418-gb2ea1df/intl/locale.alias ++++ /intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -1219,8 +1219,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.14-498-g98591e5/libio/stdio.h -+++ glibc-2.14.90-15/libio/stdio.h +--- glibc-2.14-418-gb2ea1df/libio/stdio.h ++++ /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. */ @@ -1234,8 +1234,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.14-498-g98591e5/locale/iso-4217.def -+++ glibc-2.14.90-15/locale/iso-4217.def +--- glibc-2.14-418-gb2ea1df/locale/iso-4217.def ++++ /locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1327,8 +1327,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.14-498-g98591e5/locale/programs/locarchive.c -+++ glibc-2.14.90-15/locale/programs/locarchive.c +--- glibc-2.14-418-gb2ea1df/locale/programs/locarchive.c ++++ /locale/programs/locarchive.c @@ -253,9 +253,9 @@ oldlocrecentcmp (const void *a, const void *b) /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -1360,8 +1360,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.14-498-g98591e5/localedata/ChangeLog -+++ glibc-2.14.90-15/localedata/ChangeLog +--- glibc-2.14-418-gb2ea1df/localedata/ChangeLog ++++ /localedata/ChangeLog @@ -10,6 +10,14 @@ * tests-mbwc/tst_funcs.h (TST_DECL_VARS, TST_HEAD_LOCALE): Remove unused variable. @@ -1377,8 +1377,8 @@ 2011-05-21 Ulrich Drepper [BZ #12788] ---- glibc-2.14-498-g98591e5/localedata/Makefile -+++ glibc-2.14.90-15/localedata/Makefile +--- glibc-2.14-418-gb2ea1df/localedata/Makefile ++++ /localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1387,8 +1387,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.14-498-g98591e5/localedata/SUPPORTED -+++ glibc-2.14.90-15/localedata/SUPPORTED +--- glibc-2.14-418-gb2ea1df/localedata/SUPPORTED ++++ /localedata/SUPPORTED @@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1430,8 +1430,8 @@ sw_KE/UTF-8 \ sw_TZ/UTF-8 \ ta_IN/UTF-8 \ ---- glibc-2.14-498-g98591e5/localedata/locales/cy_GB -+++ glibc-2.14.90-15/localedata/locales/cy_GB +--- glibc-2.14-418-gb2ea1df/localedata/locales/cy_GB ++++ /localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1446,8 +1446,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.14-498-g98591e5/localedata/locales/en_GB -+++ glibc-2.14.90-15/localedata/locales/en_GB +--- glibc-2.14-418-gb2ea1df/localedata/locales/en_GB ++++ /localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1459,8 +1459,8 @@ date_fmt "/ / " ---- glibc-2.14-498-g98591e5/localedata/locales/no_NO -+++ glibc-2.14.90-15/localedata/locales/no_NO +--- glibc-2.14-418-gb2ea1df/localedata/locales/no_NO ++++ /localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1531,8 +1531,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.14-498-g98591e5/localedata/locales/zh_TW -+++ glibc-2.14.90-15/localedata/locales/zh_TW +--- glibc-2.14-418-gb2ea1df/localedata/locales/zh_TW ++++ /localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1560,8 +1560,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.14-498-g98591e5/login/programs/pt_chown.c -+++ glibc-2.14.90-15/login/programs/pt_chown.c +--- glibc-2.14-418-gb2ea1df/login/programs/pt_chown.c ++++ /login/programs/pt_chown.c @@ -29,6 +29,7 @@ #include #include @@ -1603,8 +1603,8 @@ - return EXIT_SUCCESS; } ---- glibc-2.14-498-g98591e5/malloc/mcheck.c -+++ glibc-2.14.90-15/malloc/mcheck.c +--- glibc-2.14-418-gb2ea1df/malloc/mcheck.c ++++ /malloc/mcheck.c @@ -25,10 +25,26 @@ # include # include @@ -1681,8 +1681,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.14-498-g98591e5/manual/libc.texinfo -+++ glibc-2.14.90-15/manual/libc.texinfo +--- glibc-2.14-418-gb2ea1df/manual/libc.texinfo ++++ /manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1692,8 +1692,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.14-498-g98591e5/misc/sys/cdefs.h -+++ glibc-2.14.90-15/misc/sys/cdefs.h +--- glibc-2.14-418-gb2ea1df/misc/sys/cdefs.h ++++ /misc/sys/cdefs.h @@ -146,7 +146,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -1706,7 +1706,7 @@ # define __warndecl(name, msg) \ extern void name (void) __attribute__((__warning__ (msg))) # define __warnattr(msg) __attribute__((__warning__ (msg))) -@@ -316,10 +319,16 @@ +@@ -312,10 +315,16 @@ /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 inline semantics, unless -fgnu89-inline is used. */ @@ -1725,7 +1725,7 @@ # define __extern_always_inline \ extern __always_inline __attribute__ ((__gnu_inline__, __artificial__)) # else -@@ -339,7 +348,10 @@ +@@ -335,7 +344,10 @@ /* GCC 4.3 and above allow passing all anonymous arguments of an __extern_always_inline function to some other vararg function. */ @@ -1737,8 +1737,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.14-498-g98591e5/nis/Makefile -+++ glibc-2.14.90-15/nis/Makefile +--- glibc-2.14-418-gb2ea1df/nis/Makefile ++++ /nis/Makefile @@ -23,9 +23,9 @@ subdir := nis aux := nis_hash @@ -1760,8 +1760,8 @@ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ ---- glibc-2.14-498-g98591e5/nis/nss -+++ glibc-2.14.90-15/nis/nss +--- glibc-2.14-418-gb2ea1df/nis/nss ++++ /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 @@ -1771,9 +1771,9 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.14-498-g98591e5/nptl/ChangeLog -+++ glibc-2.14.90-15/nptl/ChangeLog -@@ -169,6 +169,51 @@ +--- glibc-2.14-418-gb2ea1df/nptl/ChangeLog ++++ /nptl/ChangeLog +@@ -158,6 +158,51 @@ clearing memory. Patch partly by Robert Rex . @@ -1825,7 +1825,7 @@ 2011-01-19 Roland McGrath * pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo. -@@ -4898,6 +4943,11 @@ +@@ -4887,6 +4932,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1837,7 +1837,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6972,6 +7022,11 @@ +@@ -6961,6 +7011,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1849,8 +1849,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.14-498-g98591e5/nptl/DESIGN-systemtap-probes.txt -+++ glibc-2.14.90-15/nptl/DESIGN-systemtap-probes.txt +--- glibc-2.14-418-gb2ea1df/nptl/DESIGN-systemtap-probes.txt ++++ /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. @@ -1941,8 +1941,8 @@ + arg1 = condition +cond_broadcast - probe for pthread_cond_broadcast + arg1 = condition ---- glibc-2.14-498-g98591e5/nptl/Makefile -+++ glibc-2.14.90-15/nptl/Makefile +--- glibc-2.14-418-gb2ea1df/nptl/Makefile ++++ /nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1975,8 +1975,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.14-498-g98591e5/nptl/Versions -+++ glibc-2.14.90-15/nptl/Versions +--- glibc-2.14-418-gb2ea1df/nptl/Versions ++++ /nptl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; # Internal libc interface to libpthread @@ -1985,8 +1985,8 @@ } } ---- glibc-2.14-498-g98591e5/nptl/nptl-init.c -+++ glibc-2.14.90-15/nptl/nptl-init.c +--- glibc-2.14-418-gb2ea1df/nptl/nptl-init.c ++++ /nptl/nptl-init.c @@ -415,7 +415,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. */ @@ -1996,8 +1996,8 @@ || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ ---- glibc-2.14-498-g98591e5/nptl/pthread_cond_broadcast.c -+++ glibc-2.14.90-15/nptl/pthread_cond_broadcast.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_broadcast.c ++++ /nptl/pthread_cond_broadcast.c @@ -23,6 +23,7 @@ #include #include @@ -2015,8 +2015,8 @@ int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; /* Make sure we are alone. */ ---- glibc-2.14-498-g98591e5/nptl/pthread_cond_destroy.c -+++ glibc-2.14.90-15/nptl/pthread_cond_destroy.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_destroy.c ++++ /nptl/pthread_cond_destroy.c @@ -20,6 +20,7 @@ #include #include @@ -2034,8 +2034,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-498-g98591e5/nptl/pthread_cond_init.c -+++ glibc-2.14.90-15/nptl/pthread_cond_init.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_init.c ++++ /nptl/pthread_cond_init.c @@ -20,6 +20,7 @@ #include @@ -2053,8 +2053,8 @@ return 0; } versioned_symbol (libpthread, __pthread_cond_init, ---- glibc-2.14-498-g98591e5/nptl/pthread_cond_signal.c -+++ glibc-2.14.90-15/nptl/pthread_cond_signal.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_signal.c ++++ /nptl/pthread_cond_signal.c @@ -26,6 +26,7 @@ #include @@ -2072,8 +2072,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-498-g98591e5/nptl/pthread_cond_wait.c -+++ glibc-2.14.90-15/nptl/pthread_cond_wait.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_wait.c ++++ /nptl/pthread_cond_wait.c @@ -25,6 +25,7 @@ #include @@ -2091,8 +2091,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-498-g98591e5/nptl/pthread_create.c -+++ glibc-2.14.90-15/nptl/pthread_create.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_create.c ++++ /nptl/pthread_create.c @@ -32,6 +32,8 @@ #include @@ -2120,8 +2120,8 @@ /* Start the thread. */ return create_thread (pd, iattr, STACK_VARIABLES_ARGS); } ---- glibc-2.14-498-g98591e5/nptl/pthread_join.c -+++ glibc-2.14.90-15/nptl/pthread_join.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_join.c ++++ /nptl/pthread_join.c @@ -23,6 +23,8 @@ #include #include "pthreadP.h" @@ -2148,8 +2148,8 @@ + return result; } ---- glibc-2.14-498-g98591e5/nptl/pthread_mutex_destroy.c -+++ glibc-2.14.90-15/nptl/pthread_mutex_destroy.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_destroy.c ++++ /nptl/pthread_mutex_destroy.c @@ -20,11 +20,15 @@ #include #include "pthreadP.h" @@ -2166,8 +2166,8 @@ if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0 && mutex->__data.__nusers != 0) return EBUSY; ---- glibc-2.14-498-g98591e5/nptl/pthread_mutex_init.c -+++ glibc-2.14.90-15/nptl/pthread_mutex_init.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_init.c ++++ /nptl/pthread_mutex_init.c @@ -24,6 +24,8 @@ #include #include "pthreadP.h" @@ -2186,8 +2186,8 @@ return 0; } strong_alias (__pthread_mutex_init, pthread_mutex_init) ---- glibc-2.14-498-g98591e5/nptl/pthread_mutex_lock.c -+++ glibc-2.14.90-15/nptl/pthread_mutex_lock.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_lock.c ++++ /nptl/pthread_mutex_lock.c @@ -24,6 +24,7 @@ #include #include "pthreadP.h" @@ -2224,8 +2224,8 @@ return 0; } #ifndef __pthread_mutex_lock ---- glibc-2.14-498-g98591e5/nptl/pthread_mutex_timedlock.c -+++ glibc-2.14.90-15/nptl/pthread_mutex_timedlock.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_timedlock.c ++++ /nptl/pthread_mutex_timedlock.c @@ -24,6 +24,8 @@ #include #include @@ -2280,8 +2280,8 @@ } out: ---- glibc-2.14-498-g98591e5/nptl/pthread_mutex_unlock.c -+++ glibc-2.14.90-15/nptl/pthread_mutex_unlock.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_unlock.c ++++ /nptl/pthread_mutex_unlock.c @@ -22,6 +22,7 @@ #include #include "pthreadP.h" @@ -2318,8 +2318,8 @@ return 0; } ---- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_destroy.c -+++ glibc-2.14.90-15/nptl/pthread_rwlock_destroy.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_destroy.c ++++ /nptl/pthread_rwlock_destroy.c @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -2336,8 +2336,8 @@ /* Nothing to be done. For now. */ return 0; } ---- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_rdlock.c -+++ glibc-2.14.90-15/nptl/pthread_rwlock_rdlock.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_rdlock.c ++++ /nptl/pthread_rwlock_rdlock.c @@ -22,6 +22,7 @@ #include #include @@ -2364,8 +2364,8 @@ break; } ---- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_unlock.c -+++ glibc-2.14.90-15/nptl/pthread_rwlock_unlock.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_unlock.c ++++ /nptl/pthread_rwlock_unlock.c @@ -22,11 +22,14 @@ #include #include @@ -2381,8 +2381,8 @@ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); if (rwlock->__data.__writer) rwlock->__data.__writer = 0; ---- glibc-2.14-498-g98591e5/nptl/pthread_rwlock_wrlock.c -+++ glibc-2.14.90-15/nptl/pthread_rwlock_wrlock.c +--- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_wrlock.c ++++ /nptl/pthread_rwlock_wrlock.c @@ -22,6 +22,7 @@ #include #include @@ -2409,8 +2409,8 @@ break; } ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ /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 @@ -2419,8 +2419,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/Versions +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ /nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -2428,8 +2428,8 @@ + __uname; + } +} ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S ++++ /nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2449,8 +2449,8 @@ ENTER_KERNEL 2: movl %edx, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S ++++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S @@ -24,6 +24,7 @@ #include #include @@ -2468,8 +2468,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S ++++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S @@ -24,7 +24,7 @@ #include #include @@ -2488,8 +2488,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S ++++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S @@ -24,7 +24,7 @@ #include #include @@ -2508,8 +2508,8 @@ cmpl $1000000000, 4(%ebp) movl $EINVAL, %eax jae 18f ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S ++++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S @@ -25,6 +25,7 @@ #include #include @@ -2527,8 +2527,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S ++++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S @@ -23,6 +23,7 @@ #include #include @@ -2546,8 +2546,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S ++++ /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S @@ -23,6 +23,7 @@ #include #include @@ -2565,8 +2565,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h ++++ /nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2584,8 +2584,8 @@ __asm __volatile (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ /nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -2595,8 +2595,8 @@ cp = u.uts.version; else { ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ /nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -2604,8 +2604,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2635,8 +2635,8 @@ syscall 2: movl %edx, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2654,8 +2654,8 @@ __asm __volatile ("syscall" \ : "=a" (__ignore) \ : "0" (SYS_futex), "D" (futex), \ ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S @@ -25,7 +25,7 @@ #include #include @@ -2674,8 +2674,8 @@ /* Get internal lock. */ movl $1, %esi xorl %eax, %eax ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S @@ -24,6 +24,7 @@ #include #include @@ -2693,8 +2693,8 @@ /* Get internal lock. */ movq %rdi, %r8 movl $1, %esi ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -23,6 +23,7 @@ #include #include @@ -2712,8 +2712,8 @@ cmpq $1000000000, 8(%rdx) movl $EINVAL, %eax jae 48f ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S @@ -23,6 +23,7 @@ #include #include @@ -2731,8 +2731,8 @@ cmpq $-1, dep_mutex(%rdi) /* Prepare structure passed to cancellation handler. */ ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S @@ -22,7 +22,7 @@ #include #include @@ -2752,8 +2752,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-498-g98591e5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S -+++ glibc-2.14.90-15/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S +--- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S ++++ /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S @@ -22,7 +22,7 @@ #include #include @@ -2773,8 +2773,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-498-g98591e5/nscd/nscd.conf -+++ glibc-2.14.90-15/nscd/nscd.conf +--- glibc-2.14-418-gb2ea1df/nscd/nscd.conf ++++ /nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -2784,8 +2784,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.14-498-g98591e5/nscd/nscd.init -+++ glibc-2.14.90-15/nscd/nscd.init +--- glibc-2.14-418-gb2ea1df/nscd/nscd.init ++++ /nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -2862,8 +2862,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.14-498-g98591e5/nss/Makefile -+++ glibc-2.14.90-15/nss/Makefile +--- glibc-2.14-418-gb2ea1df/nss/Makefile ++++ /nss/Makefile @@ -88,6 +88,7 @@ endif include ../Rules @@ -2872,8 +2872,8 @@ ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a ---- glibc-2.14-498-g98591e5/nss/nss_files/files-XXX.c -+++ glibc-2.14.90-15/nss/nss_files/files-XXX.c +--- glibc-2.14-418-gb2ea1df/nss/nss_files/files-XXX.c ++++ /nss/nss_files/files-XXX.c @@ -190,7 +190,7 @@ internal_getent (struct STRUCTURE *result, { char *p; @@ -2883,8 +2883,8 @@ int parse_result; if (buflen < sizeof *data + 2) ---- glibc-2.14-498-g98591e5/posix/Makefile -+++ glibc-2.14.90-15/posix/Makefile +--- glibc-2.14-418-gb2ea1df/posix/Makefile ++++ /posix/Makefile @@ -320,15 +320,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -2905,8 +2905,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.14-498-g98591e5/posix/gai.conf -+++ glibc-2.14.90-15/posix/gai.conf +--- glibc-2.14-418-gb2ea1df/posix/gai.conf ++++ /posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -2931,8 +2931,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.14-498-g98591e5/posix/getconf.speclist.h -+++ glibc-2.14.90-15/posix/getconf.speclist.h +--- glibc-2.14-418-gb2ea1df/posix/getconf.speclist.h ++++ /posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -2973,8 +2973,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.14-498-g98591e5/posix/regcomp.c -+++ glibc-2.14.90-15/posix/regcomp.c +--- glibc-2.14-418-gb2ea1df/posix/regcomp.c ++++ /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. @@ -3106,8 +3106,8 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.14-498-g98591e5/resolv/Makefile -+++ glibc-2.14.90-15/resolv/Makefile +--- glibc-2.14-418-gb2ea1df/resolv/Makefile ++++ /resolv/Makefile @@ -81,6 +81,7 @@ ifeq (yes,$(have-ssp)) CFLAGS-libresolv += -fstack-protector endif @@ -3116,8 +3116,8 @@ # The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings ---- glibc-2.14-498-g98591e5/resolv/res_query.c -+++ glibc-2.14.90-15/resolv/res_query.c +--- glibc-2.14-418-gb2ea1df/resolv/res_query.c ++++ /resolv/res_query.c @@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, && *resplen2 > (int) sizeof (HEADER)) { @@ -3127,8 +3127,8 @@ hp = hp2; } else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) ---- glibc-2.14-498-g98591e5/resource/getrlimit.c -+++ glibc-2.14.90-15/resource/getrlimit.c +--- glibc-2.14-418-gb2ea1df/resource/getrlimit.c ++++ /resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -3137,8 +3137,8 @@ weak_alias (__getrlimit, getrlimit) stub_warning (getrlimit) ---- glibc-2.14-498-g98591e5/scripts/check-local-headers.sh -+++ glibc-2.14.90-15/scripts/check-local-headers.sh +--- glibc-2.14-418-gb2ea1df/scripts/check-local-headers.sh ++++ /scripts/check-local-headers.sh @@ -29,7 +29,7 @@ exec ${AWK} -v includedir="$includedir" ' BEGIN { status = 0 @@ -3148,8 +3148,8 @@ } /^[^ ]/ && $1 ~ /.*:/ { obj = $1 } { ---- glibc-2.14-498-g98591e5/stdio-common/vfprintf.c -+++ glibc-2.14.90-15/stdio-common/vfprintf.c +--- glibc-2.14-418-gb2ea1df/stdio-common/vfprintf.c ++++ /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')) \ { \ @@ -3195,8 +3195,8 @@ else \ len = strlen (string); \ } \ ---- glibc-2.14-498-g98591e5/streams/Makefile -+++ glibc-2.14.90-15/streams/Makefile +--- glibc-2.14-418-gb2ea1df/streams/Makefile ++++ /streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -3206,8 +3206,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.14-498-g98591e5/sunrpc/Makefile -+++ glibc-2.14.90-15/sunrpc/Makefile +--- glibc-2.14-418-gb2ea1df/sunrpc/Makefile ++++ /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) \ @@ -3228,8 +3228,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-498-g98591e5/sysdeps/generic/dl-cache.h -+++ glibc-2.14.90-15/sysdeps/generic/dl-cache.h +--- glibc-2.14-418-gb2ea1df/sysdeps/generic/dl-cache.h ++++ /sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -3245,8 +3245,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-498-g98591e5/sysdeps/i386/Makefile -+++ glibc-2.14.90-15/sysdeps/i386/Makefile +--- glibc-2.14-418-gb2ea1df/sysdeps/i386/Makefile ++++ /sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -3271,8 +3271,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-498-g98591e5/sysdeps/i386/__longjmp.S -+++ glibc-2.14.90-15/sysdeps/i386/__longjmp.S +--- glibc-2.14-418-gb2ea1df/sysdeps/i386/__longjmp.S ++++ /sysdeps/i386/__longjmp.S @@ -1,5 +1,5 @@ /* longjmp for i386. - Copyright (C) 1995-1998,2000,2002,2005,2006,2009 @@ -3319,8 +3319,8 @@ #endif /* Jump to saved PC. */ jmp *%edx ---- glibc-2.14-498-g98591e5/sysdeps/i386/bsd-_setjmp.S -+++ glibc-2.14.90-15/sysdeps/i386/bsd-_setjmp.S +--- glibc-2.14-418-gb2ea1df/sysdeps/i386/bsd-_setjmp.S ++++ /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. @@ -3345,8 +3345,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-498-g98591e5/sysdeps/i386/bsd-setjmp.S -+++ glibc-2.14.90-15/sysdeps/i386/bsd-setjmp.S +--- glibc-2.14-418-gb2ea1df/sysdeps/i386/bsd-setjmp.S ++++ /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. @@ -3371,8 +3371,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-498-g98591e5/sysdeps/i386/i686/Makefile -+++ glibc-2.14.90-15/sysdeps/i386/i686/Makefile +--- glibc-2.14-418-gb2ea1df/sysdeps/i386/i686/Makefile ++++ /sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -3393,8 +3393,8 @@ -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif ---- glibc-2.14-498-g98591e5/sysdeps/i386/setjmp.S -+++ glibc-2.14.90-15/sysdeps/i386/setjmp.S +--- glibc-2.14-418-gb2ea1df/sysdeps/i386/setjmp.S ++++ /sysdeps/i386/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for i386. - Copyright (C) 1995,1996,1997,2000,2001,2005,2006 @@ -3418,8 +3418,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-498-g98591e5/sysdeps/ia64/Makefile -+++ glibc-2.14.90-15/sysdeps/ia64/Makefile +--- glibc-2.14-418-gb2ea1df/sysdeps/ia64/Makefile ++++ /sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -3431,8 +3431,8 @@ endif endif ---- glibc-2.14-498-g98591e5/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.14.90-15/sysdeps/ia64/ia64libgcc.S +--- glibc-2.14-418-gb2ea1df/sysdeps/ia64/ia64libgcc.S ++++ /sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -3784,8 +3784,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.14-498-g98591e5/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.14.90-15/sysdeps/ia64/libgcc-compat.c +--- glibc-2.14-418-gb2ea1df/sysdeps/ia64/libgcc-compat.c ++++ /sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -3871,16 +3871,16 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.14-498-g98591e5/sysdeps/mach/hurd/getrlimit.c -+++ glibc-2.14.90-15/sysdeps/mach/hurd/getrlimit.c +--- glibc-2.14-418-gb2ea1df/sysdeps/mach/hurd/getrlimit.c ++++ /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-498-g98591e5/sysdeps/posix/getaddrinfo.c -+++ glibc-2.14.90-15/sysdeps/posix/getaddrinfo.c +--- glibc-2.14-418-gb2ea1df/sysdeps/posix/getaddrinfo.c ++++ /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 @@ -4005,8 +4005,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.14-498-g98591e5/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.14.90-15/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.14-418-gb2ea1df/sysdeps/powerpc/powerpc64/Makefile ++++ /sysdeps/powerpc/powerpc64/Makefile @@ -33,6 +33,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -4015,16 +4015,16 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-498-g98591e5/sysdeps/powerpc/powerpc64/elf/Makefile -+++ glibc-2.14.90-15/sysdeps/powerpc/powerpc64/elf/Makefile +--- glibc-2.14-418-gb2ea1df/sysdeps/powerpc/powerpc64/elf/Makefile ++++ /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-498-g98591e5/sysdeps/s390/s390-64/utf16-utf32-z9.c -+++ glibc-2.14.90-15/sysdeps/s390/s390-64/utf16-utf32-z9.c +--- glibc-2.14-418-gb2ea1df/sysdeps/s390/s390-64/utf16-utf32-z9.c ++++ /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; \ @@ -4037,8 +4037,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-498-g98591e5/sysdeps/s390/s390-64/utf8-utf16-z9.c -+++ glibc-2.14.90-15/sysdeps/s390/s390-64/utf8-utf16-z9.c +--- glibc-2.14-418-gb2ea1df/sysdeps/s390/s390-64/utf8-utf16-z9.c ++++ /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; \ @@ -4051,8 +4051,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-498-g98591e5/sysdeps/s390/s390-64/utf8-utf32-z9.c -+++ glibc-2.14.90-15/sysdeps/s390/s390-64/utf8-utf32-z9.c +--- glibc-2.14-418-gb2ea1df/sysdeps/s390/s390-64/utf8-utf32-z9.c ++++ /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; \ @@ -4065,8 +4065,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-498-g98591e5/sysdeps/unix/nice.c -+++ glibc-2.14.90-15/sysdeps/unix/nice.c +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/nice.c ++++ /sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -4081,8 +4081,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/futimesat.c ++++ /sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -4125,8 +4125,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S ++++ /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 @@ -4160,8 +4160,8 @@ + LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx) jmp *%edx END (____longjmp_chk) ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ /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. @@ -4222,16 +4222,16 @@ + } while (0) + +#include_next ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ /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-498-g98591e5/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ /sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -4264,29 +4264,29 @@ + } while (0) + #include_next ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ /sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ /sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ /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-498-g98591e5/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/paths.h ++++ /sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -4296,8 +4296,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/tcsetattr.c ++++ /sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -4343,8 +4343,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.14-498-g98591e5/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S -+++ glibc-2.14.90-15/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +--- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S ++++ /sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S @@ -19,6 +19,7 @@ #include #include @@ -4371,8 +4371,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (____longjmp_chk) ---- glibc-2.14-498-g98591e5/sysdeps/x86_64/__longjmp.S -+++ glibc-2.14.90-15/sysdeps/x86_64/__longjmp.S +--- glibc-2.14-418-gb2ea1df/sysdeps/x86_64/__longjmp.S ++++ /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. @@ -4402,8 +4402,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (__longjmp) ---- glibc-2.14-498-g98591e5/sysdeps/x86_64/setjmp.S -+++ glibc-2.14.90-15/sysdeps/x86_64/setjmp.S +--- glibc-2.14-418-gb2ea1df/sysdeps/x86_64/setjmp.S ++++ /sysdeps/x86_64/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for x86-64. - Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc. @@ -4427,8 +4427,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%rax) #endif ---- glibc-2.14-498-g98591e5/timezone/zic.c -+++ glibc-2.14.90-15/timezone/zic.c +--- glibc-2.14-418-gb2ea1df/timezone/zic.c ++++ /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 e3f836f..1c5a133 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.14-498-g98591e5 +%define glibcsrcdir glibc-2.14-418-gb2ea1df %define glibcversion 2.14.90 %define glibcportsdir glibc-ports-2.14-43-gf335e01 ### glibc.spec.in follows: @@ -28,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 15.2 +Release: 15.1 # 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 @@ -1112,37 +1112,21 @@ rm -f *.filelist* %endif %changelog -* Fri Nov 11 2011 Andreas Schwab - 2.14.90-15 -- Update from master - - Fix db makefile rule for group.db - - Mark setjmp and ucontext functions as non-leaf (#752905) - - Check malloc arana limit atomically - -* Tue Nov 8 2011 Andreas Schwab - 2.14.90-14 +* Tue Nov 8 2011 Andreas Schwab - 2.4.90-14 - Update from master - Fix locking in _IO_flush_all_lockp - - Fix buffer allocation in files initgroups handler (#750361) + - Fix buffer allocation in files initgroups handler - Don't start AVC thread until credentials are installed - - Don't fail in makedb if SELinux is disabled (#750858) + - Don't fail in makedb if SELinux is disabled - New Linux syscalls process_vm_readv and process_vm_writev - Unify getent output for initgroups database (BZ#13367) - - Cache network interface information - Avoid assertion in processes with VM in bad shape (BZ#13276) - Don't mark memory synchronisation functions as leaf (#747377, BZ#13344) - Add missing register initialization in x86-64 pthread_cond_timedwait (BZ#13358) - - Fix accuracy problem in generic sin (BZ#10709) - Correctly NUL-terminate link name in sprof (BZ#13337) - Fix readlink call in ldconfig's chroot handling (BZ#13335) - - Optimize accurate 64-bit routines for FMA4 on x86-64 - - Optimized remquo for 64-bit platforms - - Optimize fmod - - Add optimized wcslen and strnlen for x86-32 - - Optimized strnlen and wcscmp for x86-64 - - Improve x86-32 SSSE3 memcpy - Preserve link time dependencies over relocation dependencies (BZ#12892) - - Optimize x86-64 rawmemchr - - Add optimized str{,n}casecmp for AVX on x86-64 * Wed Oct 19 2011 Andreas Schwab - 2.14.90-13 - Update from master diff --git a/sources b/sources index 966759a..eca8595 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -2ca57c728649b2d33580f97f9f3545f3 glibc-2.14-498-g98591e5-fedora.tar.xz -49bd20c056b1ae61985a099e791dc79a glibc-2.14-498-g98591e5.tar.xz +bce89b90d75eb65d573c89d231128a45 glibc-2.14-418-gb2ea1df-fedora.tar.xz +a1c214925f0f2dabf4f88bddb1fcf39e glibc-2.14-418-gb2ea1df.tar.xz b89c04e859de608e0c6b33ab77923527 glibc-ports-2.14-43-gf335e01.tar.xz From d930a6ebb20e5da4f5d815f59bb95eb2aa2d8974 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 15 Nov 2011 22:03:21 -0700 Subject: [PATCH 06/15] Revert "Merge remote-tracking branch 'origin/f16' into f16" This reverts commit 3e058f4c4ccd4134432d95f943d028ed68281211, reversing changes made to a515186e368f56556e46c8f1d9eff2501e33f5f1. --- .gitignore | 6 +- glibc-fedora.patch | 685 +++++++++++++++++++--------------- glibc-no-leaf-attribute.patch | 49 +++ glibc.spec | 30 +- sources | 6 +- 5 files changed, 456 insertions(+), 320 deletions(-) create mode 100644 glibc-no-leaf-attribute.patch diff --git a/.gitignore b/.gitignore index b064741..318563b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/glibc-2.14-418-gb2ea1df-fedora.tar.xz -/glibc-2.14-418-gb2ea1df.tar.xz -/glibc-ports-2.14-43-gf335e01.tar.xz +/glibc-ports-2.14-25-gd3d9bde.tar.xz +/glibc-2.14-394-g8f3b1ff-fedora.tar.xz +/glibc-2.14-394-g8f3b1ff.tar.xz diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 52804b5..af6a2a4 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,18 @@ ---- glibc-2.14-418-gb2ea1df/ChangeLog -+++ /ChangeLog -@@ -1694,6 +1694,15 @@ +--- glibc-2.14-394-g8f3b1ff/ChangeLog ++++ glibc-2.14.90-13/ChangeLog +@@ -1312,6 +1312,11 @@ + + * sysdeps/mach/hurd/sys/param.h (DEV_BSIZE): New macro. + ++2011-09-02 Andreas Schwab ++ ++ * nscd/selinux.c (avc_create_thread): Set PR_SET_KEEPCAPS before ++ spawning AVC thread. ++ + 2011-09-08 Andreas Schwab + + * elf/dl-load.c (lose): Check for non-null L. +@@ -1574,6 +1579,15 @@ * sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi directive. @@ -16,7 +28,7 @@ 2011-08-24 David S. Miller * sysdeps/sparc/sparc64/strcmp.S: Rewrite. -@@ -2499,6 +2508,14 @@ +@@ -2379,6 +2393,14 @@ * config.make.in: Likewise. * malloc/Makefile: Likewise. @@ -31,7 +43,7 @@ 2011-06-27 Andreas Schwab * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP -@@ -2630,6 +2647,10 @@ +@@ -2510,6 +2532,10 @@ * inet/getnetgrent_r.c: Use DL_CALL_FCT in several places. @@ -42,7 +54,7 @@ 2011-06-20 David S. Miller * sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple -@@ -3252,6 +3273,13 @@ +@@ -3132,6 +3158,13 @@ * libio/Makefile (tests): Add bug-fclose1. * libio/bug-fclose1.c: New file. @@ -56,7 +68,7 @@ 2011-05-12 Ulrich Drepper [BZ #12511] -@@ -3529,13 +3557,6 @@ +@@ -3409,13 +3442,6 @@ * stdlib/bug-getcontext.c: New file. * stdlib/Makefile: Add rules to build and run bug-getcontext. @@ -70,7 +82,7 @@ 2011-04-11 Andreas Krebbel * sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes -@@ -3773,6 +3794,31 @@ +@@ -3653,6 +3679,31 @@ * sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime): Export. @@ -102,7 +114,7 @@ 2011-03-22 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment -@@ -3833,6 +3879,16 @@ +@@ -3713,6 +3764,16 @@ $LDFLAGS and -nostdlib -nostartfiles to linking step. Change main to _start. @@ -119,7 +131,7 @@ 2011-03-06 Ulrich Drepper * elf/dl-load.c (_dl_map_object): If we are looking for the first -@@ -4049,6 +4105,12 @@ +@@ -3929,6 +3990,12 @@ * shadow/sgetspent.c: Check return value of __sgetspent_r instead of errno. @@ -132,7 +144,7 @@ 2011-01-19 Ulrich Drepper [BZ #11724] -@@ -4736,6 +4798,26 @@ +@@ -4616,6 +4683,26 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid. @@ -159,7 +171,7 @@ 2010-09-24 Petr Baudis * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -5528,6 +5610,17 @@ +@@ -5408,6 +5495,17 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -177,7 +189,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -5580,6 +5673,21 @@ +@@ -5460,6 +5558,21 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -199,8 +211,8 @@ 2010-05-28 Luis Machado * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.14-418-gb2ea1df/ChangeLog.15 -+++ /ChangeLog.15 +--- glibc-2.14-394-g8f3b1ff/ChangeLog.15 ++++ glibc-2.14.90-13/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -266,8 +278,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.14-418-gb2ea1df/ChangeLog.16 -+++ /ChangeLog.16 +--- glibc-2.14-394-g8f3b1ff/ChangeLog.16 ++++ glibc-2.14.90-13/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -290,8 +302,8 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . ---- glibc-2.14-418-gb2ea1df/ChangeLog.17 -+++ /ChangeLog.17 +--- glibc-2.14-394-g8f3b1ff/ChangeLog.17 ++++ glibc-2.14.90-13/ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -340,8 +352,24 @@ 2007-04-16 Ulrich Drepper [BZ #4364] ---- glibc-2.14-418-gb2ea1df/Makeconfig -+++ /Makeconfig +@@ -13075,6 +13095,15 @@ d2009-10-30 Ulrich Drepper + separators also if no non-zero digits found. + * stdlib/Makefile (tests): Add tst-strtod3. + ++2006-12-10 Jakub Jelinek ++ ++ * sysdeps/unix/sysv/linux/netlinkaccess.h: Include linux/if_addr.h ++ if IFA_MAX is not defined. ++ (IFA_RTA, IFA_PAYLOAD, IFLA_RTA, IFLA_PAYLOAD): Define if not ++ defined. ++ * sysdeps/unix/sysv/linux/check_pf.c: Include netlinkaccess.h ++ instead of asm/types.h, linux/netlink.h and linux/rtnetlink.h. ++ + 2006-12-09 Ulrich Drepper + + [BZ #3632] +--- glibc-2.14-394-g8f3b1ff/Makeconfig ++++ glibc-2.14.90-13/Makeconfig @@ -803,12 +803,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -358,8 +386,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.14-418-gb2ea1df/NEWS -+++ /NEWS +--- glibc-2.14-394-g8f3b1ff/NEWS ++++ glibc-2.14.90-13/NEWS @@ -63,16 +63,6 @@ Version 2.14 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, 12795, 12811, 12813, 12814, 12841 @@ -377,8 +405,8 @@ * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at, syncfs, setns, sendmmsg ---- glibc-2.14-418-gb2ea1df/config.h.in -+++ /config.h.in +--- glibc-2.14-394-g8f3b1ff/config.h.in ++++ glibc-2.14.90-13/config.h.in @@ -184,6 +184,9 @@ /* Define if `.ctors' and `.dtors' sections shouldn't be used. */ #undef NO_CTORS_DTORS_SECTIONS @@ -389,8 +417,8 @@ /* */ ---- glibc-2.14-418-gb2ea1df/configure -+++ /configure +--- glibc-2.14-394-g8f3b1ff/configure ++++ glibc-2.14.90-13/configure @@ -791,6 +791,7 @@ enable_kernel enable_all_warnings enable_multi_arch @@ -459,8 +487,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-418-gb2ea1df/configure.in -+++ /configure.in +--- glibc-2.14-394-g8f3b1ff/configure.in ++++ glibc-2.14.90-13/configure.in @@ -291,6 +291,29 @@ else fi AC_SUBST(libc_cv_nss_crypt) @@ -491,8 +519,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-418-gb2ea1df/csu/Makefile -+++ /csu/Makefile +--- glibc-2.14-394-g8f3b1ff/csu/Makefile ++++ glibc-2.14.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 $@ @@ -503,8 +531,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.14-418-gb2ea1df/csu/elf-init.c -+++ /csu/elf-init.c +--- glibc-2.14-394-g8f3b1ff/csu/elf-init.c ++++ glibc-2.14.90-13/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; @@ -529,8 +557,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.14-418-gb2ea1df/debug/tst-chk1.c -+++ /debug/tst-chk1.c +--- glibc-2.14-394-g8f3b1ff/debug/tst-chk1.c ++++ glibc-2.14.90-13/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -559,8 +587,8 @@ # define O 0 # else # define O 1 ---- glibc-2.14-418-gb2ea1df/elf/Makefile -+++ /elf/Makefile +--- glibc-2.14-394-g8f3b1ff/elf/Makefile ++++ glibc-2.14.90-13/elf/Makefile @@ -135,6 +135,7 @@ include ../Makeconfig ifeq ($(unwind-find-fde),yes) routines += unwind-dw2-fde-glibc @@ -579,8 +607,8 @@ test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names)))) generated += $(addsuffix .so,$(strip $(modules-names))) ---- glibc-2.14-418-gb2ea1df/elf/dl-close.c -+++ /elf/dl-close.c +--- glibc-2.14-394-g8f3b1ff/elf/dl-close.c ++++ glibc-2.14.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) @@ -601,9 +629,9 @@ /* There are still references to this object. Do nothing more. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) ---- glibc-2.14-418-gb2ea1df/elf/dl-deps.c -+++ /elf/dl-deps.c -@@ -489,6 +489,7 @@ _dl_map_object_deps (struct link_map *map, +--- glibc-2.14-394-g8f3b1ff/elf/dl-deps.c ++++ glibc-2.14.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 (); l->l_initfini = l_initfini; @@ -611,7 +639,7 @@ } /* If we have no auxiliary objects just go on to the next map. */ -@@ -689,6 +690,7 @@ Filters not supported with LD_TRACE_PRELINKING")); +@@ -678,6 +679,7 @@ Filters not supported with LD_TRACE_PRELINKING")); l_initfini[nlist] = NULL; atomic_write_barrier (); map->l_initfini = l_initfini; @@ -619,7 +647,7 @@ if (l_reldeps != NULL) { atomic_write_barrier (); -@@ -697,7 +699,7 @@ Filters not supported with LD_TRACE_PRELINKING")); +@@ -686,7 +688,7 @@ Filters not supported with LD_TRACE_PRELINKING")); _dl_scope_free (old_l_reldeps); } if (old_l_initfini != NULL) @@ -628,8 +656,8 @@ if (errno_reason) _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, ---- glibc-2.14-418-gb2ea1df/elf/dl-init.c -+++ /elf/dl-init.c +--- glibc-2.14-394-g8f3b1ff/elf/dl-init.c ++++ glibc-2.14.90-13/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -652,8 +680,8 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.14-418-gb2ea1df/elf/dl-libc.c -+++ /elf/dl-libc.c +--- glibc-2.14-394-g8f3b1ff/elf/dl-libc.c ++++ glibc-2.14.90-13/elf/dl-libc.c @@ -270,13 +270,13 @@ libc_freeres_fn (free_mem) for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) @@ -680,8 +708,8 @@ } if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 ---- glibc-2.14-418-gb2ea1df/elf/dl-load.c -+++ /elf/dl-load.c +--- glibc-2.14-394-g8f3b1ff/elf/dl-load.c ++++ glibc-2.14.90-13/elf/dl-load.c @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len) @@ -761,8 +789,8 @@ } else /* No DST we recognize. */ ---- glibc-2.14-418-gb2ea1df/elf/dl-support.c -+++ /elf/dl-support.c +--- glibc-2.14-394-g8f3b1ff/elf/dl-support.c ++++ glibc-2.14.90-13/elf/dl-support.c @@ -82,10 +82,8 @@ unsigned long long _dl_load_adds; create a fake scope containing nothing. */ struct r_scope_elem _dl_initial_searchlist; @@ -774,8 +802,8 @@ /* Random data provided by the kernel. */ void *_dl_random; ---- glibc-2.14-418-gb2ea1df/elf/ldconfig.c -+++ /elf/ldconfig.c +--- glibc-2.14-394-g8f3b1ff/elf/ldconfig.c ++++ glibc-2.14.90-13/elf/ldconfig.c @@ -1034,17 +1034,19 @@ search_dirs (void) @@ -857,8 +885,8 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.14-418-gb2ea1df/elf/ldd.bash.in -+++ /elf/ldd.bash.in +--- glibc-2.14-394-g8f3b1ff/elf/ldd.bash.in ++++ glibc-2.14.90-13/elf/ldd.bash.in @@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2 fi done @@ -887,8 +915,8 @@ try_trace "$RTLD" "$file" || result=1 ;; *) ---- glibc-2.14-418-gb2ea1df/elf/rtld-Rules -+++ /elf/rtld-Rules +--- glibc-2.14-394-g8f3b1ff/elf/rtld-Rules ++++ glibc-2.14.90-13/elf/rtld-Rules @@ -1,7 +1,7 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker. @@ -906,8 +934,8 @@ +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld endif ---- glibc-2.14-418-gb2ea1df/elf/rtld.c -+++ /elf/rtld.c +--- glibc-2.14-394-g8f3b1ff/elf/rtld.c ++++ glibc-2.14.90-13/elf/rtld.c @@ -107,7 +107,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -962,24 +990,24 @@ if (! prelinked && rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. ---- glibc-2.14-418-gb2ea1df/extra-lib.mk -+++ /extra-lib.mk +--- glibc-2.14-394-g8f3b1ff/extra-lib.mk ++++ glibc-2.14.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.14-418-gb2ea1df/include/bits/stdlib-ldbl.h -+++ /include/bits/stdlib-ldbl.h +--- glibc-2.14-394-g8f3b1ff/include/bits/stdlib-ldbl.h ++++ glibc-2.14.90-13/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-418-gb2ea1df/include/bits/wchar-ldbl.h -+++ /include/bits/wchar-ldbl.h +--- glibc-2.14-394-g8f3b1ff/include/bits/wchar-ldbl.h ++++ glibc-2.14.90-13/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-418-gb2ea1df/include/features.h -+++ /include/features.h +--- glibc-2.14-394-g8f3b1ff/include/features.h ++++ glibc-2.14.90-13/include/features.h @@ -310,8 +310,13 @@ #endif @@ -996,8 +1024,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.14-418-gb2ea1df/include/libc-symbols.h -+++ /include/libc-symbols.h +--- glibc-2.14-394-g8f3b1ff/include/libc-symbols.h ++++ glibc-2.14.90-13/include/libc-symbols.h @@ -626,7 +626,7 @@ for linking") # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libc_hidden_def(name) hidden_def (name) @@ -1007,8 +1035,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-418-gb2ea1df/include/link.h -+++ /include/link.h +--- glibc-2.14-394-g8f3b1ff/include/link.h ++++ glibc-2.14.90-13/include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. @@ -1046,8 +1074,8 @@ # elif NO_TLS_OFFSET == -1 # define FORCED_DYNAMIC_TLS_OFFSET -2 # else ---- glibc-2.14-418-gb2ea1df/include/stap-probe.h -+++ /include/stap-probe.h +--- glibc-2.14-394-g8f3b1ff/include/stap-probe.h ++++ glibc-2.14.90-13/include/stap-probe.h @@ -0,0 +1,140 @@ +/* Macros for defining Systemtap static probe points. + Copyright (C) 2011 Free Software Foundation, Inc. @@ -1189,16 +1217,16 @@ +#endif /* USE_STAP_PROBE. */ + +#endif /* stap-probe.h */ ---- glibc-2.14-418-gb2ea1df/include/sys/resource.h -+++ /include/sys/resource.h +--- glibc-2.14-394-g8f3b1ff/include/sys/resource.h ++++ glibc-2.14.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.14-418-gb2ea1df/inet/Makefile -+++ /inet/Makefile +--- glibc-2.14-394-g8f3b1ff/inet/Makefile ++++ glibc-2.14.90-13/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -1208,8 +1236,8 @@ ifeq ($(have-thread-library),yes) CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions ---- glibc-2.14-418-gb2ea1df/intl/locale.alias -+++ /intl/locale.alias +--- glibc-2.14-394-g8f3b1ff/intl/locale.alias ++++ glibc-2.14.90-13/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -1219,8 +1247,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.14-418-gb2ea1df/libio/stdio.h -+++ /libio/stdio.h +--- glibc-2.14-394-g8f3b1ff/libio/stdio.h ++++ glibc-2.14.90-13/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. */ @@ -1234,8 +1262,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.14-418-gb2ea1df/locale/iso-4217.def -+++ /locale/iso-4217.def +--- glibc-2.14-394-g8f3b1ff/locale/iso-4217.def ++++ glibc-2.14.90-13/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1327,8 +1355,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.14-418-gb2ea1df/locale/programs/locarchive.c -+++ /locale/programs/locarchive.c +--- glibc-2.14-394-g8f3b1ff/locale/programs/locarchive.c ++++ glibc-2.14.90-13/locale/programs/locarchive.c @@ -253,9 +253,9 @@ oldlocrecentcmp (const void *a, const void *b) /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -1360,8 +1388,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.14-418-gb2ea1df/localedata/ChangeLog -+++ /localedata/ChangeLog +--- glibc-2.14-394-g8f3b1ff/localedata/ChangeLog ++++ glibc-2.14.90-13/localedata/ChangeLog @@ -10,6 +10,14 @@ * tests-mbwc/tst_funcs.h (TST_DECL_VARS, TST_HEAD_LOCALE): Remove unused variable. @@ -1377,8 +1405,8 @@ 2011-05-21 Ulrich Drepper [BZ #12788] ---- glibc-2.14-418-gb2ea1df/localedata/Makefile -+++ /localedata/Makefile +--- glibc-2.14-394-g8f3b1ff/localedata/Makefile ++++ glibc-2.14.90-13/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1387,8 +1415,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.14-418-gb2ea1df/localedata/SUPPORTED -+++ /localedata/SUPPORTED +--- glibc-2.14-394-g8f3b1ff/localedata/SUPPORTED ++++ glibc-2.14.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 \ @@ -1430,8 +1458,8 @@ sw_KE/UTF-8 \ sw_TZ/UTF-8 \ ta_IN/UTF-8 \ ---- glibc-2.14-418-gb2ea1df/localedata/locales/cy_GB -+++ /localedata/locales/cy_GB +--- glibc-2.14-394-g8f3b1ff/localedata/locales/cy_GB ++++ glibc-2.14.90-13/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1446,8 +1474,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.14-418-gb2ea1df/localedata/locales/en_GB -+++ /localedata/locales/en_GB +--- glibc-2.14-394-g8f3b1ff/localedata/locales/en_GB ++++ glibc-2.14.90-13/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1459,8 +1487,8 @@ date_fmt "/ / " ---- glibc-2.14-418-gb2ea1df/localedata/locales/no_NO -+++ /localedata/locales/no_NO +--- glibc-2.14-394-g8f3b1ff/localedata/locales/no_NO ++++ glibc-2.14.90-13/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1531,8 +1559,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.14-418-gb2ea1df/localedata/locales/zh_TW -+++ /localedata/locales/zh_TW +--- glibc-2.14-394-g8f3b1ff/localedata/locales/zh_TW ++++ glibc-2.14.90-13/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1560,8 +1588,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.14-418-gb2ea1df/login/programs/pt_chown.c -+++ /login/programs/pt_chown.c +--- glibc-2.14-394-g8f3b1ff/login/programs/pt_chown.c ++++ glibc-2.14.90-13/login/programs/pt_chown.c @@ -29,6 +29,7 @@ #include #include @@ -1603,8 +1631,8 @@ - return EXIT_SUCCESS; } ---- glibc-2.14-418-gb2ea1df/malloc/mcheck.c -+++ /malloc/mcheck.c +--- glibc-2.14-394-g8f3b1ff/malloc/mcheck.c ++++ glibc-2.14.90-13/malloc/mcheck.c @@ -25,10 +25,26 @@ # include # include @@ -1681,8 +1709,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.14-418-gb2ea1df/manual/libc.texinfo -+++ /manual/libc.texinfo +--- glibc-2.14-394-g8f3b1ff/manual/libc.texinfo ++++ glibc-2.14.90-13/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1692,9 +1720,9 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.14-418-gb2ea1df/misc/sys/cdefs.h -+++ /misc/sys/cdefs.h -@@ -146,7 +146,10 @@ +--- glibc-2.14-394-g8f3b1ff/misc/sys/cdefs.h ++++ glibc-2.14.90-13/misc/sys/cdefs.h +@@ -141,7 +141,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -1706,7 +1734,7 @@ # define __warndecl(name, msg) \ extern void name (void) __attribute__((__warning__ (msg))) # define __warnattr(msg) __attribute__((__warning__ (msg))) -@@ -312,10 +315,16 @@ +@@ -307,10 +310,16 @@ /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 inline semantics, unless -fgnu89-inline is used. */ @@ -1725,7 +1753,7 @@ # define __extern_always_inline \ extern __always_inline __attribute__ ((__gnu_inline__, __artificial__)) # else -@@ -335,7 +344,10 @@ +@@ -330,7 +339,10 @@ /* GCC 4.3 and above allow passing all anonymous arguments of an __extern_always_inline function to some other vararg function. */ @@ -1737,8 +1765,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.14-418-gb2ea1df/nis/Makefile -+++ /nis/Makefile +--- glibc-2.14-394-g8f3b1ff/nis/Makefile ++++ glibc-2.14.90-13/nis/Makefile @@ -23,9 +23,9 @@ subdir := nis aux := nis_hash @@ -1760,8 +1788,8 @@ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ ---- glibc-2.14-418-gb2ea1df/nis/nss -+++ /nis/nss +--- glibc-2.14-394-g8f3b1ff/nis/nss ++++ glibc-2.14.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 @@ -1771,9 +1799,9 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.14-418-gb2ea1df/nptl/ChangeLog -+++ /nptl/ChangeLog -@@ -158,6 +158,51 @@ +--- glibc-2.14-394-g8f3b1ff/nptl/ChangeLog ++++ glibc-2.14.90-13/nptl/ChangeLog +@@ -143,6 +143,51 @@ clearing memory. Patch partly by Robert Rex . @@ -1825,7 +1853,7 @@ 2011-01-19 Roland McGrath * pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo. -@@ -4887,6 +4932,11 @@ +@@ -4872,6 +4917,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1837,7 +1865,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6961,6 +7011,11 @@ +@@ -6946,6 +6996,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1849,8 +1877,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.14-418-gb2ea1df/nptl/DESIGN-systemtap-probes.txt -+++ /nptl/DESIGN-systemtap-probes.txt +--- glibc-2.14-394-g8f3b1ff/nptl/DESIGN-systemtap-probes.txt ++++ glibc-2.14.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. @@ -1941,8 +1969,8 @@ + arg1 = condition +cond_broadcast - probe for pthread_cond_broadcast + arg1 = condition ---- glibc-2.14-418-gb2ea1df/nptl/Makefile -+++ /nptl/Makefile +--- glibc-2.14-394-g8f3b1ff/nptl/Makefile ++++ glibc-2.14.90-13/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1975,8 +2003,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.14-418-gb2ea1df/nptl/Versions -+++ /nptl/Versions +--- glibc-2.14-394-g8f3b1ff/nptl/Versions ++++ glibc-2.14.90-13/nptl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; # Internal libc interface to libpthread @@ -1985,8 +2013,8 @@ } } ---- glibc-2.14-418-gb2ea1df/nptl/nptl-init.c -+++ /nptl/nptl-init.c +--- glibc-2.14-394-g8f3b1ff/nptl/nptl-init.c ++++ glibc-2.14.90-13/nptl/nptl-init.c @@ -415,7 +415,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. */ @@ -1996,8 +2024,8 @@ || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ ---- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_broadcast.c -+++ /nptl/pthread_cond_broadcast.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_cond_broadcast.c ++++ glibc-2.14.90-13/nptl/pthread_cond_broadcast.c @@ -23,6 +23,7 @@ #include #include @@ -2015,8 +2043,8 @@ int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; /* Make sure we are alone. */ ---- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_destroy.c -+++ /nptl/pthread_cond_destroy.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_cond_destroy.c ++++ glibc-2.14.90-13/nptl/pthread_cond_destroy.c @@ -20,6 +20,7 @@ #include #include @@ -2034,8 +2062,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_init.c -+++ /nptl/pthread_cond_init.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_cond_init.c ++++ glibc-2.14.90-13/nptl/pthread_cond_init.c @@ -20,6 +20,7 @@ #include @@ -2053,8 +2081,8 @@ return 0; } versioned_symbol (libpthread, __pthread_cond_init, ---- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_signal.c -+++ /nptl/pthread_cond_signal.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_cond_signal.c ++++ glibc-2.14.90-13/nptl/pthread_cond_signal.c @@ -26,6 +26,7 @@ #include @@ -2072,8 +2100,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-418-gb2ea1df/nptl/pthread_cond_wait.c -+++ /nptl/pthread_cond_wait.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_cond_wait.c ++++ glibc-2.14.90-13/nptl/pthread_cond_wait.c @@ -25,6 +25,7 @@ #include @@ -2091,8 +2119,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-418-gb2ea1df/nptl/pthread_create.c -+++ /nptl/pthread_create.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_create.c ++++ glibc-2.14.90-13/nptl/pthread_create.c @@ -32,6 +32,8 @@ #include @@ -2120,8 +2148,8 @@ /* Start the thread. */ return create_thread (pd, iattr, STACK_VARIABLES_ARGS); } ---- glibc-2.14-418-gb2ea1df/nptl/pthread_join.c -+++ /nptl/pthread_join.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_join.c ++++ glibc-2.14.90-13/nptl/pthread_join.c @@ -23,6 +23,8 @@ #include #include "pthreadP.h" @@ -2148,8 +2176,8 @@ + return result; } ---- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_destroy.c -+++ /nptl/pthread_mutex_destroy.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_mutex_destroy.c ++++ glibc-2.14.90-13/nptl/pthread_mutex_destroy.c @@ -20,11 +20,15 @@ #include #include "pthreadP.h" @@ -2166,8 +2194,8 @@ if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0 && mutex->__data.__nusers != 0) return EBUSY; ---- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_init.c -+++ /nptl/pthread_mutex_init.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_mutex_init.c ++++ glibc-2.14.90-13/nptl/pthread_mutex_init.c @@ -24,6 +24,8 @@ #include #include "pthreadP.h" @@ -2186,8 +2214,8 @@ return 0; } strong_alias (__pthread_mutex_init, pthread_mutex_init) ---- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_lock.c -+++ /nptl/pthread_mutex_lock.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_mutex_lock.c ++++ glibc-2.14.90-13/nptl/pthread_mutex_lock.c @@ -24,6 +24,7 @@ #include #include "pthreadP.h" @@ -2224,8 +2252,8 @@ return 0; } #ifndef __pthread_mutex_lock ---- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_timedlock.c -+++ /nptl/pthread_mutex_timedlock.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_mutex_timedlock.c ++++ glibc-2.14.90-13/nptl/pthread_mutex_timedlock.c @@ -24,6 +24,8 @@ #include #include @@ -2280,8 +2308,8 @@ } out: ---- glibc-2.14-418-gb2ea1df/nptl/pthread_mutex_unlock.c -+++ /nptl/pthread_mutex_unlock.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_mutex_unlock.c ++++ glibc-2.14.90-13/nptl/pthread_mutex_unlock.c @@ -22,6 +22,7 @@ #include #include "pthreadP.h" @@ -2318,8 +2346,8 @@ return 0; } ---- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_destroy.c -+++ /nptl/pthread_rwlock_destroy.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_rwlock_destroy.c ++++ glibc-2.14.90-13/nptl/pthread_rwlock_destroy.c @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -2336,8 +2364,8 @@ /* Nothing to be done. For now. */ return 0; } ---- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_rdlock.c -+++ /nptl/pthread_rwlock_rdlock.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_rwlock_rdlock.c ++++ glibc-2.14.90-13/nptl/pthread_rwlock_rdlock.c @@ -22,6 +22,7 @@ #include #include @@ -2364,8 +2392,8 @@ break; } ---- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_unlock.c -+++ /nptl/pthread_rwlock_unlock.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_rwlock_unlock.c ++++ glibc-2.14.90-13/nptl/pthread_rwlock_unlock.c @@ -22,11 +22,14 @@ #include #include @@ -2381,8 +2409,8 @@ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); if (rwlock->__data.__writer) rwlock->__data.__writer = 0; ---- glibc-2.14-418-gb2ea1df/nptl/pthread_rwlock_wrlock.c -+++ /nptl/pthread_rwlock_wrlock.c +--- glibc-2.14-394-g8f3b1ff/nptl/pthread_rwlock_wrlock.c ++++ glibc-2.14.90-13/nptl/pthread_rwlock_wrlock.c @@ -22,6 +22,7 @@ #include #include @@ -2409,8 +2437,8 @@ break; } ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ /nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.14.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 @@ -2419,8 +2447,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ /nptl/sysdeps/unix/sysv/linux/i386/Versions +--- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -2428,8 +2456,8 @@ + __uname; + } +} ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S -+++ /nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +--- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2449,8 +2477,8 @@ ENTER_KERNEL 2: movl %edx, %eax ---- glibc-2.14-418-gb2ea1df/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-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S @@ -24,6 +24,7 @@ #include #include @@ -2468,8 +2496,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-418-gb2ea1df/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-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S @@ -24,7 +24,7 @@ #include #include @@ -2488,8 +2516,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-418-gb2ea1df/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-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S @@ -24,7 +24,7 @@ #include #include @@ -2508,8 +2536,8 @@ cmpl $1000000000, 4(%ebp) movl $EINVAL, %eax jae 18f ---- glibc-2.14-418-gb2ea1df/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-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S @@ -25,6 +25,7 @@ #include #include @@ -2527,8 +2555,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-418-gb2ea1df/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-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S @@ -23,6 +23,7 @@ #include #include @@ -2546,8 +2574,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-418-gb2ea1df/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-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S @@ -23,6 +23,7 @@ #include #include @@ -2565,8 +2593,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h -+++ /nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +--- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2584,8 +2612,8 @@ __asm __volatile (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ /nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -2595,8 +2623,8 @@ cp = u.uts.version; else { ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ /nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -2604,8 +2632,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S -+++ /nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +--- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2635,8 +2663,8 @@ syscall 2: movl %edx, %eax ---- glibc-2.14-418-gb2ea1df/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h -+++ /nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +--- glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2654,8 +2682,8 @@ __asm __volatile ("syscall" \ : "=a" (__ignore) \ : "0" (SYS_futex), "D" (futex), \ ---- glibc-2.14-418-gb2ea1df/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-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S @@ -25,7 +25,7 @@ #include #include @@ -2674,8 +2702,8 @@ /* Get internal lock. */ movl $1, %esi xorl %eax, %eax ---- glibc-2.14-418-gb2ea1df/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-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S @@ -24,6 +24,7 @@ #include #include @@ -2693,8 +2721,8 @@ /* Get internal lock. */ movq %rdi, %r8 movl $1, %esi ---- glibc-2.14-418-gb2ea1df/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-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -23,6 +23,7 @@ #include #include @@ -2712,8 +2740,8 @@ cmpq $1000000000, 8(%rdx) movl $EINVAL, %eax jae 48f ---- glibc-2.14-418-gb2ea1df/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-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S @@ -23,6 +23,7 @@ #include #include @@ -2731,8 +2759,8 @@ cmpq $-1, dep_mutex(%rdi) /* Prepare structure passed to cancellation handler. */ ---- glibc-2.14-418-gb2ea1df/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-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S @@ -22,7 +22,7 @@ #include #include @@ -2752,8 +2780,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-418-gb2ea1df/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-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S ++++ glibc-2.14.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S @@ -22,7 +22,7 @@ #include #include @@ -2773,8 +2801,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-418-gb2ea1df/nscd/nscd.conf -+++ /nscd/nscd.conf +--- glibc-2.14-394-g8f3b1ff/nscd/nscd.conf ++++ glibc-2.14.90-13/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -2784,8 +2812,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.14-418-gb2ea1df/nscd/nscd.init -+++ /nscd/nscd.init +--- glibc-2.14-394-g8f3b1ff/nscd/nscd.init ++++ glibc-2.14.90-13/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -2862,8 +2890,29 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.14-418-gb2ea1df/nss/Makefile -+++ /nss/Makefile +--- glibc-2.14-394-g8f3b1ff/nscd/selinux.c ++++ glibc-2.14.90-13/nscd/selinux.c +@@ -270,6 +270,18 @@ avc_create_thread (void (*run) (void)) + { + int rc; + ++#if defined HAVE_LIBAUDIT && defined HAVE_LIBCAP ++ if (server_user != NULL && getuid () == 0) ++ { ++ /* We need to preserve the capabilities in the AVC thread. */ ++ if (prctl (PR_SET_KEEPCAPS, 1) == -1) ++ { ++ dbg_log (_("Failed to set keep-capabilities")); ++ error (EXIT_FAILURE, errno, _("prctl(KEEPCAPS) failed")); ++ } ++ } ++#endif ++ + rc = + pthread_create (&avc_notify_thread, NULL, (void *(*) (void *)) run, NULL); + if (rc != 0) +--- glibc-2.14-394-g8f3b1ff/nss/Makefile ++++ glibc-2.14.90-13/nss/Makefile @@ -88,6 +88,7 @@ endif include ../Rules @@ -2872,8 +2921,8 @@ ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a ---- glibc-2.14-418-gb2ea1df/nss/nss_files/files-XXX.c -+++ /nss/nss_files/files-XXX.c +--- glibc-2.14-394-g8f3b1ff/nss/nss_files/files-XXX.c ++++ glibc-2.14.90-13/nss/nss_files/files-XXX.c @@ -190,7 +190,7 @@ internal_getent (struct STRUCTURE *result, { char *p; @@ -2883,8 +2932,8 @@ int parse_result; if (buflen < sizeof *data + 2) ---- glibc-2.14-418-gb2ea1df/posix/Makefile -+++ /posix/Makefile +--- glibc-2.14-394-g8f3b1ff/posix/Makefile ++++ glibc-2.14.90-13/posix/Makefile @@ -320,15 +320,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -2905,8 +2954,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.14-418-gb2ea1df/posix/gai.conf -+++ /posix/gai.conf +--- glibc-2.14-394-g8f3b1ff/posix/gai.conf ++++ glibc-2.14.90-13/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -2931,8 +2980,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.14-418-gb2ea1df/posix/getconf.speclist.h -+++ /posix/getconf.speclist.h +--- glibc-2.14-394-g8f3b1ff/posix/getconf.speclist.h ++++ glibc-2.14.90-13/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -2973,8 +3022,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.14-418-gb2ea1df/posix/regcomp.c -+++ /posix/regcomp.c +--- glibc-2.14-394-g8f3b1ff/posix/regcomp.c ++++ glibc-2.14.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. @@ -3106,8 +3155,8 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.14-418-gb2ea1df/resolv/Makefile -+++ /resolv/Makefile +--- glibc-2.14-394-g8f3b1ff/resolv/Makefile ++++ glibc-2.14.90-13/resolv/Makefile @@ -81,6 +81,7 @@ ifeq (yes,$(have-ssp)) CFLAGS-libresolv += -fstack-protector endif @@ -3116,8 +3165,8 @@ # The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings ---- glibc-2.14-418-gb2ea1df/resolv/res_query.c -+++ /resolv/res_query.c +--- glibc-2.14-394-g8f3b1ff/resolv/res_query.c ++++ glibc-2.14.90-13/resolv/res_query.c @@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, && *resplen2 > (int) sizeof (HEADER)) { @@ -3127,8 +3176,8 @@ hp = hp2; } else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) ---- glibc-2.14-418-gb2ea1df/resource/getrlimit.c -+++ /resource/getrlimit.c +--- glibc-2.14-394-g8f3b1ff/resource/getrlimit.c ++++ glibc-2.14.90-13/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -3137,19 +3186,19 @@ weak_alias (__getrlimit, getrlimit) stub_warning (getrlimit) ---- glibc-2.14-418-gb2ea1df/scripts/check-local-headers.sh -+++ /scripts/check-local-headers.sh +--- glibc-2.14-394-g8f3b1ff/scripts/check-local-headers.sh ++++ glibc-2.14.90-13/scripts/check-local-headers.sh @@ -29,7 +29,7 @@ exec ${AWK} -v includedir="$includedir" ' BEGIN { status = 0 exclude = "^" includedir \ -- "/(asm[-/]|linux/|selinux/|gd|nss3/|sys/capability\\.h|libaudit\\.h)" -+ "/(asm[-/]|linux/|selinux/|gd|nss3/|sys/capability\\.h|libaudit\\.h|sys/sdt(-config)?\\.h)" +- "/(asm[-/]|linux/|selinux/|gd|nss3/|sys/capability\\.h)" ++ "/(asm[-/]|linux/|selinux/|gd|nss3/|sys/capability\\.h|sys/sdt(-config)?\\.h)" } /^[^ ]/ && $1 ~ /.*:/ { obj = $1 } { ---- glibc-2.14-418-gb2ea1df/stdio-common/vfprintf.c -+++ /stdio-common/vfprintf.c +--- glibc-2.14-394-g8f3b1ff/stdio-common/vfprintf.c ++++ glibc-2.14.90-13/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')) \ { \ @@ -3195,8 +3244,8 @@ else \ len = strlen (string); \ } \ ---- glibc-2.14-418-gb2ea1df/streams/Makefile -+++ /streams/Makefile +--- glibc-2.14-394-g8f3b1ff/streams/Makefile ++++ glibc-2.14.90-13/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -3206,8 +3255,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.14-418-gb2ea1df/sunrpc/Makefile -+++ /sunrpc/Makefile +--- glibc-2.14-394-g8f3b1ff/sunrpc/Makefile ++++ glibc-2.14.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) \ @@ -3228,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-418-gb2ea1df/sysdeps/generic/dl-cache.h -+++ /sysdeps/generic/dl-cache.h +--- glibc-2.14-394-g8f3b1ff/sysdeps/generic/dl-cache.h ++++ glibc-2.14.90-13/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -3245,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-418-gb2ea1df/sysdeps/i386/Makefile -+++ /sysdeps/i386/Makefile +--- glibc-2.14-394-g8f3b1ff/sysdeps/i386/Makefile ++++ glibc-2.14.90-13/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -3271,8 +3320,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-418-gb2ea1df/sysdeps/i386/__longjmp.S -+++ /sysdeps/i386/__longjmp.S +--- glibc-2.14-394-g8f3b1ff/sysdeps/i386/__longjmp.S ++++ glibc-2.14.90-13/sysdeps/i386/__longjmp.S @@ -1,5 +1,5 @@ /* longjmp for i386. - Copyright (C) 1995-1998,2000,2002,2005,2006,2009 @@ -3319,8 +3368,8 @@ #endif /* Jump to saved PC. */ jmp *%edx ---- glibc-2.14-418-gb2ea1df/sysdeps/i386/bsd-_setjmp.S -+++ /sysdeps/i386/bsd-_setjmp.S +--- glibc-2.14-394-g8f3b1ff/sysdeps/i386/bsd-_setjmp.S ++++ glibc-2.14.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. @@ -3345,8 +3394,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-418-gb2ea1df/sysdeps/i386/bsd-setjmp.S -+++ /sysdeps/i386/bsd-setjmp.S +--- glibc-2.14-394-g8f3b1ff/sysdeps/i386/bsd-setjmp.S ++++ glibc-2.14.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. @@ -3371,8 +3420,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-418-gb2ea1df/sysdeps/i386/i686/Makefile -+++ /sysdeps/i386/i686/Makefile +--- glibc-2.14-394-g8f3b1ff/sysdeps/i386/i686/Makefile ++++ glibc-2.14.90-13/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -3393,8 +3442,8 @@ -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif ---- glibc-2.14-418-gb2ea1df/sysdeps/i386/setjmp.S -+++ /sysdeps/i386/setjmp.S +--- glibc-2.14-394-g8f3b1ff/sysdeps/i386/setjmp.S ++++ glibc-2.14.90-13/sysdeps/i386/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for i386. - Copyright (C) 1995,1996,1997,2000,2001,2005,2006 @@ -3418,8 +3467,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-418-gb2ea1df/sysdeps/ia64/Makefile -+++ /sysdeps/ia64/Makefile +--- glibc-2.14-394-g8f3b1ff/sysdeps/ia64/Makefile ++++ glibc-2.14.90-13/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -3431,8 +3480,8 @@ endif endif ---- glibc-2.14-418-gb2ea1df/sysdeps/ia64/ia64libgcc.S -+++ /sysdeps/ia64/ia64libgcc.S +--- glibc-2.14-394-g8f3b1ff/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.14.90-13/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -3784,8 +3833,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.14-418-gb2ea1df/sysdeps/ia64/libgcc-compat.c -+++ /sysdeps/ia64/libgcc-compat.c +--- glibc-2.14-394-g8f3b1ff/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.14.90-13/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -3871,16 +3920,16 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.14-418-gb2ea1df/sysdeps/mach/hurd/getrlimit.c -+++ /sysdeps/mach/hurd/getrlimit.c +--- glibc-2.14-394-g8f3b1ff/sysdeps/mach/hurd/getrlimit.c ++++ glibc-2.14.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.14-418-gb2ea1df/sysdeps/posix/getaddrinfo.c -+++ /sysdeps/posix/getaddrinfo.c +--- glibc-2.14-394-g8f3b1ff/sysdeps/posix/getaddrinfo.c ++++ glibc-2.14.90-13/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 @@ -4005,8 +4054,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.14-418-gb2ea1df/sysdeps/powerpc/powerpc64/Makefile -+++ /sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.14-394-g8f3b1ff/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.14.90-13/sysdeps/powerpc/powerpc64/Makefile @@ -33,6 +33,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -4015,16 +4064,16 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-418-gb2ea1df/sysdeps/powerpc/powerpc64/elf/Makefile -+++ /sysdeps/powerpc/powerpc64/elf/Makefile +--- glibc-2.14-394-g8f3b1ff/sysdeps/powerpc/powerpc64/elf/Makefile ++++ glibc-2.14.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.14-418-gb2ea1df/sysdeps/s390/s390-64/utf16-utf32-z9.c -+++ /sysdeps/s390/s390-64/utf16-utf32-z9.c +--- glibc-2.14-394-g8f3b1ff/sysdeps/s390/s390-64/utf16-utf32-z9.c ++++ glibc-2.14.90-13/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; \ @@ -4037,8 +4086,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-418-gb2ea1df/sysdeps/s390/s390-64/utf8-utf16-z9.c -+++ /sysdeps/s390/s390-64/utf8-utf16-z9.c +--- glibc-2.14-394-g8f3b1ff/sysdeps/s390/s390-64/utf8-utf16-z9.c ++++ glibc-2.14.90-13/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; \ @@ -4051,8 +4100,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-418-gb2ea1df/sysdeps/s390/s390-64/utf8-utf32-z9.c -+++ /sysdeps/s390/s390-64/utf8-utf32-z9.c +--- glibc-2.14-394-g8f3b1ff/sysdeps/s390/s390-64/utf8-utf32-z9.c ++++ glibc-2.14.90-13/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; \ @@ -4065,8 +4114,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/nice.c -+++ /sysdeps/unix/nice.c +--- glibc-2.14-394-g8f3b1ff/sysdeps/unix/nice.c ++++ glibc-2.14.90-13/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -4081,8 +4130,25 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/futimesat.c -+++ /sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/check_pf.c +@@ -27,13 +27,10 @@ + #include + #include + +-#include +-#include +-#include +- + #include + #include + ++#include "netlinkaccess.h" + + #ifndef IFA_F_HOMEADDRESS + # define IFA_F_HOMEADDRESS 0 +--- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -4125,8 +4191,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S -+++ /sysdeps/unix/sysv/linux/i386/____longjmp_chk.S +--- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S ++++ glibc-2.14.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 @@ -4160,8 +4226,8 @@ + LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx) jmp *%edx END (____longjmp_chk) ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ /sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.14.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. @@ -4222,16 +4288,16 @@ + } while (0) + +#include_next ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ /sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ glibc-2.14.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.14-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ /sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.14.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) @@ -4264,29 +4330,56 @@ + } while (0) + #include_next ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ /sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ /sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ /sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.14.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.14-418-gb2ea1df/sysdeps/unix/sysv/linux/paths.h -+++ /sysdeps/unix/sysv/linux/paths.h +--- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/netlinkaccess.h +@@ -25,6 +25,24 @@ + + #include + ++#ifndef IFA_MAX ++/* 2.6.19 kernel headers helpfully removed some macros and ++ moved lots of stuff into new headers, some of which aren't ++ included by linux/rtnetlink.h. */ ++#include ++#endif ++ ++#ifndef IFA_RTA ++# define IFA_RTA(r) \ ++ ((struct rtattr*) ((char*)(r) + NLMSG_ALIGN (sizeof (struct ifaddrmsg)))) ++# define IFA_PAYLOAD(n) NLMSG_PAYLOAD (n, sizeof (struct ifaddrmsg)) ++#endif ++ ++#ifndef IFLA_RTA ++# define IFLA_RTA(r) \ ++ ((struct rtattr*) ((char*)(r) + NLMSG_ALIGN (sizeof (struct ifinfomsg)))) ++# define IFLA_PAYLOAD(n) NLMSG_PAYLOAD (n, sizeof (struct ifinfomsg)) ++#endif + + struct netlink_res + { +--- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -4296,8 +4389,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/tcsetattr.c -+++ /sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -4343,8 +4436,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.14-418-gb2ea1df/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S -+++ /sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +--- glibc-2.14-394-g8f3b1ff/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S ++++ glibc-2.14.90-13/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S @@ -19,6 +19,7 @@ #include #include @@ -4371,8 +4464,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (____longjmp_chk) ---- glibc-2.14-418-gb2ea1df/sysdeps/x86_64/__longjmp.S -+++ /sysdeps/x86_64/__longjmp.S +--- glibc-2.14-394-g8f3b1ff/sysdeps/x86_64/__longjmp.S ++++ glibc-2.14.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. @@ -4402,8 +4495,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (__longjmp) ---- glibc-2.14-418-gb2ea1df/sysdeps/x86_64/setjmp.S -+++ /sysdeps/x86_64/setjmp.S +--- glibc-2.14-394-g8f3b1ff/sysdeps/x86_64/setjmp.S ++++ glibc-2.14.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. @@ -4427,8 +4520,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%rax) #endif ---- glibc-2.14-418-gb2ea1df/timezone/zic.c -+++ /timezone/zic.c +--- glibc-2.14-394-g8f3b1ff/timezone/zic.c ++++ glibc-2.14.90-13/timezone/zic.c @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) return; diff --git a/glibc-no-leaf-attribute.patch b/glibc-no-leaf-attribute.patch new file mode 100644 index 0000000..1cac26e --- /dev/null +++ b/glibc-no-leaf-attribute.patch @@ -0,0 +1,49 @@ +From 7327af4c323f6d4f500bf4aaa66a9cac6236772f Mon Sep 17 00:00:00 2001 +From: Jim Meyering +Date: Wed, 26 Oct 2011 20:08:52 +0200 +Subject: [PATCH] Revert "Use leaf function attribute in __THROW" + +This reverts commit aa78043a4aafe5db1a1a76d544a833b63b4c5f5c +and the related 49a43d80ec5c97cf6136b1ee2687414773b2d5aa. +This fixes http://bugzilla.redhat.com/747377 +--- + misc/sys/cdefs.h | 15 +++------------ + 2 files changed, 3 insertions(+), 14 deletions(-) + +diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h +index 72073e8..165a94a 100644 +--- a/misc/sys/cdefs.h ++++ b/misc/sys/cdefs.h +@@ -38,27 +38,18 @@ + + #ifdef __GNUC__ + +-/* All functions, except those with callbacks, are leaf functions. */ +-# if __GNUC_PREREQ (4, 6) && !defined _LIBC +-# define __LEAF , __leaf__ +-# define __LEAF_ATTR __attribute__ ((__leaf__)) +-# else +-# define __LEAF +-# define __LEAF_ATTR +-# endif +- + /* GCC can always grok prototypes. For C++ programs we add throw() + to help it optimize the function calls. But this works only with + gcc 2.8.x and egcs. For gcc 3.2 and up we even mark C functions + as non-throwing using a function attribute since programs can use + the -fexceptions options for C code as well. */ + # if !defined __cplusplus && __GNUC_PREREQ (3, 3) +-# define __THROW __attribute__ ((__nothrow__ __LEAF)) +-# define __NTH(fct) __attribute__ ((__nothrow__ __LEAF)) fct ++# define __THROW __attribute__ ((__nothrow__)) ++# define __NTH(fct) __attribute__ ((__nothrow__)) fct + # else + # if defined __cplusplus && __GNUC_PREREQ (2,8) + # define __THROW throw () +-# define __NTH(fct) __LEAF_ATTR fct throw () ++# define __NTH(fct) fct throw () + # else + # define __THROW + # define __NTH(fct) fct +-- +1.7.7.1 diff --git a/glibc.spec b/glibc.spec index 1c5a133..fb3cd14 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.14-418-gb2ea1df +%define glibcsrcdir glibc-2.14-394-g8f3b1ff %define glibcversion 2.14.90 -%define glibcportsdir glibc-ports-2.14-43-gf335e01 +%define glibcportsdir glibc-ports-2.14-25-gd3d9bde ### glibc.spec.in follows: %define run_glibc_tests 1 %define auxarches athlon alphaev6 @@ -28,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 15.1 +Release: 15 # 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 @@ -42,6 +42,7 @@ Source1: %{?glibc_release_url}%{glibcportsdir}.tar.xz Source2: %{glibcsrcdir}-fedora.tar.xz Patch0: %{name}-fedora.patch Patch1: %{name}-ia64-lib64.patch +Patch2: %{name}-no-leaf-attribute.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: glibc-profile < 2.4 Obsoletes: nss_db @@ -260,6 +261,7 @@ rm -rf %{glibcportsdir} %patch1 -p1 %endif %endif +%patch2 -p1 # A lot of programs still misuse memcpy when they have to use # memmove. The memcpy implementation below is not tolerant at @@ -1112,21 +1114,13 @@ rm -f *.filelist* %endif %changelog -* Tue Nov 8 2011 Andreas Schwab - 2.4.90-14 -- Update from master - - Fix locking in _IO_flush_all_lockp - - Fix buffer allocation in files initgroups handler - - Don't start AVC thread until credentials are installed - - Don't fail in makedb if SELinux is disabled - - New Linux syscalls process_vm_readv and process_vm_writev - - Unify getent output for initgroups database (BZ#13367) - - Avoid assertion in processes with VM in bad shape (BZ#13276) - - Don't mark memory synchronisation functions as leaf (#747377, BZ#13344) - - Add missing register initialization in x86-64 - pthread_cond_timedwait (BZ#13358) - - Correctly NUL-terminate link name in sprof (BZ#13337) - - Fix readlink call in ldconfig's chroot handling (BZ#13335) - - Preserve link time dependencies over relocation dependencies (BZ#12892) +* Wed Oct 26 2011 Fedora Release Engineering - 2.14.90-15 +- Rebuilt for glibc bug#747377 + +* Wed Oct 19 2011 Jim Meyering - 2.14.90-14 +- Revert the upstream patch that added the leaf attribute, since it + caused gcc -O2 to move code past thread primitives and sometimes + even out of critical sections. See http://bugzilla.redhat.com/747377 * Wed Oct 19 2011 Andreas Schwab - 2.14.90-13 - Update from master diff --git a/sources b/sources index eca8595..c990b62 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -bce89b90d75eb65d573c89d231128a45 glibc-2.14-418-gb2ea1df-fedora.tar.xz -a1c214925f0f2dabf4f88bddb1fcf39e glibc-2.14-418-gb2ea1df.tar.xz -b89c04e859de608e0c6b33ab77923527 glibc-ports-2.14-43-gf335e01.tar.xz +6cb0f013d410bf40e1a1d28a5d9f95b9 glibc-2.14-394-g8f3b1ff-fedora.tar.xz +860f193936a67a1fd1e06c2b85912477 glibc-2.14-394-g8f3b1ff.tar.xz +9673adaacae3ac645748827a62876ce9 glibc-ports-2.14-25-gd3d9bde.tar.xz From 31ab57089138fe340b777d7297d63791953a3207 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 15 Nov 2011 22:11:36 -0700 Subject: [PATCH 07/15] * Tue Nov 15 2011 Jeff Law - 2.14.90-17 Revert bogus commits/rebasing of Nov 14, Nov 11 and Nov 8. --- glibc.spec | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/glibc.spec b/glibc.spec index fb3cd14..0e927b2 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1114,6 +1114,47 @@ rm -f *.filelist* %endif %changelog +* Tue Nov 15 2011 Jeff Law - 2.14.90-17 + Revert bogus commits/rebasing of Nov 14, Nov 11 and Nov 8. Sources + should be equivalent to Fedora 16's initial release. + +* Mon Nov 14 2011 Andreas Schwab - 2.14.90-16 +- Update from master + - Don't call reused_arena when _int_new_arena failed (#753601) + - Fix grouping and reuse other locales in various locales (BZ#13147) + +* Fri Nov 11 2011 Andreas Schwab - 2.14.90-15 +- Update from master + - Fix db makefile rule for group.db + - Mark setjmp and ucontext functions as non-leaf (#752905) + - Check malloc arana limit atomically + +* Tue Nov 8 2011 Andreas Schwab - 2.14.90-14 +- Update from master + - Fix locking in _IO_flush_all_lockp + - Fix buffer allocation in files initgroups handler (#750361) + - Don't start AVC thread until credentials are installed + - Don't fail in makedb if SELinux is disabled (#750858) + - New Linux syscalls process_vm_readv and process_vm_writev + - Unify getent output for initgroups database (BZ#13367) + - Cache network interface information + - Avoid assertion in processes with VM in bad shape (BZ#13276) + - Don't mark memory synchronisation functions as leaf (#747377, BZ#13344) + - Add missing register initialization in x86-64 + pthread_cond_timedwait (BZ#13358) + - Fix accuracy problem in generic sin (BZ#10709) + - Correctly NUL-terminate link name in sprof (BZ#13337) + - Fix readlink call in ldconfig's chroot handling (BZ#13335) + - Optimize accurate 64-bit routines for FMA4 on x86-64 + - Optimized remquo for 64-bit platforms + - Optimize fmod + - Add optimized wcslen and strnlen for x86-32 + - Optimized strnlen and wcscmp for x86-64 + - Improve x86-32 SSSE3 memcpy + - Preserve link time dependencies over relocation dependencies (BZ#12892) + - Optimize x86-64 rawmemchr + - Add optimized str{,n}casecmp for AVX on x86-64 + * Wed Oct 26 2011 Fedora Release Engineering - 2.14.90-15 - Rebuilt for glibc bug#747377 From f62c55540fc39a05d8d55babb76bd8cec99d93fa Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 15 Nov 2011 22:15:06 -0700 Subject: [PATCH 08/15] Fix Release # --- glibc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glibc.spec b/glibc.spec index 0e927b2..79c670e 100644 --- a/glibc.spec +++ b/glibc.spec @@ -28,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 15 +Release: 17 # 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 From be07c4dc8bcb7308d10262e1efd419e252cc5a67 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 16 Nov 2011 23:38:42 -0700 Subject: [PATCH 09/15] * Wed Nov 16 2011 Jeff Law - 2.14.90-18 - Fix grouping and reuse other locales in various locales (#13147) --- glibc-localegrouping.patch | 1660 ++++++++++++++++++++++++++++++++++++ glibc.spec | 7 +- 2 files changed, 1666 insertions(+), 1 deletion(-) create mode 100644 glibc-localegrouping.patch diff --git a/glibc-localegrouping.patch b/glibc-localegrouping.patch new file mode 100644 index 0000000..13ca55b --- /dev/null +++ b/glibc-localegrouping.patch @@ -0,0 +1,1660 @@ +commit 4b19cd7aef8511714947e658077c85f51c29ef65 +Author: Ulrich Drepper +Date: Fri Nov 11 11:25:45 2011 -0500 + + Fix grouping and reuse other locales in various locales + +diff --git a/NEWS b/NEWS +index 6223bae..ad0ef1d 100644 +--- a/NEWS ++++ b/NEWS +*************** Version 2.15 +*** 11,17 **** + + 6779, 6783, 9696, 11589, 12403, 12847, 12868, 12852, 12874, 12885, 12907, + 12922, 12935, 13007, 13021, 13067, 13068, 13090, 13092, 13114, 13118, +! 13123, 13134, 13138, 13150, 13179, 13192, 13268, 13291 + + * New program pldd to list loaded object of a process + Implemented by Ulrich Drepper. +--- 11,17 ---- + + 6779, 6783, 9696, 11589, 12403, 12847, 12868, 12852, 12874, 12885, 12907, + 12922, 12935, 13007, 13021, 13067, 13068, 13090, 13092, 13114, 13118, +! 13123, 13134, 13138, 13147, 13150, 13179, 13192, 13268, 13291 + + * New program pldd to list loaded object of a process + Implemented by Ulrich Drepper. +diff --git a/localedata/ChangeLog b/localedata/ChangeLog +index dc2b8a0..8bd381f 100644 +--- a/localedata/ChangeLog ++++ b/localedata/ChangeLog +@@ -1,3 +1,30 @@ ++2011-11-11 Ulrich Drepper ++ ++ [BZ #13147] ++ * locales/de_AT: Use de_DE for LC_NUMERIC. ++ * locales/es_BO: Use es_ES for LC_MESSAGES and LC_NUMERIC. ++ * locales/es_CL: Likewise. ++ * locales/es_CO: Likewise. ++ * locales/es_DO: Likewise. ++ * locales/es_EC: Likewise. ++ * locales/es_GT: Likewise. ++ * locales/es_HN: Likewise. ++ * locales/es_MX: Likewise. ++ * locales/es_NI: Likewise. ++ * locales/es_PA: Likewise. ++ * locales/es_PE: Likewise. ++ * locales/es_PR: Likewise. ++ * locales/es_PY: Likewise. ++ * locales/es_SV: Likewise. ++ * locales/es_UY: Likewise. ++ * locales/es_VE: Likewise. ++ * locales/es_ES: Fix LC_NUMERIC. ++ * locales/es_CR: Use es_ES for LC_MESSAGES. ++ * locales/fr_BE: Actually use grouping in LC_NUMERIC. ++ * locales/fr_CA: Use fr_FR for LC_MESSAGES and LC_NUMERIC. ++ * locales/fr_CH: Use de_CH for LC_NUMERIC. ++ * locales/fr_LU: Use same grouping in LC_NUMERIC as in LC_MONETARY. ++ + 2011-10-15 Ulrich Drepper + + * Makefile (tests): Add tst-setlocale2: +diff --git a/localedata/locales/de_AT b/localedata/locales/de_AT +index 4e0b7fb..b3adf90 100644 +--- a/localedata/locales/de_AT ++++ b/localedata/locales/de_AT +@@ -78,41 +78,39 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "de_DE" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/es_BO b/localedata/locales/es_BO +index c77bb1d..6964311 100644 +--- a/localedata/locales/es_BO ++++ b/localedata/locales/es_BO +@@ -56,8 +56,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -79,41 +78,39 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/es_CL b/localedata/locales/es_CL +index ff44fa8..fe5b6d9 100644 +--- a/localedata/locales/es_CL ++++ b/localedata/locales/es_CL +@@ -56,8 +56,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -79,41 +78,39 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO +index 4c1de13..5db5d6d 100644 +--- a/localedata/locales/es_CO ++++ b/localedata/locales/es_CO +@@ -56,8 +56,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -79,41 +78,39 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR +index 6cff560..f998c86 100644 +--- a/localedata/locales/es_CR ++++ b/localedata/locales/es_CR +@@ -47,8 +47,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -79,34 +78,34 @@ END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/es_DO b/localedata/locales/es_DO +index fcd0f9e..7cf54cf 100644 +--- a/localedata/locales/es_DO ++++ b/localedata/locales/es_DO +@@ -56,8 +56,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -79,41 +78,39 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/es_EC b/localedata/locales/es_EC +index b8d4c8f..480f6ef 100644 +--- a/localedata/locales/es_EC ++++ b/localedata/locales/es_EC +@@ -56,8 +56,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -79,41 +78,39 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/es_ES b/localedata/locales/es_ES +index fba4125..fcf90cb 100644 +--- a/localedata/locales/es_ES ++++ b/localedata/locales/es_ES +@@ -85,40 +85,40 @@ END LC_MONETARY + + LC_NUMERIC + decimal_point "" +-thousands_sep "" +-grouping 0;0 ++thousands_sep "" ++grouping 3;3 + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/es_GT b/localedata/locales/es_GT +index 455b076..49d369f 100644 +--- a/localedata/locales/es_GT ++++ b/localedata/locales/es_GT +@@ -55,8 +55,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -78,9 +77,7 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME +diff --git a/localedata/locales/es_HN b/localedata/locales/es_HN +index 53892b4..a809188 100644 +--- a/localedata/locales/es_HN ++++ b/localedata/locales/es_HN +@@ -56,8 +56,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -79,41 +78,39 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX +index 91dac23..7a1cccc 100644 +--- a/localedata/locales/es_MX ++++ b/localedata/locales/es_MX +@@ -56,8 +56,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -79,41 +78,39 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/es_NI b/localedata/locales/es_NI +index c0c395f..207f2da 100644 +--- a/localedata/locales/es_NI ++++ b/localedata/locales/es_NI +@@ -47,8 +47,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -70,9 +69,7 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME +diff --git a/localedata/locales/es_PA b/localedata/locales/es_PA +index 10d6d82..ae5cd3a 100644 +--- a/localedata/locales/es_PA ++++ b/localedata/locales/es_PA +@@ -56,8 +56,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -79,41 +78,39 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/es_PE b/localedata/locales/es_PE +index 634c927..da1a640 100644 +--- a/localedata/locales/es_PE ++++ b/localedata/locales/es_PE +@@ -56,8 +56,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -79,41 +78,39 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/es_PR b/localedata/locales/es_PR +index 546b6c2..53496d4 100644 +--- a/localedata/locales/es_PR ++++ b/localedata/locales/es_PR +@@ -47,8 +47,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -70,41 +69,39 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/es_PY b/localedata/locales/es_PY +index 2c31b2f..ce226ba 100644 +--- a/localedata/locales/es_PY ++++ b/localedata/locales/es_PY +@@ -56,8 +56,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -79,41 +78,39 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/es_SV b/localedata/locales/es_SV +index 3b6be32..d99b6cf 100644 +--- a/localedata/locales/es_SV ++++ b/localedata/locales/es_SV +@@ -56,8 +56,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -79,9 +78,7 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME +diff --git a/localedata/locales/es_UY b/localedata/locales/es_UY +index 8b7ed0d..cbb7d5a 100644 +--- a/localedata/locales/es_UY ++++ b/localedata/locales/es_UY +@@ -56,8 +56,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -79,41 +78,39 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/es_VE b/localedata/locales/es_VE +index ca6637a..1ec2dff 100644 +--- a/localedata/locales/es_VE ++++ b/localedata/locales/es_VE +@@ -56,8 +56,7 @@ copy "es_ES" + END LC_CTYPE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "es_ES" + END LC_MESSAGES + + LC_MONETARY +@@ -79,41 +78,39 @@ n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "es_ES" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/fr_BE b/localedata/locales/fr_BE +index f9c911a..43beac5 100644 +--- a/localedata/locales/fr_BE ++++ b/localedata/locales/fr_BE +@@ -79,7 +79,7 @@ END LC_MONETARY + LC_NUMERIC + decimal_point "" + thousands_sep "" +-grouping 0;0 ++grouping 3;3 + END LC_NUMERIC + + LC_TIME +diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA +index 992a4b1..21eb670 100644 +--- a/localedata/locales/fr_CA ++++ b/localedata/locales/fr_CA +@@ -55,8 +55,7 @@ copy "en_CA" + END LC_COLLATE + + LC_MESSAGES +-yesexpr "" +-noexpr "" ++copy "fr_FR" + END LC_MESSAGES + + LC_MONETARY +@@ -78,41 +77,39 @@ n_sign_posn 0 + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "fr_FR" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/fr_CH b/localedata/locales/fr_CH +index 7cb6282..5ab6af1 100644 +--- a/localedata/locales/fr_CH ++++ b/localedata/locales/fr_CH +@@ -64,41 +64,39 @@ copy "de_CH" + END LC_MONETARY + + LC_NUMERIC +-decimal_point "" +-thousands_sep "" +-grouping 0;0 ++copy "de_CH" + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" +diff --git a/localedata/locales/fr_LU b/localedata/locales/fr_LU +index 80b29b6..8cb90b3 100644 +--- a/localedata/locales/fr_LU ++++ b/localedata/locales/fr_LU +@@ -78,40 +78,40 @@ END LC_MONETARY + + LC_NUMERIC + decimal_point "" +-thousands_sep "" +-grouping 0;0 ++thousands_sep "" ++grouping 3;3 + END LC_NUMERIC + + LC_TIME + abday "";"";/ +- "";"";/ +- "";"";/ +- "" ++ "";"";/ ++ "";"";/ ++ "" + day "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + abmon "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"";/ +- "";"" ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" + mon "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "";/ +- "" ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" + d_t_fmt "" + d_fmt "" + t_fmt "" diff --git a/glibc.spec b/glibc.spec index 79c670e..a2672fd 100644 --- a/glibc.spec +++ b/glibc.spec @@ -28,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 17 +Release: 18 # 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 @@ -43,6 +43,7 @@ Source2: %{glibcsrcdir}-fedora.tar.xz Patch0: %{name}-fedora.patch Patch1: %{name}-ia64-lib64.patch Patch2: %{name}-no-leaf-attribute.patch +Patch3: %{name}-localegrouping.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: glibc-profile < 2.4 Obsoletes: nss_db @@ -262,6 +263,7 @@ rm -rf %{glibcportsdir} %endif %endif %patch2 -p1 +%patch3 -p1 # A lot of programs still misuse memcpy when they have to use # memmove. The memcpy implementation below is not tolerant at @@ -1114,6 +1116,9 @@ rm -f *.filelist* %endif %changelog +* Wed Nov 16 2011 Jeff Law - 2.14.90-18 + - Fix grouping and reuse other locales in various locales (#13147) + * Tue Nov 15 2011 Jeff Law - 2.14.90-17 Revert bogus commits/rebasing of Nov 14, Nov 11 and Nov 8. Sources should be equivalent to Fedora 16's initial release. From 6d7f7445a99aec574cbdbf21ac12ae7ebfdff811 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sun, 20 Nov 2011 21:30:51 -0700 Subject: [PATCH 10/15] - Check malloc areana atomically - Don't call reused_arena when _int_new_arena failed (#753601) --- glibc-arenalock.patch | 146 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 glibc-arenalock.patch diff --git a/glibc-arenalock.patch b/glibc-arenalock.patch new file mode 100644 index 0000000..56ea56d --- /dev/null +++ b/glibc-arenalock.patch @@ -0,0 +1,146 @@ +commit 77cdc054e02069d72dcf54a9ad7d7df3a24bcb01 +Author: Andreas Schwab +Date: Wed Nov 9 17:14:39 2011 +0100 + + Check malloc arana limit atomically + +diff --git a/ChangeLog b/ChangeLog +index bf09161..edd7dd8 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,14 @@ ++2011-11-14 Andreas Schwab ++ ++ * malloc/arena.c (arena_get2): Don't call reused_arena when ++ _int_new_arena failed. ++ ++2011-11-10 Andreas Schwab ++ ++ * malloc/arena.c (_int_new_arena): Don't increment narenas. ++ (reused_arena): Don't check arena limit. ++ (arena_get2): Atomically check arena limit. ++ + 2011-10-19 Andreas Schwab + + * sysdeps/x86_64/fpu/math_private.h (libc_feupdateenv): Use +diff --git a/malloc/arena.c b/malloc/arena.c +index 9114fd2..042cac8 100644 +--- a/malloc/arena.c ++++ b/malloc/arena.c +@@ -747,8 +747,6 @@ _int_new_arena(size_t size) + main_arena.next = a; + + #ifdef PER_THREAD +- ++narenas; +- + (void)mutex_unlock(&list_lock); + #endif + +@@ -786,30 +784,6 @@ get_free_list (void) + static mstate + reused_arena (void) + { +- if (narenas <= mp_.arena_test) +- return NULL; +- +- static int narenas_limit; +- if (narenas_limit == 0) +- { +- if (mp_.arena_max != 0) +- narenas_limit = mp_.arena_max; +- else +- { +- int n = __get_nprocs (); +- +- if (n >= 1) +- narenas_limit = NARENAS_FROM_NCORES (n); +- else +- /* We have no information about the system. Assume two +- cores. */ +- narenas_limit = NARENAS_FROM_NCORES (2); +- } +- } +- +- if (narenas < narenas_limit) +- return NULL; +- + mstate result; + static mstate next_to_use; + if (next_to_use == NULL) +@@ -844,10 +818,41 @@ arena_get2(mstate a_tsd, size_t size) + mstate a; + + #ifdef PER_THREAD +- if ((a = get_free_list ()) == NULL +- && (a = reused_arena ()) == NULL) +- /* Nothing immediately available, so generate a new arena. */ +- a = _int_new_arena(size); ++ static size_t narenas_limit; ++ ++ a = get_free_list (); ++ if (a == NULL) ++ { ++ /* Nothing immediately available, so generate a new arena. */ ++ if (narenas_limit == 0) ++ { ++ if (mp_.arena_max != 0) ++ narenas_limit = mp_.arena_max; ++ else ++ { ++ int n = __get_nprocs (); ++ ++ if (n >= 1) ++ narenas_limit = NARENAS_FROM_NCORES (n); ++ else ++ /* We have no information about the system. Assume two ++ cores. */ ++ narenas_limit = NARENAS_FROM_NCORES (2); ++ } ++ } ++ repeat:; ++ size_t n = narenas; ++ if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0)) ++ { ++ if (catomic_compare_and_exchange_bool_acq(&narenas, n + 1, n)) ++ goto repeat; ++ a = _int_new_arena (size); ++ if (__builtin_expect (a != NULL, 1)) ++ return a; ++ catomic_decrement(&narenas); ++ } ++ a = reused_arena (); ++ } + #else + if(!a_tsd) + a = a_tsd = &main_arena; + +commit a5fb313cb7b7e692fd4684916aaa98e03ec7e8b6 +Author: Andreas Schwab +Date: Mon Nov 14 11:41:52 2011 +0100 + + Don't call reused_arena when _int_new_arena failed + +diff --git a/malloc/arena.c b/malloc/arena.c +index 042cac8..cb8548b 100644 +--- a/malloc/arena.c ++++ b/malloc/arena.c +@@ -844,14 +844,14 @@ arena_get2(mstate a_tsd, size_t size) + size_t n = narenas; + if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0)) + { +- if (catomic_compare_and_exchange_bool_acq(&narenas, n + 1, n)) ++ if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n)) + goto repeat; + a = _int_new_arena (size); +- if (__builtin_expect (a != NULL, 1)) +- return a; +- catomic_decrement(&narenas); ++ if (__builtin_expect (a == NULL, 0)) ++ catomic_decrement (&narenas); + } +- a = reused_arena (); ++ else ++ a = reused_arena (); + } + #else + if(!a_tsd) From f3164c2c09c755d3d63b13eedb4e2f01d4265645 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sun, 20 Nov 2011 21:32:39 -0700 Subject: [PATCH 11/15] + - Check malloc areana atomically + - Don't call reused_arena when _int_new_arena failed (#753601) --- glibc.spec | 47 ++++++++--------------------------------------- 1 file changed, 8 insertions(+), 39 deletions(-) diff --git a/glibc.spec b/glibc.spec index a2672fd..d77f8d4 100644 --- a/glibc.spec +++ b/glibc.spec @@ -28,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 18 +Release: 19 # 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 @@ -44,6 +44,7 @@ Patch0: %{name}-fedora.patch Patch1: %{name}-ia64-lib64.patch Patch2: %{name}-no-leaf-attribute.patch Patch3: %{name}-localegrouping.patch +Patch4: %{name}-arenalock.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: glibc-profile < 2.4 Obsoletes: nss_db @@ -264,6 +265,7 @@ rm -rf %{glibcportsdir} %endif %patch2 -p1 %patch3 -p1 +%patch4 -p1 # A lot of programs still misuse memcpy when they have to use # memmove. The memcpy implementation below is not tolerant at @@ -1116,50 +1118,17 @@ rm -f *.filelist* %endif %changelog +* Fri Nov 18 2011 Jeff Law - 2.14.90-19 + - Check malloc areana atomically + - Don't call reused_arena when _int_new_arena failed (#753601) + * Wed Nov 16 2011 Jeff Law - 2.14.90-18 - - Fix grouping and reuse other locales in various locales (#13147) + - Fix grouping and reuse other locales in various locales (BZ#13147) * Tue Nov 15 2011 Jeff Law - 2.14.90-17 Revert bogus commits/rebasing of Nov 14, Nov 11 and Nov 8. Sources should be equivalent to Fedora 16's initial release. -* Mon Nov 14 2011 Andreas Schwab - 2.14.90-16 -- Update from master - - Don't call reused_arena when _int_new_arena failed (#753601) - - Fix grouping and reuse other locales in various locales (BZ#13147) - -* Fri Nov 11 2011 Andreas Schwab - 2.14.90-15 -- Update from master - - Fix db makefile rule for group.db - - Mark setjmp and ucontext functions as non-leaf (#752905) - - Check malloc arana limit atomically - -* Tue Nov 8 2011 Andreas Schwab - 2.14.90-14 -- Update from master - - Fix locking in _IO_flush_all_lockp - - Fix buffer allocation in files initgroups handler (#750361) - - Don't start AVC thread until credentials are installed - - Don't fail in makedb if SELinux is disabled (#750858) - - New Linux syscalls process_vm_readv and process_vm_writev - - Unify getent output for initgroups database (BZ#13367) - - Cache network interface information - - Avoid assertion in processes with VM in bad shape (BZ#13276) - - Don't mark memory synchronisation functions as leaf (#747377, BZ#13344) - - Add missing register initialization in x86-64 - pthread_cond_timedwait (BZ#13358) - - Fix accuracy problem in generic sin (BZ#10709) - - Correctly NUL-terminate link name in sprof (BZ#13337) - - Fix readlink call in ldconfig's chroot handling (BZ#13335) - - Optimize accurate 64-bit routines for FMA4 on x86-64 - - Optimized remquo for 64-bit platforms - - Optimize fmod - - Add optimized wcslen and strnlen for x86-32 - - Optimized strnlen and wcscmp for x86-64 - - Improve x86-32 SSSE3 memcpy - - Preserve link time dependencies over relocation dependencies (BZ#12892) - - Optimize x86-64 rawmemchr - - Add optimized str{,n}casecmp for AVX on x86-64 - * Wed Oct 26 2011 Fedora Release Engineering - 2.14.90-15 - Rebuilt for glibc bug#747377 From 892715e90c622592445b0f2c7daa0fefbf6e5dce Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sun, 20 Nov 2011 21:34:14 -0700 Subject: [PATCH 12/15] Ignore exploded upstream tree as well as tarballs --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 318563b..38c1594 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /glibc-ports-2.14-25-gd3d9bde.tar.xz /glibc-2.14-394-g8f3b1ff-fedora.tar.xz /glibc-2.14-394-g8f3b1ff.tar.xz +glibc-2.14-394-g8f3b1ff From 33ba2101d3a319ceddf70002372e8cbfa6f73ed5 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 21 Nov 2011 10:41:19 -0700 Subject: [PATCH 13/15] Add upstream BZ # for -19 change --- glibc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glibc.spec b/glibc.spec index d77f8d4..c271f36 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1119,7 +1119,7 @@ rm -f *.filelist* %changelog * Fri Nov 18 2011 Jeff Law - 2.14.90-19 - - Check malloc areana atomically + - Check malloc areana atomically (BZ#13071) - Don't call reused_arena when _int_new_arena failed (#753601) * Wed Nov 16 2011 Jeff Law - 2.14.90-18 From a30509e2d1e116cb47b8206f565666dd82fae50e Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 21 Nov 2011 11:08:29 -0700 Subject: [PATCH 14/15] Fix typo in changelog --- glibc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glibc.spec b/glibc.spec index c271f36..1495e71 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1119,7 +1119,7 @@ rm -f *.filelist* %changelog * Fri Nov 18 2011 Jeff Law - 2.14.90-19 - - Check malloc areana atomically (BZ#13071) + - Check malloc arena atomically (BZ#13071) - Don't call reused_arena when _int_new_arena failed (#753601) * Wed Nov 16 2011 Jeff Law - 2.14.90-18 From 2716093f61830255202455c2551969f848791136 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 29 Nov 2011 11:23:08 -0700 Subject: [PATCH 15/15] + - Drop lock before calling malloc_printerr (#757881) --- glibc-rh757881.patch | 170 +++++++++++++++++++++++++++++++++++++++++++ glibc.spec | 7 +- 2 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 glibc-rh757881.patch diff --git a/glibc-rh757881.patch b/glibc-rh757881.patch new file mode 100644 index 0000000..0b41987 --- /dev/null +++ b/glibc-rh757881.patch @@ -0,0 +1,170 @@ +Index: glibc-2.12-2-gc4ccff1/malloc/arena.c +=================================================================== +--- glibc-2.12-2-gc4ccff1.orig/malloc/arena.c ++++ glibc-2.12-2-gc4ccff1/malloc/arena.c +@@ -870,7 +870,7 @@ heap_trim(heap, pad) heap_info *heap; si + heap = prev_heap; + if(!prev_inuse(p)) { /* consolidate backward */ + p = prev_chunk(p); +- unlink(p, bck, fwd); ++ unlink(ar_ptr, p, bck, fwd); + } + assert(((unsigned long)((char*)p + new_size) & (pagesz-1)) == 0); + assert( ((char*)p + new_size) == ((char*)heap + heap->size) ); +Index: glibc-2.12-2-gc4ccff1/malloc/hooks.c +=================================================================== +--- glibc-2.12-2-gc4ccff1.orig/malloc/hooks.c ++++ glibc-2.12-2-gc4ccff1/malloc/hooks.c +@@ -219,7 +219,9 @@ top_check() + (char*)t + chunksize(t) == mp_.sbrk_base + main_arena.system_mem))) + return 0; + ++ mutex_unlock(&main_arena); + malloc_printerr (check_action, "malloc: top chunk is corrupt", t); ++ mutex_lock(&main_arena); + + /* Try to set up a new top chunk. */ + brk = MORECORE(0); +Index: glibc-2.12-2-gc4ccff1/malloc/malloc.c +=================================================================== +--- glibc-2.12-2-gc4ccff1.orig/malloc/malloc.c ++++ glibc-2.12-2-gc4ccff1/malloc/malloc.c +@@ -1541,12 +1541,14 @@ + #define last(b) ((b)->bk) + + /* Take a chunk off a bin list */ +-#define unlink(P, BK, FD) { \ ++#define unlink(AV, P, BK, FD) { \ + FD = P->fd; \ + BK = P->bk; \ +- if (__builtin_expect (FD->bk != P || BK->fd != P, 0)) \ ++ if (__builtin_expect (FD->bk != P || BK->fd != P, 0)) { \ ++ mutex_unlock(&(AV)->mutex); \ + malloc_printerr (check_action, "corrupted double-linked list", P); \ +- else { \ ++ mutex_lock(&(AV)->mutex); \ ++ } else { \ + FD->bk = BK; \ + BK->fd = FD; \ + if (!in_smallbin_range (P->size) \ +@@ -2593,7 +2595,9 @@ + + else if (contiguous(av) && old_size && brk < old_end) { + /* Oops! Someone else killed our space.. Can't touch anything. */ ++ mutex_unlock(&av->mutex); + malloc_printerr (3, "break adjusted to free malloc space", brk); ++ mutex_lock(&av->mutex); + } + + /* +@@ -3467,7 +3471,9 @@ + { + errstr = "malloc(): memory corruption (fast)"; + errout: ++ mutex_unlock(&av->mutex); + malloc_printerr (check_action, errstr, chunk2mem (victim)); ++ mutex_lock(&av->mutex); + return NULL; + } + check_remalloced_chunk(av, victim, nb); +@@ -3552,8 +3558,12 @@ + bck = victim->bk; + if (__builtin_expect (victim->size <= 2 * SIZE_SZ, 0) + || __builtin_expect (victim->size > av->system_mem, 0)) +- malloc_printerr (check_action, "malloc(): memory corruption", +- chunk2mem (victim)); ++ { ++ void *p = chunk2mem(victim); ++ mutex_unlock(&av->mutex); ++ malloc_printerr (check_action, "malloc(): memory corruption", p); ++ mutex_lock(&av->mutex); ++ } + size = chunksize(victim); + + /* +@@ -3694,7 +3704,7 @@ + victim = victim->fd; + + remainder_size = size - nb; +- unlink(victim, bck, fwd); ++ unlink(av, victim, bck, fwd); + + /* Exhaust */ + if (remainder_size < MINSIZE) { +@@ -3792,7 +3802,7 @@ + remainder_size = size - nb; + + /* unlink */ +- unlink(victim, bck, fwd); ++ unlink(av, victim, bck, fwd); + + /* Exhaust */ + if (remainder_size < MINSIZE) { +@@ -3927,9 +3937,11 @@ + { + errstr = "free(): invalid pointer"; + errout: +- if (! have_lock && locked) ++ if (have_lock || locked) + (void)mutex_unlock(&av->mutex); + malloc_printerr (check_action, errstr, chunk2mem(p)); ++ if (have_lock) ++ mutex_lock(&av->mutex); + return; + } + /* We know that each chunk is at least MINSIZE bytes in size. */ +@@ -4073,7 +4085,7 @@ + prevsize = p->prev_size; + size += prevsize; + p = chunk_at_offset(p, -((long) prevsize)); +- unlink(p, bck, fwd); ++ unlink(av, p, bck, fwd); + } + + if (nextchunk != av->top) { +@@ -4082,7 +4094,7 @@ + + /* consolidate forward */ + if (!nextinuse) { +- unlink(nextchunk, bck, fwd); ++ unlink(av, nextchunk, bck, fwd); + size += nextsize; + } else + clear_inuse_bit_at_offset(nextchunk, 0); +@@ -4243,7 +4255,7 @@ + prevsize = p->prev_size; + size += prevsize; + p = chunk_at_offset(p, -((long) prevsize)); +- unlink(p, bck, fwd); ++ unlink(av, p, bck, fwd); + } + + if (nextchunk != av->top) { +@@ -4251,7 +4263,7 @@ + + if (!nextinuse) { + size += nextsize; +- unlink(nextchunk, bck, fwd); ++ unlink(av, nextchunk, bck, fwd); + } else + clear_inuse_bit_at_offset(nextchunk, 0); + +@@ -4320,7 +4332,9 @@ + { + errstr = "realloc(): invalid old size"; + errout: ++ mutex_unlock(&av->mutex); + malloc_printerr (check_action, errstr, chunk2mem(oldp)); ++ mutex_lock(&av->mutex); + return NULL; + } + +@@ -4362,7 +4376,7 @@ + (unsigned long)(newsize = oldsize + nextsize) >= + (unsigned long)(nb)) { + newp = oldp; +- unlink(next, bck, fwd); ++ unlink(av, next, bck, fwd); + } + + /* allocate, copy, free */ diff --git a/glibc.spec b/glibc.spec index 1495e71..fee2558 100644 --- a/glibc.spec +++ b/glibc.spec @@ -28,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 19 +Release: 20 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -45,6 +45,7 @@ Patch1: %{name}-ia64-lib64.patch Patch2: %{name}-no-leaf-attribute.patch Patch3: %{name}-localegrouping.patch Patch4: %{name}-arenalock.patch +Patch5: %{name}-rh757881.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: glibc-profile < 2.4 Obsoletes: nss_db @@ -266,6 +267,7 @@ rm -rf %{glibcportsdir} %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 # A lot of programs still misuse memcpy when they have to use # memmove. The memcpy implementation below is not tolerant at @@ -1118,6 +1120,9 @@ rm -f *.filelist* %endif %changelog +* Mon Nov 28 2011 Jeff Law - 2.14.90-20 + - Drop lock before calling malloc_printerr (#757881) + * Fri Nov 18 2011 Jeff Law - 2.14.90-19 - Check malloc arena atomically (BZ#13071) - Don't call reused_arena when _int_new_arena failed (#753601)