From f79eb1f5028c97ae3735e7264b703885ca696bfb Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 20 Dec 2011 05:46:44 +0000 Subject: [PATCH] - Update from master (a4647e7). --- .gitignore | 3 + glibc-arenalock.patch | 146 --- glibc-fdelt.patch | 33 - glibc-fedora.patch | 1062 ++++++++++++--------- glibc-localegrouping.patch | 1660 --------------------------------- glibc-no-leaf-attribute.patch | 49 - glibc-rh552960.patch | 226 ----- glibc-rh708455.patch | 13 - glibc-rh750811.patch | 29 - glibc-rh750858.patch | 35 - glibc-rh757887.patch | 242 ----- glibc-rh758252.patch | 45 - glibc-rh767696.patch | 82 -- glibc-rh767746.patch | 14 - glibc.spec | 44 +- sources | 6 +- 16 files changed, 616 insertions(+), 3073 deletions(-) delete mode 100644 glibc-arenalock.patch delete mode 100644 glibc-fdelt.patch delete mode 100644 glibc-localegrouping.patch delete mode 100644 glibc-no-leaf-attribute.patch delete mode 100644 glibc-rh552960.patch delete mode 100644 glibc-rh708455.patch delete mode 100644 glibc-rh750811.patch delete mode 100644 glibc-rh750858.patch delete mode 100644 glibc-rh757887.patch delete mode 100644 glibc-rh758252.patch delete mode 100644 glibc-rh767696.patch delete mode 100644 glibc-rh767746.patch diff --git a/.gitignore b/.gitignore index 38c1594..8b28c6e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ /glibc-2.14-394-g8f3b1ff-fedora.tar.xz /glibc-2.14-394-g8f3b1ff.tar.xz glibc-2.14-394-g8f3b1ff +/glibc-2.14-a4647e7-fedora.tar.gz +/glibc-2.14-a4647e7.tar.gz +/glibc-ports-2.14-4a93ed4.tar.gz diff --git a/glibc-arenalock.patch b/glibc-arenalock.patch deleted file mode 100644 index 56ea56d..0000000 --- a/glibc-arenalock.patch +++ /dev/null @@ -1,146 +0,0 @@ -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) diff --git a/glibc-fdelt.patch b/glibc-fdelt.patch deleted file mode 100644 index 4b26722..0000000 --- a/glibc-fdelt.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit d4cc29a254db6bd3838aac79d9d0e91cfd467c9d -Author: Andreas Schwab -Date: Fri Dec 2 11:34:28 2011 +0100 - - Mark fortified __FD_ELT as extension - -diff --git a/ChangeLog b/ChangeLog -index dddb628..e512bbb 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,8 @@ -+2011-12-02 Andreas Schwab -+ -+ * misc/bits/select2.h (__FD_ELT): Mark as extension. Add -+ parenthesis. -+ - 2011-11-29 Andreas Schwab - - * locale/weight.h (findidx): Add parameter len. -diff --git a/misc/bits/select2.h b/misc/bits/select2.h -index 37c4827..a7ce1b4 100644 ---- a/misc/bits/select2.h -+++ b/misc/bits/select2.h -@@ -27,7 +27,8 @@ extern unsigned long int __fdelt_warn (unsigned long int __d) - __warnattr ("bit outside of fd_set selected"); - #undef __FD_ELT - #define __FD_ELT(d) \ -- ({ unsigned long int __d = d; \ -+ __extension__ \ -+ ({ unsigned long int __d = (d); \ - (__builtin_constant_p (__d) \ - ? (__d >= __FD_SETSIZE \ - ? __fdelt_warn (__d) : (__d / __NFDBITS)) \ diff --git a/glibc-fedora.patch b/glibc-fedora.patch index af6a2a4..807a6bb 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,7 @@ ---- glibc-2.14-394-g8f3b1ff/ChangeLog -+++ glibc-2.14.90-13/ChangeLog -@@ -1312,6 +1312,11 @@ +diff -ru a/ChangeLog b/ChangeLog +--- a/ChangeLog 2011-12-12 14:10:51.000000000 -0700 ++++ b/ChangeLog 2011-12-12 14:23:04.769739117 -0700 +@@ -2255,6 +2255,11 @@ * sysdeps/mach/hurd/sys/param.h (DEV_BSIZE): New macro. @@ -12,7 +13,7 @@ 2011-09-08 Andreas Schwab * elf/dl-load.c (lose): Check for non-null L. -@@ -1574,6 +1579,15 @@ +@@ -2517,6 +2522,15 @@ * sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi directive. @@ -28,7 +29,7 @@ 2011-08-24 David S. Miller * sysdeps/sparc/sparc64/strcmp.S: Rewrite. -@@ -2379,6 +2393,14 @@ +@@ -3322,6 +3336,14 @@ * config.make.in: Likewise. * malloc/Makefile: Likewise. @@ -43,7 +44,7 @@ 2011-06-27 Andreas Schwab * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP -@@ -2510,6 +2532,10 @@ +@@ -3453,6 +3475,10 @@ * inet/getnetgrent_r.c: Use DL_CALL_FCT in several places. @@ -54,7 +55,7 @@ 2011-06-20 David S. Miller * sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple -@@ -3132,6 +3158,13 @@ +@@ -4075,6 +4101,13 @@ * libio/Makefile (tests): Add bug-fclose1. * libio/bug-fclose1.c: New file. @@ -68,7 +69,7 @@ 2011-05-12 Ulrich Drepper [BZ #12511] -@@ -3409,13 +3442,6 @@ +@@ -4352,13 +4385,6 @@ * stdlib/bug-getcontext.c: New file. * stdlib/Makefile: Add rules to build and run bug-getcontext. @@ -82,7 +83,7 @@ 2011-04-11 Andreas Krebbel * sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes -@@ -3653,6 +3679,31 @@ +@@ -4596,6 +4622,31 @@ * sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime): Export. @@ -114,7 +115,7 @@ 2011-03-22 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment -@@ -3713,6 +3764,16 @@ +@@ -4656,6 +4707,16 @@ $LDFLAGS and -nostdlib -nostartfiles to linking step. Change main to _start. @@ -131,7 +132,7 @@ 2011-03-06 Ulrich Drepper * elf/dl-load.c (_dl_map_object): If we are looking for the first -@@ -3929,6 +3990,12 @@ +@@ -4872,6 +4933,12 @@ * shadow/sgetspent.c: Check return value of __sgetspent_r instead of errno. @@ -144,7 +145,7 @@ 2011-01-19 Ulrich Drepper [BZ #11724] -@@ -4616,6 +4683,26 @@ +@@ -5559,6 +5626,26 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid. @@ -171,7 +172,7 @@ 2010-09-24 Petr Baudis * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -5408,6 +5495,17 @@ +@@ -6351,6 +6438,17 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -189,7 +190,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -5460,6 +5558,21 @@ +@@ -6403,6 +6501,21 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -211,8 +212,9 @@ 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 +diff -ru a/ChangeLog.15 b/ChangeLog.15 +--- a/ChangeLog.15 2011-12-12 14:10:51.000000000 -0700 ++++ b/ChangeLog.15 2011-12-12 14:23:04.773739117 -0700 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -278,8 +280,9 @@ 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 +diff -ru a/ChangeLog.16 b/ChangeLog.16 +--- a/ChangeLog.16 2011-12-12 14:10:51.000000000 -0700 ++++ b/ChangeLog.16 2011-12-12 14:23:04.776739115 -0700 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -302,8 +305,9 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . ---- glibc-2.14-394-g8f3b1ff/ChangeLog.17 -+++ glibc-2.14.90-13/ChangeLog.17 +diff -ru a/ChangeLog.17 b/ChangeLog.17 +--- a/ChangeLog.17 2011-12-12 14:10:51.000000000 -0700 ++++ b/ChangeLog.17 2011-12-12 14:23:04.780739116 -0700 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -317,7 +321,7 @@ 2010-04-05 Thomas Schwinge * sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/. -@@ -2953,6 +2959,11 @@ d2009-10-30 Ulrich Drepper +@@ -2953,6 +2959,11 @@ * sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in the unique symbol hash table should not be const. @@ -329,7 +333,7 @@ 2009-07-21 Ulrich Drepper * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -3218,6 +3229,11 @@ d2009-10-30 Ulrich Drepper +@@ -3218,6 +3229,11 @@ out common code into new function get_common_indeces. Determine extended family and model for Intel processors. @@ -341,7 +345,7 @@ 2009-06-26 Ulrich Drepper * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -11818,6 +11834,10 @@ d2009-10-30 Ulrich Drepper +@@ -11818,6 +11834,10 @@ [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -352,7 +356,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -13075,6 +13095,15 @@ d2009-10-30 Ulrich Drepper +@@ -13075,6 +13095,15 @@ separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -368,9 +372,10 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.14-394-g8f3b1ff/Makeconfig -+++ glibc-2.14.90-13/Makeconfig -@@ -803,12 +803,12 @@ endif +diff -ru a/Makeconfig b/Makeconfig +--- a/Makeconfig 2011-12-12 14:10:51.000000000 -0700 ++++ b/Makeconfig 2011-12-12 14:23:04.781739116 -0700 +@@ -803,12 +803,12 @@ # The assembler can generate debug information too. ifndef ASFLAGS ifeq ($(have-cpp-asm-debuginfo),yes) @@ -386,9 +391,10 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.14-394-g8f3b1ff/NEWS -+++ glibc-2.14.90-13/NEWS -@@ -63,16 +63,6 @@ Version 2.14 +diff -ru a/NEWS b/NEWS +--- a/NEWS 2011-12-12 14:10:51.000000000 -0700 ++++ b/NEWS 2011-12-12 14:23:04.782739116 -0700 +@@ -75,16 +75,6 @@ 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, 12795, 12811, 12813, 12814, 12841 @@ -405,9 +411,10 @@ * 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 -@@ -184,6 +184,9 @@ +diff -ru a/config.h.in b/config.h.in +--- a/config.h.in 2011-12-12 14:10:52.000000000 -0700 ++++ b/config.h.in 2011-12-12 14:23:04.783739116 -0700 +@@ -187,6 +187,9 @@ /* Define if `.ctors' and `.dtors' sections shouldn't be used. */ #undef NO_CTORS_DTORS_SECTIONS @@ -417,9 +424,10 @@ /* */ ---- glibc-2.14-394-g8f3b1ff/configure -+++ glibc-2.14.90-13/configure -@@ -791,6 +791,7 @@ enable_kernel +diff -ru a/configure b/configure +--- a/configure 2011-12-12 14:10:52.000000000 -0700 ++++ b/configure 2011-12-12 14:23:04.785739116 -0700 +@@ -791,6 +791,7 @@ enable_all_warnings enable_multi_arch enable_nss_crypt @@ -427,7 +435,7 @@ with_cpu ' ac_precious_vars='build_alias -@@ -1450,6 +1451,7 @@ Optional Features: +@@ -1450,6 +1451,7 @@ --enable-multi-arch enable single DSO with optimizations for multiple architectures --enable-nss-crypt enable libcrypt to use nss @@ -435,7 +443,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -3804,6 +3806,51 @@ else +@@ -3804,6 +3806,51 @@ fi @@ -487,9 +495,10 @@ # 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 -@@ -291,6 +291,29 @@ else +diff -ru a/configure.in b/configure.in +--- a/configure.in 2011-12-12 14:10:52.000000000 -0700 ++++ b/configure.in 2011-12-12 14:23:04.786739116 -0700 +@@ -290,6 +290,29 @@ fi AC_SUBST(libc_cv_nss_crypt) @@ -519,9 +528,10 @@ # 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 -@@ -93,7 +93,8 @@ omit-deps += $(crtstuff) +diff -ru a/csu/Makefile b/csu/Makefile +--- a/csu/Makefile 2011-12-12 14:10:52.000000000 -0700 ++++ b/csu/Makefile 2011-12-12 14:23:04.786739116 -0700 +@@ -93,7 +93,8 @@ $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -531,9 +541,10 @@ vpath initfini.c $(sysdirs) ---- 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 **) +diff -ru a/csu/elf-init.c b/csu/elf-init.c +--- a/csu/elf-init.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/csu/elf-init.c 2011-12-12 14:23:04.787739116 -0700 +@@ -64,6 +64,23 @@ extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -557,8 +568,9 @@ /* 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 +diff -ru a/debug/tst-chk1.c b/debug/tst-chk1.c +--- a/debug/tst-chk1.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/debug/tst-chk1.c 2011-12-12 14:23:04.787739116 -0700 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -569,7 +581,7 @@ #include #include #include -@@ -243,7 +246,7 @@ do_test (void) +@@ -243,7 +246,7 @@ if (memcmp (a.buf1, "aabcdabcjj", 10)) FAIL (); @@ -578,7 +590,7 @@ /* The following tests are supposed to crash with -D_FORTIFY_SOURCE=2 and sufficient GCC support, as the string operations overflow from a.buf1 into a.buf2. */ -@@ -358,7 +361,7 @@ do_test (void) +@@ -358,7 +361,7 @@ memset (a.buf1 + 9, 'j', l0 + 2); CHK_FAIL_END @@ -587,9 +599,10 @@ # define O 0 # else # define O 1 ---- glibc-2.14-394-g8f3b1ff/elf/Makefile -+++ glibc-2.14.90-13/elf/Makefile -@@ -135,6 +135,7 @@ include ../Makeconfig +diff -ru a/elf/Makefile b/elf/Makefile +--- a/elf/Makefile 2011-12-12 14:10:52.000000000 -0700 ++++ b/elf/Makefile 2011-12-12 14:23:04.788739116 -0700 +@@ -135,6 +135,7 @@ ifeq ($(unwind-find-fde),yes) routines += unwind-dw2-fde-glibc shared-only-routines += unwind-dw2-fde-glibc @@ -597,7 +610,7 @@ endif before-compile = $(objpfx)trusted-dirs.h -@@ -505,7 +506,8 @@ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ +@@ -505,7 +506,8 @@ CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) CFLAGS-cache.c = $(SYSCONF-FLAGS) @@ -607,9 +620,10 @@ 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 -@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) +diff -ru a/elf/dl-close.c b/elf/dl-close.c +--- a/elf/dl-close.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/elf/dl-close.c 2011-12-12 14:23:04.789739116 -0700 +@@ -119,17 +119,8 @@ if (map->l_direct_opencount > 0 || map->l_type != lt_loaded || dl_close_state != not_pending) { @@ -629,9 +643,10 @@ /* 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, +diff -ru a/elf/dl-deps.c b/elf/dl-deps.c +--- a/elf/dl-deps.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/elf/dl-deps.c 2011-12-12 14:23:04.789739116 -0700 +@@ -489,6 +489,7 @@ nneeded * sizeof needed[0]); atomic_write_barrier (); l->l_initfini = l_initfini; @@ -639,7 +654,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 @@ l_initfini[nlist] = NULL; atomic_write_barrier (); map->l_initfini = l_initfini; @@ -647,7 +662,7 @@ if (l_reldeps != NULL) { atomic_write_barrier (); -@@ -686,7 +688,7 @@ Filters not supported with LD_TRACE_PRELINKING")); +@@ -697,7 +699,7 @@ _dl_scope_free (old_l_reldeps); } if (old_l_initfini != NULL) @@ -656,8 +671,9 @@ 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 +diff -ru a/elf/dl-init.c b/elf/dl-init.c +--- a/elf/dl-init.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/elf/dl-init.c 2011-12-12 14:23:04.790739116 -0700 @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -670,7 +686,7 @@ static void -@@ -133,9 +131,7 @@ _dl_init (struct link_map *main_map, int argc, char **argv, char **env) +@@ -133,9 +131,7 @@ while (i-- > 0) call_init (main_map->l_initfini[i], argc, argv, env); @@ -680,9 +696,10 @@ -#endif } INTDEF (_dl_init) ---- 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) +diff -ru a/elf/dl-libc.c b/elf/dl-libc.c +--- a/elf/dl-libc.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/elf/dl-libc.c 2011-12-12 14:23:04.790739116 -0700 +@@ -270,13 +270,13 @@ for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) { @@ -697,7 +714,7 @@ while (lnp != NULL) { struct libname_list *old = lnp; -@@ -284,6 +284,10 @@ libc_freeres_fn (free_mem) +@@ -284,6 +284,10 @@ if (! old->dont_free) free (old); } @@ -708,9 +725,10 @@ } 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 -@@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len) +diff -ru a/elf/dl-load.c b/elf/dl-load.c +--- a/elf/dl-load.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/elf/dl-load.c 2011-12-12 14:23:04.791739116 -0700 +@@ -250,8 +250,7 @@ static size_t @@ -720,7 +738,7 @@ { size_t len; bool is_curly = false; -@@ -280,12 +279,6 @@ is_dst (const char *start, const char *name, const char *str, +@@ -280,12 +279,6 @@ && (!is_path || name[len] != ':')) return 0; @@ -733,7 +751,7 @@ return len; } -@@ -300,13 +293,10 @@ _dl_dst_count (const char *name, int is_path) +@@ -300,13 +293,10 @@ { size_t len; @@ -750,7 +768,7 @@ ++cnt; name = strchr (name + len, '$'); -@@ -339,9 +329,16 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, +@@ -339,9 +329,16 @@ size_t len; ++name; @@ -769,7 +787,7 @@ #ifndef SHARED if (l == NULL) repl = _dl_get_origin (); -@@ -352,9 +349,9 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, +@@ -352,9 +349,9 @@ check_for_trusted = (INTUSE(__libc_enable_secure) && l->l_type == lt_executable); } @@ -781,7 +799,7 @@ repl = DL_DST_LIB; if (repl != NULL && repl != (const char *) -1) -@@ -374,6 +371,7 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, +@@ -374,6 +371,7 @@ element, but keep an empty element at the end. */ if (wp == result && is_path && *name == ':' && name[1] != '\0') ++name; @@ -789,9 +807,10 @@ } else /* No DST we recognize. */ ---- 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; +diff -ru a/elf/dl-support.c b/elf/dl-support.c +--- a/elf/dl-support.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/elf/dl-support.c 2011-12-12 14:23:04.792739116 -0700 +@@ -82,10 +82,8 @@ create a fake scope containing nothing. */ struct r_scope_elem _dl_initial_searchlist; @@ -802,9 +821,10 @@ /* 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 -@@ -1034,17 +1034,19 @@ search_dirs (void) +diff -ru a/elf/ldconfig.c b/elf/ldconfig.c +--- a/elf/ldconfig.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/elf/ldconfig.c 2011-12-12 14:23:04.792739116 -0700 +@@ -1034,17 +1034,19 @@ static void parse_conf_include (const char *config_file, unsigned int lineno, @@ -826,7 +846,7 @@ if (do_chroot && opt_chroot) { -@@ -1105,7 +1107,14 @@ parse_conf (const char *filename, bool do_chroot) +@@ -1105,7 +1107,14 @@ cp += 8; while ((dir = strsep (&cp, " \t")) != NULL) if (dir[0] != '\0') @@ -842,7 +862,7 @@ } else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5])) { -@@ -1168,7 +1177,7 @@ parse_conf (const char *filename, bool do_chroot) +@@ -1168,7 +1177,7 @@ config files to read. */ static void parse_conf_include (const char *config_file, unsigned int lineno, @@ -851,7 +871,7 @@ { if (opt_chroot && pattern[0] != '/') error (EXIT_FAILURE, 0, -@@ -1200,7 +1209,7 @@ parse_conf_include (const char *config_file, unsigned int lineno, +@@ -1200,7 +1209,7 @@ { case 0: for (size_t i = 0; i < gl.gl_pathc; ++i) @@ -860,7 +880,7 @@ globfree64 (&gl); break; -@@ -1243,6 +1252,8 @@ main (int argc, char **argv) +@@ -1243,6 +1252,8 @@ /* Set the text message domain. */ textdomain (_libc_intl_domainname); @@ -869,7 +889,7 @@ /* Parse and process arguments. */ int remaining; argp_parse (&argp, argc, argv, 0, &remaining, NULL); -@@ -1352,12 +1363,14 @@ main (int argc, char **argv) +@@ -1352,12 +1363,14 @@ if (!opt_only_cline) { @@ -885,9 +905,10 @@ } 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 -@@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2 +diff -ru a/elf/ldd.bash.in b/elf/ldd.bash.in +--- a/elf/ldd.bash.in 2011-12-12 14:10:52.000000000 -0700 ++++ b/elf/ldd.bash.in 2011-12-12 14:23:04.793739116 -0700 +@@ -167,18 +167,6 @@ fi done case $ret in @@ -906,7 +927,7 @@ 1) # This can be a non-ELF binary or no binary at all. nonelf "$file" || { -@@ -186,7 +174,7 @@ warning: you do not have execution permission for" "\`$file'" >&2 +@@ -186,7 +174,7 @@ result=1 } ;; @@ -915,8 +936,9 @@ try_trace "$RTLD" "$file" || result=1 ;; *) ---- glibc-2.14-394-g8f3b1ff/elf/rtld-Rules -+++ glibc-2.14.90-13/elf/rtld-Rules +diff -ru a/elf/rtld-Rules b/elf/rtld-Rules +--- a/elf/rtld-Rules 2011-12-12 14:10:52.000000000 -0700 ++++ b/elf/rtld-Rules 2011-12-12 14:23:04.793739116 -0700 @@ -1,7 +1,7 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker. @@ -926,7 +948,7 @@ # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or -@@ -131,6 +131,6 @@ ifdef rtld-depfiles +@@ -131,6 +131,6 @@ endif # This here is the whole point of all the shenanigans. @@ -934,9 +956,10 @@ +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 -@@ -107,7 +107,6 @@ static struct audit_list +diff -ru a/elf/rtld.c b/elf/rtld.c +--- a/elf/rtld.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/elf/rtld.c 2011-12-12 14:23:04.794739116 -0700 +@@ -107,7 +107,6 @@ struct audit_list *next; } *audit_list; @@ -944,7 +967,7 @@ /* Set nonzero during loading and initialization of executable and libraries, cleared before the executable's entry point runs. This must not be initialized to nonzero, because the unused dynamic -@@ -117,7 +116,6 @@ static struct audit_list +@@ -117,7 +116,6 @@ never be called. */ int _dl_starting_up = 0; INTVARDEF(_dl_starting_up) @@ -952,7 +975,7 @@ /* This is the structure which defines all variables global to ld.so (except those which cannot be added for some reason). */ -@@ -929,10 +927,8 @@ dl_main (const ElfW(Phdr) *phdr, +@@ -929,10 +927,8 @@ /* Process the environment variable which control the behaviour. */ process_envvars (&mode); @@ -963,7 +986,7 @@ if (*user_entry == (ElfW(Addr)) ENTRY_POINT) { -@@ -1397,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\ +@@ -1397,7 +1393,9 @@ char *copy = malloc (len); if (copy == NULL) _dl_fatal_printf ("out of memory\n"); @@ -974,7 +997,7 @@ } /* Add the vDSO to the object list. */ -@@ -2276,6 +2274,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", +@@ -2276,6 +2274,7 @@ lnp->dont_free = 1; lnp = lnp->next; } @@ -982,7 +1005,7 @@ if (l != &GL(dl_rtld_map)) _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, -@@ -2327,7 +2326,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", +@@ -2327,7 +2326,6 @@ /* Make sure no new search directories have been added. */ assert (GLRO(dl_init_all_dirs) == GL(dl_all_dirs)); @@ -990,9 +1013,10 @@ 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 -@@ -101,4 +101,4 @@ ifneq (,$(cpp-srcs-left)) +diff -ru a/extra-lib.mk b/extra-lib.mk +--- a/extra-lib.mk 2011-12-12 14:10:52.000000000 -0700 ++++ b/extra-lib.mk 2011-12-12 14:23:04.795739115 -0700 +@@ -101,4 +101,4 @@ include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) endif @@ -1006,8 +1030,9 @@ +++ glibc-2.14.90-13/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 +diff -ru a/include/features.h b/include/features.h +--- a/include/features.h 2011-12-12 14:10:52.000000000 -0700 ++++ b/include/features.h 2011-12-12 14:23:04.796739115 -0700 @@ -310,8 +310,13 @@ #endif @@ -1024,9 +1049,10 @@ # 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 -@@ -626,7 +626,7 @@ for linking") +diff -ru a/include/libc-symbols.h b/include/libc-symbols.h +--- a/include/libc-symbols.h 2011-12-12 14:10:52.000000000 -0700 ++++ b/include/libc-symbols.h 2011-12-12 14:23:04.796739115 -0700 +@@ -626,7 +626,7 @@ # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libc_hidden_def(name) hidden_def (name) # define libc_hidden_weak(name) hidden_weak (name) @@ -1035,8 +1061,9 @@ # 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 +diff -ru a/include/link.h b/include/link.h +--- a/include/link.h 2011-12-12 14:10:52.000000000 -0700 ++++ b/include/link.h 2011-12-12 14:23:04.797739114 -0700 @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. @@ -1045,7 +1072,7 @@ This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or -@@ -192,6 +192,9 @@ struct link_map +@@ -192,6 +192,9 @@ during LD_TRACE_PRELINKING=1 contains any DT_SYMBOLIC libraries. */ @@ -1055,7 +1082,7 @@ /* Collected information about own RPATH directories. */ struct r_search_path_struct l_rpath_dirs; -@@ -240,9 +243,6 @@ struct link_map +@@ -240,9 +243,6 @@ /* List of object in order of the init and fini calls. */ struct link_map **l_initfini; @@ -1065,7 +1092,7 @@ /* List of the dependencies introduced through symbol binding. */ struct link_map_reldeps -@@ -290,7 +290,7 @@ struct link_map +@@ -290,7 +290,7 @@ #endif #ifndef FORCED_DYNAMIC_TLS_OFFSET # if NO_TLS_OFFSET == 0 @@ -1217,17 +1244,19 @@ +#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 -@@ -13,4 +13,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage) +diff -ru a/include/sys/resource.h b/include/sys/resource.h +--- a/include/sys/resource.h 2011-12-12 14:10:52.000000000 -0700 ++++ b/include/sys/resource.h 2011-12-12 14:23:04.798739113 -0700 +@@ -13,4 +13,5 @@ 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 -@@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ +diff -ru a/inet/Makefile b/inet/Makefile +--- a/inet/Makefile 2011-12-12 14:10:52.000000000 -0700 ++++ b/inet/Makefile 2011-12-12 14:23:04.798739113 -0700 +@@ -57,6 +57,8 @@ include ../Rules @@ -1236,9 +1265,10 @@ 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 -@@ -57,8 +57,6 @@ korean ko_KR.eucKR +diff -ru a/intl/locale.alias b/intl/locale.alias +--- a/intl/locale.alias 2011-12-12 14:10:52.000000000 -0700 ++++ b/intl/locale.alias 2011-12-12 14:23:04.798739113 -0700 +@@ -57,8 +57,6 @@ korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR lithuanian lt_LT.ISO-8859-13 @@ -1247,9 +1277,10 @@ 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 -@@ -169,10 +169,12 @@ typedef _G_fpos64_t fpos64_t; +diff -ru a/libio/stdio.h b/libio/stdio.h +--- a/libio/stdio.h 2011-12-12 14:10:52.000000000 -0700 ++++ b/libio/stdio.h 2011-12-12 14:23:04.799739113 -0700 +@@ -169,10 +169,12 @@ extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ extern struct _IO_FILE *stderr; /* Standard error output stream. */ @@ -1262,8 +1293,9 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.14-394-g8f3b1ff/locale/iso-4217.def -+++ glibc-2.14.90-13/locale/iso-4217.def +diff -ru a/locale/iso-4217.def b/locale/iso-4217.def +--- a/locale/iso-4217.def 2011-12-12 14:10:52.000000000 -0700 ++++ b/locale/iso-4217.def 2011-12-12 14:23:04.800739114 -0700 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1272,7 +1304,7 @@ DEFINE_INT_CURR("AED") /* United Arab Emirates Dirham */ DEFINE_INT_CURR("AFN") /* Afghanistan Afgani */ DEFINE_INT_CURR("ALL") /* Albanian Lek */ -@@ -15,12 +16,14 @@ DEFINE_INT_CURR("AMD") /* Armenia Dram */ +@@ -15,12 +16,14 @@ DEFINE_INT_CURR("ANG") /* Netherlands Antilles */ DEFINE_INT_CURR("AOA") /* Angolan Kwanza */ DEFINE_INT_CURR("ARS") /* Argentine Peso */ @@ -1287,7 +1319,7 @@ DEFINE_INT_CURR("BGN") /* Bulgarian Lev */ DEFINE_INT_CURR("BHD") /* Bahraini Dinar */ DEFINE_INT_CURR("BIF") /* Burundi Franc */ -@@ -44,6 +47,7 @@ DEFINE_INT_CURR("CUP") /* Cuban Peso */ +@@ -44,6 +47,7 @@ DEFINE_INT_CURR("CVE") /* Cape Verde Escudo */ DEFINE_INT_CURR("CYP") /* Cypriot Pound */ DEFINE_INT_CURR("CZK") /* Czech Koruna */ @@ -1295,7 +1327,7 @@ DEFINE_INT_CURR("DJF") /* Djibouti Franc */ DEFINE_INT_CURR("DKK") /* Danish Krone (Faroe Islands, Greenland) */ DEFINE_INT_CURR("DOP") /* Dominican Republic */ -@@ -51,16 +55,20 @@ DEFINE_INT_CURR("DZD") /* Algerian Dinar */ +@@ -51,16 +55,20 @@ DEFINE_INT_CURR("EEK") /* Estonian Kroon */ DEFINE_INT_CURR("EGP") /* Egyptian Pound */ DEFINE_INT_CURR("ERN") /* Eritrean Nakfa */ @@ -1316,7 +1348,7 @@ DEFINE_INT_CURR("GTQ") /* Guatemala Quetzal */ DEFINE_INT_CURR("GYD") /* Guyana Dollar */ DEFINE_INT_CURR("HKD") /* Hong Kong Dollar */ -@@ -69,12 +77,14 @@ DEFINE_INT_CURR("HRK") /* Croatia Kuna */ +@@ -69,12 +77,14 @@ DEFINE_INT_CURR("HTG") /* Haiti Gourde */ DEFINE_INT_CURR("HUF") /* Hungarian Forint */ DEFINE_INT_CURR("IDR") /* Indonesia Rupiah */ @@ -1331,7 +1363,7 @@ DEFINE_INT_CURR("JEP") /* Jersey Pound */ DEFINE_INT_CURR("JMD") /* Jamaican Dollar */ DEFINE_INT_CURR("JOD") /* Jordanian Dinar */ -@@ -94,6 +104,7 @@ DEFINE_INT_CURR("LKR") /* Sri Lankan Rupee */ +@@ -94,6 +104,7 @@ DEFINE_INT_CURR("LRD") /* Liberian Dollar */ DEFINE_INT_CURR("LSL") /* Lesotho Maloti */ DEFINE_INT_CURR("LTL") /* Lithuanian Litas */ @@ -1339,7 +1371,7 @@ DEFINE_INT_CURR("LVL") /* Latvia Lat */ DEFINE_INT_CURR("LYD") /* Libyan Arab Jamahiriya Dinar */ DEFINE_INT_CURR("MAD") /* Moroccan Dirham */ -@@ -114,6 +125,7 @@ DEFINE_INT_CURR("MZM") /* Mozambique Metical */ +@@ -114,6 +125,7 @@ DEFINE_INT_CURR("NAD") /* Namibia Dollar */ DEFINE_INT_CURR("NGN") /* Nigeria Naira */ DEFINE_INT_CURR("NIO") /* Nicaragua Cordoba Oro */ @@ -1347,7 +1379,7 @@ DEFINE_INT_CURR("NOK") /* Norwegian Krone */ DEFINE_INT_CURR("NPR") /* Nepalese Rupee */ DEFINE_INT_CURR("NZD") /* New Zealand Dollar */ -@@ -124,6 +136,7 @@ DEFINE_INT_CURR("PGK") /* Papau New Guinea Kina */ +@@ -124,6 +136,7 @@ DEFINE_INT_CURR("PHP") /* Philippines Peso */ DEFINE_INT_CURR("PKR") /* Pakistan Rupee */ DEFINE_INT_CURR("PLN") /* Polish Zloty */ @@ -1355,9 +1387,10 @@ 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 -@@ -253,9 +253,9 @@ oldlocrecentcmp (const void *a, const void *b) +diff -ru a/locale/programs/locarchive.c b/locale/programs/locarchive.c +--- a/locale/programs/locarchive.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/locale/programs/locarchive.c 2011-12-12 14:23:04.801739114 -0700 +@@ -253,9 +253,9 @@ /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, locale_data_t data, bool replace); @@ -1370,7 +1403,7 @@ static bool -@@ -636,7 +636,7 @@ close_archive (struct locarhandle *ah) +@@ -636,7 +636,7 @@ #include "../../intl/explodename.c" #include "../../intl/l10nflist.c" @@ -1379,7 +1412,7 @@ insert_name (struct locarhandle *ah, const char *name, size_t name_len, bool replace) { -@@ -694,7 +694,7 @@ insert_name (struct locarhandle *ah, +@@ -694,7 +694,7 @@ return &namehashtab[idx]; } @@ -1388,9 +1421,10 @@ 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 -@@ -10,6 +10,14 @@ +diff -ru a/localedata/ChangeLog b/localedata/ChangeLog +--- a/localedata/ChangeLog 2011-12-12 14:10:52.000000000 -0700 ++++ b/localedata/ChangeLog 2011-12-12 14:23:04.802739114 -0700 +@@ -43,6 +43,14 @@ * tests-mbwc/tst_funcs.h (TST_DECL_VARS, TST_HEAD_LOCALE): Remove unused variable. @@ -1405,9 +1439,10 @@ 2011-05-21 Ulrich Drepper [BZ #12788] ---- glibc-2.14-394-g8f3b1ff/localedata/Makefile -+++ glibc-2.14.90-13/localedata/Makefile -@@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir +diff -ru a/localedata/Makefile b/localedata/Makefile +--- a/localedata/Makefile 2011-12-12 14:10:52.000000000 -0700 ++++ b/localedata/Makefile 2011-12-12 14:23:04.803739114 -0700 +@@ -224,6 +224,7 @@ echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ $(LOCALEDEF) --alias-file=../intl/locale.alias \ @@ -1415,9 +1450,10 @@ -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 -@@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \ +diff -ru a/localedata/SUPPORTED b/localedata/SUPPORTED +--- a/localedata/SUPPORTED 2011-12-12 14:10:52.000000000 -0700 ++++ b/localedata/SUPPORTED 2011-12-12 14:23:04.803739114 -0700 +@@ -86,6 +86,7 @@ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ da_DK/ISO-8859-1 \ @@ -1425,7 +1461,7 @@ de_AT.UTF-8/UTF-8 \ de_AT/ISO-8859-1 \ de_AT@euro/ISO-8859-15 \ -@@ -117,6 +118,7 @@ en_DK.UTF-8/UTF-8 \ +@@ -117,6 +118,7 @@ en_DK/ISO-8859-1 \ en_GB.UTF-8/UTF-8 \ en_GB/ISO-8859-1 \ @@ -1433,7 +1469,7 @@ en_HK.UTF-8/UTF-8 \ en_HK/ISO-8859-1 \ en_IE.UTF-8/UTF-8 \ -@@ -132,6 +134,7 @@ en_SG.UTF-8/UTF-8 \ +@@ -132,6 +134,7 @@ en_SG/ISO-8859-1 \ en_US.UTF-8/UTF-8 \ en_US/ISO-8859-1 \ @@ -1441,7 +1477,7 @@ en_ZA.UTF-8/UTF-8 \ en_ZA/ISO-8859-1 \ en_ZM/UTF-8 \ -@@ -313,6 +316,8 @@ nl_NL/ISO-8859-1 \ +@@ -313,6 +316,8 @@ nl_NL@euro/ISO-8859-15 \ nn_NO.UTF-8/UTF-8 \ nn_NO/ISO-8859-1 \ @@ -1450,7 +1486,7 @@ nr_ZA/UTF-8 \ nso_ZA/UTF-8 \ oc_FR.UTF-8/UTF-8 \ -@@ -374,6 +379,7 @@ sv_FI/ISO-8859-1 \ +@@ -374,6 +379,7 @@ sv_FI@euro/ISO-8859-15 \ sv_SE.UTF-8/UTF-8 \ sv_SE/ISO-8859-1 \ @@ -1458,9 +1494,10 @@ 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 -@@ -248,8 +248,11 @@ mon "";/ +diff -ru a/localedata/locales/cy_GB b/localedata/locales/cy_GB +--- a/localedata/locales/cy_GB 2011-12-12 14:10:52.000000000 -0700 ++++ b/localedata/locales/cy_GB 2011-12-12 14:23:04.803739114 -0700 +@@ -248,8 +248,11 @@ d_t_fmt "" d_fmt "" t_fmt "" @@ -1474,9 +1511,10 @@ END LC_TIME LC_MESSAGES ---- glibc-2.14-394-g8f3b1ff/localedata/locales/en_GB -+++ glibc-2.14.90-13/localedata/locales/en_GB -@@ -116,8 +116,8 @@ mon "";/ +diff -ru a/localedata/locales/en_GB b/localedata/locales/en_GB +--- a/localedata/locales/en_GB 2011-12-12 14:10:52.000000000 -0700 ++++ b/localedata/locales/en_GB 2011-12-12 14:23:04.804739114 -0700 +@@ -116,8 +116,8 @@ d_t_fmt "" d_fmt "" t_fmt "" @@ -1559,8 +1597,9 @@ +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 +diff -ru a/localedata/locales/zh_TW b/localedata/locales/zh_TW +--- a/localedata/locales/zh_TW 2011-12-12 14:10:52.000000000 -0700 ++++ b/localedata/locales/zh_TW 2011-12-12 14:23:04.804739114 -0700 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1570,7 +1609,7 @@ % charmap: BIG5-CP950 % % Original Author: -@@ -17,7 +17,7 @@ escape_char / +@@ -17,7 +17,7 @@ % Reference: http://wwwold.dkuug.dk/JTC1/SC22/WG20/docs/n690.pdf LC_IDENTIFICATION @@ -1579,7 +1618,7 @@ source "" address "" contact "" -@@ -25,7 +25,7 @@ email "bug-glibc-locales@gnu.org" +@@ -25,7 +25,7 @@ tel "" fax "" language "Chinese" @@ -1588,8 +1627,9 @@ 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 +diff -ru a/login/programs/pt_chown.c b/login/programs/pt_chown.c +--- a/login/programs/pt_chown.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/login/programs/pt_chown.c 2011-12-12 14:23:04.805739114 -0700 @@ -29,6 +29,7 @@ #include #include @@ -1598,7 +1638,7 @@ #ifdef HAVE_LIBCAP # include # include -@@ -143,7 +144,7 @@ main (int argc, char *argv[]) +@@ -143,7 +144,7 @@ uid_t uid = getuid (); int remaining; @@ -1607,7 +1647,7 @@ { #ifdef HAVE_LIBCAP /* Drop privileges. */ -@@ -176,6 +177,13 @@ main (int argc, char *argv[]) +@@ -176,6 +177,13 @@ /* We aren't going to be using privileges, so drop them right now. */ setuid (uid); @@ -1621,7 +1661,7 @@ /* Set locale via LC_ALL. */ setlocale (LC_ALL, ""); -@@ -195,9 +203,5 @@ main (int argc, char *argv[]) +@@ -195,9 +203,5 @@ return EXIT_FAILURE; } @@ -1631,8 +1671,9 @@ - return EXIT_SUCCESS; } ---- glibc-2.14-394-g8f3b1ff/malloc/mcheck.c -+++ glibc-2.14.90-13/malloc/mcheck.c +diff -ru a/malloc/mcheck.c b/malloc/mcheck.c +--- a/malloc/mcheck.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/malloc/mcheck.c 2011-12-12 14:23:04.805739114 -0700 @@ -25,10 +25,26 @@ # include # include @@ -1660,7 +1701,7 @@ /* Old hook values. */ static void (*old_free_hook) (__ptr_t ptr, __const __ptr_t); static __ptr_t (*old_malloc_hook) (__malloc_size_t size, const __ptr_t); -@@ -199,7 +215,7 @@ freehook (__ptr_t ptr, const __ptr_t caller) +@@ -199,7 +215,7 @@ if (old_free_hook != NULL) (*old_free_hook) (ptr, caller); else @@ -1669,7 +1710,7 @@ __free_hook = freehook; } -@@ -222,7 +238,7 @@ mallochook (__malloc_size_t size, const __ptr_t caller) +@@ -222,7 +238,7 @@ hdr = (struct hdr *) (*old_malloc_hook) (sizeof (struct hdr) + size + 1, caller); else @@ -1678,7 +1719,7 @@ __malloc_hook = mallochook; if (hdr == NULL) return NULL; -@@ -259,7 +275,7 @@ memalignhook (__malloc_size_t alignment, __malloc_size_t size, +@@ -259,7 +275,7 @@ if (old_memalign_hook != NULL) block = (*old_memalign_hook) (alignment, slop + size + 1, caller); else @@ -1687,7 +1728,7 @@ __memalign_hook = memalignhook; if (block == NULL) return NULL; -@@ -320,8 +336,8 @@ reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller) +@@ -320,8 +336,8 @@ sizeof (struct hdr) + size + 1, caller); else @@ -1698,7 +1739,7 @@ __free_hook = freehook; __malloc_hook = mallochook; __memalign_hook = memalignhook; -@@ -381,8 +397,8 @@ mcheck (func) +@@ -381,8 +397,8 @@ if (__malloc_initialized <= 0 && !mcheck_used) { /* We call malloc() once here to ensure it is initialized. */ @@ -1709,8 +1750,9 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.14-394-g8f3b1ff/manual/libc.texinfo -+++ glibc-2.14.90-13/manual/libc.texinfo +diff -ru a/manual/libc.texinfo b/manual/libc.texinfo +--- a/manual/libc.texinfo 2011-12-12 14:10:52.000000000 -0700 ++++ b/manual/libc.texinfo 2011-12-12 14:23:04.806739114 -0700 @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1720,9 +1762,10 @@ @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 @@ +diff -ru a/misc/sys/cdefs.h b/misc/sys/cdefs.h +--- a/misc/sys/cdefs.h 2011-12-12 14:10:52.000000000 -0700 ++++ b/misc/sys/cdefs.h 2011-12-12 14:23:04.806739114 -0700 +@@ -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 +1777,7 @@ # define __warndecl(name, msg) \ extern void name (void) __attribute__((__warning__ (msg))) # define __warnattr(msg) __attribute__((__warning__ (msg))) -@@ -307,10 +310,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. */ @@ -1753,7 +1796,7 @@ # define __extern_always_inline \ extern __always_inline __attribute__ ((__gnu_inline__, __artificial__)) # else -@@ -330,7 +339,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. */ @@ -1765,9 +1808,10 @@ # 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 -@@ -23,9 +23,9 @@ subdir := nis +diff -ru a/nis/Makefile b/nis/Makefile +--- a/nis/Makefile 2011-12-12 14:10:52.000000000 -0700 ++++ b/nis/Makefile 2011-12-12 14:23:04.807739114 -0700 +@@ -23,9 +23,9 @@ aux := nis_hash @@ -1779,7 +1823,7 @@ # These are the databases available for the nis (and perhaps later nisplus) # service. This must be a superset of the services in nss. -@@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes)) +@@ -69,6 +69,8 @@ include ../Rules @@ -1788,8 +1832,9 @@ $(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 +diff -ru a/nis/nss b/nis/nss +--- a/nis/nss 2011-12-12 14:10:52.000000000 -0700 ++++ b/nis/nss 2011-12-12 14:23:04.807739114 -0700 @@ -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 +1844,10 @@ # # 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 @@ +diff -ru a/nptl/ChangeLog b/nptl/ChangeLog +--- a/nptl/ChangeLog 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/ChangeLog 2011-12-12 14:23:04.810739112 -0700 +@@ -180,6 +180,51 @@ clearing memory. Patch partly by Robert Rex . @@ -1853,7 +1899,7 @@ 2011-01-19 Roland McGrath * pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo. -@@ -4872,6 +4917,11 @@ +@@ -4909,6 +4954,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1865,7 +1911,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6946,6 +6996,11 @@ +@@ -6983,6 +7033,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1969,9 +2015,10 @@ + 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 -@@ -342,7 +342,8 @@ endif +diff -ru a/nptl/Makefile b/nptl/Makefile +--- a/nptl/Makefile 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/Makefile 2011-12-12 14:23:04.811739112 -0700 +@@ -342,7 +342,8 @@ extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1981,7 +2028,7 @@ endif CFLAGS-flockfile.c = -D_IO_MTSAFE_IO -@@ -529,15 +530,19 @@ $(addprefix $(objpfx), \ +@@ -529,15 +530,19 @@ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a $(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so @@ -2003,9 +2050,10 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.14-394-g8f3b1ff/nptl/Versions -+++ glibc-2.14.90-13/nptl/Versions -@@ -30,6 +30,7 @@ libc { +diff -ru a/nptl/Versions b/nptl/Versions +--- a/nptl/Versions 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/Versions 2011-12-12 14:23:04.811739112 -0700 +@@ -30,6 +30,7 @@ __libc_alloca_cutoff; # Internal libc interface to libpthread __libc_dl_error_tsd; @@ -2013,9 +2061,10 @@ } } ---- 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) +diff -ru a/nptl/nptl-init.c b/nptl/nptl-init.c +--- a/nptl/nptl-init.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/nptl-init.c 2011-12-12 14:23:04.812739112 -0700 +@@ -415,7 +415,7 @@ /* Determine the default allowed stack size. This is the size used in case the user does not specify one. */ struct rlimit limit; @@ -2024,8 +2073,9 @@ || 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 +diff -ru a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c +--- a/nptl/pthread_cond_broadcast.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_cond_broadcast.c 2011-12-12 14:23:04.812739112 -0700 @@ -23,6 +23,7 @@ #include #include @@ -2034,7 +2084,7 @@ #include #include -@@ -32,6 +33,8 @@ int +@@ -32,6 +33,8 @@ __pthread_cond_broadcast (cond) pthread_cond_t *cond; { @@ -2043,8 +2093,9 @@ 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 +diff -ru a/nptl/pthread_cond_destroy.c b/nptl/pthread_cond_destroy.c +--- a/nptl/pthread_cond_destroy.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_cond_destroy.c 2011-12-12 14:23:04.813739112 -0700 @@ -20,6 +20,7 @@ #include #include @@ -2053,7 +2104,7 @@ int -@@ -29,6 +30,8 @@ __pthread_cond_destroy (cond) +@@ -29,6 +30,8 @@ int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; @@ -2062,8 +2113,9 @@ /* 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 +diff -ru a/nptl/pthread_cond_init.c b/nptl/pthread_cond_init.c +--- a/nptl/pthread_cond_init.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_cond_init.c 2011-12-12 14:23:04.813739112 -0700 @@ -20,6 +20,7 @@ #include @@ -2072,7 +2124,7 @@ int -@@ -42,6 +43,8 @@ __pthread_cond_init (cond, cond_attr) +@@ -42,6 +43,8 @@ ? NULL : (void *) ~0l); cond->__data.__broadcast_seq = 0; @@ -2081,8 +2133,9 @@ 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 +diff -ru a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c +--- a/nptl/pthread_cond_signal.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_cond_signal.c 2011-12-12 14:23:04.813739112 -0700 @@ -26,6 +26,7 @@ #include @@ -2091,7 +2144,7 @@ int -@@ -35,6 +36,8 @@ __pthread_cond_signal (cond) +@@ -35,6 +36,8 @@ int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; @@ -2100,8 +2153,9 @@ /* 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 +diff -ru a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c +--- a/nptl/pthread_cond_wait.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_cond_wait.c 2011-12-12 14:23:04.814739112 -0700 @@ -25,6 +25,7 @@ #include @@ -2110,7 +2164,7 @@ struct _condvar_cleanup_buffer -@@ -101,6 +102,8 @@ __pthread_cond_wait (cond, mutex) +@@ -101,6 +102,8 @@ int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; @@ -2119,8 +2173,9 @@ /* 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 +diff -ru a/nptl/pthread_create.c b/nptl/pthread_create.c +--- a/nptl/pthread_create.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_create.c 2011-12-12 14:23:04.814739112 -0700 @@ -32,6 +32,8 @@ #include @@ -2130,7 +2185,7 @@ /* Local function to start thread and handle cleanup. */ static int start_thread (void *arg); -@@ -300,6 +302,8 @@ start_thread (void *arg) +@@ -300,6 +302,8 @@ CANCEL_RESET (oldtype); } @@ -2139,7 +2194,7 @@ /* Run the code the user provided. */ #ifdef CALL_THREAD_FCT THREAD_SETMEM (pd, result, CALL_THREAD_FCT (pd)); -@@ -556,6 +560,8 @@ __pthread_create_2_1 (newthread, attr, start_routine, arg) +@@ -556,6 +560,8 @@ /* Pass the descriptor to the caller. */ *newthread = (pthread_t) pd; @@ -2148,8 +2203,9 @@ /* 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 +diff -ru a/nptl/pthread_join.c b/nptl/pthread_join.c +--- a/nptl/pthread_join.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_join.c 2011-12-12 14:23:04.815739112 -0700 @@ -23,6 +23,8 @@ #include #include "pthreadP.h" @@ -2159,7 +2215,7 @@ static void cleanup (void *arg) -@@ -55,6 +57,8 @@ pthread_join (threadid, thread_return) +@@ -55,6 +57,8 @@ struct pthread *self = THREAD_SELF; int result = 0; @@ -2168,7 +2224,7 @@ /* During the wait we change to asynchronous cancellation. If we are canceled the thread we are waiting for must be marked as un-wait-ed for again. */ -@@ -110,5 +114,7 @@ pthread_join (threadid, thread_return) +@@ -110,5 +114,7 @@ __free_tcb (pd); } @@ -2176,8 +2232,9 @@ + return result; } ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_mutex_destroy.c -+++ glibc-2.14.90-13/nptl/pthread_mutex_destroy.c +diff -ru a/nptl/pthread_mutex_destroy.c b/nptl/pthread_mutex_destroy.c +--- a/nptl/pthread_mutex_destroy.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_mutex_destroy.c 2011-12-12 14:23:04.815739112 -0700 @@ -20,11 +20,15 @@ #include #include "pthreadP.h" @@ -2194,8 +2251,9 @@ 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 +diff -ru a/nptl/pthread_mutex_init.c b/nptl/pthread_mutex_init.c +--- a/nptl/pthread_mutex_init.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_mutex_init.c 2011-12-12 14:23:04.815739112 -0700 @@ -24,6 +24,8 @@ #include #include "pthreadP.h" @@ -2205,7 +2263,7 @@ static const struct pthread_mutexattr default_attr = { /* Default is a normal mutex, not shared between processes. */ -@@ -135,6 +137,8 @@ __pthread_mutex_init (mutex, mutexattr) +@@ -135,6 +137,8 @@ // mutex->__spins = 0; already done by memset // mutex->__next = NULL; already done by memset @@ -2214,8 +2272,9 @@ 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 +diff -ru a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c +--- a/nptl/pthread_mutex_lock.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_mutex_lock.c 2011-12-12 14:23:04.816739112 -0700 @@ -24,6 +24,7 @@ #include #include "pthreadP.h" @@ -2224,7 +2283,7 @@ #ifndef LLL_MUTEX_LOCK -@@ -48,6 +49,9 @@ __pthread_mutex_lock (mutex) +@@ -48,6 +49,9 @@ assert (sizeof (mutex->__size) >= sizeof (mutex->__data)); unsigned int type = PTHREAD_MUTEX_TYPE (mutex); @@ -2234,7 +2293,7 @@ if (__builtin_expect (type & ~PTHREAD_MUTEX_KIND_MASK_NP, 0)) return __pthread_mutex_lock_full (mutex); -@@ -127,6 +131,8 @@ __pthread_mutex_lock (mutex) +@@ -127,6 +131,8 @@ ++mutex->__data.__nusers; #endif @@ -2243,7 +2302,7 @@ return 0; } -@@ -467,6 +473,8 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex) +@@ -467,6 +473,8 @@ ++mutex->__data.__nusers; #endif @@ -2252,8 +2311,9 @@ 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 +diff -ru a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c +--- a/nptl/pthread_mutex_timedlock.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_mutex_timedlock.c 2011-12-12 14:23:04.816739112 -0700 @@ -24,6 +24,8 @@ #include #include @@ -2263,7 +2323,7 @@ int pthread_mutex_timedlock (mutex, abstime) -@@ -34,6 +36,8 @@ pthread_mutex_timedlock (mutex, abstime) +@@ -34,6 +36,8 @@ pid_t id = THREAD_GETMEM (THREAD_SELF, tid); int result = 0; @@ -2272,7 +2332,7 @@ /* We must not check ABSTIME here. If the thread does not block abstime must not be checked for a valid value. */ -@@ -172,6 +176,8 @@ pthread_mutex_timedlock (mutex, abstime) +@@ -172,6 +176,8 @@ ++mutex->__data.__count; @@ -2281,7 +2341,7 @@ return 0; } } -@@ -242,6 +248,8 @@ pthread_mutex_timedlock (mutex, abstime) +@@ -242,6 +248,8 @@ ++mutex->__data.__count; @@ -2290,7 +2350,7 @@ return 0; } } -@@ -377,6 +385,8 @@ pthread_mutex_timedlock (mutex, abstime) +@@ -377,6 +385,8 @@ ++mutex->__data.__count; @@ -2299,7 +2359,7 @@ return 0; } } -@@ -477,6 +487,8 @@ pthread_mutex_timedlock (mutex, abstime) +@@ -477,6 +487,8 @@ /* Record the ownership. */ mutex->__data.__owner = id; ++mutex->__data.__nusers; @@ -2308,8 +2368,9 @@ } out: ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_mutex_unlock.c -+++ glibc-2.14.90-13/nptl/pthread_mutex_unlock.c +diff -ru a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c +--- a/nptl/pthread_mutex_unlock.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_mutex_unlock.c 2011-12-12 14:23:04.817739112 -0700 @@ -22,6 +22,7 @@ #include #include "pthreadP.h" @@ -2318,7 +2379,7 @@ static int internal_function -@@ -50,6 +51,9 @@ __pthread_mutex_unlock_usercnt (mutex, decr) +@@ -50,6 +51,9 @@ /* Unlock. */ lll_unlock (mutex->__data.__lock, PTHREAD_MUTEX_PSHARED (mutex)); @@ -2328,7 +2389,7 @@ return 0; } else if (__builtin_expect (type == PTHREAD_MUTEX_RECURSIVE_NP, 1)) -@@ -272,6 +276,9 @@ __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr) +@@ -272,6 +276,9 @@ PTHREAD_MUTEX_PSHARED (mutex)); int oldprio = newval >> PTHREAD_MUTEX_PRIO_CEILING_SHIFT; @@ -2338,7 +2399,7 @@ return __pthread_tpp_change_priority (oldprio, -1); default: -@@ -279,6 +286,7 @@ __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr) +@@ -279,6 +286,7 @@ return EINVAL; } @@ -2346,8 +2407,9 @@ return 0; } ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_rwlock_destroy.c -+++ glibc-2.14.90-13/nptl/pthread_rwlock_destroy.c +diff -ru a/nptl/pthread_rwlock_destroy.c b/nptl/pthread_rwlock_destroy.c +--- a/nptl/pthread_rwlock_destroy.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_rwlock_destroy.c 2011-12-12 14:23:04.817739112 -0700 @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -2364,8 +2426,9 @@ /* 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 +diff -ru a/nptl/pthread_rwlock_rdlock.c b/nptl/pthread_rwlock_rdlock.c +--- a/nptl/pthread_rwlock_rdlock.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_rwlock_rdlock.c 2011-12-12 14:23:04.817739112 -0700 @@ -22,6 +22,7 @@ #include #include @@ -2374,7 +2437,7 @@ /* Acquire read lock for RWLOCK. */ -@@ -31,6 +32,8 @@ __pthread_rwlock_rdlock (rwlock) +@@ -31,6 +32,8 @@ { int result = 0; @@ -2383,7 +2446,7 @@ /* Make sure we are alone. */ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); -@@ -49,6 +52,8 @@ __pthread_rwlock_rdlock (rwlock) +@@ -49,6 +52,8 @@ --rwlock->__data.__nr_readers; result = EAGAIN; } @@ -2392,8 +2455,9 @@ break; } ---- glibc-2.14-394-g8f3b1ff/nptl/pthread_rwlock_unlock.c -+++ glibc-2.14.90-13/nptl/pthread_rwlock_unlock.c +diff -ru a/nptl/pthread_rwlock_unlock.c b/nptl/pthread_rwlock_unlock.c +--- a/nptl/pthread_rwlock_unlock.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_rwlock_unlock.c 2011-12-12 14:23:04.818739112 -0700 @@ -22,11 +22,14 @@ #include #include @@ -2409,8 +2473,9 @@ 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 +diff -ru a/nptl/pthread_rwlock_wrlock.c b/nptl/pthread_rwlock_wrlock.c +--- a/nptl/pthread_rwlock_wrlock.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/pthread_rwlock_wrlock.c 2011-12-12 14:23:04.818739112 -0700 @@ -22,6 +22,7 @@ #include #include @@ -2419,7 +2484,7 @@ /* Acquire write lock for RWLOCK. */ -@@ -31,6 +32,8 @@ __pthread_rwlock_wrlock (rwlock) +@@ -31,6 +32,8 @@ { int result = 0; @@ -2428,7 +2493,7 @@ /* Make sure we are alone. */ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); -@@ -41,6 +44,8 @@ __pthread_rwlock_wrlock (rwlock) +@@ -41,6 +44,8 @@ { /* Mark self as writer. */ rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid); @@ -2437,8 +2502,9 @@ 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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 2011-12-12 14:23:04.819739112 -0700 @@ -189,4 +189,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -2456,8 +2522,9 @@ + __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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S 2011-12-12 14:23:04.819739112 -0700 @@ -22,6 +22,8 @@ #include #include @@ -2467,7 +2534,7 @@ .text #ifdef __ASSUME_PRIVATE_FUTEX -@@ -91,7 +93,8 @@ __lll_lock_wait_private: +@@ -91,7 +93,8 @@ cmpl %edx, %eax /* NB: %edx == 2 */ jne 2f @@ -2477,8 +2544,9 @@ 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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S +--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S 2011-12-12 14:23:04.820739112 -0700 @@ -24,6 +24,7 @@ #include #include @@ -2487,7 +2555,7 @@ .text -@@ -49,6 +50,8 @@ __pthread_cond_broadcast: +@@ -49,6 +50,8 @@ movl 20(%esp), %ebx @@ -2496,8 +2564,9 @@ /* 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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S +--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S 2011-12-12 14:23:04.820739112 -0700 @@ -24,7 +24,7 @@ #include #include @@ -2507,7 +2576,7 @@ .text -@@ -45,6 +45,8 @@ __pthread_cond_signal: +@@ -45,6 +45,8 @@ movl 12(%esp), %edi @@ -2516,8 +2585,9 @@ /* 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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S +--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S 2011-12-12 14:23:04.820739112 -0700 @@ -24,7 +24,7 @@ #include #include @@ -2527,7 +2597,7 @@ .text -@@ -61,6 +61,8 @@ __pthread_cond_timedwait: +@@ -61,6 +61,8 @@ movl 20(%esp), %ebx movl 28(%esp), %ebp @@ -2536,8 +2606,9 @@ 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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-12 14:23:04.821739112 -0700 @@ -25,6 +25,7 @@ #include #include @@ -2546,7 +2617,7 @@ .text -@@ -61,6 +62,8 @@ __pthread_cond_wait: +@@ -61,6 +62,8 @@ xorl %esi, %esi movl 20(%esp), %ebx @@ -2555,8 +2626,9 @@ /* 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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S +--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S 2011-12-12 14:23:04.821739112 -0700 @@ -23,6 +23,7 @@ #include #include @@ -2565,7 +2637,7 @@ .text -@@ -41,6 +42,8 @@ __pthread_rwlock_rdlock: +@@ -41,6 +42,8 @@ xorl %esi, %esi movl 12(%esp), %ebx @@ -2574,8 +2646,9 @@ /* 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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S +--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S 2011-12-12 14:23:04.822739112 -0700 @@ -23,6 +23,7 @@ #include #include @@ -2584,7 +2657,7 @@ .text -@@ -41,6 +42,8 @@ __pthread_rwlock_wrlock: +@@ -41,6 +42,8 @@ xorl %esi, %esi movl 12(%esp), %ebx @@ -2593,8 +2666,9 @@ /* 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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +--- a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h 2011-12-12 14:23:04.822739112 -0700 @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2604,7 +2678,7 @@ #ifndef __ASSEMBLER__ # include # include -@@ -226,6 +228,7 @@ LLL_STUB_UNWIND_INFO_END +@@ -226,6 +228,7 @@ do { \ int __ignore; \ register __typeof (nr) _nr asm ("edx") = (nr); \ @@ -2612,9 +2686,10 @@ __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 -@@ -37,7 +37,7 @@ is_smp_system (void) +diff -ru a/nptl/sysdeps/unix/sysv/linux/i386/smp.h b/nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- a/nptl/sysdeps/unix/sysv/linux/i386/smp.h 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/smp.h 2011-12-12 14:23:04.823739112 -0700 +@@ -37,7 +37,7 @@ char *cp; /* Try reading the number using `sysctl' first. */ @@ -2632,8 +2707,9 @@ +#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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S 2011-12-12 14:23:04.823739112 -0700 @@ -22,6 +22,8 @@ #include #include @@ -2643,7 +2719,7 @@ .text #ifdef __ASSUME_PRIVATE_FUTEX -@@ -87,7 +89,8 @@ __lll_lock_wait_private: +@@ -87,7 +89,8 @@ cmpl %edx, %eax /* NB: %edx == 2 */ jne 2f @@ -2653,7 +2729,7 @@ syscall 2: movl %edx, %eax -@@ -126,7 +129,8 @@ __lll_lock_wait: +@@ -126,7 +129,8 @@ cmpl %edx, %eax /* NB: %edx == 2 */ jne 2f @@ -2663,8 +2739,9 @@ 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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h 2011-12-12 14:23:04.824739112 -0700 @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2674,7 +2751,7 @@ #ifndef __ASSEMBLER__ # include # include -@@ -227,6 +229,7 @@ LLL_STUB_UNWIND_INFO_END +@@ -227,6 +229,7 @@ do { \ int __ignore; \ register __typeof (nr) _nr __asm ("edx") = (nr); \ @@ -2682,8 +2759,9 @@ __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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S 2011-12-12 14:23:04.824739112 -0700 @@ -25,7 +25,7 @@ #include #include @@ -2702,8 +2780,9 @@ /* 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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S 2011-12-12 14:23:04.825739112 -0700 @@ -24,6 +24,7 @@ #include #include @@ -2721,8 +2800,9 @@ /* 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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S 2011-12-12 14:23:04.825739112 -0700 @@ -23,6 +23,7 @@ #include #include @@ -2731,7 +2811,7 @@ #include -@@ -68,6 +69,8 @@ __pthread_cond_timedwait: +@@ -68,6 +69,8 @@ cfi_adjust_cfa_offset(FRAME_SIZE) cfi_remember_state @@ -2740,17 +2820,18 @@ 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 -@@ -23,6 +23,7 @@ - #include +diff -ru a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-12 14:27:35.992716447 -0700 +@@ -24,6 +24,7 @@ #include #include + #include +#include #include -@@ -65,6 +66,8 @@ __pthread_cond_wait: +@@ -66,6 +67,8 @@ +--------------------------+ */ @@ -2759,8 +2840,9 @@ 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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S 2011-12-12 14:23:04.826739112 -0700 @@ -22,7 +22,7 @@ #include #include @@ -2780,8 +2862,9 @@ 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 +diff -ru a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S 2011-12-12 14:23:04.827739112 -0700 @@ -22,7 +22,7 @@ #include #include @@ -2801,8 +2884,9 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-394-g8f3b1ff/nscd/nscd.conf -+++ glibc-2.14.90-13/nscd/nscd.conf +diff -ru a/nscd/nscd.conf b/nscd/nscd.conf +--- a/nscd/nscd.conf 2011-12-12 14:10:52.000000000 -0700 ++++ b/nscd/nscd.conf 2011-12-12 14:23:04.827739112 -0700 @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -2812,8 +2896,9 @@ # 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 +diff -ru a/nscd/nscd.init b/nscd/nscd.init +--- a/nscd/nscd.init 2011-12-12 14:10:52.000000000 -0700 ++++ b/nscd/nscd.init 2011-12-12 14:23:04.827739112 -0700 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -2845,7 +2930,7 @@ RETVAL=0 prog=nscd -@@ -50,7 +39,7 @@ start () { +@@ -50,7 +39,7 @@ [ -d /var/run/nscd ] || mkdir /var/run/nscd [ -d /var/db/nscd ] || mkdir /var/db/nscd echo -n $"Starting $prog: " @@ -2854,7 +2939,7 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd -@@ -83,11 +72,11 @@ restart() { +@@ -83,11 +72,11 @@ # See how we were called. case "$1" in start) @@ -2868,7 +2953,7 @@ RETVAL=$? ;; status) -@@ -99,14 +88,17 @@ case "$1" in +@@ -99,14 +88,17 @@ RETVAL=$? ;; try-restart | condrestart) @@ -2890,9 +2975,10 @@ ;; *) 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)) +diff -ru a/nscd/selinux.c b/nscd/selinux.c +--- a/nscd/selinux.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nscd/selinux.c 2011-12-12 14:23:04.828739112 -0700 +@@ -270,6 +270,18 @@ { int rc; @@ -2911,9 +2997,10 @@ 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 +diff -ru a/nss/Makefile b/nss/Makefile +--- a/nss/Makefile 2011-12-12 14:10:52.000000000 -0700 ++++ b/nss/Makefile 2011-12-12 14:23:04.828739112 -0700 +@@ -88,6 +88,7 @@ include ../Rules @@ -2921,9 +3008,10 @@ 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 -@@ -190,7 +190,7 @@ internal_getent (struct STRUCTURE *result, +diff -ru a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c +--- a/nss/nss_files/files-XXX.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/nss/nss_files/files-XXX.c 2011-12-12 14:23:04.829739111 -0700 +@@ -190,7 +190,7 @@ { char *p; struct parser_data *data = (void *) buffer; @@ -2932,9 +3020,10 @@ int parse_result; if (buflen < sizeof *data + 2) ---- glibc-2.14-394-g8f3b1ff/posix/Makefile -+++ glibc-2.14.90-13/posix/Makefile -@@ -320,15 +320,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ +diff -ru a/posix/Makefile b/posix/Makefile +--- a/posix/Makefile 2011-12-12 14:10:52.000000000 -0700 ++++ b/posix/Makefile 2011-12-12 14:23:04.829739111 -0700 +@@ -320,15 +320,8 @@ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -2954,8 +3043,9 @@ + | 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 +diff -ru a/posix/gai.conf b/posix/gai.conf +--- a/posix/gai.conf 2011-12-12 14:10:52.000000000 -0700 ++++ b/posix/gai.conf 2011-12-12 14:23:04.830739110 -0700 @@ -41,7 +41,7 @@ # # precedence @@ -3022,9 +3112,10 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- 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, +diff -ru a/posix/regcomp.c b/posix/regcomp.c +--- a/posix/regcomp.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/posix/regcomp.c 2011-12-12 14:23:04.831739110 -0700 +@@ -2745,40 +2745,29 @@ /* Local function for parse_bracket_exp used in _LIBC environement. Seek the collating symbol entry correspondings to NAME. @@ -3044,7 +3135,8 @@ - if (symb_table[2 * elem] != 0) - { - int32_t second = hash % (table_size - 2) + 1; -- ++ int32_t elem; + - do - { - /* First compare the hashing value. */ @@ -3058,8 +3150,7 @@ - /* Yep, this is the entry. */ - break; - } -+ int32_t elem; - +- - /* Next entry. */ - elem += second; - } @@ -3083,7 +3174,7 @@ } /* Local function for parse_bracket_exp used in _LIBC environment. -@@ -2787,8 +2776,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, +@@ -2787,8 +2776,7 @@ auto inline unsigned int __attribute ((always_inline)) @@ -3093,7 +3184,7 @@ { if (br_elem->type == SB_CHAR) { -@@ -2816,7 +2804,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, +@@ -2816,7 +2804,7 @@ int32_t elem, idx; elem = seek_collating_symbol_entry (br_elem->opr.name, sym_name_len); @@ -3102,7 +3193,7 @@ { /* We found the entry. */ idx = symb_table[2 * elem + 1]; -@@ -2834,7 +2822,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, +@@ -2834,7 +2822,7 @@ /* Return the collation sequence value. */ return *(unsigned int *) (extra + idx); } @@ -3111,7 +3202,7 @@ { /* No valid character. Match it as a single byte character. */ -@@ -2856,11 +2844,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, +@@ -2856,11 +2844,8 @@ auto inline reg_errcode_t __attribute ((always_inline)) @@ -3125,7 +3216,7 @@ { unsigned int ch; uint32_t start_collseq; -@@ -2939,25 +2924,22 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, +@@ -2939,25 +2924,22 @@ auto inline reg_errcode_t __attribute ((always_inline)) @@ -3155,9 +3246,10 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.14-394-g8f3b1ff/resolv/Makefile -+++ glibc-2.14.90-13/resolv/Makefile -@@ -81,6 +81,7 @@ ifeq (yes,$(have-ssp)) +diff -ru a/resolv/Makefile b/resolv/Makefile +--- a/resolv/Makefile 2011-12-12 14:10:52.000000000 -0700 ++++ b/resolv/Makefile 2011-12-12 14:23:04.831739110 -0700 +@@ -81,6 +81,7 @@ CFLAGS-libresolv += -fstack-protector endif CFLAGS-res_hconf.c = -fexceptions @@ -3165,9 +3257,10 @@ # 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 -@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, +diff -ru a/resolv/res_query.c b/resolv/res_query.c +--- a/resolv/res_query.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/resolv/res_query.c 2011-12-12 14:23:04.832739111 -0700 +@@ -248,7 +248,7 @@ && *resplen2 > (int) sizeof (HEADER)) { /* Special case of partial answer. */ @@ -3176,9 +3269,10 @@ 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 -@@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) +diff -ru a/resource/getrlimit.c b/resource/getrlimit.c +--- a/resource/getrlimit.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/resource/getrlimit.c 2011-12-12 14:23:04.833739111 -0700 +@@ -28,6 +28,7 @@ __set_errno (ENOSYS); return -1; } @@ -3186,20 +3280,22 @@ 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 -@@ -29,7 +29,7 @@ exec ${AWK} -v includedir="$includedir" ' +diff -ru a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh +--- a/scripts/check-local-headers.sh 2011-12-12 14:10:52.000000000 -0700 ++++ b/scripts/check-local-headers.sh 2011-12-12 14:26:47.271720153 -0700 +@@ -29,7 +29,7 @@ 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 -@@ -1161,41 +1161,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) +diff -ru a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c +--- a/stdio-common/vfprintf.c 2011-12-12 14:10:52.000000000 -0700 ++++ b/stdio-common/vfprintf.c 2011-12-12 14:23:04.834739111 -0700 +@@ -1161,41 +1161,9 @@ else if (!is_long && spec != L_('S')) \ { \ if (prec != -1) \ @@ -3244,8 +3340,9 @@ else \ len = strlen (string); \ } \ ---- glibc-2.14-394-g8f3b1ff/streams/Makefile -+++ glibc-2.14.90-13/streams/Makefile +diff -ru a/streams/Makefile b/streams/Makefile +--- a/streams/Makefile 2011-12-12 14:10:52.000000000 -0700 ++++ b/streams/Makefile 2011-12-12 14:23:04.834739111 -0700 @@ -21,7 +21,7 @@ # subdir := streams @@ -3255,9 +3352,10 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- 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 \ +diff -ru a/sunrpc/Makefile b/sunrpc/Makefile +--- a/sunrpc/Makefile 2011-12-12 14:10:52.000000000 -0700 ++++ b/sunrpc/Makefile 2011-12-12 14:23:04.835739111 -0700 +@@ -53,7 +53,7 @@ des_crypt.h) headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h @@ -3266,7 +3364,7 @@ install-others = $(inst_sysconfdir)/rpc generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen -@@ -152,6 +152,10 @@ CFLAGS-openchild.c = -fexceptions +@@ -152,6 +152,10 @@ CPPFLAGS += -D_RPC_THREAD_SAFE_ @@ -3277,8 +3375,9 @@ $(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 +diff -ru a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h +--- a/sysdeps/generic/dl-cache.h 2011-12-12 14:10:52.000000000 -0700 ++++ b/sysdeps/generic/dl-cache.h 2011-12-12 14:23:04.835739111 -0700 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -3294,8 +3393,9 @@ #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 +diff -ru a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile +--- a/sysdeps/i386/Makefile 2011-12-12 14:10:52.000000000 -0700 ++++ b/sysdeps/i386/Makefile 2011-12-12 14:23:04.835739111 -0700 @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -3305,7 +3405,7 @@ # The i386 `long double' is a distinct type we support. long-double-fcts = yes -@@ -68,6 +70,14 @@ endif +@@ -68,6 +70,14 @@ ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS))) defines += -DNO_TLS_DIRECT_SEG_REFS @@ -3320,8 +3420,9 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-394-g8f3b1ff/sysdeps/i386/__longjmp.S -+++ glibc-2.14.90-13/sysdeps/i386/__longjmp.S +diff -ru a/sysdeps/i386/__longjmp.S b/sysdeps/i386/__longjmp.S +--- a/sysdeps/i386/__longjmp.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/sysdeps/i386/__longjmp.S 2011-12-12 14:23:04.836739111 -0700 @@ -1,5 +1,5 @@ /* longjmp for i386. - Copyright (C) 1995-1998,2000,2002,2005,2006,2009 @@ -3337,7 +3438,7 @@ .text ENTRY (__longjmp) -@@ -33,6 +34,7 @@ ENTRY (__longjmp) +@@ -33,6 +34,7 @@ movl (JB_SP*4)(%eax), %ecx PTR_DEMANGLE (%edx) PTR_DEMANGLE (%ecx) @@ -3345,7 +3446,7 @@ cfi_def_cfa(%eax, 0) cfi_register(%eip, %edx) cfi_register(%esp, %ecx) -@@ -50,6 +52,7 @@ ENTRY (__longjmp) +@@ -50,6 +52,7 @@ cfi_restore(%edi) cfi_restore(%ebp) @@ -3353,7 +3454,7 @@ movl 8(%esp), %eax /* Second argument is return value. */ movl %ecx, %esp #else -@@ -57,12 +60,14 @@ ENTRY (__longjmp) +@@ -57,12 +60,14 @@ movl 8(%esp), %eax /* Second argument is return value. */ /* Save the return address now. */ movl (JB_PC*4)(%ecx), %edx @@ -3368,8 +3469,9 @@ #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 +diff -ru a/sysdeps/i386/bsd-_setjmp.S b/sysdeps/i386/bsd-_setjmp.S +--- a/sysdeps/i386/bsd-_setjmp.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/sysdeps/i386/bsd-_setjmp.S 2011-12-12 14:23:04.836739111 -0700 @@ -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. @@ -3386,7 +3488,7 @@ #define PARMS LINKAGE /* no space for saved regs */ #define JMPBUF PARMS -@@ -47,6 +49,7 @@ ENTRY (BP_SYM (_setjmp)) +@@ -47,6 +49,7 @@ #endif movl %ecx, (JB_SP*4)(%edx) movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */ @@ -3394,8 +3496,9 @@ #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 +diff -ru a/sysdeps/i386/bsd-setjmp.S b/sysdeps/i386/bsd-setjmp.S +--- a/sysdeps/i386/bsd-setjmp.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/sysdeps/i386/bsd-setjmp.S 2011-12-12 14:23:04.837739111 -0700 @@ -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. @@ -3412,7 +3515,7 @@ #define PARMS LINKAGE /* no space for saved regs */ #define JMPBUF PARMS -@@ -49,6 +51,7 @@ ENTRY (BP_SYM (setjmp)) +@@ -49,6 +51,7 @@ #endif movl %ecx, (JB_SP*4)(%eax) movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */ @@ -3420,9 +3523,10 @@ #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 -@@ -9,19 +9,3 @@ stack-align-test-flags += -msse +diff -ru a/sysdeps/i386/i686/Makefile b/sysdeps/i386/i686/Makefile +--- a/sysdeps/i386/i686/Makefile 2011-12-12 14:10:52.000000000 -0700 ++++ b/sysdeps/i386/i686/Makefile 2011-12-12 14:23:04.837739111 -0700 +@@ -9,19 +9,3 @@ ifeq ($(subdir),string) sysdep_routines += cacheinfo endif @@ -3442,8 +3546,9 @@ -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 +diff -ru a/sysdeps/i386/setjmp.S b/sysdeps/i386/setjmp.S +--- a/sysdeps/i386/setjmp.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/sysdeps/i386/setjmp.S 2011-12-12 14:23:04.837739111 -0700 @@ -1,5 +1,5 @@ /* setjmp for i386. - Copyright (C) 1995,1996,1997,2000,2001,2005,2006 @@ -3459,7 +3564,7 @@ #define PARMS LINKAGE /* no space for saved regs */ #define JMPBUF PARMS -@@ -44,6 +45,7 @@ ENTRY (BP_SYM (__sigsetjmp)) +@@ -44,6 +45,7 @@ #endif movl %ecx, (JB_SP*4)(%eax) movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */ @@ -3467,9 +3572,10 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- 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 +diff -ru a/sysdeps/ia64/Makefile b/sysdeps/ia64/Makefile +--- a/sysdeps/ia64/Makefile 2011-12-12 14:10:52.000000000 -0700 ++++ b/sysdeps/ia64/Makefile 2011-12-12 14:23:04.838739111 -0700 +@@ -12,8 +12,8 @@ ifeq (yes,$(build-shared)) # Compatibility @@ -3480,8 +3586,9 @@ endif endif ---- glibc-2.14-394-g8f3b1ff/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.14.90-13/sysdeps/ia64/ia64libgcc.S +diff -ru a/sysdeps/ia64/ia64libgcc.S b/sysdeps/ia64/ia64libgcc.S +--- a/sysdeps/ia64/ia64libgcc.S 2011-12-12 14:10:52.000000000 -0700 ++++ b/sysdeps/ia64/ia64libgcc.S 2011-12-12 14:23:04.838739111 -0700 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -3920,17 +4027,19 @@ +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 -@@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) +diff -ru a/sysdeps/mach/hurd/getrlimit.c b/sysdeps/mach/hurd/getrlimit.c +--- a/sysdeps/mach/hurd/getrlimit.c 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/mach/hurd/getrlimit.c 2011-12-12 14:23:04.839739111 -0700 +@@ -44,4 +44,5 @@ 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 -@@ -565,8 +565,8 @@ gaih_inet (const char *name, const struct gaih_service *service, +diff -ru a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c +--- a/sysdeps/posix/getaddrinfo.c 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/posix/getaddrinfo.c 2011-12-12 14:23:04.840739110 -0700 +@@ -565,8 +565,8 @@ /* If we do not have to look for IPv6 addresses, use the simple, old functions, which do not support @@ -3941,7 +4050,7 @@ { size_t tmpbuflen = 512; assert (tmpbuf == NULL); -@@ -1105,68 +1105,10 @@ gaih_inet (const char *name, const struct gaih_service *service, +@@ -1105,68 +1105,10 @@ /* Only the first entry gets the canonical name. */ if (at2 == at && (req->ai_flags & AI_CANONNAME) != 0) { @@ -4013,7 +4122,7 @@ #ifdef HAVE_LIBIDN if (req->ai_flags & AI_CANONIDN) -@@ -1181,9 +1123,6 @@ gaih_inet (const char *name, const struct gaih_service *service, +@@ -1181,9 +1123,6 @@ int rc = __idna_to_unicode_lzlz (canon, &out, idn_flags); if (rc != IDNA_SUCCESS) { @@ -4023,7 +4132,7 @@ if (rc == IDNA_MALLOC_ERROR) result = -EAI_MEMORY; else if (rc == IDNA_DLOPEN_ERROR) -@@ -1213,17 +1152,11 @@ gaih_inet (const char *name, const struct gaih_service *service, +@@ -1213,17 +1152,11 @@ canon = strdup (canon); if (canon == NULL) { @@ -4041,7 +4150,7 @@ } family = at2->family; -@@ -1360,10 +1293,12 @@ static const struct scopeentry +@@ -1360,10 +1293,12 @@ /* Link-local addresses: scope 2. */ { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 }, { { { 127, 0, 0, 0 } }, htonl_c (0xff000000), 2 }, @@ -4054,9 +4163,10 @@ /* 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 -@@ -33,6 +33,7 @@ ifneq ($(elf),no) +diff -ru a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Makefile +--- a/sysdeps/powerpc/powerpc64/Makefile 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/powerpc/powerpc64/Makefile 2011-12-12 14:23:04.840739110 -0700 +@@ -33,6 +33,7 @@ # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 endif @@ -4064,17 +4174,19 @@ endif ifeq ($(subdir),elf) ---- 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) +diff -ru a/sysdeps/powerpc/powerpc64/elf/Makefile b/sysdeps/powerpc/powerpc64/elf/Makefile +--- a/sysdeps/powerpc/powerpc64/elf/Makefile 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/powerpc/powerpc64/elf/Makefile 2011-12-12 14:23:04.840739110 -0700 +@@ -9,3 +9,5 @@ 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 -@@ -169,10 +169,7 @@ gconv_end (struct __gconv_step *data) +diff -ru a/sysdeps/s390/s390-64/utf16-utf32-z9.c b/sysdeps/s390/s390-64/utf16-utf32-z9.c +--- a/sysdeps/s390/s390-64/utf16-utf32-z9.c 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/s390/s390-64/utf16-utf32-z9.c 2011-12-12 14:23:04.841739109 -0700 +@@ -169,10 +169,7 @@ register unsigned long long outlen asm("11") = outend - outptr; \ uint64_t cc = 0; \ \ @@ -4086,9 +4198,10 @@ " 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 -@@ -151,10 +151,7 @@ gconv_end (struct __gconv_step *data) +diff -ru a/sysdeps/s390/s390-64/utf8-utf16-z9.c b/sysdeps/s390/s390-64/utf8-utf16-z9.c +--- a/sysdeps/s390/s390-64/utf8-utf16-z9.c 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/s390/s390-64/utf8-utf16-z9.c 2011-12-12 14:23:04.841739109 -0700 +@@ -151,10 +151,7 @@ register unsigned long long outlen asm("11") = outend - outptr; \ uint64_t cc = 0; \ \ @@ -4100,9 +4213,10 @@ " 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 -@@ -155,10 +155,7 @@ gconv_end (struct __gconv_step *data) +diff -ru a/sysdeps/s390/s390-64/utf8-utf32-z9.c b/sysdeps/s390/s390-64/utf8-utf32-z9.c +--- a/sysdeps/s390/s390-64/utf8-utf32-z9.c 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/s390/s390-64/utf8-utf32-z9.c 2011-12-12 14:23:04.842739109 -0700 +@@ -155,10 +155,7 @@ register unsigned long long outlen asm("11") = outend - outptr; \ uint64_t cc = 0; \ \ @@ -4114,9 +4228,10 @@ " 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 -@@ -42,7 +42,12 @@ nice (int incr) +diff -ru a/sysdeps/unix/nice.c b/sysdeps/unix/nice.c +--- a/sysdeps/unix/nice.c 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/unix/nice.c 2011-12-12 14:23:04.842739109 -0700 +@@ -42,7 +42,12 @@ __set_errno (save); } @@ -4130,9 +4245,10 @@ 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 @@ +diff -ru a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c +--- a/sysdeps/unix/sysv/linux/check_pf.c 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/check_pf.c 2011-12-12 14:24:28.719731563 -0700 +@@ -27,16 +27,14 @@ #include #include @@ -4142,14 +4258,19 @@ - #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) +diff -ru a/sysdeps/unix/sysv/linux/futimesat.c b/sysdeps/unix/sysv/linux/futimesat.c +--- a/sysdeps/unix/sysv/linux/futimesat.c 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/futimesat.c 2011-12-12 14:23:04.843739110 -0700 +@@ -37,14 +37,14 @@ { int result; @@ -4167,7 +4288,7 @@ result = INLINE_SYSCALL (futimesat, 3, fd, file, tvp); # ifndef __ASSUME_ATFCTS if (result == -1 && errno == ENOSYS) -@@ -58,22 +58,7 @@ futimesat (fd, file, tvp) +@@ -58,22 +58,7 @@ #ifndef __ASSUME_ATFCTS char *buf = NULL; @@ -4191,8 +4312,9 @@ { 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 +diff -ru a/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S b/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S +--- a/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S 2011-12-12 14:23:04.844739110 -0700 @@ -1,4 +1,5 @@ -/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc. +/* Copyright (C) 2001,2004,2005,2006,2009,2011 @@ -4208,7 +4330,7 @@ .section .rodata.str1.1,"aMS",@progbits,1 -@@ -79,7 +81,9 @@ ENTRY (____longjmp_chk) +@@ -79,7 +81,9 @@ cfi_adjust_cfa_offset(-12) movl 4(%esp), %ecx @@ -4219,7 +4341,7 @@ cfi_def_cfa(%ecx, 0) cfi_register(%eip, %edx) cfi_register(%esp, %edi) -@@ -102,5 +106,6 @@ ENTRY (____longjmp_chk) +@@ -102,5 +106,6 @@ cfi_restore(%ebp) /* Jump to saved PC. */ @@ -4288,16 +4410,18 @@ + } 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 -@@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) +diff -ru a/sysdeps/unix/sysv/linux/i386/getrlimit.c b/sysdeps/unix/sysv/linux/i386/getrlimit.c +--- a/sysdeps/unix/sysv/linux/i386/getrlimit.c 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/i386/getrlimit.c 2011-12-12 14:23:04.844739110 -0700 +@@ -79,4 +79,5 @@ } 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 +diff -ru a/sysdeps/unix/sysv/linux/ia64/dl-cache.h b/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- a/sysdeps/unix/sysv/linux/ia64/dl-cache.h 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/ia64/dl-cache.h 2011-12-12 14:23:04.845739110 -0700 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -4346,13 +4470,15 @@ +#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 +diff -ru a/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- a/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 2011-12-12 14:23:04.846739110 -0700 @@ -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 +diff -ru a/sysdeps/unix/sysv/linux/netlinkaccess.h b/sysdeps/unix/sysv/linux/netlinkaccess.h +--- a/sysdeps/unix/sysv/linux/netlinkaccess.h 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/netlinkaccess.h 2011-12-12 14:23:04.846739110 -0700 @@ -25,6 +25,24 @@ #include @@ -4378,8 +4504,9 @@ 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 +diff -ru a/sysdeps/unix/sysv/linux/paths.h b/sysdeps/unix/sysv/linux/paths.h +--- a/sysdeps/unix/sysv/linux/paths.h 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/paths.h 2011-12-12 14:23:04.847739110 -0700 @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -4389,9 +4516,10 @@ #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 -@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) +diff -ru a/sysdeps/unix/sysv/linux/tcsetattr.c b/sysdeps/unix/sysv/linux/tcsetattr.c +--- a/sysdeps/unix/sysv/linux/tcsetattr.c 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/tcsetattr.c 2011-12-12 14:23:04.847739110 -0700 +@@ -49,6 +49,7 @@ { struct __kernel_termios k_termios; unsigned long int cmd; @@ -4399,7 +4527,7 @@ switch (optional_actions) { -@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios_p) +@@ -80,6 +81,35 @@ memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0], __KERNEL_NCCS * sizeof (cc_t)); @@ -4436,8 +4564,9 @@ + 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 +diff -ru a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +--- a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S 2011-12-12 14:23:04.847739110 -0700 @@ -19,6 +19,7 @@ #include #include @@ -4446,7 +4575,7 @@ .section .rodata.str1.1,"aMS",@progbits,1 .type longjmp_msg,@object -@@ -94,7 +95,9 @@ ENTRY(____longjmp_chk) +@@ -94,7 +95,9 @@ movl %ebx, %esi cfi_restore (%rsi) @@ -4457,15 +4586,16 @@ cfi_def_cfa(%rdi, 0) cfi_register(%rsp,%r8) cfi_register(%rbp,%r9) -@@ -113,5 +116,6 @@ ENTRY(____longjmp_chk) +@@ -113,5 +116,6 @@ movl %esi, %eax movq %r8,%rsp movq %r9,%rbp + 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 +diff -ru a/sysdeps/x86_64/__longjmp.S b/sysdeps/x86_64/__longjmp.S +--- a/sysdeps/x86_64/__longjmp.S 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/x86_64/__longjmp.S 2011-12-12 14:23:04.848739110 -0700 @@ -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. @@ -4480,7 +4610,7 @@ /* Jump to the position specified by ENV, causing the setjmp call there to return VAL, or 1 if VAL is 0. -@@ -34,6 +35,7 @@ ENTRY(__longjmp) +@@ -34,6 +35,7 @@ PTR_DEMANGLE (%r9) PTR_DEMANGLE (%rdx) #endif @@ -4488,15 +4618,16 @@ /* We add unwind information for the target here. */ cfi_def_cfa(%rdi, 0) cfi_register(%rsp,%r8) -@@ -53,5 +55,6 @@ ENTRY(__longjmp) +@@ -53,5 +55,6 @@ mov %esi, %eax movq %r8,%rsp movq %r9,%rbp + 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 +diff -ru a/sysdeps/x86_64/setjmp.S b/sysdeps/x86_64/setjmp.S +--- a/sysdeps/x86_64/setjmp.S 2011-12-12 14:10:53.000000000 -0700 ++++ b/sysdeps/x86_64/setjmp.S 2011-12-12 14:23:04.848739110 -0700 @@ -1,5 +1,5 @@ /* setjmp for x86-64. - Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc. @@ -4512,7 +4643,7 @@ ENTRY (__sigsetjmp) /* Save registers. */ -@@ -41,6 +42,7 @@ ENTRY (__sigsetjmp) +@@ -41,6 +42,7 @@ #endif movq %rdx, (JB_RSP*8)(%rdi) movq (%rsp), %rax /* Save PC we are returning to now. */ @@ -4520,9 +4651,10 @@ #ifdef PTR_MANGLE PTR_MANGLE (%rax) #endif ---- glibc-2.14-394-g8f3b1ff/timezone/zic.c -+++ glibc-2.14.90-13/timezone/zic.c -@@ -1921,7 +1921,7 @@ const int zonecount; +diff -ru a/timezone/zic.c b/timezone/zic.c +--- a/timezone/zic.c 2011-12-12 14:10:53.000000000 -0700 ++++ b/timezone/zic.c 2011-12-12 14:23:04.849739110 -0700 +@@ -1921,7 +1921,7 @@ if (stdrp != NULL && stdrp->r_hiyear == 2037) return; } diff --git a/glibc-localegrouping.patch b/glibc-localegrouping.patch deleted file mode 100644 index 13ca55b..0000000 --- a/glibc-localegrouping.patch +++ /dev/null @@ -1,1660 +0,0 @@ -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-no-leaf-attribute.patch b/glibc-no-leaf-attribute.patch deleted file mode 100644 index 1cac26e..0000000 --- a/glibc-no-leaf-attribute.patch +++ /dev/null @@ -1,49 +0,0 @@ -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-rh552960.patch b/glibc-rh552960.patch deleted file mode 100644 index 96e2c8c..0000000 --- a/glibc-rh552960.patch +++ /dev/null @@ -1,226 +0,0 @@ -diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S ---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-15 10:45:09.759232551 -0700 -+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-15 15:11:57.534479377 -0700 -@@ -137,6 +137,7 @@ __pthread_cond_wait: - cmpl $PI_BIT, %eax - jne 18f - -+90: - movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx - movl %ebp, %edx - xorl %esi, %esi -@@ -150,6 +151,9 @@ __pthread_cond_wait: - sete 16(%esp) - je 19f - -+ cmpl $-EAGAIN, %eax -+ je 91f -+ - /* Normal and PI futexes dont mix. Use normal futex functions only - if the kernel does not support the PI futex functions. */ - cmpl $-ENOSYS, %eax -@@ -394,6 +398,78 @@ __pthread_cond_wait: - #endif - call __lll_unlock_wake - jmp 11b -+ -+91: -+.LcleanupSTART2: -+ /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to -+ call it again. */ -+ -+ /* Get internal lock. */ -+ movl $1, %edx -+ xorl %eax, %eax -+ LOCK -+#if cond_lock == 0 -+ cmpxchgl %edx, (%ebx) -+#else -+ cmpxchgl %edx, cond_lock(%ebx) -+#endif -+ jz 92f -+ -+#if cond_lock == 0 -+ movl %ebx, %edx -+#else -+ leal cond_lock(%ebx), %edx -+#endif -+#if (LLL_SHARED-LLL_PRIVATE) > 255 -+ xorl %ecx, %ecx -+#endif -+ cmpl $-1, dep_mutex(%ebx) -+ setne %cl -+ subl $1, %ecx -+ andl $(LLL_SHARED-LLL_PRIVATE), %ecx -+#if LLL_PRIVATE != 0 -+ addl $LLL_PRIVATE, %ecx -+#endif -+ call __lll_lock_wait -+ -+92: -+ /* Increment the cond_futex value again, so it can be used as a new -+ expected value. */ -+ addl $1, cond_futex(%ebx) -+ movl cond_futex(%ebx), %ebp -+ -+ /* Unlock. */ -+ LOCK -+#if cond_lock == 0 -+ subl $1, (%ebx) -+#else -+ subl $1, cond_lock(%ebx) -+#endif -+ je 93f -+#if cond_lock == 0 -+ movl %ebx, %eax -+#else -+ leal cond_lock(%ebx), %eax -+#endif -+#if (LLL_SHARED-LLL_PRIVATE) > 255 -+ xorl %ecx, %ecx -+#endif -+ cmpl $-1, dep_mutex(%ebx) -+ setne %cl -+ subl $1, %ecx -+ andl $(LLL_SHARED-LLL_PRIVATE), %ecx -+#if LLL_PRIVATE != 0 -+ addl $LLL_PRIVATE, %ecx -+#endif -+ call __lll_unlock_wake -+ -+93: -+ /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ -+ xorl %ecx, %ecx -+ movl dep_mutex(%ebx), %edi -+ jmp 90b -+.LcleanupEND2: -+ - .size __pthread_cond_wait, .-__pthread_cond_wait - versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, - GLIBC_2_3_2) -@@ -566,6 +642,10 @@ __condvar_w_cleanup: - .long .LcleanupEND-.Lsub_cond_futex - .long __condvar_w_cleanup-.LSTARTCODE - .uleb128 0 -+ .long .LcleanupSTART2-.LSTARTCODE -+ .long .LcleanupEND2-.LcleanupSTART2 -+ .long __condvar_w_cleanup-.LSTARTCODE -+ .uleb128 0 - .long .LcallUR-.LSTARTCODE - .long .LENDCODE-.LcallUR - .long 0 -diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-15 10:45:09.764232551 -0700 -+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-15 15:12:49.287474417 -0700 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - - #include -@@ -136,11 +137,14 @@ __pthread_cond_wait: - cmpl $PI_BIT, %eax - jne 61f - -+90: - movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi - movl $SYS_futex, %eax - syscall - - movl $1, %r8d -+ cmpq $-EAGAIN, %rax -+ je 91f - #ifdef __ASSUME_REQUEUE_PI - jmp 62f - #else -@@ -327,6 +331,70 @@ __pthread_cond_wait: - - 13: movq %r10, %rax - jmp 14b -+ -+91: -+.LcleanupSTART2: -+ /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to -+ call it again. */ -+ movq 8(%rsp), %rdi -+ -+ /* Get internal lock. */ -+ movl $1, %esi -+ xorl %eax, %eax -+ LOCK -+#if cond_lock == 0 -+ cmpxchgl %esi, (%rdi) -+#else -+ cmpxchgl %esi, cond_lock(%rdi) -+#endif -+ jz 92f -+ -+#if cond_lock != 0 -+ addq $cond_lock, %rdi -+#endif -+ cmpq $-1, dep_mutex-cond_lock(%rdi) -+ movl $LLL_PRIVATE, %eax -+ movl $LLL_SHARED, %esi -+ cmovne %eax, %esi -+ callq __lll_lock_wait -+#if cond_lock != 0 -+ subq $cond_lock, %rdi -+#endif -+92: -+ /* Increment the cond_futex value again, so it can be used as a new -+ expected value. */ -+ incl cond_futex(%rdi) -+ movl cond_futex(%rdi), %edx -+ -+ /* Release internal lock. */ -+ LOCK -+#if cond_lock == 0 -+ decl (%rdi) -+#else -+ decl cond_lock(%rdi) -+#endif -+ jz 93f -+ -+#if cond_lock != 0 -+ addq $cond_lock, %rdi -+#endif -+ cmpq $-1, dep_mutex-cond_lock(%rdi) -+ movl $LLL_PRIVATE, %eax -+ movl $LLL_SHARED, %esi -+ cmovne %eax, %esi -+ /* The call preserves %rdx. */ -+ callq __lll_unlock_wake -+#if cond_lock != 0 -+ subq $cond_lock, %rdi -+#endif -+93: -+ /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ -+ xorq %r10, %r10 -+ movq dep_mutex(%rdi), %r8 -+ leaq cond_futex(%rdi), %rdi -+ jmp 90b -+.LcleanupEND2: -+ - .size __pthread_cond_wait, .-__pthread_cond_wait - versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, - GLIBC_2_3_2) -@@ -479,11 +547,15 @@ __condvar_cleanup1: - .uleb128 .LcleanupSTART-.LSTARTCODE - .uleb128 .LcleanupEND-.LcleanupSTART - .uleb128 __condvar_cleanup1-.LSTARTCODE -- .uleb128 0 -+ .uleb128 0 -+ .uleb128 .LcleanupSTART2-.LSTARTCODE -+ .uleb128 .LcleanupEND2-.LcleanupSTART2 -+ .uleb128 __condvar_cleanup1-.LSTARTCODE -+ .uleb128 0 - .uleb128 .LcallUR-.LSTARTCODE - .uleb128 .LENDCODE-.LcallUR - .uleb128 0 -- .uleb128 0 -+ .uleb128 0 - .Lcstend: - - diff --git a/glibc-rh708455.patch b/glibc-rh708455.patch deleted file mode 100644 index efc8116..0000000 --- a/glibc-rh708455.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/manual/resource.texi b/manual/resource.texi -index 0549572..8e3155c 100644 ---- a/manual/resource.texi -+++ b/manual/resource.texi -@@ -1607,7 +1607,7 @@ processors and so the call - @end smallexample - - @noindent --returns the number of processors which are currently inline (i.e., -+returns the number of processors which are currently online (i.e., - available). - - For these two pieces of information the GNU C library also provides diff --git a/glibc-rh750811.patch b/glibc-rh750811.patch deleted file mode 100644 index 325766b..0000000 --- a/glibc-rh750811.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit 850fb039cec802072f70ed9763927881bbbf639c -Author: Andreas Schwab -Date: Tue Dec 6 11:10:06 2011 +0100 - - Fix a wrong constant in powerpc hypot implementation - ---- a/ChangeLog 2011-12-05 20:28:47.000000000 -0700 -+++ b/ChangeLog 2011-12-07 13:14:29.619858242 -0700 -@@ -1,3 +1,7 @@ -+2011-12-06 Andreas Schwab -+ -+ * sysdeps/powerpc/fpu/e_hypot.c (twoM600): Correct value. -+ - 2011-12-02 Andreas Schwab - - * misc/bits/select2.h (__FD_ELT): Mark as extension. Add -diff --git a/sysdeps/powerpc/fpu/e_hypot.c b/sysdeps/powerpc/fpu/e_hypot.c -index a8d67d8..3731c58 100644 ---- a/sysdeps/powerpc/fpu/e_hypot.c -+++ b/sysdeps/powerpc/fpu/e_hypot.c -@@ -26,7 +26,7 @@ static const double two500 = 3.2733906078961419e+150; - static const double two600 = 4.149515568880993e+180; - static const double two1022 = 4.49423283715579e+307; - static const double twoM500 = 3.054936363499605e-151; --static const double twoM600 = 4.616489308892868e-128; -+static const double twoM600 = 2.4099198651028841e-181; - static const double pdnum = 2.225073858507201e-308; - - /* __ieee754_hypot(x,y) diff --git a/glibc-rh750858.patch b/glibc-rh750858.patch deleted file mode 100644 index c2840d7..0000000 --- a/glibc-rh750858.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 3d7ba52b68e4dc5c4d3eb19de436c66ed9bb2f0d -Author: Andreas Schwab -Date: Thu Nov 3 14:26:38 2011 +0100 - - Don't fail in makedb if SELinux is disabled - -*** a/ChangeLog Wed Nov 30 12:38:59 2011 ---- b/ChangeLog Wed Nov 30 12:39:17 2011 -*************** -*** 9,14 **** ---- 9,19 ---- - (reused_arena): Don't check arena limit. - (arena_get2): Atomically check arena limit. - -+ 2011-11-03 Andreas Schwab -+ -+ * nss/makedb.c (set_file_creation_context): Do nothing if SELinux -+ is disabled. -+ - 2011-10-19 Andreas Schwab - - * sysdeps/x86_64/fpu/math_private.h (libc_feupdateenv): Use -diff --git a/nss/makedb.c b/nss/makedb.c -index 8cee92f..1b19966 100644 ---- a/nss/makedb.c -+++ b/nss/makedb.c -@@ -842,7 +842,7 @@ set_file_creation_context (const char *outname, mode_t mode) - - /* Check if SELinux is enabled, and remember. */ - if (enabled == 0) -- enabled = is_selinux_enabled (); -+ enabled = is_selinux_enabled () ? 1 : -1; - if (enabled < 0) - return; - diff --git a/glibc-rh757887.patch b/glibc-rh757887.patch deleted file mode 100644 index 436f28a..0000000 --- a/glibc-rh757887.patch +++ /dev/null @@ -1,242 +0,0 @@ -commit f3a6cc0a560a17f32a3e90d2f20501a53cab6058 -Author: Andreas Schwab -Date: Tue Nov 29 10:52:22 2011 +0100 - - Fix access after end of search string in regex matcher - ---- a/ChangeLog 2011-11-30 12:43:22.312632113 -0700 -+++ b/ChangeLog 2011-11-30 12:43:50.569624022 -0700 -@@ -1,3 +1,14 @@ -+2011-11-29 Andreas Schwab -+ -+ * locale/weight.h (findidx): Add parameter len. -+ * locale/weightwc.h (findidx): Likewise. -+ * posix/fnmatch_loop.c (FCT): Adjust caller. -+ * posix/regcomp.c (build_equiv_class): Likewise. -+ * posix/regex_internal.h (re_string_elem_size_at): Likewise. -+ * posix/regexec.c (check_node_accept_bytes): Likewise. -+ * string/strcoll_l.c (STRCOLL): Likewise. -+ * string/strxfrm_l.c (STRXFRM): Likewise. -+ - 2011-11-14 Andreas Schwab - - * malloc/arena.c (arena_get2): Don't call reused_arena when -diff --git a/locale/weight.h b/locale/weight.h -index dc70a00..967e176 100644 ---- a/locale/weight.h -+++ b/locale/weight.h -@@ -1,4 +1,4 @@ --/* Copyright (C) 1996,1997,1998,1999,2000,2003,2004 Free Software Foundation, Inc. -+/* Copyright (C) 1996,1997,1998,1999,2000,2003,2004,2011 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Written by Ulrich Drepper, . - -@@ -20,7 +20,7 @@ - /* Find index of weight. */ - auto inline int32_t - __attribute ((always_inline)) --findidx (const unsigned char **cpp) -+findidx (const unsigned char **cpp, size_t len) - { - int_fast32_t i = table[*(*cpp)++]; - const unsigned char *cp; -@@ -34,6 +34,7 @@ findidx (const unsigned char **cpp) - Search for the correct one. */ - cp = &extra[-i]; - usrc = *cpp; -+ --len; - while (1) - { - size_t nhere; -@@ -56,7 +57,7 @@ findidx (const unsigned char **cpp) - already. */ - size_t cnt; - -- for (cnt = 0; cnt < nhere; ++cnt) -+ for (cnt = 0; cnt < nhere && cnt < len; ++cnt) - if (cp[cnt] != usrc[cnt]) - break; - -@@ -79,13 +80,13 @@ findidx (const unsigned char **cpp) - size_t cnt; - size_t offset = 0; - -- for (cnt = 0; cnt < nhere; ++cnt) -+ for (cnt = 0; cnt < nhere && cnt < len; ++cnt) - if (cp[cnt] != usrc[cnt]) - break; - - if (cnt != nhere) - { -- if (cp[cnt] > usrc[cnt]) -+ if (cnt == len || cp[cnt] > usrc[cnt]) - { - /* Cannot be in this range. */ - cp += 2 * nhere; -diff --git a/locale/weightwc.h b/locale/weightwc.h -index 9ea1126..7862091 100644 ---- a/locale/weightwc.h -+++ b/locale/weightwc.h -@@ -1,4 +1,4 @@ --/* Copyright (C) 1996-2001,2003,2004,2005,2007 Free Software Foundation, Inc. -+/* Copyright (C) 1996-2001,2003,2004,2005,2007,2011 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Written by Ulrich Drepper, . - -@@ -20,7 +20,7 @@ - /* Find index of weight. */ - auto inline int32_t - __attribute ((always_inline)) --findidx (const wint_t **cpp) -+findidx (const wint_t **cpp, size_t len) - { - wint_t ch = *(*cpp)++; - int32_t i = __collidx_table_lookup ((const char *) table, ch); -@@ -32,6 +32,7 @@ findidx (const wint_t **cpp) - /* Oh well, more than one sequence starting with this byte. - Search for the correct one. */ - const int32_t *cp = (const int32_t *) &extra[-i]; -+ --len; - while (1) - { - size_t nhere; -@@ -54,7 +55,7 @@ findidx (const wint_t **cpp) - already. */ - size_t cnt; - -- for (cnt = 0; cnt < nhere; ++cnt) -+ for (cnt = 0; cnt < nhere && cnt < len; ++cnt) - if (cp[cnt] != usrc[cnt]) - break; - -@@ -75,7 +76,7 @@ findidx (const wint_t **cpp) - size_t cnt; - size_t offset; - -- for (cnt = 0; cnt < nhere - 1; ++cnt) -+ for (cnt = 0; cnt < nhere - 1 && cnt < len; ++cnt) - if (cp[cnt] != usrc[cnt]) - break; - -diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c -index 18a6667..72bd3ee 100644 ---- a/posix/fnmatch_loop.c -+++ b/posix/fnmatch_loop.c -@@ -412,7 +412,7 @@ FCT (pattern, string, string_end, no_leading_period, flags, ends, alloca_used) - _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB); - # endif - -- idx = findidx (&cp); -+ idx = findidx (&cp, 1); - if (idx != 0) - { - /* We found a table entry. Now see whether the -@@ -422,7 +422,7 @@ FCT (pattern, string, string_end, no_leading_period, flags, ends, alloca_used) - int32_t idx2; - const UCHAR *np = (const UCHAR *) n; - -- idx2 = findidx (&np); -+ idx2 = findidx (&np, string_end - n); - if (idx2 != 0 - && (idx >> 24) == (idx2 >> 24) - && len == weights[idx2 & 0xffffff]) -diff --git a/posix/regcomp.c b/posix/regcomp.c -index b238c08..34ee845 100644 ---- a/posix/regcomp.c -+++ b/posix/regcomp.c -@@ -1,5 +1,5 @@ - /* Extended regular expression matching and search library. -- Copyright (C) 2002-2007,2009,2010 Free Software Foundation, Inc. -+ Copyright (C) 2002-2007,2009,2010,2011 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Isamu Hasegawa . - -@@ -3409,19 +3409,18 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name) - _NL_COLLATE_EXTRAMB); - indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE, - _NL_COLLATE_INDIRECTMB); -- idx1 = findidx (&cp); -- if (BE (idx1 == 0 || cp < name + strlen ((const char *) name), 0)) -+ idx1 = findidx (&cp, -1); -+ if (BE (idx1 == 0 || *cp != '\0', 0)) - /* This isn't a valid character. */ - return REG_ECOLLATE; - - /* Build single byte matcing table for this equivalence class. */ -- char_buf[1] = (unsigned char) '\0'; - len = weights[idx1 & 0xffffff]; - for (ch = 0; ch < SBC_MAX; ++ch) - { - char_buf[0] = ch; - cp = char_buf; -- idx2 = findidx (&cp); -+ idx2 = findidx (&cp, 1); - /* - idx2 = table[ch]; - */ - ---- a/posix/regex_internal.h 2011-11-30 12:47:02.706567482 -0700 -+++ a/posix/regex_internal.h 2011-11-30 12:47:32.969558337 -0700 -@@ -756,7 +756,7 @@ - indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE, - _NL_COLLATE_INDIRECTMB); - p = pstr->mbs + idx; -- tmp = findidx (&p); -+ tmp = findidx (&p, pstr->len - idx); - return p - pstr->mbs - idx; - } - else -diff --git a/posix/regexec.c b/posix/regexec.c -index 9e0c565..3ea810b 100644 ---- a/posix/regexec.c -+++ b/posix/regexec.c -@@ -3924,7 +3924,7 @@ check_node_accept_bytes (const re_dfa_t *dfa, int node_idx, - _NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB); - indirect = (const int32_t *) - _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB); -- int32_t idx = findidx (&cp); -+ int32_t idx = findidx (&cp, elem_len); - if (idx > 0) - for (i = 0; i < cset->nequiv_classes; ++i) - { -diff --git a/string/strcoll_l.c b/string/strcoll_l.c -index d8d1139..fb77d08 100644 ---- a/string/strcoll_l.c -+++ b/string/strcoll_l.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 1995-1997,2002,2004,2007,2010 Free Software Foundation, Inc. -+/* Copyright (C) 1995-1997,2002,2004,2007,2010,2011 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Written by Ulrich Drepper , 1995. - -@@ -205,7 +205,7 @@ STRCOLL (s1, s2, l) - - while (*us1 != L('\0')) - { -- int32_t tmp = findidx (&us1); -+ int32_t tmp = findidx (&us1, -1); - rule1arr[idx1max] = tmp >> 24; - idx1arr[idx1max] = tmp & 0xffffff; - idx1cnt = idx1max++; -@@ -267,7 +267,7 @@ STRCOLL (s1, s2, l) - - while (*us2 != L('\0')) - { -- int32_t tmp = findidx (&us2); -+ int32_t tmp = findidx (&us2, -1); - rule2arr[idx2max] = tmp >> 24; - idx2arr[idx2max] = tmp & 0xffffff; - idx2cnt = idx2max++; -diff --git a/string/strxfrm_l.c b/string/strxfrm_l.c -index 220253c..b06556d 100644 ---- a/string/strxfrm_l.c -+++ b/string/strxfrm_l.c -@@ -176,7 +176,7 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l) - idxmax = 0; - do - { -- int32_t tmp = findidx (&usrc); -+ int32_t tmp = findidx (&usrc, -1); - rulearr[idxmax] = tmp >> 24; - idxarr[idxmax] = tmp & 0xffffff; - diff --git a/glibc-rh758252.patch b/glibc-rh758252.patch deleted file mode 100644 index bdac89a..0000000 --- a/glibc-rh758252.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit 6257af2d05d460a0dd3e2a8268dd813edb980d81 -Author: Andreas Schwab -Date: Thu Dec 1 13:27:53 2011 +0100 - - Truncate time values in Linux futimes when falling back to utime - -diff --git a/ChangeLog b/ChangeLog -index 2bf0a0a..dddb628 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -7,6 +7,12 @@ - * misc/bits/select2.h (__FD_ELT): Mark as extension. Add - parenthesis. - -+2011-12-01 Andreas Schwab -+ -+ * sysdeps/unix/sysv/linux/futimes.c: Truncate time values when -+ falling back to utime. -+ -+ - 2011-11-29 Andreas Schwab - - * locale/weight.h (findidx): Add parameter len. -diff --git a/sysdeps/unix/sysv/linux/futimes.c b/sysdeps/unix/sysv/linux/futimes.c -index 272b83e..cd3cce6 100644 ---- a/sysdeps/unix/sysv/linux/futimes.c -+++ b/sysdeps/unix/sysv/linux/futimes.c -@@ -1,5 +1,5 @@ - /* futimes -- change access and modification times of open file. Linux version. -- Copyright (C) 2002,2003,2005,2006,2007 Free Software Foundation, Inc. -+ Copyright (C) 2002,2003,2005,2006,2007,2011 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -95,8 +95,8 @@ __futimes (int fd, const struct timeval tvp[2]) - if (tvp != NULL) - { - times = &buf; -- buf.actime = tvp[0].tv_sec + (tvp[0].tv_usec + 500000) / 1000000; -- buf.modtime = tvp[1].tv_sec + (tvp[1].tv_usec + 500000) / 1000000; -+ buf.actime = tvp[0].tv_sec; -+ buf.modtime = tvp[1].tv_sec; - } - else - times = NULL; diff --git a/glibc-rh767696.patch b/glibc-rh767696.patch deleted file mode 100644 index 66493ac..0000000 --- a/glibc-rh767696.patch +++ /dev/null @@ -1,82 +0,0 @@ -commit 97ac2654b2d831acaa18a2b018b0736245903fd2 -Author: Ulrich Drepper -Date: Sat Dec 17 20:18:42 2011 -0500 - - Check values from TZ file header - - - [BZ #13506] - * time/tzfile.c (__tzfile_read): Check values from file header. - -diff --git a/time/tzfile.c b/time/tzfile.c -index 144e20b..402389c 100644 ---- a/time/tzfile.c -+++ b/time/tzfile.c -@@ -234,23 +234,58 @@ __tzfile_read (const char *file, size_t extra, char **extrap) - goto read_again; - } - -+ if (__builtin_expect (num_transitions -+ > ((SIZE_MAX - (__alignof__ (struct ttinfo) - 1)) -+ / (sizeof (time_t) + 1)), 0)) -+ goto lose; - total_size = num_transitions * (sizeof (time_t) + 1); - total_size = ((total_size + __alignof__ (struct ttinfo) - 1) - & ~(__alignof__ (struct ttinfo) - 1)); - types_idx = total_size; -- total_size += num_types * sizeof (struct ttinfo) + chars; -+ if (__builtin_expect (num_types -+ > (SIZE_MAX - total_size) / sizeof (struct ttinfo), 0)) -+ goto lose; -+ total_size += num_types * sizeof (struct ttinfo); -+ if (__builtin_expect (chars > SIZE_MAX - total_size, 0)) -+ goto lose; -+ total_size += chars; -+ if (__builtin_expect (__alignof__ (struct leap) - 1 -+ > SIZE_MAX - total_size, 0)) -+ goto lose; - total_size = ((total_size + __alignof__ (struct leap) - 1) - & ~(__alignof__ (struct leap) - 1)); - leaps_idx = total_size; -+ if (__builtin_expect (num_leaps -+ > (SIZE_MAX - total_size) / sizeof (struct leap), 0)) -+ goto lose; - total_size += num_leaps * sizeof (struct leap); -- tzspec_len = (sizeof (time_t) == 8 && trans_width == 8 -- ? st.st_size - (ftello (f) -- + num_transitions * (8 + 1) -- + num_types * 6 -- + chars -- + num_leaps * 12 -- + num_isstd -- + num_isgmt) - 1 : 0); -+ tzspec_len = 0; -+ if (sizeof (time_t) == 8 && trans_width == 8) -+ { -+ off_t rem = st.st_size - ftello (f); -+ if (__builtin_expect (rem < 0 -+ || (size_t) rem < (num_transitions * (8 + 1) -+ + num_types * 6 -+ + chars), 0)) -+ goto lose; -+ tzspec_len = (size_t) rem - (num_transitions * (8 + 1) -+ + num_types * 6 -+ + chars); -+ if (__builtin_expect (num_leaps > SIZE_MAX / 12 -+ || tzspec_len < num_leaps * 12, 0)) -+ goto lose; -+ tzspec_len -= num_leaps * 12; -+ if (__builtin_expect (tzspec_len < num_isstd, 0)) -+ goto lose; -+ tzspec_len -= num_isstd; -+ if (__builtin_expect (tzspec_len == 0 || tzspec_len - 1 < num_isgmt, 0)) -+ goto lose; -+ tzspec_len -= num_isgmt + 1; -+ if (__builtin_expect (SIZE_MAX - total_size < tzspec_len, 0)) -+ goto lose; -+ } -+ if (__builtin_expect (SIZE_MAX - total_size - tzspec_len < extra, 0)) -+ goto lose; - - /* Allocate enough memory including the extra block requested by the - caller. */ diff --git a/glibc-rh767746.patch b/glibc-rh767746.patch deleted file mode 100644 index 58d96d8..0000000 --- a/glibc-rh767746.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/nptl/pthread_create.c 2011-12-13 11:41:37.000000000 -0700 -+++ b/nptl/pthread_create.c 2011-12-14 10:03:13.000000000 -0700 -@@ -440,8 +440,9 @@ - int err = ALLOCATE_STACK (iattr, &pd); - if (__builtin_expect (err != 0, 0)) - /* Something went wrong. Maybe a parameter of the attributes is -- invalid or we could not allocate memory. */ -- return err; -+ invalid or we could not allocate memory. Note we have to -+ translate error codes. */ -+ return err == ENOMEM ? EAGAIN : err; - - - /* Initialize the TCB. All initializations with zero should be diff --git a/glibc.spec b/glibc.spec index 8e2dae8..aeb21be 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.14-394-g8f3b1ff +%define glibcsrcdir glibc-2.14-a4647e7 %define glibcversion 2.14.90 -%define glibcportsdir glibc-ports-2.14-25-gd3d9bde +%define glibcportsdir glibc-ports-2.14-4a93ed4 ### 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: 24%{?dist}.3 +Release: 25%{?dist} # 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 @@ -37,24 +37,15 @@ Release: 24%{?dist}.3 License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+ Group: System Environment/Libraries URL: http://www.gnu.org/software/glibc/ -Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.xz -Source1: %{?glibc_release_url}%{glibcportsdir}.tar.xz -Source2: %{glibcsrcdir}-fedora.tar.xz +Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.gz +Source1: %{?glibc_release_url}%{glibcportsdir}.tar.gz +Source2: %{glibcsrcdir}-fedora.tar.gz Patch0: %{name}-fedora.patch Patch1: %{name}-ia64-lib64.patch -Patch2: %{name}-no-leaf-attribute.patch -Patch3: %{name}-localegrouping.patch -Patch4: %{name}-arenalock.patch -Patch5: %{name}-rh757881.patch -Patch6: %{name}-rh750858.patch -Patch7: %{name}-rh757887.patch -Patch8: %{name}-fdelt.patch -Patch9: %{name}-rh708455.patch -Patch10: %{name}-rh750811.patch -Patch11: %{name}-rh758252.patch -Patch12: %{name}-rh767746.patch -Patch13: %{name}-rh552960.patch -Patch14: %{name}-rh767696.patch +# Uli wants to see this undergo more analyis (what happens when thread B calls into malloc when +# thread A has unlocked on the error path +# There's an alternate approach using mmap after detecting an error that needs discussion +Patch2: %{name}-rh757881.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: glibc-profile < 2.4 Obsoletes: nss_db @@ -274,18 +265,6 @@ rm -rf %{glibcportsdir} %endif %endif %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 # A lot of programs still misuse memcpy when they have to use # memmove. The memcpy implementation below is not tolerant at @@ -1138,6 +1117,9 @@ rm -f *.filelist* %endif %changelog +* Mon Dec 19 2011 Jeff Law - 2.14.90-25.fc17 + - Update from master (a4647e7). + * Sun Dec 18 2011 Jeff Law - 2.14.90-24.fc16.3 - Check values from TZ file header (#767696) - Handle EAGAIN from FUTEX_WAIT_REQUEUE_PI (#552960) diff --git a/sources b/sources index c990b62..0a836c8 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 +cb5aa693529a29dccf63ff469464fcce glibc-2.14-a4647e7-fedora.tar.gz +905fb427fbfa8a32c01f63bfdd3f7912 glibc-2.14-a4647e7.tar.gz +2e5aa88b3474e41a90cdb1dab2ee1c5d glibc-ports-2.14-4a93ed4.tar.gz