This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via a24c4d29aee03f85ca55569e01d8da161d02e2a4 (commit) via 7f98fc96d93217249f615a62fdfb4e04bf413327 (commit) from e9423d27d6e94512b3b1b0eb8887b8ca8809db13 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit a24c4d29aee03f85ca55569e01d8da161d02e2a4 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jan 30 00:26:52 2012 +0100
python: Force to build with db-4.8.
commit 7f98fc96d93217249f615a62fdfb4e04bf413327 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 29 23:50:53 2012 +0100
glibc: Update to 2.15.
Required to fix the ARM bootstrap.
-----------------------------------------------------------------------
Summary of changes: glibc/glibc.nm | 12 +- glibc/patches/glibc-fedora.patch | 1226 ++++++++++---------- ...2.15-add-arm-dependency-of-libmemusage.so.patch | 26 + python/patches/python-2.7.1-setup-db48.patch | 13 + python/python.nm | 4 +- 5 files changed, 660 insertions(+), 621 deletions(-) create mode 100644 glibc/patches/glibc-ports-2.15-add-arm-dependency-of-libmemusage.so.patch create mode 100644 python/patches/python-2.7.1-setup-db48.patch
Difference in files: diff --git a/glibc/glibc.nm b/glibc/glibc.nm index 3e6093d..d191602 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -4,9 +4,9 @@ ###############################################################################
name = glibc -version = 2.14.90 +version = 2.15 release = 1 -thisapp = %{name}-2.14-16c6f99 +thisapp = %{name}-2.15-a316c1f
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Base @@ -25,7 +25,7 @@ description end
# The version of the ports addon. -ports_version = 2.14-c2aeee1 +ports_version = 2.15-8a70b2d
source_dl = http://ftp.gnu.org/gnu/glibc/ sources = %{thisapp}.tar.gz glibc-ports-%{ports_version}.tar.gz @@ -36,14 +36,14 @@ build
requires #audit-devel - #autoconf - #automake + autoconf + automake #gettext kernel-headers>=%{OPTIMIZED_KERNEL} libcap-devel libselinux-devel #nss-devel - #texinfo + texinfo end
# Build glibc with custom cflags diff --git a/glibc/patches/glibc-fedora.patch b/glibc/patches/glibc-fedora.patch index 1f5298b..25fa067 100644 --- a/glibc/patches/glibc-fedora.patch +++ b/glibc/patches/glibc-fedora.patch @@ -1,7 +1,7 @@ -diff -Nur a/ChangeLog b/ChangeLog ---- a/ChangeLog 2011-12-22 16:50:52.000000000 +0000 -+++ b/ChangeLog 2011-12-22 18:00:44.158145149 +0000 -@@ -2416,6 +2416,11 @@ +diff -Nrup a/ChangeLog b/ChangeLog +--- a/ChangeLog 2012-01-01 05:16:32.000000000 -0700 ++++ b/ChangeLog 2012-01-01 20:41:26.621439845 -0700 +@@ -2542,6 +2542,11 @@
* sysdeps/mach/hurd/sys/param.h (DEV_BSIZE): New macro.
@@ -13,7 +13,7 @@ diff -Nur a/ChangeLog b/ChangeLog 2011-09-08 Andreas Schwab schwab@redhat.com
* elf/dl-load.c (lose): Check for non-null L. -@@ -2678,6 +2683,11 @@ +@@ -2804,6 +2809,11 @@ * sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi directive.
@@ -25,7 +25,7 @@ diff -Nur a/ChangeLog b/ChangeLog 2011-08-24 David S. Miller davem@davemloft.net
* sysdeps/sparc/sparc64/strcmp.S: Rewrite. -@@ -3483,6 +3493,14 @@ +@@ -3609,6 +3619,14 @@ * config.make.in: Likewise. * malloc/Makefile: Likewise.
@@ -40,7 +40,7 @@ diff -Nur a/ChangeLog b/ChangeLog 2011-06-27 Andreas Schwab schwab@redhat.com
* iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP -@@ -3614,6 +3632,10 @@ +@@ -3740,6 +3758,10 @@
* inet/getnetgrent_r.c: Use DL_CALL_FCT in several places.
@@ -51,7 +51,7 @@ diff -Nur a/ChangeLog b/ChangeLog 2011-06-20 David S. Miller davem@davemloft.net
* sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple -@@ -4236,6 +4258,13 @@ +@@ -4362,6 +4384,13 @@ * libio/Makefile (tests): Add bug-fclose1. * libio/bug-fclose1.c: New file.
@@ -65,7 +65,7 @@ diff -Nur a/ChangeLog b/ChangeLog 2011-05-12 Ulrich Drepper drepper@gmail.com
[BZ #12511] -@@ -4513,13 +4542,6 @@ +@@ -4639,13 +4668,6 @@ * stdlib/bug-getcontext.c: New file. * stdlib/Makefile: Add rules to build and run bug-getcontext.
@@ -79,7 +79,7 @@ diff -Nur a/ChangeLog b/ChangeLog 2011-04-11 Andreas Krebbel Andreas.Krebbel@de.ibm.com
* sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes -@@ -4757,6 +4779,31 @@ +@@ -4883,6 +4905,31 @@ * sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime): Export.
@@ -111,7 +111,7 @@ diff -Nur a/ChangeLog b/ChangeLog 2011-03-22 Ulrich Drepper drepper@gmail.com
* sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment -@@ -4817,6 +4864,16 @@ +@@ -4943,6 +4990,16 @@ $LDFLAGS and -nostdlib -nostartfiles to linking step. Change main to _start.
@@ -128,7 +128,7 @@ diff -Nur a/ChangeLog b/ChangeLog 2011-03-06 Ulrich Drepper drepper@gmail.com
* elf/dl-load.c (_dl_map_object): If we are looking for the first -@@ -5033,6 +5090,12 @@ +@@ -5159,6 +5216,12 @@ * shadow/sgetspent.c: Check return value of __sgetspent_r instead of errno.
@@ -141,7 +141,7 @@ diff -Nur a/ChangeLog b/ChangeLog 2011-01-19 Ulrich Drepper drepper@gmail.com
[BZ #11724] -@@ -5720,6 +5783,26 @@ +@@ -5846,6 +5909,26 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid.
@@ -168,7 +168,7 @@ diff -Nur a/ChangeLog b/ChangeLog 2010-09-24 Petr Baudis pasky@suse.cz
* debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -6512,6 +6595,17 @@ +@@ -6638,6 +6721,17 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise.
@@ -186,7 +186,7 @@ diff -Nur a/ChangeLog b/ChangeLog 2010-06-07 Andreas Schwab schwab@redhat.com
* dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -6564,6 +6658,21 @@ +@@ -6690,6 +6784,21 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS.
@@ -208,9 +208,9 @@ diff -Nur a/ChangeLog b/ChangeLog 2010-05-28 Luis Machado luisgpm@br.ibm.com
* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. -diff -Nur a/ChangeLog.15 b/ChangeLog.15 ---- a/ChangeLog.15 2011-12-22 16:50:52.000000000 +0000 -+++ b/ChangeLog.15 2011-12-22 17:59:24.542119295 +0000 +diff -Nrup a/ChangeLog.15 b/ChangeLog.15 +--- a/ChangeLog.15 2012-01-01 05:16:32.000000000 -0700 ++++ b/ChangeLog.15 2012-01-01 20:41:26.623439845 -0700 @@ -477,6 +477,14 @@
2004-11-26 Jakub Jelinek jakub@redhat.com @@ -276,9 +276,9 @@ diff -Nur a/ChangeLog.15 b/ChangeLog.15 2004-08-30 Roland McGrath roland@frob.com
* scripts/extract-abilist.awk: If `lastversion' variable defined, omit -diff -Nur a/ChangeLog.16 b/ChangeLog.16 ---- a/ChangeLog.16 2011-12-22 16:50:52.000000000 +0000 -+++ b/ChangeLog.16 2011-12-22 17:59:24.545119296 +0000 +diff -Nrup a/ChangeLog.16 b/ChangeLog.16 +--- a/ChangeLog.16 2012-01-01 05:16:32.000000000 -0700 ++++ b/ChangeLog.16 2012-01-01 20:41:26.626439845 -0700 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -301,9 +301,9 @@ diff -Nur a/ChangeLog.16 b/ChangeLog.16 2006-01-19 Thomas Schwinge tschwinge@gnu.org
* libio/genops.c: Include <stdbool.h>. -diff -Nur a/ChangeLog.17 b/ChangeLog.17 ---- a/ChangeLog.17 2011-12-22 16:50:52.000000000 +0000 -+++ b/ChangeLog.17 2011-12-22 17:59:24.549119296 +0000 +diff -Nrup a/ChangeLog.17 b/ChangeLog.17 +--- a/ChangeLog.17 2012-01-01 05:16:32.000000000 -0700 ++++ b/ChangeLog.17 2012-01-01 20:41:26.629439844 -0700 @@ -256,6 +256,12 @@
* Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -317,7 +317,7 @@ diff -Nur a/ChangeLog.17 b/ChangeLog.17 2010-04-05 Thomas Schwinge thomas@schwinge.name
* sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/. -@@ -2953,6 +2959,11 @@ +@@ -2953,6 +2959,11 @@ d2009-10-30 Ulrich Drepper <drepper@re * sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in the unique symbol hash table should not be const.
@@ -329,7 +329,7 @@ diff -Nur a/ChangeLog.17 b/ChangeLog.17 2009-07-21 Ulrich Drepper drepper@redhat.com
* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -3218,6 +3229,11 @@ +@@ -3218,6 +3229,11 @@ d2009-10-30 Ulrich Drepper <drepper@re out common code into new function get_common_indeces. Determine extended family and model for Intel processors.
@@ -341,7 +341,7 @@ diff -Nur a/ChangeLog.17 b/ChangeLog.17 2009-06-26 Ulrich Drepper drepper@redhat.com
* resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -11818,6 +11834,10 @@ +@@ -11818,6 +11834,10 @@ d2009-10-30 Ulrich Drepper <drepper@re [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath.
@@ -352,7 +352,7 @@ diff -Nur a/ChangeLog.17 b/ChangeLog.17 2007-04-16 Ulrich Drepper drepper@redhat.com
[BZ #4364] -@@ -13075,6 +13095,15 @@ +@@ -13075,6 +13095,15 @@ d2009-10-30 Ulrich Drepper <drepper@re separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3.
@@ -368,10 +368,10 @@ diff -Nur a/ChangeLog.17 b/ChangeLog.17 2006-12-09 Ulrich Drepper drepper@redhat.com
[BZ #3632] -diff -Nur a/Makeconfig b/Makeconfig ---- a/Makeconfig 2011-12-22 16:50:52.000000000 +0000 -+++ b/Makeconfig 2011-12-22 17:59:24.551119298 +0000 -@@ -803,12 +803,12 @@ +diff -Nrup a/Makeconfig b/Makeconfig +--- a/Makeconfig 2012-01-01 05:16:32.000000000 -0700 ++++ b/Makeconfig 2012-01-01 20:41:26.630439843 -0700 +@@ -803,12 +803,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS ifeq ($(have-cpp-asm-debuginfo),yes) @@ -387,10 +387,10 @@ diff -Nur a/Makeconfig b/Makeconfig
ifndef BUILD_CC BUILD_CC = $(CC) -diff -Nur a/NEWS b/NEWS ---- a/NEWS 2011-12-22 16:50:52.000000000 +0000 -+++ b/NEWS 2011-12-22 17:59:24.552119299 +0000 -@@ -83,16 +83,6 @@ +diff -Nrup a/NEWS b/NEWS +--- a/NEWS 2012-01-01 05:16:32.000000000 -0700 ++++ b/NEWS 2012-01-01 20:41:26.631439843 -0700 +@@ -84,16 +84,6 @@ Version 2.14 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, 12795, 12811, 12813, 12814, 12841
@@ -407,9 +407,9 @@ diff -Nur a/NEWS b/NEWS * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at, syncfs, setns, sendmmsg
-diff -Nur a/config.h.in b/config.h.in ---- a/config.h.in 2011-12-22 16:50:52.000000000 +0000 -+++ b/config.h.in 2011-12-22 17:59:24.552119299 +0000 +diff -Nrup a/config.h.in b/config.h.in +--- a/config.h.in 2012-01-01 05:16:32.000000000 -0700 ++++ b/config.h.in 2012-01-01 20:41:26.632439843 -0700 @@ -187,6 +187,9 @@ /* Define if `.ctors' and `.dtors' sections shouldn't be used. */ #undef NO_CTORS_DTORS_SECTIONS @@ -420,10 +420,10 @@ diff -Nur a/config.h.in b/config.h.in /* */
-diff -Nur a/configure b/configure ---- a/configure 2011-12-22 18:00:26.275139344 +0000 -+++ b/configure 2011-12-22 17:59:24.706119348 +0000 -@@ -791,6 +791,7 @@ +diff -Nrup a/configure b/configure +--- a/configure 2012-01-01 20:40:50.423446105 -0700 ++++ b/configure 2012-01-01 20:41:26.634439843 -0700 +@@ -791,6 +791,7 @@ enable_kernel enable_all_warnings enable_multi_arch enable_nss_crypt @@ -431,7 +431,7 @@ diff -Nur a/configure b/configure with_cpu ' ac_precious_vars='build_alias -@@ -1450,6 +1451,7 @@ +@@ -1450,6 +1451,7 @@ Optional Features: --enable-multi-arch enable single DSO with optimizations for multiple architectures --enable-nss-crypt enable libcrypt to use nss @@ -439,7 +439,7 @@ diff -Nur a/configure b/configure
Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -3804,6 +3806,51 @@ +@@ -3804,6 +3806,51 @@ else fi
@@ -491,10 +491,10 @@ diff -Nur a/configure b/configure # 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 -diff -Nur a/configure.in b/configure.in ---- a/configure.in 2011-12-22 16:50:52.000000000 +0000 -+++ b/configure.in 2011-12-22 17:59:24.555119299 +0000 -@@ -290,6 +290,29 @@ +diff -Nrup a/configure.in b/configure.in +--- a/configure.in 2012-01-01 05:16:32.000000000 -0700 ++++ b/configure.in 2012-01-01 20:41:26.635439843 -0700 +@@ -290,6 +290,29 @@ else fi AC_SUBST(libc_cv_nss_crypt)
@@ -524,10 +524,10 @@ diff -Nur a/configure.in b/configure.in # 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 -diff -Nur a/csu/Makefile b/csu/Makefile ---- a/csu/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/csu/Makefile 2011-12-22 17:59:24.556119299 +0000 -@@ -93,7 +93,8 @@ +diff -Nrup a/csu/Makefile b/csu/Makefile +--- a/csu/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/csu/Makefile 2012-01-01 20:41:26.635439843 -0700 +@@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -537,10 +537,10 @@ diff -Nur a/csu/Makefile b/csu/Makefile
vpath initfini.c $(sysdirs)
-diff -Nur a/csu/elf-init.c b/csu/elf-init.c ---- a/csu/elf-init.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/csu/elf-init.c 2011-12-22 17:59:24.557119299 +0000 -@@ -64,6 +64,23 @@ +diff -Nrup a/csu/elf-init.c b/csu/elf-init.c +--- a/csu/elf-init.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/csu/elf-init.c 2012-01-01 20:41:26.636439843 -0700 +@@ -64,6 +64,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -564,9 +564,9 @@ diff -Nur a/csu/elf-init.c b/csu/elf-init.c
/* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ -diff -Nur a/debug/tst-chk1.c b/debug/tst-chk1.c ---- a/debug/tst-chk1.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/debug/tst-chk1.c 2011-12-22 17:59:24.557119299 +0000 +diff -Nrup a/debug/tst-chk1.c b/debug/tst-chk1.c +--- a/debug/tst-chk1.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/debug/tst-chk1.c 2012-01-01 20:41:26.636439843 -0700 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -577,7 +577,7 @@ diff -Nur a/debug/tst-chk1.c b/debug/tst-chk1.c #include <assert.h> #include <fcntl.h> #include <locale.h> -@@ -243,7 +246,7 @@ +@@ -243,7 +246,7 @@ do_test (void) if (memcmp (a.buf1, "aabcdabcjj", 10)) FAIL ();
@@ -586,7 +586,7 @@ diff -Nur a/debug/tst-chk1.c b/debug/tst-chk1.c /* 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 @@ +@@ -358,7 +361,7 @@ do_test (void) memset (a.buf1 + 9, 'j', l0 + 2); CHK_FAIL_END
@@ -595,10 +595,10 @@ diff -Nur a/debug/tst-chk1.c b/debug/tst-chk1.c # define O 0 # else # define O 1 -diff -Nur a/elf/Makefile b/elf/Makefile ---- a/elf/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/elf/Makefile 2011-12-22 17:59:24.558119299 +0000 -@@ -135,6 +135,7 @@ +diff -Nrup a/elf/Makefile b/elf/Makefile +--- a/elf/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/elf/Makefile 2012-01-01 20:41:26.637439843 -0700 +@@ -135,6 +135,7 @@ include ../Makeconfig ifeq ($(unwind-find-fde),yes) routines += unwind-dw2-fde-glibc shared-only-routines += unwind-dw2-fde-glibc @@ -606,7 +606,7 @@ diff -Nur a/elf/Makefile b/elf/Makefile endif
before-compile = $(objpfx)trusted-dirs.h -@@ -505,7 +506,8 @@ +@@ -505,7 +506,8 @@ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D' CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) CFLAGS-cache.c = $(SYSCONF-FLAGS)
@@ -616,10 +616,10 @@ diff -Nur a/elf/Makefile b/elf/Makefile
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names)))) generated += $(addsuffix .so,$(strip $(modules-names))) -diff -Nur a/elf/dl-close.c b/elf/dl-close.c ---- a/elf/dl-close.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/elf/dl-close.c 2011-12-22 17:59:24.559119299 +0000 -@@ -119,17 +119,8 @@ +diff -Nrup a/elf/dl-close.c b/elf/dl-close.c +--- a/elf/dl-close.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/elf/dl-close.c 2012-01-01 20:41:26.638439843 -0700 +@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) if (map->l_direct_opencount > 0 || map->l_type != lt_loaded || dl_close_state != not_pending) { @@ -639,10 +639,10 @@ diff -Nur a/elf/dl-close.c b/elf/dl-close.c
/* There are still references to this object. Do nothing more. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) -diff -Nur a/elf/dl-deps.c b/elf/dl-deps.c ---- a/elf/dl-deps.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/elf/dl-deps.c 2011-12-22 17:59:24.559119299 +0000 -@@ -489,6 +489,7 @@ +diff -Nrup a/elf/dl-deps.c b/elf/dl-deps.c +--- a/elf/dl-deps.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/elf/dl-deps.c 2012-01-01 20:41:26.638439843 -0700 +@@ -489,6 +489,7 @@ _dl_map_object_deps (struct link_map *ma nneeded * sizeof needed[0]); atomic_write_barrier (); l->l_initfini = l_initfini; @@ -650,7 +650,7 @@ diff -Nur a/elf/dl-deps.c b/elf/dl-deps.c }
/* If we have no auxiliary objects just go on to the next map. */ -@@ -689,6 +690,7 @@ +@@ -689,6 +690,7 @@ Filters not supported with LD_TRACE_PREL l_initfini[nlist] = NULL; atomic_write_barrier (); map->l_initfini = l_initfini; @@ -658,7 +658,7 @@ diff -Nur a/elf/dl-deps.c b/elf/dl-deps.c if (l_reldeps != NULL) { atomic_write_barrier (); -@@ -697,7 +699,7 @@ +@@ -697,7 +699,7 @@ Filters not supported with LD_TRACE_PREL _dl_scope_free (old_l_reldeps); } if (old_l_initfini != NULL) @@ -667,9 +667,9 @@ diff -Nur a/elf/dl-deps.c b/elf/dl-deps.c
if (errno_reason) _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, -diff -Nur a/elf/dl-init.c b/elf/dl-init.c ---- a/elf/dl-init.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/elf/dl-init.c 2011-12-22 17:59:24.560119299 +0000 +diff -Nrup a/elf/dl-init.c b/elf/dl-init.c +--- a/elf/dl-init.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/elf/dl-init.c 2012-01-01 20:41:26.639439843 -0700 @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -682,7 +682,7 @@ diff -Nur a/elf/dl-init.c b/elf/dl-init.c
static void -@@ -133,9 +131,7 @@ +@@ -133,9 +131,7 @@ _dl_init (struct link_map *main_map, int while (i-- > 0) call_init (main_map->l_initfini[i], argc, argv, env);
@@ -692,10 +692,10 @@ diff -Nur a/elf/dl-init.c b/elf/dl-init.c -#endif } INTDEF (_dl_init) -diff -Nur a/elf/dl-libc.c b/elf/dl-libc.c ---- a/elf/dl-libc.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/elf/dl-libc.c 2011-12-22 17:59:24.560119299 +0000 -@@ -270,13 +270,13 @@ +diff -Nrup a/elf/dl-libc.c b/elf/dl-libc.c +--- a/elf/dl-libc.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/elf/dl-libc.c 2012-01-01 20:41:26.639439843 -0700 +@@ -270,13 +270,13 @@ libc_freeres_fn (free_mem)
for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) { @@ -710,7 +710,7 @@ diff -Nur a/elf/dl-libc.c b/elf/dl-libc.c while (lnp != NULL) { struct libname_list *old = lnp; -@@ -284,6 +284,10 @@ +@@ -284,6 +284,10 @@ libc_freeres_fn (free_mem) if (! old->dont_free) free (old); } @@ -721,10 +721,10 @@ diff -Nur a/elf/dl-libc.c b/elf/dl-libc.c }
if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 -diff -Nur a/elf/dl-load.c b/elf/dl-load.c ---- a/elf/dl-load.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/elf/dl-load.c 2011-12-22 17:59:24.561119300 +0000 -@@ -250,8 +250,7 @@ +diff -Nrup a/elf/dl-load.c b/elf/dl-load.c +--- a/elf/dl-load.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/elf/dl-load.c 2012-01-01 20:41:26.640439842 -0700 +@@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *p
static size_t @@ -734,7 +734,7 @@ diff -Nur a/elf/dl-load.c b/elf/dl-load.c { size_t len; bool is_curly = false; -@@ -280,12 +279,6 @@ +@@ -280,12 +279,6 @@ is_dst (const char *start, const char *n && (!is_path || name[len] != ':')) return 0;
@@ -747,7 +747,7 @@ diff -Nur a/elf/dl-load.c b/elf/dl-load.c return len; }
-@@ -300,13 +293,10 @@ +@@ -300,13 +293,10 @@ _dl_dst_count (const char *name, int is_ { size_t len;
@@ -764,7 +764,7 @@ diff -Nur a/elf/dl-load.c b/elf/dl-load.c ++cnt;
name = strchr (name + len, '$'); -@@ -339,9 +329,16 @@ +@@ -339,9 +329,16 @@ _dl_dst_substitute (struct link_map *l, size_t len;
++name; @@ -783,7 +783,7 @@ diff -Nur a/elf/dl-load.c b/elf/dl-load.c #ifndef SHARED if (l == NULL) repl = _dl_get_origin (); -@@ -352,9 +349,9 @@ +@@ -352,9 +349,9 @@ _dl_dst_substitute (struct link_map *l, check_for_trusted = (INTUSE(__libc_enable_secure) && l->l_type == lt_executable); } @@ -795,7 +795,7 @@ diff -Nur a/elf/dl-load.c b/elf/dl-load.c repl = DL_DST_LIB;
if (repl != NULL && repl != (const char *) -1) -@@ -374,6 +371,7 @@ +@@ -374,6 +371,7 @@ _dl_dst_substitute (struct link_map *l, element, but keep an empty element at the end. */ if (wp == result && is_path && *name == ':' && name[1] != '\0') ++name; @@ -803,10 +803,10 @@ diff -Nur a/elf/dl-load.c b/elf/dl-load.c } else /* No DST we recognize. */ -diff -Nur a/elf/dl-support.c b/elf/dl-support.c ---- a/elf/dl-support.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/elf/dl-support.c 2011-12-22 17:59:24.561119300 +0000 -@@ -82,10 +82,8 @@ +diff -Nrup a/elf/dl-support.c b/elf/dl-support.c +--- a/elf/dl-support.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/elf/dl-support.c 2012-01-01 20:41:26.641439841 -0700 +@@ -82,10 +82,8 @@ unsigned long long _dl_load_adds; create a fake scope containing nothing. */ struct r_scope_elem _dl_initial_searchlist;
@@ -817,10 +817,10 @@ diff -Nur a/elf/dl-support.c b/elf/dl-support.c
/* Random data provided by the kernel. */ void *_dl_random; -diff -Nur a/elf/ldconfig.c b/elf/ldconfig.c ---- a/elf/ldconfig.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/elf/ldconfig.c 2011-12-22 17:59:24.562119301 +0000 -@@ -1034,17 +1034,19 @@ +diff -Nrup a/elf/ldconfig.c b/elf/ldconfig.c +--- a/elf/ldconfig.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/elf/ldconfig.c 2012-01-01 20:41:26.641439841 -0700 +@@ -1034,17 +1034,19 @@ search_dirs (void)
static void parse_conf_include (const char *config_file, unsigned int lineno, @@ -842,7 +842,7 @@ diff -Nur a/elf/ldconfig.c b/elf/ldconfig.c
if (do_chroot && opt_chroot) { -@@ -1105,7 +1107,14 @@ +@@ -1105,7 +1107,14 @@ parse_conf (const char *filename, bool d cp += 8; while ((dir = strsep (&cp, " \t")) != NULL) if (dir[0] != '\0') @@ -858,7 +858,7 @@ diff -Nur a/elf/ldconfig.c b/elf/ldconfig.c } else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5])) { -@@ -1168,7 +1177,7 @@ +@@ -1168,7 +1177,7 @@ parse_conf (const char *filename, bool d config files to read. */ static void parse_conf_include (const char *config_file, unsigned int lineno, @@ -867,7 +867,7 @@ diff -Nur a/elf/ldconfig.c b/elf/ldconfig.c { if (opt_chroot && pattern[0] != '/') error (EXIT_FAILURE, 0, -@@ -1200,7 +1209,7 @@ +@@ -1200,7 +1209,7 @@ parse_conf_include (const char *config_f { case 0: for (size_t i = 0; i < gl.gl_pathc; ++i) @@ -876,7 +876,7 @@ diff -Nur a/elf/ldconfig.c b/elf/ldconfig.c globfree64 (&gl); break;
-@@ -1243,6 +1252,8 @@ +@@ -1243,6 +1252,8 @@ main (int argc, char **argv) /* Set the text message domain. */ textdomain (_libc_intl_domainname);
@@ -885,7 +885,7 @@ diff -Nur a/elf/ldconfig.c b/elf/ldconfig.c /* Parse and process arguments. */ int remaining; argp_parse (&argp, argc, argv, 0, &remaining, NULL); -@@ -1352,12 +1363,14 @@ +@@ -1352,12 +1363,14 @@ main (int argc, char **argv)
if (!opt_only_cline) { @@ -901,10 +901,10 @@ diff -Nur a/elf/ldconfig.c b/elf/ldconfig.c }
const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; -diff -Nur a/elf/ldd.bash.in b/elf/ldd.bash.in ---- a/elf/ldd.bash.in 2011-12-22 16:50:52.000000000 +0000 -+++ b/elf/ldd.bash.in 2011-12-22 17:59:24.563119302 +0000 -@@ -167,18 +167,6 @@ +diff -Nrup a/elf/ldd.bash.in b/elf/ldd.bash.in +--- a/elf/ldd.bash.in 2012-01-01 05:16:32.000000000 -0700 ++++ b/elf/ldd.bash.in 2012-01-01 20:41:26.642439841 -0700 +@@ -167,18 +167,6 @@ warning: you do not have execution permi fi done case $ret in @@ -923,7 +923,7 @@ diff -Nur a/elf/ldd.bash.in b/elf/ldd.bash.in 1) # This can be a non-ELF binary or no binary at all. nonelf "$file" || { -@@ -186,7 +174,7 @@ +@@ -186,7 +174,7 @@ warning: you do not have execution permi result=1 } ;; @@ -932,9 +932,9 @@ diff -Nur a/elf/ldd.bash.in b/elf/ldd.bash.in try_trace "$RTLD" "$file" || result=1 ;; *) -diff -Nur a/elf/rtld-Rules b/elf/rtld-Rules ---- a/elf/rtld-Rules 2011-12-22 16:50:52.000000000 +0000 -+++ b/elf/rtld-Rules 2011-12-22 17:59:24.563119302 +0000 +diff -Nrup a/elf/rtld-Rules b/elf/rtld-Rules +--- a/elf/rtld-Rules 2012-01-01 05:16:32.000000000 -0700 ++++ b/elf/rtld-Rules 2012-01-01 20:41:26.642439841 -0700 @@ -1,7 +1,7 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker.
@@ -944,7 +944,7 @@ diff -Nur a/elf/rtld-Rules b/elf/rtld-Rules # 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 @@ +@@ -131,6 +131,6 @@ ifdef rtld-depfiles endif
# This here is the whole point of all the shenanigans. @@ -952,10 +952,10 @@ diff -Nur a/elf/rtld-Rules b/elf/rtld-Rules +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld
endif -diff -Nur a/elf/rtld.c b/elf/rtld.c ---- a/elf/rtld.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/elf/rtld.c 2011-12-22 17:59:24.564119303 +0000 -@@ -107,7 +107,6 @@ +diff -Nrup a/elf/rtld.c b/elf/rtld.c +--- a/elf/rtld.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/elf/rtld.c 2012-01-01 20:41:26.643439841 -0700 +@@ -107,7 +107,6 @@ static struct audit_list struct audit_list *next; } *audit_list;
@@ -963,7 +963,7 @@ diff -Nur a/elf/rtld.c b/elf/rtld.c /* 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 @@ +@@ -117,7 +116,6 @@ static struct audit_list never be called. */ int _dl_starting_up = 0; INTVARDEF(_dl_starting_up) @@ -971,7 +971,7 @@ diff -Nur a/elf/rtld.c b/elf/rtld.c
/* 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 @@ +@@ -929,10 +927,8 @@ dl_main (const ElfW(Phdr) *phdr, /* Process the environment variable which control the behaviour. */ process_envvars (&mode);
@@ -982,7 +982,7 @@ diff -Nur a/elf/rtld.c b/elf/rtld.c
if (*user_entry == (ElfW(Addr)) ENTRY_POINT) { -@@ -1397,7 +1393,9 @@ +@@ -1397,7 +1393,9 @@ of this helper program; chances are you char *copy = malloc (len); if (copy == NULL) _dl_fatal_printf ("out of memory\n"); @@ -993,7 +993,7 @@ diff -Nur a/elf/rtld.c b/elf/rtld.c }
/* Add the vDSO to the object list. */ -@@ -2276,6 +2274,7 @@ +@@ -2276,6 +2274,7 @@ ERROR: ld.so: object '%s' cannot be load lnp->dont_free = 1; lnp = lnp->next; } @@ -1001,7 +1001,7 @@ diff -Nur a/elf/rtld.c b/elf/rtld.c
if (l != &GL(dl_rtld_map)) _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, -@@ -2327,7 +2326,6 @@ +@@ -2327,7 +2326,6 @@ ERROR: ld.so: object '%s' cannot be load
/* Make sure no new search directories have been added. */ assert (GLRO(dl_init_all_dirs) == GL(dl_all_dirs)); @@ -1009,28 +1009,28 @@ diff -Nur a/elf/rtld.c b/elf/rtld.c if (! prelinked && rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. -diff -Nur a/extra-lib.mk b/extra-lib.mk ---- a/extra-lib.mk 2011-12-22 16:50:52.000000000 +0000 -+++ b/extra-lib.mk 2011-12-22 17:59:24.564119303 +0000 -@@ -101,4 +101,4 @@ +diff -Nrup a/extra-lib.mk b/extra-lib.mk +--- a/extra-lib.mk 2012-01-01 05:16:32.000000000 -0700 ++++ b/extra-lib.mk 2012-01-01 20:41:26.644439841 -0700 +@@ -101,4 +101,4 @@ ifneq (,$(cpp-srcs-left)) include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) endif
-CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 +CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -DIN_LIB=$(lib) -diff -Nur a/include/bits/stdlib-ldbl.h b/include/bits/stdlib-ldbl.h ---- a/include/bits/stdlib-ldbl.h 1970-01-01 00:00:00.000000000 +0000 -+++ b/include/bits/stdlib-ldbl.h 2011-12-22 17:59:24.565119304 +0000 +diff -Nrup a/include/bits/stdlib-ldbl.h b/include/bits/stdlib-ldbl.h +--- a/include/bits/stdlib-ldbl.h 1969-12-31 17:00:00.000000000 -0700 ++++ b/include/bits/stdlib-ldbl.h 2012-01-01 20:41:26.644439841 -0700 @@ -0,0 +1 @@ +#include <stdlib/bits/stdlib-ldbl.h> -diff -Nur a/include/bits/wchar-ldbl.h b/include/bits/wchar-ldbl.h ---- a/include/bits/wchar-ldbl.h 1970-01-01 00:00:00.000000000 +0000 -+++ b/include/bits/wchar-ldbl.h 2011-12-22 17:59:24.565119304 +0000 +diff -Nrup a/include/bits/wchar-ldbl.h b/include/bits/wchar-ldbl.h +--- a/include/bits/wchar-ldbl.h 1969-12-31 17:00:00.000000000 -0700 ++++ b/include/bits/wchar-ldbl.h 2012-01-01 20:41:26.644439841 -0700 @@ -0,0 +1 @@ +#include <wcsmbs/bits/wchar-ldbl.h> -diff -Nur a/include/features.h b/include/features.h ---- a/include/features.h 2011-12-22 16:50:52.000000000 +0000 -+++ b/include/features.h 2011-12-22 17:59:24.565119304 +0000 +diff -Nrup a/include/features.h b/include/features.h +--- a/include/features.h 2012-01-01 05:16:32.000000000 -0700 ++++ b/include/features.h 2012-01-01 20:41:26.644439841 -0700 @@ -310,8 +310,13 @@ #endif
@@ -1047,10 +1047,10 @@ diff -Nur a/include/features.h b/include/features.h # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 -diff -Nur a/include/libc-symbols.h b/include/libc-symbols.h ---- a/include/libc-symbols.h 2011-12-22 16:50:52.000000000 +0000 -+++ b/include/libc-symbols.h 2011-12-22 17:59:24.566119304 +0000 -@@ -626,7 +626,7 @@ +diff -Nrup a/include/libc-symbols.h b/include/libc-symbols.h +--- a/include/libc-symbols.h 2012-01-01 05:16:32.000000000 -0700 ++++ b/include/libc-symbols.h 2012-01-01 20:41:26.645439841 -0700 +@@ -626,7 +626,7 @@ for linking") # 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) @@ -1059,9 +1059,9 @@ diff -Nur a/include/libc-symbols.h b/include/libc-symbols.h # 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) -diff -Nur a/include/link.h b/include/link.h ---- a/include/link.h 2011-12-22 16:50:52.000000000 +0000 -+++ b/include/link.h 2011-12-22 17:59:24.567119304 +0000 +diff -Nrup a/include/link.h b/include/link.h +--- a/include/link.h 2012-01-01 05:16:32.000000000 -0700 ++++ b/include/link.h 2012-01-01 20:41:26.646439841 -0700 @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. @@ -1070,7 +1070,7 @@ diff -Nur a/include/link.h b/include/link.h 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 @@ +@@ -192,6 +192,9 @@ struct link_map during LD_TRACE_PRELINKING=1 contains any DT_SYMBOLIC libraries. */ @@ -1080,7 +1080,7 @@ diff -Nur a/include/link.h b/include/link.h
/* Collected information about own RPATH directories. */ struct r_search_path_struct l_rpath_dirs; -@@ -240,9 +243,6 @@ +@@ -240,9 +243,6 @@ struct link_map
/* List of object in order of the init and fini calls. */ struct link_map **l_initfini; @@ -1090,7 +1090,7 @@ diff -Nur a/include/link.h b/include/link.h
/* List of the dependencies introduced through symbol binding. */ struct link_map_reldeps -@@ -290,7 +290,7 @@ +@@ -290,7 +290,7 @@ struct link_map #endif #ifndef FORCED_DYNAMIC_TLS_OFFSET # if NO_TLS_OFFSET == 0 @@ -1099,9 +1099,9 @@ diff -Nur a/include/link.h b/include/link.h # elif NO_TLS_OFFSET == -1 # define FORCED_DYNAMIC_TLS_OFFSET -2 # else -diff -Nur a/include/stap-probe.h b/include/stap-probe.h ---- a/include/stap-probe.h 1970-01-01 00:00:00.000000000 +0000 -+++ b/include/stap-probe.h 2011-12-22 17:59:24.567119304 +0000 +diff -Nrup a/include/stap-probe.h b/include/stap-probe.h +--- a/include/stap-probe.h 1969-12-31 17:00:00.000000000 -0700 ++++ b/include/stap-probe.h 2012-01-01 20:41:26.646439841 -0700 @@ -0,0 +1,140 @@ +/* Macros for defining Systemtap <sys/sdt.h> static probe points. + Copyright (C) 2011 Free Software Foundation, Inc. @@ -1243,19 +1243,19 @@ diff -Nur a/include/stap-probe.h b/include/stap-probe.h +#endif /* USE_STAP_PROBE. */ + +#endif /* stap-probe.h */ -diff -Nur a/include/sys/resource.h b/include/sys/resource.h ---- a/include/sys/resource.h 2011-12-22 16:50:52.000000000 +0000 -+++ b/include/sys/resource.h 2011-12-22 17:59:24.567119304 +0000 -@@ -13,4 +13,5 @@ +diff -Nrup a/include/sys/resource.h b/include/sys/resource.h +--- a/include/sys/resource.h 2012-01-01 05:16:32.000000000 -0700 ++++ b/include/sys/resource.h 2012-01-01 20:41:26.647439841 -0700 +@@ -13,4 +13,5 @@ extern int __getrusage (enum __rusage_wh
extern int __setrlimit (enum __rlimit_resource __resource, const struct rlimit *__rlimits); +libc_hidden_proto (__getrlimit) #endif -diff -Nur a/inet/Makefile b/inet/Makefile ---- a/inet/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/inet/Makefile 2011-12-22 17:59:24.568119304 +0000 -@@ -57,6 +57,8 @@ +diff -Nrup a/inet/Makefile b/inet/Makefile +--- a/inet/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/inet/Makefile 2012-01-01 20:41:26.647439841 -0700 +@@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa
include ../Rules
@@ -1264,10 +1264,10 @@ diff -Nur a/inet/Makefile b/inet/Makefile ifeq ($(have-thread-library),yes)
CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions -diff -Nur a/intl/locale.alias b/intl/locale.alias ---- a/intl/locale.alias 2011-12-22 16:50:52.000000000 +0000 -+++ b/intl/locale.alias 2011-12-22 17:59:24.568119304 +0000 -@@ -57,8 +57,6 @@ +diff -Nrup a/intl/locale.alias b/intl/locale.alias +--- a/intl/locale.alias 2012-01-01 05:16:32.000000000 -0700 ++++ b/intl/locale.alias 2012-01-01 20:41:26.647439841 -0700 +@@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR lithuanian lt_LT.ISO-8859-13 @@ -1276,10 +1276,10 @@ diff -Nur a/intl/locale.alias b/intl/locale.alias norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 -diff -Nur a/libio/stdio.h b/libio/stdio.h ---- a/libio/stdio.h 2011-12-22 16:50:52.000000000 +0000 -+++ b/libio/stdio.h 2011-12-22 17:59:24.569119304 +0000 -@@ -169,10 +169,12 @@ +diff -Nrup a/libio/stdio.h b/libio/stdio.h +--- a/libio/stdio.h 2012-01-01 05:16:32.000000000 -0700 ++++ b/libio/stdio.h 2012-01-01 20:41:26.648439841 -0700 +@@ -169,10 +169,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ extern struct _IO_FILE *stderr; /* Standard error output stream. */ @@ -1292,9 +1292,9 @@ diff -Nur a/libio/stdio.h b/libio/stdio.h
__BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ -diff -Nur a/locale/iso-4217.def b/locale/iso-4217.def ---- a/locale/iso-4217.def 2011-12-22 16:50:52.000000000 +0000 -+++ b/locale/iso-4217.def 2011-12-22 17:59:24.569119304 +0000 +diff -Nrup a/locale/iso-4217.def b/locale/iso-4217.def +--- a/locale/iso-4217.def 2012-01-01 05:16:32.000000000 -0700 ++++ b/locale/iso-4217.def 2012-01-01 20:41:26.649439841 -0700 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1303,7 +1303,7 @@ diff -Nur a/locale/iso-4217.def b/locale/iso-4217.def DEFINE_INT_CURR("AED") /* United Arab Emirates Dirham */ DEFINE_INT_CURR("AFN") /* Afghanistan Afgani */ DEFINE_INT_CURR("ALL") /* Albanian Lek */ -@@ -15,12 +16,14 @@ +@@ -15,12 +16,14 @@ DEFINE_INT_CURR("AMD") /* Armenia Dram DEFINE_INT_CURR("ANG") /* Netherlands Antilles */ DEFINE_INT_CURR("AOA") /* Angolan Kwanza */ DEFINE_INT_CURR("ARS") /* Argentine Peso */ @@ -1318,7 +1318,7 @@ diff -Nur a/locale/iso-4217.def b/locale/iso-4217.def DEFINE_INT_CURR("BGN") /* Bulgarian Lev */ DEFINE_INT_CURR("BHD") /* Bahraini Dinar */ DEFINE_INT_CURR("BIF") /* Burundi Franc */ -@@ -44,6 +47,7 @@ +@@ -44,6 +47,7 @@ DEFINE_INT_CURR("CUP") /* Cuban Peso * DEFINE_INT_CURR("CVE") /* Cape Verde Escudo */ DEFINE_INT_CURR("CYP") /* Cypriot Pound */ DEFINE_INT_CURR("CZK") /* Czech Koruna */ @@ -1326,7 +1326,7 @@ diff -Nur a/locale/iso-4217.def b/locale/iso-4217.def 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 @@ +@@ -51,16 +55,20 @@ DEFINE_INT_CURR("DZD") /* Algerian Dina DEFINE_INT_CURR("EEK") /* Estonian Kroon */ DEFINE_INT_CURR("EGP") /* Egyptian Pound */ DEFINE_INT_CURR("ERN") /* Eritrean Nakfa */ @@ -1347,7 +1347,7 @@ diff -Nur a/locale/iso-4217.def b/locale/iso-4217.def DEFINE_INT_CURR("GTQ") /* Guatemala Quetzal */ DEFINE_INT_CURR("GYD") /* Guyana Dollar */ DEFINE_INT_CURR("HKD") /* Hong Kong Dollar */ -@@ -69,12 +77,14 @@ +@@ -69,12 +77,14 @@ DEFINE_INT_CURR("HRK") /* Croatia Kuna DEFINE_INT_CURR("HTG") /* Haiti Gourde */ DEFINE_INT_CURR("HUF") /* Hungarian Forint */ DEFINE_INT_CURR("IDR") /* Indonesia Rupiah */ @@ -1362,7 +1362,7 @@ diff -Nur a/locale/iso-4217.def b/locale/iso-4217.def DEFINE_INT_CURR("JEP") /* Jersey Pound */ DEFINE_INT_CURR("JMD") /* Jamaican Dollar */ DEFINE_INT_CURR("JOD") /* Jordanian Dinar */ -@@ -94,6 +104,7 @@ +@@ -94,6 +104,7 @@ DEFINE_INT_CURR("LKR") /* Sri Lankan Ru DEFINE_INT_CURR("LRD") /* Liberian Dollar */ DEFINE_INT_CURR("LSL") /* Lesotho Maloti */ DEFINE_INT_CURR("LTL") /* Lithuanian Litas */ @@ -1370,7 +1370,7 @@ diff -Nur a/locale/iso-4217.def b/locale/iso-4217.def DEFINE_INT_CURR("LVL") /* Latvia Lat */ DEFINE_INT_CURR("LYD") /* Libyan Arab Jamahiriya Dinar */ DEFINE_INT_CURR("MAD") /* Moroccan Dirham */ -@@ -114,6 +125,7 @@ +@@ -114,6 +125,7 @@ DEFINE_INT_CURR("MZM") /* Mozambique Me DEFINE_INT_CURR("NAD") /* Namibia Dollar */ DEFINE_INT_CURR("NGN") /* Nigeria Naira */ DEFINE_INT_CURR("NIO") /* Nicaragua Cordoba Oro */ @@ -1378,7 +1378,7 @@ diff -Nur a/locale/iso-4217.def b/locale/iso-4217.def DEFINE_INT_CURR("NOK") /* Norwegian Krone */ DEFINE_INT_CURR("NPR") /* Nepalese Rupee */ DEFINE_INT_CURR("NZD") /* New Zealand Dollar */ -@@ -124,6 +136,7 @@ +@@ -124,6 +136,7 @@ DEFINE_INT_CURR("PGK") /* Papau New Gui DEFINE_INT_CURR("PHP") /* Philippines Peso */ DEFINE_INT_CURR("PKR") /* Pakistan Rupee */ DEFINE_INT_CURR("PLN") /* Polish Zloty */ @@ -1386,10 +1386,10 @@ diff -Nur a/locale/iso-4217.def b/locale/iso-4217.def DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ -diff -Nur a/locale/programs/locarchive.c b/locale/programs/locarchive.c ---- a/locale/programs/locarchive.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/locale/programs/locarchive.c 2011-12-22 17:59:24.570119304 +0000 -@@ -253,9 +253,9 @@ +diff -Nrup a/locale/programs/locarchive.c b/locale/programs/locarchive.c +--- a/locale/programs/locarchive.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/locale/programs/locarchive.c 2012-01-01 20:41:26.649439841 -0700 +@@ -253,9 +253,9 @@ oldlocrecentcmp (const void *a, const vo /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, locale_data_t data, bool replace); @@ -1402,7 +1402,7 @@ diff -Nur a/locale/programs/locarchive.c b/locale/programs/locarchive.c
static bool -@@ -636,7 +636,7 @@ +@@ -636,7 +636,7 @@ close_archive (struct locarhandle *ah) #include "../../intl/explodename.c" #include "../../intl/l10nflist.c"
@@ -1411,7 +1411,7 @@ diff -Nur a/locale/programs/locarchive.c b/locale/programs/locarchive.c insert_name (struct locarhandle *ah, const char *name, size_t name_len, bool replace) { -@@ -694,7 +694,7 @@ +@@ -694,7 +694,7 @@ insert_name (struct locarhandle *ah, return &namehashtab[idx]; }
@@ -1420,10 +1420,10 @@ diff -Nur a/locale/programs/locarchive.c b/locale/programs/locarchive.c add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { -diff -Nur a/localedata/ChangeLog b/localedata/ChangeLog ---- a/localedata/ChangeLog 2011-12-22 16:50:52.000000000 +0000 -+++ b/localedata/ChangeLog 2011-12-22 17:59:24.571119304 +0000 -@@ -64,6 +64,14 @@ +diff -Nrup a/localedata/ChangeLog b/localedata/ChangeLog +--- a/localedata/ChangeLog 2012-01-01 05:16:32.000000000 -0700 ++++ b/localedata/ChangeLog 2012-01-01 20:41:26.651439841 -0700 +@@ -90,6 +90,14 @@ * tests-mbwc/tst_funcs.h (TST_DECL_VARS, TST_HEAD_LOCALE): Remove unused variable.
@@ -1438,10 +1438,10 @@ diff -Nur a/localedata/ChangeLog b/localedata/ChangeLog 2011-05-21 Ulrich Drepper drepper@gmail.com
[BZ #12788] -diff -Nur a/localedata/Makefile b/localedata/Makefile ---- a/localedata/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/localedata/Makefile 2011-12-22 17:59:24.572119304 +0000 -@@ -224,6 +224,7 @@ +diff -Nrup a/localedata/Makefile b/localedata/Makefile +--- a/localedata/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/localedata/Makefile 2012-01-01 20:41:26.652439840 -0700 +@@ -224,6 +224,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/([^.]*)[^@]*(.*)/\1\2/'`; \ $(LOCALEDEF) --alias-file=../intl/locale.alias \ @@ -1449,10 +1449,10 @@ diff -Nur a/localedata/Makefile b/localedata/Makefile -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ -diff -Nur a/localedata/SUPPORTED b/localedata/SUPPORTED ---- a/localedata/SUPPORTED 2011-12-22 16:50:52.000000000 +0000 -+++ b/localedata/SUPPORTED 2011-12-22 17:59:24.572119304 +0000 -@@ -88,6 +88,7 @@ +diff -Nrup a/localedata/SUPPORTED b/localedata/SUPPORTED +--- a/localedata/SUPPORTED 2012-01-01 05:16:32.000000000 -0700 ++++ b/localedata/SUPPORTED 2012-01-01 20:41:26.652439840 -0700 +@@ -88,6 +88,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ da_DK/ISO-8859-1 \ @@ -1460,7 +1460,7 @@ diff -Nur a/localedata/SUPPORTED b/localedata/SUPPORTED de_AT.UTF-8/UTF-8 \ de_AT/ISO-8859-1 \ de_AT@euro/ISO-8859-15 \ -@@ -119,6 +120,7 @@ +@@ -119,6 +120,7 @@ en_DK.UTF-8/UTF-8 \ en_DK/ISO-8859-1 \ en_GB.UTF-8/UTF-8 \ en_GB/ISO-8859-1 \ @@ -1468,7 +1468,7 @@ diff -Nur a/localedata/SUPPORTED b/localedata/SUPPORTED en_HK.UTF-8/UTF-8 \ en_HK/ISO-8859-1 \ en_IE.UTF-8/UTF-8 \ -@@ -134,6 +136,7 @@ +@@ -134,6 +136,7 @@ en_SG.UTF-8/UTF-8 \ en_SG/ISO-8859-1 \ en_US.UTF-8/UTF-8 \ en_US/ISO-8859-1 \ @@ -1476,7 +1476,7 @@ diff -Nur a/localedata/SUPPORTED b/localedata/SUPPORTED en_ZA.UTF-8/UTF-8 \ en_ZA/ISO-8859-1 \ en_ZM/UTF-8 \ -@@ -316,6 +319,8 @@ +@@ -316,6 +319,8 @@ nl_NL/ISO-8859-1 \ nl_NL@euro/ISO-8859-15 \ nn_NO.UTF-8/UTF-8 \ nn_NO/ISO-8859-1 \ @@ -1485,7 +1485,7 @@ diff -Nur a/localedata/SUPPORTED b/localedata/SUPPORTED nr_ZA/UTF-8 \ nso_ZA/UTF-8 \ oc_FR.UTF-8/UTF-8 \ -@@ -377,6 +382,7 @@ +@@ -377,6 +382,7 @@ sv_FI/ISO-8859-1 \ sv_FI@euro/ISO-8859-15 \ sv_SE.UTF-8/UTF-8 \ sv_SE/ISO-8859-1 \ @@ -1493,10 +1493,10 @@ diff -Nur a/localedata/SUPPORTED b/localedata/SUPPORTED sw_KE/UTF-8 \ sw_TZ/UTF-8 \ ta_IN/UTF-8 \ -diff -Nur a/localedata/locales/cy_GB b/localedata/locales/cy_GB ---- a/localedata/locales/cy_GB 2011-12-22 16:50:52.000000000 +0000 -+++ b/localedata/locales/cy_GB 2011-12-22 17:59:24.573119304 +0000 -@@ -248,8 +248,11 @@ +diff -Nrup a/localedata/locales/cy_GB b/localedata/locales/cy_GB +--- a/localedata/locales/cy_GB 2012-01-01 05:16:32.000000000 -0700 ++++ b/localedata/locales/cy_GB 2012-01-01 20:41:26.653439839 -0700 +@@ -248,8 +248,11 @@ mon "<U0049><U006F><U006E><U0061 d_t_fmt "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>" t_fmt "<U0025><U0054>" @@ -1510,10 +1510,10 @@ diff -Nur a/localedata/locales/cy_GB b/localedata/locales/cy_GB END LC_TIME
LC_MESSAGES -diff -Nur a/localedata/locales/en_GB b/localedata/locales/en_GB ---- a/localedata/locales/en_GB 2011-12-22 16:50:52.000000000 +0000 -+++ b/localedata/locales/en_GB 2011-12-22 17:59:24.573119304 +0000 -@@ -116,8 +116,8 @@ +diff -Nrup a/localedata/locales/en_GB b/localedata/locales/en_GB +--- a/localedata/locales/en_GB 2012-01-01 05:16:32.000000000 -0700 ++++ b/localedata/locales/en_GB 2012-01-01 20:41:26.653439839 -0700 +@@ -116,8 +116,8 @@ mon "<U004A><U0061><U006E><U0075 d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>" t_fmt "<U0025><U0054>" @@ -1524,9 +1524,9 @@ diff -Nur a/localedata/locales/en_GB b/localedata/locales/en_GB date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ <U0025><U005A><U0020><U0025><U0059>" -diff -Nur a/localedata/locales/no_NO b/localedata/locales/no_NO ---- a/localedata/locales/no_NO 1970-01-01 00:00:00.000000000 +0000 -+++ b/localedata/locales/no_NO 2011-12-22 17:59:24.573119304 +0000 +diff -Nrup a/localedata/locales/no_NO b/localedata/locales/no_NO +--- a/localedata/locales/no_NO 1969-12-31 17:00:00.000000000 -0700 ++++ b/localedata/locales/no_NO 2012-01-01 20:41:26.653439839 -0700 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1597,9 +1597,9 @@ diff -Nur a/localedata/locales/no_NO b/localedata/locales/no_NO +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS -diff -Nur a/localedata/locales/zh_TW b/localedata/locales/zh_TW ---- a/localedata/locales/zh_TW 2011-12-22 16:50:52.000000000 +0000 -+++ b/localedata/locales/zh_TW 2011-12-22 17:59:24.574119304 +0000 +diff -Nrup a/localedata/locales/zh_TW b/localedata/locales/zh_TW +--- a/localedata/locales/zh_TW 2012-01-01 05:16:32.000000000 -0700 ++++ b/localedata/locales/zh_TW 2012-01-01 20:41:26.653439839 -0700 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1609,7 +1609,7 @@ diff -Nur a/localedata/locales/zh_TW b/localedata/locales/zh_TW % charmap: BIG5-CP950 % % Original Author: -@@ -17,7 +17,7 @@ +@@ -17,7 +17,7 @@ escape_char / % Reference: http://wwwold.dkuug.dk/JTC1/SC22/WG20/docs/n690.pdf
LC_IDENTIFICATION @@ -1618,7 +1618,7 @@ diff -Nur a/localedata/locales/zh_TW b/localedata/locales/zh_TW source "" address "" contact "" -@@ -25,7 +25,7 @@ +@@ -25,7 +25,7 @@ email "bug-glibc-locales@gnu.org" tel "" fax "" language "Chinese" @@ -1627,9 +1627,9 @@ diff -Nur a/localedata/locales/zh_TW b/localedata/locales/zh_TW revision "0.2" date "2000-08-02" % -diff -Nur a/login/programs/pt_chown.c b/login/programs/pt_chown.c ---- a/login/programs/pt_chown.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/login/programs/pt_chown.c 2011-12-22 17:59:24.574119304 +0000 +diff -Nrup a/login/programs/pt_chown.c b/login/programs/pt_chown.c +--- a/login/programs/pt_chown.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/login/programs/pt_chown.c 2012-01-01 20:41:26.654439839 -0700 @@ -29,6 +29,7 @@ #include <string.h> #include <sys/stat.h> @@ -1638,7 +1638,7 @@ diff -Nur a/login/programs/pt_chown.c b/login/programs/pt_chown.c #ifdef HAVE_LIBCAP # include <sys/capability.h> # include <sys/prctl.h> -@@ -143,7 +144,7 @@ +@@ -143,7 +144,7 @@ main (int argc, char *argv[]) uid_t uid = getuid (); int remaining;
@@ -1647,7 +1647,7 @@ diff -Nur a/login/programs/pt_chown.c b/login/programs/pt_chown.c { #ifdef HAVE_LIBCAP /* Drop privileges. */ -@@ -176,6 +177,13 @@ +@@ -176,6 +177,13 @@ main (int argc, char *argv[])
/* We aren't going to be using privileges, so drop them right now. */ setuid (uid); @@ -1661,7 +1661,7 @@ diff -Nur a/login/programs/pt_chown.c b/login/programs/pt_chown.c
/* Set locale via LC_ALL. */ setlocale (LC_ALL, ""); -@@ -195,9 +203,5 @@ +@@ -195,9 +203,5 @@ main (int argc, char *argv[]) return EXIT_FAILURE; }
@@ -1671,9 +1671,9 @@ diff -Nur a/login/programs/pt_chown.c b/login/programs/pt_chown.c - return EXIT_SUCCESS; } -diff -Nur a/malloc/mcheck.c b/malloc/mcheck.c ---- a/malloc/mcheck.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/malloc/mcheck.c 2011-12-22 17:59:24.575119304 +0000 +diff -Nrup a/malloc/mcheck.c b/malloc/mcheck.c +--- a/malloc/mcheck.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/malloc/mcheck.c 2012-01-01 20:41:26.654439839 -0700 @@ -25,10 +25,26 @@ # include <mcheck.h> # include <stdint.h> @@ -1701,7 +1701,7 @@ diff -Nur a/malloc/mcheck.c b/malloc/mcheck.c /* 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 @@ +@@ -199,7 +215,7 @@ freehook (__ptr_t ptr, const __ptr_t cal if (old_free_hook != NULL) (*old_free_hook) (ptr, caller); else @@ -1710,7 +1710,7 @@ diff -Nur a/malloc/mcheck.c b/malloc/mcheck.c __free_hook = freehook; }
-@@ -222,7 +238,7 @@ +@@ -222,7 +238,7 @@ mallochook (__malloc_size_t size, const hdr = (struct hdr *) (*old_malloc_hook) (sizeof (struct hdr) + size + 1, caller); else @@ -1719,7 +1719,7 @@ diff -Nur a/malloc/mcheck.c b/malloc/mcheck.c __malloc_hook = mallochook; if (hdr == NULL) return NULL; -@@ -259,7 +275,7 @@ +@@ -259,7 +275,7 @@ memalignhook (__malloc_size_t alignment, if (old_memalign_hook != NULL) block = (*old_memalign_hook) (alignment, slop + size + 1, caller); else @@ -1728,7 +1728,7 @@ diff -Nur a/malloc/mcheck.c b/malloc/mcheck.c __memalign_hook = memalignhook; if (block == NULL) return NULL; -@@ -320,8 +336,8 @@ +@@ -320,8 +336,8 @@ reallochook (__ptr_t ptr, __malloc_size_ sizeof (struct hdr) + size + 1, caller); else @@ -1739,7 +1739,7 @@ diff -Nur a/malloc/mcheck.c b/malloc/mcheck.c __free_hook = freehook; __malloc_hook = mallochook; __memalign_hook = memalignhook; -@@ -381,8 +397,8 @@ +@@ -381,8 +397,8 @@ mcheck (func) if (__malloc_initialized <= 0 && !mcheck_used) { /* We call malloc() once here to ensure it is initialized. */ @@ -1750,9 +1750,9 @@ diff -Nur a/malloc/mcheck.c b/malloc/mcheck.c
old_free_hook = __free_hook; __free_hook = freehook; -diff -Nur a/manual/libc.texinfo b/manual/libc.texinfo ---- a/manual/libc.texinfo 2011-12-22 16:50:52.000000000 +0000 -+++ b/manual/libc.texinfo 2011-12-22 17:59:24.575119304 +0000 +diff -Nrup a/manual/libc.texinfo b/manual/libc.texinfo +--- a/manual/libc.texinfo 2012-01-01 05:16:32.000000000 -0700 ++++ b/manual/libc.texinfo 2012-01-01 20:41:26.655439839 -0700 @@ -5,7 +5,7 @@ @c setchapternewpage odd
@@ -1762,9 +1762,9 @@ diff -Nur a/manual/libc.texinfo b/manual/libc.texinfo @direntry * Libc: (libc). C library. @end direntry -diff -Nur a/misc/sys/cdefs.h b/misc/sys/cdefs.h ---- a/misc/sys/cdefs.h 2011-12-22 16:50:52.000000000 +0000 -+++ b/misc/sys/cdefs.h 2011-12-22 17:59:24.576119305 +0000 +diff -Nrup a/misc/sys/cdefs.h b/misc/sys/cdefs.h +--- a/misc/sys/cdefs.h 2012-01-01 05:16:32.000000000 -0700 ++++ b/misc/sys/cdefs.h 2012-01-01 20:41:26.655439839 -0700 @@ -146,7 +146,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -1808,10 +1808,10 @@ diff -Nur a/misc/sys/cdefs.h b/misc/sys/cdefs.h # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif -diff -Nur a/nis/Makefile b/nis/Makefile ---- a/nis/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/nis/Makefile 2011-12-22 17:59:24.576119305 +0000 -@@ -23,9 +23,9 @@ +diff -Nrup a/nis/Makefile b/nis/Makefile +--- a/nis/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/nis/Makefile 2012-01-01 20:41:26.656439839 -0700 +@@ -23,9 +23,9 @@ subdir := nis
aux := nis_hash
@@ -1823,7 +1823,7 @@ diff -Nur a/nis/Makefile b/nis/Makefile
# 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 @@ +@@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out
include ../Rules
@@ -1832,9 +1832,9 @@ diff -Nur a/nis/Makefile b/nis/Makefile
$(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ -diff -Nur a/nis/nss b/nis/nss ---- a/nis/nss 2011-12-22 16:50:52.000000000 +0000 -+++ b/nis/nss 2011-12-22 17:59:24.577119306 +0000 +diff -Nrup a/nis/nss b/nis/nss +--- a/nis/nss 2012-01-01 05:16:32.000000000 -0700 ++++ b/nis/nss 2012-01-01 20:41:26.656439839 -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 @@ -1844,10 +1844,10 @@ diff -Nur a/nis/nss b/nis/nss # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not -diff -Nur a/nptl/ChangeLog b/nptl/ChangeLog ---- a/nptl/ChangeLog 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/ChangeLog 2011-12-22 17:59:24.579119308 +0000 -@@ -195,6 +195,51 @@ +diff -Nrup a/nptl/ChangeLog b/nptl/ChangeLog +--- a/nptl/ChangeLog 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/ChangeLog 2012-01-01 20:41:26.659439839 -0700 +@@ -210,6 +210,51 @@ clearing memory. Patch partly by Robert Rex robert.rex@exasol.com.
@@ -1899,7 +1899,7 @@ diff -Nur a/nptl/ChangeLog b/nptl/ChangeLog 2011-01-19 Roland McGrath roland@redhat.com
* pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo. -@@ -4924,6 +4969,11 @@ +@@ -4939,6 +4984,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld.
@@ -1911,7 +1911,7 @@ diff -Nur a/nptl/ChangeLog b/nptl/ChangeLog 2004-09-02 Ulrich Drepper drepper@redhat.com
* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6998,6 +7048,11 @@ +@@ -7013,6 +7063,11 @@
* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
@@ -1923,9 +1923,9 @@ diff -Nur a/nptl/ChangeLog b/nptl/ChangeLog 2003-07-25 Jakub Jelinek jakub@redhat.com
* tst-cancel17.c (do_test): Check if aio_cancel failed. -diff -Nur a/nptl/DESIGN-systemtap-probes.txt b/nptl/DESIGN-systemtap-probes.txt ---- a/nptl/DESIGN-systemtap-probes.txt 1970-01-01 00:00:00.000000000 +0000 -+++ b/nptl/DESIGN-systemtap-probes.txt 2011-12-22 17:59:24.580119308 +0000 +diff -Nrup a/nptl/DESIGN-systemtap-probes.txt b/nptl/DESIGN-systemtap-probes.txt +--- a/nptl/DESIGN-systemtap-probes.txt 1969-12-31 17:00:00.000000000 -0700 ++++ b/nptl/DESIGN-systemtap-probes.txt 2012-01-01 20:41:26.660439839 -0700 @@ -0,0 +1,89 @@ +Systemtap is a dynamic tracing/instrumenting tool available on Linux. Probes +that are not fired at run time have close to zero overhead. @@ -2016,10 +2016,10 @@ diff -Nur a/nptl/DESIGN-systemtap-probes.txt b/nptl/DESIGN-systemtap-probes.txt + arg1 = condition +cond_broadcast - probe for pthread_cond_broadcast + arg1 = condition -diff -Nur a/nptl/Makefile b/nptl/Makefile ---- a/nptl/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/Makefile 2011-12-22 17:59:24.580119308 +0000 -@@ -342,7 +342,8 @@ +diff -Nrup a/nptl/Makefile b/nptl/Makefile +--- a/nptl/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/Makefile 2012-01-01 20:41:26.660439839 -0700 +@@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn
@@ -2029,7 +2029,7 @@ diff -Nur a/nptl/Makefile b/nptl/Makefile endif
CFLAGS-flockfile.c = -D_IO_MTSAFE_IO -@@ -529,15 +530,19 @@ +@@ -529,15 +530,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a $(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so @@ -2051,10 +2051,10 @@ diff -Nur a/nptl/Makefile b/nptl/Makefile else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif -diff -Nur a/nptl/Versions b/nptl/Versions ---- a/nptl/Versions 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/Versions 2011-12-22 17:59:24.581119308 +0000 -@@ -30,6 +30,7 @@ +diff -Nrup a/nptl/Versions b/nptl/Versions +--- a/nptl/Versions 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/Versions 2012-01-01 20:41:26.661439839 -0700 +@@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; # Internal libc interface to libpthread __libc_dl_error_tsd; @@ -2062,10 +2062,10 @@ diff -Nur a/nptl/Versions b/nptl/Versions } }
-diff -Nur a/nptl/nptl-init.c b/nptl/nptl-init.c ---- a/nptl/nptl-init.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/nptl-init.c 2011-12-22 17:59:24.581119308 +0000 -@@ -415,7 +415,7 @@ +diff -Nrup a/nptl/nptl-init.c b/nptl/nptl-init.c +--- a/nptl/nptl-init.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/nptl-init.c 2012-01-01 20:41:26.661439839 -0700 +@@ -415,7 +415,7 @@ __pthread_initialize_minimal_internal (v /* Determine the default allowed stack size. This is the size used in case the user does not specify one. */ struct rlimit limit; @@ -2074,9 +2074,9 @@ diff -Nur a/nptl/nptl-init.c b/nptl/nptl-init.c || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ -diff -Nur a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c ---- a/nptl/pthread_cond_broadcast.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_cond_broadcast.c 2011-12-22 17:59:24.582119308 +0000 +diff -Nrup a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c +--- a/nptl/pthread_cond_broadcast.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_cond_broadcast.c 2012-01-01 20:41:26.662439839 -0700 @@ -23,6 +23,7 @@ #include <lowlevellock.h> #include <pthread.h> @@ -2085,7 +2085,7 @@ diff -Nur a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c
#include <shlib-compat.h> #include <kernel-features.h> -@@ -32,6 +33,8 @@ +@@ -32,6 +33,8 @@ int __pthread_cond_broadcast (cond) pthread_cond_t *cond; { @@ -2094,9 +2094,9 @@ diff -Nur a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; /* Make sure we are alone. */ -diff -Nur a/nptl/pthread_cond_destroy.c b/nptl/pthread_cond_destroy.c ---- a/nptl/pthread_cond_destroy.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_cond_destroy.c 2011-12-22 17:59:24.582119308 +0000 +diff -Nrup a/nptl/pthread_cond_destroy.c b/nptl/pthread_cond_destroy.c +--- a/nptl/pthread_cond_destroy.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_cond_destroy.c 2012-01-01 20:41:26.662439839 -0700 @@ -20,6 +20,7 @@ #include <errno.h> #include <shlib-compat.h> @@ -2105,7 +2105,7 @@ diff -Nur a/nptl/pthread_cond_destroy.c b/nptl/pthread_cond_destroy.c
int -@@ -29,6 +30,8 @@ +@@ -29,6 +30,8 @@ __pthread_cond_destroy (cond) int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE;
@@ -2114,9 +2114,9 @@ diff -Nur a/nptl/pthread_cond_destroy.c b/nptl/pthread_cond_destroy.c /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared);
-diff -Nur a/nptl/pthread_cond_init.c b/nptl/pthread_cond_init.c ---- a/nptl/pthread_cond_init.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_cond_init.c 2011-12-22 17:59:24.583119308 +0000 +diff -Nrup a/nptl/pthread_cond_init.c b/nptl/pthread_cond_init.c +--- a/nptl/pthread_cond_init.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_cond_init.c 2012-01-01 20:41:26.662439839 -0700 @@ -20,6 +20,7 @@
#include <shlib-compat.h> @@ -2125,7 +2125,7 @@ diff -Nur a/nptl/pthread_cond_init.c b/nptl/pthread_cond_init.c
int -@@ -42,6 +43,8 @@ +@@ -42,6 +43,8 @@ __pthread_cond_init (cond, cond_attr) ? NULL : (void *) ~0l); cond->__data.__broadcast_seq = 0;
@@ -2134,9 +2134,9 @@ diff -Nur a/nptl/pthread_cond_init.c b/nptl/pthread_cond_init.c return 0; } versioned_symbol (libpthread, __pthread_cond_init, -diff -Nur a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c ---- a/nptl/pthread_cond_signal.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_cond_signal.c 2011-12-22 17:59:24.583119308 +0000 +diff -Nrup a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c +--- a/nptl/pthread_cond_signal.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_cond_signal.c 2012-01-01 20:41:26.663439839 -0700 @@ -26,6 +26,7 @@
#include <shlib-compat.h> @@ -2145,7 +2145,7 @@ diff -Nur a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c
int -@@ -35,6 +36,8 @@ +@@ -35,6 +36,8 @@ __pthread_cond_signal (cond) int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE;
@@ -2154,9 +2154,9 @@ diff -Nur a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared);
-diff -Nur a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c ---- a/nptl/pthread_cond_wait.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_cond_wait.c 2011-12-22 17:59:24.583119308 +0000 +diff -Nrup a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c +--- a/nptl/pthread_cond_wait.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_cond_wait.c 2012-01-01 20:41:26.663439839 -0700 @@ -25,6 +25,7 @@ #include <pthreadP.h>
@@ -2165,7 +2165,7 @@ diff -Nur a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c
struct _condvar_cleanup_buffer -@@ -101,6 +102,8 @@ +@@ -101,6 +102,8 @@ __pthread_cond_wait (cond, mutex) int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE;
@@ -2174,9 +2174,9 @@ diff -Nur a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared);
-diff -Nur a/nptl/pthread_create.c b/nptl/pthread_create.c ---- a/nptl/pthread_create.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_create.c 2011-12-22 17:59:24.584119309 +0000 +diff -Nrup a/nptl/pthread_create.c b/nptl/pthread_create.c +--- a/nptl/pthread_create.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_create.c 2012-01-01 20:41:26.664439838 -0700 @@ -32,6 +32,8 @@
#include <shlib-compat.h> @@ -2186,7 +2186,7 @@ diff -Nur a/nptl/pthread_create.c b/nptl/pthread_create.c
/* Local function to start thread and handle cleanup. */ static int start_thread (void *arg); -@@ -300,6 +302,8 @@ +@@ -300,6 +302,8 @@ start_thread (void *arg) CANCEL_RESET (oldtype); }
@@ -2195,7 +2195,7 @@ diff -Nur a/nptl/pthread_create.c b/nptl/pthread_create.c /* Run the code the user provided. */ #ifdef CALL_THREAD_FCT THREAD_SETMEM (pd, result, CALL_THREAD_FCT (pd)); -@@ -557,6 +561,8 @@ +@@ -557,6 +561,8 @@ __pthread_create_2_1 (newthread, attr, s /* Pass the descriptor to the caller. */ *newthread = (pthread_t) pd;
@@ -2204,9 +2204,9 @@ diff -Nur a/nptl/pthread_create.c b/nptl/pthread_create.c /* Start the thread. */ return create_thread (pd, iattr, STACK_VARIABLES_ARGS); } -diff -Nur a/nptl/pthread_join.c b/nptl/pthread_join.c ---- a/nptl/pthread_join.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_join.c 2011-12-22 17:59:24.585119309 +0000 +diff -Nrup a/nptl/pthread_join.c b/nptl/pthread_join.c +--- a/nptl/pthread_join.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_join.c 2012-01-01 20:41:26.664439838 -0700 @@ -23,6 +23,8 @@ #include <atomic.h> #include "pthreadP.h" @@ -2216,7 +2216,7 @@ diff -Nur a/nptl/pthread_join.c b/nptl/pthread_join.c
static void cleanup (void *arg) -@@ -55,6 +57,8 @@ +@@ -55,6 +57,8 @@ pthread_join (threadid, thread_return) struct pthread *self = THREAD_SELF; int result = 0;
@@ -2225,7 +2225,7 @@ diff -Nur a/nptl/pthread_join.c b/nptl/pthread_join.c /* 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 @@ +@@ -110,5 +114,7 @@ pthread_join (threadid, thread_return) __free_tcb (pd); }
@@ -2233,9 +2233,9 @@ diff -Nur a/nptl/pthread_join.c b/nptl/pthread_join.c + return result; } -diff -Nur a/nptl/pthread_mutex_destroy.c b/nptl/pthread_mutex_destroy.c ---- a/nptl/pthread_mutex_destroy.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_mutex_destroy.c 2011-12-22 17:59:24.585119309 +0000 +diff -Nrup a/nptl/pthread_mutex_destroy.c b/nptl/pthread_mutex_destroy.c +--- a/nptl/pthread_mutex_destroy.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_mutex_destroy.c 2012-01-01 20:41:26.665439837 -0700 @@ -20,11 +20,15 @@ #include <errno.h> #include "pthreadP.h" @@ -2252,9 +2252,9 @@ diff -Nur a/nptl/pthread_mutex_destroy.c b/nptl/pthread_mutex_destroy.c if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0 && mutex->__data.__nusers != 0) return EBUSY; -diff -Nur a/nptl/pthread_mutex_init.c b/nptl/pthread_mutex_init.c ---- a/nptl/pthread_mutex_init.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_mutex_init.c 2011-12-22 17:59:24.586119309 +0000 +diff -Nrup a/nptl/pthread_mutex_init.c b/nptl/pthread_mutex_init.c +--- a/nptl/pthread_mutex_init.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_mutex_init.c 2012-01-01 20:41:26.665439837 -0700 @@ -24,6 +24,8 @@ #include <kernel-features.h> #include "pthreadP.h" @@ -2264,7 +2264,7 @@ diff -Nur a/nptl/pthread_mutex_init.c b/nptl/pthread_mutex_init.c static const struct pthread_mutexattr default_attr = { /* Default is a normal mutex, not shared between processes. */ -@@ -135,6 +137,8 @@ +@@ -135,6 +137,8 @@ __pthread_mutex_init (mutex, mutexattr) // mutex->__spins = 0; already done by memset // mutex->__next = NULL; already done by memset
@@ -2273,9 +2273,9 @@ diff -Nur a/nptl/pthread_mutex_init.c b/nptl/pthread_mutex_init.c return 0; } strong_alias (__pthread_mutex_init, pthread_mutex_init) -diff -Nur a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c ---- a/nptl/pthread_mutex_lock.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_mutex_lock.c 2011-12-22 17:59:24.586119309 +0000 +diff -Nrup a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c +--- a/nptl/pthread_mutex_lock.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_mutex_lock.c 2012-01-01 20:41:26.665439837 -0700 @@ -24,6 +24,7 @@ #include <not-cancel.h> #include "pthreadP.h" @@ -2284,7 +2284,7 @@ diff -Nur a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c
#ifndef LLL_MUTEX_LOCK -@@ -48,6 +49,9 @@ +@@ -48,6 +49,9 @@ __pthread_mutex_lock (mutex) assert (sizeof (mutex->__size) >= sizeof (mutex->__data));
unsigned int type = PTHREAD_MUTEX_TYPE (mutex); @@ -2294,7 +2294,7 @@ diff -Nur a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c if (__builtin_expect (type & ~PTHREAD_MUTEX_KIND_MASK_NP, 0)) return __pthread_mutex_lock_full (mutex);
-@@ -127,6 +131,8 @@ +@@ -127,6 +131,8 @@ __pthread_mutex_lock (mutex) ++mutex->__data.__nusers; #endif
@@ -2303,7 +2303,7 @@ diff -Nur a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c return 0; }
-@@ -467,6 +473,8 @@ +@@ -467,6 +473,8 @@ __pthread_mutex_lock_full (pthread_mutex ++mutex->__data.__nusers; #endif
@@ -2312,9 +2312,9 @@ diff -Nur a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c return 0; } #ifndef __pthread_mutex_lock -diff -Nur a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c ---- a/nptl/pthread_mutex_timedlock.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_mutex_timedlock.c 2011-12-22 17:59:24.586119309 +0000 +diff -Nrup a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c +--- a/nptl/pthread_mutex_timedlock.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_mutex_timedlock.c 2012-01-01 20:41:26.666439837 -0700 @@ -24,6 +24,8 @@ #include <lowlevellock.h> #include <not-cancel.h> @@ -2324,7 +2324,7 @@ diff -Nur a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c
int pthread_mutex_timedlock (mutex, abstime) -@@ -34,6 +36,8 @@ +@@ -34,6 +36,8 @@ pthread_mutex_timedlock (mutex, abstime) pid_t id = THREAD_GETMEM (THREAD_SELF, tid); int result = 0;
@@ -2333,7 +2333,7 @@ diff -Nur a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c /* 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 @@ +@@ -172,6 +176,8 @@ pthread_mutex_timedlock (mutex, abstime)
++mutex->__data.__count;
@@ -2342,7 +2342,7 @@ diff -Nur a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c return 0; } } -@@ -242,6 +248,8 @@ +@@ -242,6 +248,8 @@ pthread_mutex_timedlock (mutex, abstime)
++mutex->__data.__count;
@@ -2351,7 +2351,7 @@ diff -Nur a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c return 0; } } -@@ -377,6 +385,8 @@ +@@ -377,6 +385,8 @@ pthread_mutex_timedlock (mutex, abstime)
++mutex->__data.__count;
@@ -2360,7 +2360,7 @@ diff -Nur a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c return 0; } } -@@ -477,6 +487,8 @@ +@@ -477,6 +487,8 @@ pthread_mutex_timedlock (mutex, abstime) /* Record the ownership. */ mutex->__data.__owner = id; ++mutex->__data.__nusers; @@ -2369,9 +2369,9 @@ diff -Nur a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c }
out: -diff -Nur a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c ---- a/nptl/pthread_mutex_unlock.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_mutex_unlock.c 2011-12-22 17:59:24.587119309 +0000 +diff -Nrup a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c +--- a/nptl/pthread_mutex_unlock.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_mutex_unlock.c 2012-01-01 20:41:26.666439837 -0700 @@ -22,6 +22,7 @@ #include <stdlib.h> #include "pthreadP.h" @@ -2380,7 +2380,7 @@ diff -Nur a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c
static int internal_function -@@ -50,6 +51,9 @@ +@@ -50,6 +51,9 @@ __pthread_mutex_unlock_usercnt (mutex, d
/* Unlock. */ lll_unlock (mutex->__data.__lock, PTHREAD_MUTEX_PSHARED (mutex)); @@ -2390,7 +2390,7 @@ diff -Nur a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c return 0; } else if (__builtin_expect (type == PTHREAD_MUTEX_RECURSIVE_NP, 1)) -@@ -272,6 +276,9 @@ +@@ -272,6 +276,9 @@ __pthread_mutex_unlock_full (pthread_mut PTHREAD_MUTEX_PSHARED (mutex));
int oldprio = newval >> PTHREAD_MUTEX_PRIO_CEILING_SHIFT; @@ -2400,7 +2400,7 @@ diff -Nur a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c return __pthread_tpp_change_priority (oldprio, -1);
default: -@@ -279,6 +286,7 @@ +@@ -279,6 +286,7 @@ __pthread_mutex_unlock_full (pthread_mut return EINVAL; }
@@ -2408,9 +2408,9 @@ diff -Nur a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c return 0; }
-diff -Nur a/nptl/pthread_rwlock_destroy.c b/nptl/pthread_rwlock_destroy.c ---- a/nptl/pthread_rwlock_destroy.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_rwlock_destroy.c 2011-12-22 17:59:24.587119309 +0000 +diff -Nrup a/nptl/pthread_rwlock_destroy.c b/nptl/pthread_rwlock_destroy.c +--- a/nptl/pthread_rwlock_destroy.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_rwlock_destroy.c 2012-01-01 20:41:26.667439837 -0700 @@ -18,12 +18,15 @@ 02111-1307 USA. */
@@ -2427,9 +2427,9 @@ diff -Nur a/nptl/pthread_rwlock_destroy.c b/nptl/pthread_rwlock_destroy.c /* Nothing to be done. For now. */ return 0; } -diff -Nur a/nptl/pthread_rwlock_rdlock.c b/nptl/pthread_rwlock_rdlock.c ---- a/nptl/pthread_rwlock_rdlock.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_rwlock_rdlock.c 2011-12-22 17:59:24.588119309 +0000 +diff -Nrup a/nptl/pthread_rwlock_rdlock.c b/nptl/pthread_rwlock_rdlock.c +--- a/nptl/pthread_rwlock_rdlock.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_rwlock_rdlock.c 2012-01-01 20:41:26.667439837 -0700 @@ -22,6 +22,7 @@ #include <lowlevellock.h> #include <pthread.h> @@ -2438,7 +2438,7 @@ diff -Nur a/nptl/pthread_rwlock_rdlock.c b/nptl/pthread_rwlock_rdlock.c
/* Acquire read lock for RWLOCK. */ -@@ -31,6 +32,8 @@ +@@ -31,6 +32,8 @@ __pthread_rwlock_rdlock (rwlock) { int result = 0;
@@ -2447,7 +2447,7 @@ diff -Nur a/nptl/pthread_rwlock_rdlock.c b/nptl/pthread_rwlock_rdlock.c /* Make sure we are alone. */ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared);
-@@ -49,6 +52,8 @@ +@@ -49,6 +52,8 @@ __pthread_rwlock_rdlock (rwlock) --rwlock->__data.__nr_readers; result = EAGAIN; } @@ -2456,9 +2456,9 @@ diff -Nur a/nptl/pthread_rwlock_rdlock.c b/nptl/pthread_rwlock_rdlock.c
break; } -diff -Nur a/nptl/pthread_rwlock_unlock.c b/nptl/pthread_rwlock_unlock.c ---- a/nptl/pthread_rwlock_unlock.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_rwlock_unlock.c 2011-12-22 17:59:24.588119309 +0000 +diff -Nrup a/nptl/pthread_rwlock_unlock.c b/nptl/pthread_rwlock_unlock.c +--- a/nptl/pthread_rwlock_unlock.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_rwlock_unlock.c 2012-01-01 20:41:26.668439837 -0700 @@ -22,11 +22,14 @@ #include <lowlevellock.h> #include <pthread.h> @@ -2474,9 +2474,9 @@ diff -Nur a/nptl/pthread_rwlock_unlock.c b/nptl/pthread_rwlock_unlock.c lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); if (rwlock->__data.__writer) rwlock->__data.__writer = 0; -diff -Nur a/nptl/pthread_rwlock_wrlock.c b/nptl/pthread_rwlock_wrlock.c ---- a/nptl/pthread_rwlock_wrlock.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nptl/pthread_rwlock_wrlock.c 2011-12-22 17:59:24.588119309 +0000 +diff -Nrup a/nptl/pthread_rwlock_wrlock.c b/nptl/pthread_rwlock_wrlock.c +--- a/nptl/pthread_rwlock_wrlock.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/pthread_rwlock_wrlock.c 2012-01-01 20:41:26.668439837 -0700 @@ -22,6 +22,7 @@ #include <lowlevellock.h> #include <pthread.h> @@ -2485,7 +2485,7 @@ diff -Nur a/nptl/pthread_rwlock_wrlock.c b/nptl/pthread_rwlock_wrlock.c
/* Acquire write lock for RWLOCK. */ -@@ -31,6 +32,8 @@ +@@ -31,6 +32,8 @@ __pthread_rwlock_wrlock (rwlock) { int result = 0;
@@ -2494,7 +2494,7 @@ diff -Nur a/nptl/pthread_rwlock_wrlock.c b/nptl/pthread_rwlock_wrlock.c /* Make sure we are alone. */ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared);
-@@ -41,6 +44,8 @@ +@@ -41,6 +44,8 @@ __pthread_rwlock_wrlock (rwlock) { /* Mark self as writer. */ rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid); @@ -2503,9 +2503,9 @@ diff -Nur a/nptl/pthread_rwlock_wrlock.c b/nptl/pthread_rwlock_wrlock.c break; }
-diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 2011-12-22 17:59:24.589119309 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 2012-01-01 20:41:26.668439837 -0700 @@ -189,4 +189,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -2514,9 +2514,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h b/nptl/sysdeps/unix/sy +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ -diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/Versions b/nptl/sysdeps/unix/sysv/linux/i386/Versions ---- a/nptl/sysdeps/unix/sysv/linux/i386/Versions 1970-01-01 00:00:00.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/i386/Versions 2011-12-22 17:59:24.589119309 +0000 +diff -Nrup a/nptl/sysdeps/unix/sysv/linux/i386/Versions b/nptl/sysdeps/unix/sysv/linux/i386/Versions +--- a/nptl/sysdeps/unix/sysv/linux/i386/Versions 1969-12-31 17:00:00.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/Versions 2012-01-01 20:41:26.669439837 -0700 @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -2524,9 +2524,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/Versions b/nptl/sysdeps/unix/sysv/ + __uname; + } +} -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S 2011-12-22 17:59:24.589119309 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S 2012-01-01 20:41:26.669439837 -0700 @@ -22,6 +22,8 @@ #include <kernel-features.h> #include <lowlevellock.h> @@ -2536,7 +2536,7 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/nptl/sysdeps .text
#ifdef __ASSUME_PRIVATE_FUTEX -@@ -91,7 +93,8 @@ +@@ -91,7 +93,8 @@ __lll_lock_wait_private: cmpl %edx, %eax /* NB: %edx == 2 */ jne 2f
@@ -2546,9 +2546,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/nptl/sysdeps ENTER_KERNEL
2: movl %edx, %eax -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S 2011-12-22 17:59:24.590119310 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S 2012-01-01 20:41:26.670439837 -0700 @@ -24,6 +24,7 @@ #include <kernel-features.h> #include <pthread-pi-defines.h> @@ -2557,7 +2557,7 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S b/np
.text
-@@ -49,6 +50,8 @@ +@@ -49,6 +50,8 @@ __pthread_cond_broadcast:
movl 20(%esp), %ebx
@@ -2566,9 +2566,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S b/np /* Get internal lock. */ movl $1, %edx xorl %eax, %eax -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S 2011-12-22 17:59:24.590119310 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S 2012-01-01 20:41:26.670439837 -0700 @@ -24,7 +24,7 @@ #include <kernel-features.h> #include <pthread-pi-defines.h> @@ -2578,7 +2578,7 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S b/nptl/
.text
-@@ -45,6 +45,8 @@ +@@ -45,6 +45,8 @@ __pthread_cond_signal:
movl 12(%esp), %edi
@@ -2587,9 +2587,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S b/nptl/ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S 2011-12-22 17:59:24.591119311 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S 2012-01-01 20:41:26.670439837 -0700 @@ -24,7 +24,7 @@ #include <pthread-errnos.h> #include <pthread-pi-defines.h> @@ -2599,7 +2599,7 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/np
.text
-@@ -61,6 +61,8 @@ +@@ -61,6 +61,8 @@ __pthread_cond_timedwait: movl 20(%esp), %ebx movl 28(%esp), %ebp
@@ -2608,9 +2608,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/np cmpl $1000000000, 4(%ebp) movl $EINVAL, %eax jae 18f -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 17:59:24.591119311 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2012-01-01 20:41:26.671439837 -0700 @@ -25,6 +25,7 @@ #include <pthread-errnos.h> #include <pthread-pi-defines.h> @@ -2619,7 +2619,7 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sy
.text -@@ -61,6 +62,8 @@ +@@ -61,6 +62,8 @@ __pthread_cond_wait: xorl %esi, %esi movl 20(%esp), %ebx
@@ -2628,9 +2628,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sy /* Get internal lock. */ movl $1, %edx xorl %eax, %eax -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S 2011-12-22 17:59:24.592119312 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S 2012-01-01 20:41:26.671439837 -0700 @@ -23,6 +23,7 @@ #include <pthread-errnos.h> #include <kernel-features.h> @@ -2639,7 +2639,7 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S b/npt
.text
-@@ -41,6 +42,8 @@ +@@ -41,6 +42,8 @@ __pthread_rwlock_rdlock: xorl %esi, %esi movl 12(%esp), %ebx
@@ -2648,9 +2648,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S b/npt /* Get the lock. */ movl $1, %edx xorl %eax, %eax -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S 2011-12-22 17:59:24.592119312 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S 2012-01-01 20:41:26.672439837 -0700 @@ -23,6 +23,7 @@ #include <pthread-errnos.h> #include <kernel-features.h> @@ -2659,7 +2659,7 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S b/npt
.text
-@@ -41,6 +42,8 @@ +@@ -41,6 +42,8 @@ __pthread_rwlock_wrlock: xorl %esi, %esi movl 12(%esp), %ebx
@@ -2668,9 +2668,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S b/npt /* Get the lock. */ movl $1, %edx xorl %eax, %eax -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h 2011-12-22 17:59:24.593119312 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h 2012-01-01 20:41:26.672439837 -0700 @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2680,7 +2680,7 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/nptl/sysdeps/unix #ifndef __ASSEMBLER__ # include <time.h> # include <sys/param.h> -@@ -226,6 +228,7 @@ +@@ -226,6 +228,7 @@ LLL_STUB_UNWIND_INFO_END do { \ int __ignore; \ register __typeof (nr) _nr asm ("edx") = (nr); \ @@ -2688,10 +2688,10 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/nptl/sysdeps/unix __asm __volatile (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/i386/smp.h 2011-12-22 17:59:24.593119312 +0000 -@@ -37,7 +37,7 @@ +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/smp.h 2012-01-01 20:41:26.673439836 -0700 +@@ -37,7 +37,7 @@ is_smp_system (void) char *cp;
/* Try reading the number using `sysctl' first. */ @@ -2700,9 +2700,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/i386/smp.h b/nptl/sysdeps/unix/sysv/lin cp = u.uts.version; else { -diff -Nur a/nptl/sysdeps/unix/sysv/linux/kernel-features.h b/nptl/sysdeps/unix/sysv/linux/kernel-features.h ---- a/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1970-01-01 00:00:00.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/kernel-features.h 2011-12-22 17:59:24.593119312 +0000 +diff -Nrup a/nptl/sysdeps/unix/sysv/linux/kernel-features.h b/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- a/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1969-12-31 17:00:00.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/kernel-features.h 2012-01-01 20:41:26.673439836 -0700 @@ -0,0 +1,6 @@ +#include_next <kernel-features.h> + @@ -2710,9 +2710,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/kernel-features.h b/nptl/sysdeps/unix/s +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S 2011-12-22 17:59:24.594119312 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S 2012-01-01 20:41:26.673439836 -0700 @@ -22,6 +22,8 @@ #include <kernel-features.h> #include <lowlevellock.h> @@ -2722,7 +2722,7 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/nptl/sysdeps/un .text
#ifdef __ASSUME_PRIVATE_FUTEX -@@ -87,7 +89,8 @@ +@@ -87,7 +89,8 @@ __lll_lock_wait_private: cmpl %edx, %eax /* NB: %edx == 2 */ jne 2f
@@ -2732,7 +2732,7 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/nptl/sysdeps/un syscall
2: movl %edx, %eax -@@ -126,7 +129,8 @@ +@@ -126,7 +129,8 @@ __lll_lock_wait: cmpl %edx, %eax /* NB: %edx == 2 */ jne 2f
@@ -2742,9 +2742,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/nptl/sysdeps/un syscall
2: movl %edx, %eax -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h 2011-12-22 17:59:24.594119312 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h 2012-01-01 20:41:26.674439835 -0700 @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2754,7 +2754,7 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/nptl/sysdeps/un #ifndef __ASSEMBLER__ # include <time.h> # include <sys/param.h> -@@ -227,6 +229,7 @@ +@@ -227,6 +229,7 @@ LLL_STUB_UNWIND_INFO_END do { \ int __ignore; \ register __typeof (nr) _nr __asm ("edx") = (nr); \ @@ -2762,9 +2762,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/nptl/sysdeps/un __asm __volatile ("syscall" \ : "=a" (__ignore) \ : "0" (SYS_futex), "D" (futex), \ -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S 2011-12-22 17:59:24.595119312 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S 2012-01-01 20:41:26.674439835 -0700 @@ -25,7 +25,7 @@ #include <kernel-features.h> #include <pthread-pi-defines.h> @@ -2783,9 +2783,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S b/nptl/ /* Get internal lock. */ movl $1, %esi xorl %eax, %eax -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S 2011-12-22 17:59:24.595119312 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S 2012-01-01 20:41:26.675439835 -0700 @@ -24,6 +24,7 @@ #include <pthread-pi-defines.h> #include <kernel-features.h> @@ -2803,9 +2803,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S b/nptl/sys /* Get internal lock. */ movq %rdi, %r8 movl $1, %esi -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S 2011-12-22 17:59:24.596119312 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S 2012-01-01 20:41:26.675439835 -0700 @@ -23,6 +23,7 @@ #include <lowlevelcond.h> #include <pthread-pi-defines.h> @@ -2814,7 +2814,7 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/nptl/
#include <kernel-features.h>
-@@ -68,6 +69,8 @@ +@@ -68,6 +69,8 @@ __pthread_cond_timedwait: cfi_adjust_cfa_offset(FRAME_SIZE) cfi_remember_state
@@ -2823,9 +2823,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/nptl/ cmpq $1000000000, 8(%rdx) movl $EINVAL, %eax jae 48f -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 17:59:24.596119312 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2012-01-01 20:41:26.676439836 -0700 @@ -24,6 +24,7 @@ #include <tcb-offsets.h> #include <pthread-pi-defines.h> @@ -2834,7 +2834,7 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde
#include <kernel-features.h>
-@@ -66,6 +67,8 @@ +@@ -66,6 +67,8 @@ __pthread_cond_wait: +--------------------------+ */
@@ -2843,9 +2843,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde cmpq $-1, dep_mutex(%rdi)
/* Prepare structure passed to cancellation handler. */ -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S 2011-12-22 17:59:24.597119312 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S 2012-01-01 20:41:26.677439836 -0700 @@ -22,7 +22,7 @@ #include <lowlevelrwlock.h> #include <pthread-errnos.h> @@ -2865,9 +2865,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S b/nptl/s xorq %r10, %r10
/* Get the lock. */ -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S 2011-12-22 17:59:24.597119312 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S 2012-01-01 20:41:26.677439836 -0700 @@ -22,7 +22,7 @@ #include <lowlevelrwlock.h> #include <pthread-errnos.h> @@ -2887,9 +2887,9 @@ diff -Nur a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S b/nptl/s xorq %r10, %r10
/* Get the lock. */ -diff -Nur a/nscd/nscd.conf b/nscd/nscd.conf ---- a/nscd/nscd.conf 2011-12-22 16:50:52.000000000 +0000 -+++ b/nscd/nscd.conf 2011-12-22 17:59:24.597119312 +0000 +diff -Nrup a/nscd/nscd.conf b/nscd/nscd.conf +--- a/nscd/nscd.conf 2012-01-01 05:16:32.000000000 -0700 ++++ b/nscd/nscd.conf 2012-01-01 20:41:26.677439836 -0700 @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -2899,9 +2899,9 @@ diff -Nur a/nscd/nscd.conf b/nscd/nscd.conf # stat-user somebody debug-level 0 # reload-count 5 -diff -Nur a/nscd/nscd.init b/nscd/nscd.init ---- a/nscd/nscd.init 2011-12-22 16:50:52.000000000 +0000 -+++ b/nscd/nscd.init 2011-12-22 17:59:24.598119312 +0000 +diff -Nrup a/nscd/nscd.init b/nscd/nscd.init +--- a/nscd/nscd.init 2012-01-01 05:16:32.000000000 -0700 ++++ b/nscd/nscd.init 2012-01-01 20:41:26.678439836 -0700 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -2933,7 +2933,7 @@ diff -Nur a/nscd/nscd.init b/nscd/nscd.init
RETVAL=0 prog=nscd -@@ -50,7 +39,7 @@ +@@ -50,7 +39,7 @@ start () { [ -d /var/run/nscd ] || mkdir /var/run/nscd [ -d /var/db/nscd ] || mkdir /var/db/nscd echo -n $"Starting $prog: " @@ -2942,7 +2942,7 @@ diff -Nur a/nscd/nscd.init b/nscd/nscd.init RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd -@@ -83,11 +72,11 @@ +@@ -83,11 +72,11 @@ restart() { # See how we were called. case "$1" in start) @@ -2956,7 +2956,7 @@ diff -Nur a/nscd/nscd.init b/nscd/nscd.init RETVAL=$? ;; status) -@@ -99,14 +88,17 @@ +@@ -99,14 +88,17 @@ case "$1" in RETVAL=$? ;; try-restart | condrestart) @@ -2978,10 +2978,10 @@ diff -Nur a/nscd/nscd.init b/nscd/nscd.init ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" -diff -Nur a/nscd/selinux.c b/nscd/selinux.c ---- a/nscd/selinux.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nscd/selinux.c 2011-12-22 17:59:24.598119312 +0000 -@@ -270,6 +270,18 @@ +diff -Nrup a/nscd/selinux.c b/nscd/selinux.c +--- a/nscd/selinux.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nscd/selinux.c 2012-01-01 20:41:26.678439836 -0700 +@@ -270,6 +270,18 @@ avc_create_thread (void (*run) (void)) { int rc;
@@ -3000,10 +3000,10 @@ diff -Nur a/nscd/selinux.c b/nscd/selinux.c rc = pthread_create (&avc_notify_thread, NULL, (void *(*) (void *)) run, NULL); if (rc != 0) -diff -Nur a/nss/Makefile b/nss/Makefile ---- a/nss/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/nss/Makefile 2011-12-22 17:59:24.599119312 +0000 -@@ -88,6 +88,7 @@ +diff -Nrup a/nss/Makefile b/nss/Makefile +--- a/nss/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/nss/Makefile 2012-01-01 20:41:26.679439836 -0700 +@@ -88,6 +88,7 @@ endif
include ../Rules
@@ -3011,10 +3011,10 @@ diff -Nur a/nss/Makefile b/nss/Makefile
ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a -diff -Nur a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c ---- a/nss/nss_files/files-XXX.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/nss/nss_files/files-XXX.c 2011-12-22 17:59:24.599119312 +0000 -@@ -190,7 +190,7 @@ +diff -Nrup a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c +--- a/nss/nss_files/files-XXX.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/nss/nss_files/files-XXX.c 2012-01-01 20:41:26.679439836 -0700 +@@ -190,7 +190,7 @@ internal_getent (struct STRUCTURE *resul { char *p; struct parser_data *data = (void *) buffer; @@ -3023,10 +3023,10 @@ diff -Nur a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c int parse_result;
if (buflen < sizeof *data + 2) -diff -Nur a/posix/Makefile b/posix/Makefile ---- a/posix/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/posix/Makefile 2011-12-22 17:59:24.600119312 +0000 -@@ -320,15 +320,8 @@ +diff -Nrup a/posix/Makefile b/posix/Makefile +--- a/posix/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/posix/Makefile 2012-01-01 20:41:26.680439836 -0700 +@@ -320,15 +320,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist
@@ -3046,9 +3046,9 @@ diff -Nur a/posix/Makefile b/posix/Makefile + | sed -n -e '/START_OF_STRINGS/,$${/(POSIX_V[67]|XBS5)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ -diff -Nur a/posix/gai.conf b/posix/gai.conf ---- a/posix/gai.conf 2011-12-22 16:50:52.000000000 +0000 -+++ b/posix/gai.conf 2011-12-22 17:59:24.600119312 +0000 +diff -Nrup a/posix/gai.conf b/posix/gai.conf +--- a/posix/gai.conf 2012-01-01 05:16:32.000000000 -0700 ++++ b/posix/gai.conf 2012-01-01 20:41:26.680439836 -0700 @@ -41,7 +41,7 @@ # # precedence <mask> <value> @@ -3073,9 +3073,9 @@ diff -Nur a/posix/gai.conf b/posix/gai.conf #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. -diff -Nur a/posix/getconf.speclist.h b/posix/getconf.speclist.h ---- a/posix/getconf.speclist.h 1970-01-01 00:00:00.000000000 +0000 -+++ b/posix/getconf.speclist.h 2011-12-22 17:59:24.600119312 +0000 +diff -Nrup a/posix/getconf.speclist.h b/posix/getconf.speclist.h +--- a/posix/getconf.speclist.h 1969-12-31 17:00:00.000000000 -0700 ++++ b/posix/getconf.speclist.h 2012-01-01 20:41:26.680439836 -0700 @@ -0,0 +1,39 @@ +#include <unistd.h> +const char *START_OF_STRINGS = @@ -3116,10 +3116,10 @@ diff -Nur a/posix/getconf.speclist.h b/posix/getconf.speclist.h +"XBS5_LPBIG_OFFBIG" +#endif +""; -diff -Nur a/posix/regcomp.c b/posix/regcomp.c ---- a/posix/regcomp.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/posix/regcomp.c 2011-12-22 17:59:24.601119313 +0000 -@@ -2745,40 +2745,29 @@ +diff -Nrup a/posix/regcomp.c b/posix/regcomp.c +--- a/posix/regcomp.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/posix/regcomp.c 2012-01-01 20:41:26.681439836 -0700 +@@ -2745,40 +2745,29 @@ parse_bracket_exp (re_string_t *regexp,
/* Local function for parse_bracket_exp used in _LIBC environement. Seek the collating symbol entry correspondings to NAME. @@ -3178,7 +3178,7 @@ diff -Nur a/posix/regcomp.c b/posix/regcomp.c }
/* Local function for parse_bracket_exp used in _LIBC environment. -@@ -2787,8 +2776,7 @@ +@@ -2787,8 +2776,7 @@ parse_bracket_exp (re_string_t *regexp,
auto inline unsigned int __attribute ((always_inline)) @@ -3188,7 +3188,7 @@ diff -Nur a/posix/regcomp.c b/posix/regcomp.c { if (br_elem->type == SB_CHAR) { -@@ -2816,7 +2804,7 @@ +@@ -2816,7 +2804,7 @@ parse_bracket_exp (re_string_t *regexp, int32_t elem, idx; elem = seek_collating_symbol_entry (br_elem->opr.name, sym_name_len); @@ -3197,7 +3197,7 @@ diff -Nur a/posix/regcomp.c b/posix/regcomp.c { /* We found the entry. */ idx = symb_table[2 * elem + 1]; -@@ -2834,7 +2822,7 @@ +@@ -2834,7 +2822,7 @@ parse_bracket_exp (re_string_t *regexp, /* Return the collation sequence value. */ return *(unsigned int *) (extra + idx); } @@ -3206,7 +3206,7 @@ diff -Nur a/posix/regcomp.c b/posix/regcomp.c { /* No valid character. Match it as a single byte character. */ -@@ -2856,11 +2844,8 @@ +@@ -2856,11 +2844,8 @@ parse_bracket_exp (re_string_t *regexp,
auto inline reg_errcode_t __attribute ((always_inline)) @@ -3220,7 +3220,7 @@ diff -Nur a/posix/regcomp.c b/posix/regcomp.c { unsigned int ch; uint32_t start_collseq; -@@ -2939,25 +2924,22 @@ +@@ -2939,25 +2924,22 @@ parse_bracket_exp (re_string_t *regexp,
auto inline reg_errcode_t __attribute ((always_inline)) @@ -3250,10 +3250,10 @@ diff -Nur a/posix/regcomp.c b/posix/regcomp.c { /* No valid character, treat it as a normal character. */ -diff -Nur a/resolv/Makefile b/resolv/Makefile ---- a/resolv/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/resolv/Makefile 2011-12-22 17:59:24.602119314 +0000 -@@ -81,6 +81,7 @@ +diff -Nrup a/resolv/Makefile b/resolv/Makefile +--- a/resolv/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/resolv/Makefile 2012-01-01 20:41:26.682439836 -0700 +@@ -81,6 +81,7 @@ ifeq (yes,$(have-ssp)) CFLAGS-libresolv += -fstack-protector endif CFLAGS-res_hconf.c = -fexceptions @@ -3261,10 +3261,10 @@ diff -Nur a/resolv/Makefile b/resolv/Makefile
# The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings -diff -Nur a/resource/getrlimit.c b/resource/getrlimit.c ---- a/resource/getrlimit.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/resource/getrlimit.c 2011-12-22 17:59:24.603119315 +0000 -@@ -28,6 +28,7 @@ +diff -Nrup a/resource/getrlimit.c b/resource/getrlimit.c +--- a/resource/getrlimit.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/resource/getrlimit.c 2012-01-01 20:41:26.682439836 -0700 +@@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource reso __set_errno (ENOSYS); return -1; } @@ -3272,10 +3272,10 @@ diff -Nur a/resource/getrlimit.c b/resource/getrlimit.c weak_alias (__getrlimit, getrlimit)
stub_warning (getrlimit) -diff -Nur a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh ---- a/scripts/check-local-headers.sh 2011-12-22 16:50:52.000000000 +0000 -+++ b/scripts/check-local-headers.sh 2011-12-22 17:59:24.603119315 +0000 -@@ -29,7 +29,7 @@ +diff -Nrup a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh +--- a/scripts/check-local-headers.sh 2012-01-01 05:16:32.000000000 -0700 ++++ b/scripts/check-local-headers.sh 2012-01-01 20:41:26.683439836 -0700 +@@ -29,7 +29,7 @@ exec ${AWK} -v includedir="$includedir" BEGIN { status = 0 exclude = "^" includedir \ @@ -3284,10 +3284,10 @@ diff -Nur a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh } /^[^ ]/ && $1 ~ /.*:/ { obj = $1 } { -diff -Nur a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c ---- a/stdio-common/vfprintf.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/stdio-common/vfprintf.c 2011-12-22 17:59:24.604119316 +0000 -@@ -1161,41 +1161,9 @@ +diff -Nrup a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c +--- a/stdio-common/vfprintf.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/stdio-common/vfprintf.c 2012-01-01 20:41:26.683439836 -0700 +@@ -1161,41 +1161,9 @@ vfprintf (FILE *s, const CHAR_T *format, else if (!is_long && spec != L_('S')) \ { \ if (prec != -1) \ @@ -3332,9 +3332,9 @@ diff -Nur a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c else \ len = strlen (string); \ } \ -diff -Nur a/streams/Makefile b/streams/Makefile ---- a/streams/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/streams/Makefile 2011-12-22 17:59:24.605119317 +0000 +diff -Nrup a/streams/Makefile b/streams/Makefile +--- a/streams/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/streams/Makefile 2012-01-01 20:41:26.684439835 -0700 @@ -21,7 +21,7 @@ # subdir := streams @@ -3344,10 +3344,10 @@ diff -Nur a/streams/Makefile b/streams/Makefile routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach
include ../Rules -diff -Nur a/sunrpc/Makefile b/sunrpc/Makefile ---- a/sunrpc/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/sunrpc/Makefile 2011-12-22 17:59:24.605119317 +0000 -@@ -53,7 +53,7 @@ +diff -Nrup a/sunrpc/Makefile b/sunrpc/Makefile +--- a/sunrpc/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/sunrpc/Makefile 2012-01-01 20:41:26.684439835 -0700 +@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth des_crypt.h) headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h @@ -3356,7 +3356,7 @@ diff -Nur a/sunrpc/Makefile b/sunrpc/Makefile 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 @@ +@@ -152,6 +152,10 @@ CFLAGS-openchild.c = -fexceptions
CPPFLAGS += -D_RPC_THREAD_SAFE_
@@ -3367,9 +3367,9 @@ diff -Nur a/sunrpc/Makefile b/sunrpc/Makefile $(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so -diff -Nur a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h ---- a/sysdeps/generic/dl-cache.h 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/generic/dl-cache.h 2011-12-22 17:59:24.605119317 +0000 +diff -Nrup a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h +--- a/sysdeps/generic/dl-cache.h 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/generic/dl-cache.h 2012-01-01 20:41:26.685439835 -0700 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -3385,9 +3385,9 @@ diff -Nur a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h #define CACHEMAGIC "ld.so-1.7.0"
/* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another -diff -Nur a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile ---- a/sysdeps/i386/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/i386/Makefile 2011-12-22 17:59:24.606119317 +0000 +diff -Nrup a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile +--- a/sysdeps/i386/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/i386/Makefile 2012-01-01 20:41:26.685439835 -0700 @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -3397,7 +3397,7 @@ diff -Nur a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile # The i386 `long double' is a distinct type we support. long-double-fcts = yes
-@@ -68,6 +70,14 @@ +@@ -68,6 +70,14 @@ endif
ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS))) defines += -DNO_TLS_DIRECT_SEG_REFS @@ -3412,9 +3412,9 @@ diff -Nur a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile endif
ifeq ($(subdir),elf) -diff -Nur a/sysdeps/i386/__longjmp.S b/sysdeps/i386/__longjmp.S ---- a/sysdeps/i386/__longjmp.S 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/i386/__longjmp.S 2011-12-22 17:59:24.606119317 +0000 +diff -Nrup a/sysdeps/i386/__longjmp.S b/sysdeps/i386/__longjmp.S +--- a/sysdeps/i386/__longjmp.S 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/i386/__longjmp.S 2012-01-01 20:41:26.686439835 -0700 @@ -1,5 +1,5 @@ /* longjmp for i386. - Copyright (C) 1995-1998,2000,2002,2005,2006,2009 @@ -3430,7 +3430,7 @@ diff -Nur a/sysdeps/i386/__longjmp.S b/sysdeps/i386/__longjmp.S
.text ENTRY (__longjmp) -@@ -33,6 +34,7 @@ +@@ -33,6 +34,7 @@ ENTRY (__longjmp) movl (JB_SP*4)(%eax), %ecx PTR_DEMANGLE (%edx) PTR_DEMANGLE (%ecx) @@ -3438,7 +3438,7 @@ diff -Nur a/sysdeps/i386/__longjmp.S b/sysdeps/i386/__longjmp.S cfi_def_cfa(%eax, 0) cfi_register(%eip, %edx) cfi_register(%esp, %ecx) -@@ -50,6 +52,7 @@ +@@ -50,6 +52,7 @@ ENTRY (__longjmp) cfi_restore(%edi) cfi_restore(%ebp)
@@ -3446,7 +3446,7 @@ diff -Nur a/sysdeps/i386/__longjmp.S b/sysdeps/i386/__longjmp.S movl 8(%esp), %eax /* Second argument is return value. */ movl %ecx, %esp #else -@@ -57,12 +60,14 @@ +@@ -57,12 +60,14 @@ ENTRY (__longjmp) movl 8(%esp), %eax /* Second argument is return value. */ /* Save the return address now. */ movl (JB_PC*4)(%ecx), %edx @@ -3461,9 +3461,9 @@ diff -Nur a/sysdeps/i386/__longjmp.S b/sysdeps/i386/__longjmp.S #endif /* Jump to saved PC. */ jmp *%edx -diff -Nur a/sysdeps/i386/bsd-_setjmp.S b/sysdeps/i386/bsd-_setjmp.S ---- a/sysdeps/i386/bsd-_setjmp.S 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/i386/bsd-_setjmp.S 2011-12-22 17:59:24.606119317 +0000 +diff -Nrup a/sysdeps/i386/bsd-_setjmp.S b/sysdeps/i386/bsd-_setjmp.S +--- a/sysdeps/i386/bsd-_setjmp.S 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/i386/bsd-_setjmp.S 2012-01-01 20:41:26.686439835 -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. @@ -3480,7 +3480,7 @@ diff -Nur a/sysdeps/i386/bsd-_setjmp.S b/sysdeps/i386/bsd-_setjmp.S
#define PARMS LINKAGE /* no space for saved regs */ #define JMPBUF PARMS -@@ -47,6 +49,7 @@ +@@ -47,6 +49,7 @@ ENTRY (BP_SYM (_setjmp)) #endif movl %ecx, (JB_SP*4)(%edx) movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */ @@ -3488,9 +3488,9 @@ diff -Nur a/sysdeps/i386/bsd-_setjmp.S b/sysdeps/i386/bsd-_setjmp.S #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif -diff -Nur a/sysdeps/i386/bsd-setjmp.S b/sysdeps/i386/bsd-setjmp.S ---- a/sysdeps/i386/bsd-setjmp.S 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/i386/bsd-setjmp.S 2011-12-22 17:59:24.607119317 +0000 +diff -Nrup a/sysdeps/i386/bsd-setjmp.S b/sysdeps/i386/bsd-setjmp.S +--- a/sysdeps/i386/bsd-setjmp.S 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/i386/bsd-setjmp.S 2012-01-01 20:41:26.687439834 -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. @@ -3507,7 +3507,7 @@ diff -Nur a/sysdeps/i386/bsd-setjmp.S b/sysdeps/i386/bsd-setjmp.S
#define PARMS LINKAGE /* no space for saved regs */ #define JMPBUF PARMS -@@ -49,6 +51,7 @@ +@@ -49,6 +51,7 @@ ENTRY (BP_SYM (setjmp)) #endif movl %ecx, (JB_SP*4)(%eax) movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */ @@ -3515,10 +3515,10 @@ diff -Nur a/sysdeps/i386/bsd-setjmp.S b/sysdeps/i386/bsd-setjmp.S #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif -diff -Nur a/sysdeps/i386/i686/Makefile b/sysdeps/i386/i686/Makefile ---- a/sysdeps/i386/i686/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/i386/i686/Makefile 2011-12-22 17:59:24.607119317 +0000 -@@ -9,19 +9,3 @@ +diff -Nrup a/sysdeps/i386/i686/Makefile b/sysdeps/i386/i686/Makefile +--- a/sysdeps/i386/i686/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/i386/i686/Makefile 2012-01-01 20:41:26.687439834 -0700 +@@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo endif @@ -3538,9 +3538,9 @@ diff -Nur a/sysdeps/i386/i686/Makefile b/sysdeps/i386/i686/Makefile -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif -diff -Nur a/sysdeps/i386/setjmp.S b/sysdeps/i386/setjmp.S ---- a/sysdeps/i386/setjmp.S 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/i386/setjmp.S 2011-12-22 17:59:24.608119317 +0000 +diff -Nrup a/sysdeps/i386/setjmp.S b/sysdeps/i386/setjmp.S +--- a/sysdeps/i386/setjmp.S 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/i386/setjmp.S 2012-01-01 20:41:26.687439834 -0700 @@ -1,5 +1,5 @@ /* setjmp for i386. - Copyright (C) 1995,1996,1997,2000,2001,2005,2006 @@ -3556,7 +3556,7 @@ diff -Nur a/sysdeps/i386/setjmp.S b/sysdeps/i386/setjmp.S
#define PARMS LINKAGE /* no space for saved regs */ #define JMPBUF PARMS -@@ -44,6 +45,7 @@ +@@ -44,6 +45,7 @@ ENTRY (BP_SYM (__sigsetjmp)) #endif movl %ecx, (JB_SP*4)(%eax) movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */ @@ -3564,10 +3564,10 @@ diff -Nur a/sysdeps/i386/setjmp.S b/sysdeps/i386/setjmp.S #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif -diff -Nur a/sysdeps/ia64/Makefile b/sysdeps/ia64/Makefile ---- a/sysdeps/ia64/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/ia64/Makefile 2011-12-22 17:59:24.608119317 +0000 -@@ -12,8 +12,8 @@ +diff -Nrup a/sysdeps/ia64/Makefile b/sysdeps/ia64/Makefile +--- a/sysdeps/ia64/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/ia64/Makefile 2012-01-01 20:41:26.688439833 -0700 +@@ -12,8 +12,8 @@ elide-routines.os += hp-timing
ifeq (yes,$(build-shared)) # Compatibility @@ -3578,9 +3578,9 @@ diff -Nur a/sysdeps/ia64/Makefile b/sysdeps/ia64/Makefile endif endif
-diff -Nur a/sysdeps/ia64/ia64libgcc.S b/sysdeps/ia64/ia64libgcc.S ---- a/sysdeps/ia64/ia64libgcc.S 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/ia64/ia64libgcc.S 1970-01-01 00:00:00.000000000 +0000 +diff -Nrup a/sysdeps/ia64/ia64libgcc.S b/sysdeps/ia64/ia64libgcc.S +--- a/sysdeps/ia64/ia64libgcc.S 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/ia64/ia64libgcc.S 1969-12-31 17:00:00.000000000 -0700 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -3932,9 +3932,9 @@ diff -Nur a/sysdeps/ia64/ia64libgcc.S b/sysdeps/ia64/ia64libgcc.S - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif -diff -Nur a/sysdeps/ia64/libgcc-compat.c b/sysdeps/ia64/libgcc-compat.c ---- a/sysdeps/ia64/libgcc-compat.c 1970-01-01 00:00:00.000000000 +0000 -+++ b/sysdeps/ia64/libgcc-compat.c 2011-12-22 17:59:24.613119317 +0000 +diff -Nrup a/sysdeps/ia64/libgcc-compat.c b/sysdeps/ia64/libgcc-compat.c +--- a/sysdeps/ia64/libgcc-compat.c 1969-12-31 17:00:00.000000000 -0700 ++++ b/sysdeps/ia64/libgcc-compat.c 2012-01-01 20:41:26.694439833 -0700 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -4020,19 +4020,19 @@ diff -Nur a/sysdeps/ia64/libgcc-compat.c b/sysdeps/ia64/libgcc-compat.c +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif -diff -Nur a/sysdeps/mach/hurd/getrlimit.c b/sysdeps/mach/hurd/getrlimit.c ---- a/sysdeps/mach/hurd/getrlimit.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/mach/hurd/getrlimit.c 2011-12-22 17:59:24.613119317 +0000 -@@ -44,4 +44,5 @@ +diff -Nrup a/sysdeps/mach/hurd/getrlimit.c b/sysdeps/mach/hurd/getrlimit.c +--- a/sysdeps/mach/hurd/getrlimit.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/mach/hurd/getrlimit.c 2012-01-01 20:41:26.694439833 -0700 +@@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource reso
return 0; } +libc_hidden_def (__getrlimit) weak_alias (__getrlimit, getrlimit) -diff -Nur a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c ---- a/sysdeps/posix/getaddrinfo.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/posix/getaddrinfo.c 2011-12-22 17:59:24.615119317 +0000 -@@ -565,8 +565,8 @@ +diff -Nrup a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c +--- a/sysdeps/posix/getaddrinfo.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/posix/getaddrinfo.c 2012-01-01 20:41:26.695439833 -0700 +@@ -565,8 +565,8 @@ gaih_inet (const char *name, const struc
/* If we do not have to look for IPv6 addresses, use the simple, old functions, which do not support @@ -4043,7 +4043,7 @@ diff -Nur a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c { size_t tmpbuflen = 512; assert (tmpbuf == NULL); -@@ -1105,68 +1105,10 @@ +@@ -1105,68 +1105,10 @@ gaih_inet (const char *name, const struc /* Only the first entry gets the canonical name. */ if (at2 == at && (req->ai_flags & AI_CANONNAME) != 0) { @@ -4115,7 +4115,7 @@ diff -Nur a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
#ifdef HAVE_LIBIDN if (req->ai_flags & AI_CANONIDN) -@@ -1181,9 +1123,6 @@ +@@ -1181,9 +1123,6 @@ gaih_inet (const char *name, const struc int rc = __idna_to_unicode_lzlz (canon, &out, idn_flags); if (rc != IDNA_SUCCESS) { @@ -4125,7 +4125,7 @@ diff -Nur a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c if (rc == IDNA_MALLOC_ERROR) result = -EAI_MEMORY; else if (rc == IDNA_DLOPEN_ERROR) -@@ -1213,17 +1152,11 @@ +@@ -1213,17 +1152,11 @@ gaih_inet (const char *name, const struc canon = strdup (canon); if (canon == NULL) { @@ -4143,7 +4143,7 @@ diff -Nur a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c }
family = at2->family; -@@ -1360,10 +1293,12 @@ +@@ -1360,10 +1293,12 @@ static const struct scopeentry /* Link-local addresses: scope 2. */ { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 }, { { { 127, 0, 0, 0 } }, htonl_c (0xff000000), 2 }, @@ -4156,10 +4156,10 @@ diff -Nur a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; -diff -Nur a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Makefile ---- a/sysdeps/powerpc/powerpc64/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/powerpc/powerpc64/Makefile 2011-12-22 17:59:24.615119317 +0000 -@@ -33,6 +33,7 @@ +diff -Nrup a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Makefile +--- a/sysdeps/powerpc/powerpc64/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/powerpc/powerpc64/Makefile 2012-01-01 20:41:26.695439833 -0700 +@@ -33,6 +33,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 endif @@ -4167,19 +4167,19 @@ diff -Nur a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Makef endif
ifeq ($(subdir),elf) -diff -Nur a/sysdeps/powerpc/powerpc64/elf/Makefile b/sysdeps/powerpc/powerpc64/elf/Makefile ---- a/sysdeps/powerpc/powerpc64/elf/Makefile 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/powerpc/powerpc64/elf/Makefile 2011-12-22 17:59:24.616119318 +0000 -@@ -9,3 +9,5 @@ +diff -Nrup a/sysdeps/powerpc/powerpc64/elf/Makefile b/sysdeps/powerpc/powerpc64/elf/Makefile +--- a/sysdeps/powerpc/powerpc64/elf/Makefile 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/powerpc/powerpc64/elf/Makefile 2012-01-01 20:41:26.696439833 -0700 +@@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-re 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 -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/sysdeps/s390/s390-64/utf16-utf32-z9.c 2011-12-22 17:59:24.616119318 +0000 -@@ -169,10 +169,7 @@ +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/s390/s390-64/utf16-utf32-z9.c 2012-01-01 20:41:26.696439833 -0700 +@@ -169,10 +169,7 @@ gconv_end (struct __gconv_step *data) register unsigned long long outlen asm("11") = outend - outptr; \ uint64_t cc = 0; \ \ @@ -4191,10 +4191,10 @@ diff -Nur a/sysdeps/s390/s390-64/utf16-utf32-z9.c b/sysdeps/s390/s390-64/utf16-u " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/sysdeps/s390/s390-64/utf8-utf16-z9.c 2011-12-22 17:59:24.616119318 +0000 -@@ -151,10 +151,7 @@ +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/s390/s390-64/utf8-utf16-z9.c 2012-01-01 20:41:26.697439833 -0700 +@@ -151,10 +151,7 @@ gconv_end (struct __gconv_step *data) register unsigned long long outlen asm("11") = outend - outptr; \ uint64_t cc = 0; \ \ @@ -4206,10 +4206,10 @@ diff -Nur a/sysdeps/s390/s390-64/utf8-utf16-z9.c b/sysdeps/s390/s390-64/utf8-utf " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/sysdeps/s390/s390-64/utf8-utf32-z9.c 2011-12-22 17:59:24.617119319 +0000 -@@ -155,10 +155,7 @@ +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/s390/s390-64/utf8-utf32-z9.c 2012-01-01 20:41:26.697439833 -0700 +@@ -155,10 +155,7 @@ gconv_end (struct __gconv_step *data) register unsigned long long outlen asm("11") = outend - outptr; \ uint64_t cc = 0; \ \ @@ -4221,10 +4221,10 @@ diff -Nur a/sysdeps/s390/s390-64/utf8-utf32-z9.c b/sysdeps/s390/s390-64/utf8-utf " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ -diff -Nur a/sysdeps/unix/nice.c b/sysdeps/unix/nice.c ---- a/sysdeps/unix/nice.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/unix/nice.c 2011-12-22 17:59:24.617119319 +0000 -@@ -42,7 +42,12 @@ +diff -Nrup a/sysdeps/unix/nice.c b/sysdeps/unix/nice.c +--- a/sysdeps/unix/nice.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/unix/nice.c 2012-01-01 20:41:26.698439833 -0700 +@@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); }
@@ -4238,9 +4238,9 @@ diff -Nur a/sysdeps/unix/nice.c b/sysdeps/unix/nice.c if (result == -1) { if (errno == EACCES) -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/sysdeps/unix/sysv/linux/check_pf.c 2011-12-22 17:59:24.618119320 +0000 +diff -Nrup a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c +--- a/sysdeps/unix/sysv/linux/check_pf.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/check_pf.c 2012-01-01 20:41:26.698439833 -0700 @@ -27,16 +27,14 @@ #include <unistd.h> #include <sys/socket.h> @@ -4260,10 +4260,10 @@ diff -Nur a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_p
#ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 -diff -Nur a/sysdeps/unix/sysv/linux/futimesat.c b/sysdeps/unix/sysv/linux/futimesat.c ---- a/sysdeps/unix/sysv/linux/futimesat.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/unix/sysv/linux/futimesat.c 2011-12-22 17:59:24.618119320 +0000 -@@ -37,14 +37,14 @@ +diff -Nrup a/sysdeps/unix/sysv/linux/futimesat.c b/sysdeps/unix/sysv/linux/futimesat.c +--- a/sysdeps/unix/sysv/linux/futimesat.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/futimesat.c 2012-01-01 20:41:26.699439832 -0700 +@@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result;
@@ -4281,7 +4281,7 @@ diff -Nur a/sysdeps/unix/sysv/linux/futimesat.c b/sysdeps/unix/sysv/linux/futime result = INLINE_SYSCALL (futimesat, 3, fd, file, tvp); # ifndef __ASSUME_ATFCTS if (result == -1 && errno == ENOSYS) -@@ -58,22 +58,7 @@ +@@ -58,22 +58,7 @@ futimesat (fd, file, tvp) #ifndef __ASSUME_ATFCTS char *buf = NULL;
@@ -4305,9 +4305,9 @@ diff -Nur a/sysdeps/unix/sysv/linux/futimesat.c b/sysdeps/unix/sysv/linux/futime { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S 2011-12-22 17:59:24.619119321 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S 2012-01-01 20:41:26.699439832 -0700 @@ -1,4 +1,5 @@ -/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc. +/* Copyright (C) 2001,2004,2005,2006,2009,2011 @@ -4323,7 +4323,7 @@ diff -Nur a/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S b/sysdeps/unix/sysv/l
.section .rodata.str1.1,"aMS",@progbits,1 -@@ -79,7 +81,9 @@ +@@ -79,7 +81,9 @@ ENTRY (____longjmp_chk) cfi_adjust_cfa_offset(-12) movl 4(%esp), %ecx
@@ -4334,16 +4334,16 @@ diff -Nur a/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S b/sysdeps/unix/sysv/l cfi_def_cfa(%ecx, 0) cfi_register(%eip, %edx) cfi_register(%esp, %edi) -@@ -102,5 +106,6 @@ +@@ -102,5 +106,6 @@ ENTRY (____longjmp_chk) cfi_restore(%ebp)
/* Jump to saved PC. */ + LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx) jmp *%edx END (____longjmp_chk) -diff -Nur a/sysdeps/unix/sysv/linux/i386/dl-cache.h b/sysdeps/unix/sysv/linux/i386/dl-cache.h ---- a/sysdeps/unix/sysv/linux/i386/dl-cache.h 1970-01-01 00:00:00.000000000 +0000 -+++ b/sysdeps/unix/sysv/linux/i386/dl-cache.h 2011-12-22 17:59:24.620119321 +0000 +diff -Nrup a/sysdeps/unix/sysv/linux/i386/dl-cache.h b/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- a/sysdeps/unix/sysv/linux/i386/dl-cache.h 1969-12-31 17:00:00.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/i386/dl-cache.h 2012-01-01 20:41:26.700439831 -0700 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -4404,18 +4404,18 @@ diff -Nur a/sysdeps/unix/sysv/linux/i386/dl-cache.h b/sysdeps/unix/sysv/linux/i3 + } while (0) + +#include_next <dl-cache.h> -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/sysdeps/unix/sysv/linux/i386/getrlimit.c 2011-12-22 17:59:24.620119321 +0000 -@@ -79,4 +79,5 @@ +diff -Nrup a/sysdeps/unix/sysv/linux/i386/getrlimit.c b/sysdeps/unix/sysv/linux/i386/getrlimit.c +--- a/sysdeps/unix/sysv/linux/i386/getrlimit.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/i386/getrlimit.c 2012-01-01 20:41:26.700439831 -0700 +@@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource }
weak_alias (__new_getrlimit, __getrlimit); +libc_hidden_weak (__getrlimit) versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2); -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/sysdeps/unix/sysv/linux/ia64/dl-cache.h 2011-12-22 17:59:24.621119321 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/ia64/dl-cache.h 2012-01-01 20:41:26.701439831 -0700 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -4448,33 +4448,33 @@ diff -Nur a/sysdeps/unix/sysv/linux/ia64/dl-cache.h b/sysdeps/unix/sysv/linux/ia + } while (0) + #include_next <dl-cache.h> -diff -Nur a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ---- a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1970-01-01 00:00:00.000000000 +0000 -+++ b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 2011-12-22 17:59:24.621119321 +0000 +diff -Nrup a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1969-12-31 17:00:00.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 2012-01-01 20:41:26.701439831 -0700 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include <sysdeps/i386/dl-procinfo.c> +#else +#include <sysdeps/generic/dl-procinfo.c> +#endif -diff -Nur a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ---- a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1970-01-01 00:00:00.000000000 +0000 -+++ b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 2011-12-22 17:59:24.621119321 +0000 +diff -Nrup a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1969-12-31 17:00:00.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 2012-01-01 20:41:26.701439831 -0700 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h> +#else +#include <sysdeps/generic/dl-procinfo.h> +#endif -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 2011-12-22 17:59:24.621119321 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 2012-01-01 20:41:26.701439831 -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"_ -diff -Nur a/sysdeps/unix/sysv/linux/netlinkaccess.h b/sysdeps/unix/sysv/linux/netlinkaccess.h ---- a/sysdeps/unix/sysv/linux/netlinkaccess.h 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/unix/sysv/linux/netlinkaccess.h 2011-12-22 17:59:24.621119321 +0000 +diff -Nrup a/sysdeps/unix/sysv/linux/netlinkaccess.h b/sysdeps/unix/sysv/linux/netlinkaccess.h +--- a/sysdeps/unix/sysv/linux/netlinkaccess.h 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/netlinkaccess.h 2012-01-01 20:41:26.702439831 -0700 @@ -25,6 +25,24 @@
#include <kernel-features.h> @@ -4500,9 +4500,9 @@ diff -Nur a/sysdeps/unix/sysv/linux/netlinkaccess.h b/sysdeps/unix/sysv/linux/ne
struct netlink_res { -diff -Nur a/sysdeps/unix/sysv/linux/paths.h b/sysdeps/unix/sysv/linux/paths.h ---- a/sysdeps/unix/sysv/linux/paths.h 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/unix/sysv/linux/paths.h 2011-12-22 17:59:24.622119321 +0000 +diff -Nrup a/sysdeps/unix/sysv/linux/paths.h b/sysdeps/unix/sysv/linux/paths.h +--- a/sysdeps/unix/sysv/linux/paths.h 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/paths.h 2012-01-01 20:41:26.702439831 -0700 @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -4512,10 +4512,10 @@ diff -Nur a/sysdeps/unix/sysv/linux/paths.h b/sysdeps/unix/sysv/linux/paths.h #define _PATH_WTMP "/var/log/wtmp"
/* Provide trailing slash, since mostly used for building pathnames. */ -diff -Nur a/sysdeps/unix/sysv/linux/tcsetattr.c b/sysdeps/unix/sysv/linux/tcsetattr.c ---- a/sysdeps/unix/sysv/linux/tcsetattr.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/unix/sysv/linux/tcsetattr.c 2011-12-22 17:59:24.622119321 +0000 -@@ -49,6 +49,7 @@ +diff -Nrup a/sysdeps/unix/sysv/linux/tcsetattr.c b/sysdeps/unix/sysv/linux/tcsetattr.c +--- a/sysdeps/unix/sysv/linux/tcsetattr.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/tcsetattr.c 2012-01-01 20:41:26.703439831 -0700 +@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; unsigned long int cmd; @@ -4523,7 +4523,7 @@ diff -Nur a/sysdeps/unix/sysv/linux/tcsetattr.c b/sysdeps/unix/sysv/linux/tcseta
switch (optional_actions) { -@@ -80,6 +81,35 @@ +@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0], __KERNEL_NCCS * sizeof (cc_t));
@@ -4560,9 +4560,9 @@ diff -Nur a/sysdeps/unix/sysv/linux/tcsetattr.c b/sysdeps/unix/sysv/linux/tcseta + return retval; } libc_hidden_def (tcsetattr) -diff -Nur 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-22 16:50:52.000000000 +0000 -+++ b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S 2011-12-22 17:59:24.623119321 +0000 +diff -Nrup 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 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S 2012-01-01 20:41:26.703439831 -0700 @@ -19,6 +19,7 @@ #include <sysdep.h> #include <jmpbuf-offsets.h> @@ -4571,7 +4571,7 @@ diff -Nur a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S b/sysdeps/unix/sysv
.section .rodata.str1.1,"aMS",@progbits,1 .type longjmp_msg,@object -@@ -94,7 +95,9 @@ +@@ -94,7 +95,9 @@ ENTRY(____longjmp_chk) movl %ebx, %esi cfi_restore (%rsi)
@@ -4582,16 +4582,16 @@ diff -Nur a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S b/sysdeps/unix/sysv cfi_def_cfa(%rdi, 0) cfi_register(%rsp,%r8) cfi_register(%rbp,%r9) -@@ -113,5 +116,6 @@ +@@ -113,5 +116,6 @@ ENTRY(____longjmp_chk) 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) -diff -Nur a/sysdeps/x86_64/__longjmp.S b/sysdeps/x86_64/__longjmp.S ---- a/sysdeps/x86_64/__longjmp.S 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/x86_64/__longjmp.S 2011-12-22 17:59:24.623119321 +0000 +diff -Nrup a/sysdeps/x86_64/__longjmp.S b/sysdeps/x86_64/__longjmp.S +--- a/sysdeps/x86_64/__longjmp.S 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/x86_64/__longjmp.S 2012-01-01 20:41:26.703439831 -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. @@ -4606,7 +4606,7 @@ diff -Nur a/sysdeps/x86_64/__longjmp.S b/sysdeps/x86_64/__longjmp.S
/* 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 @@ +@@ -34,6 +35,7 @@ ENTRY(__longjmp) PTR_DEMANGLE (%r9) PTR_DEMANGLE (%rdx) #endif @@ -4614,16 +4614,16 @@ diff -Nur a/sysdeps/x86_64/__longjmp.S b/sysdeps/x86_64/__longjmp.S /* We add unwind information for the target here. */ cfi_def_cfa(%rdi, 0) cfi_register(%rsp,%r8) -@@ -53,5 +55,6 @@ +@@ -53,5 +55,6 @@ ENTRY(__longjmp) mov %esi, %eax movq %r8,%rsp movq %r9,%rbp + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (__longjmp) -diff -Nur a/sysdeps/x86_64/setjmp.S b/sysdeps/x86_64/setjmp.S ---- a/sysdeps/x86_64/setjmp.S 2011-12-22 16:50:52.000000000 +0000 -+++ b/sysdeps/x86_64/setjmp.S 2011-12-22 17:59:24.624119322 +0000 +diff -Nrup a/sysdeps/x86_64/setjmp.S b/sysdeps/x86_64/setjmp.S +--- a/sysdeps/x86_64/setjmp.S 2012-01-01 05:16:32.000000000 -0700 ++++ b/sysdeps/x86_64/setjmp.S 2012-01-01 20:41:26.704439831 -0700 @@ -1,5 +1,5 @@ /* setjmp for x86-64. - Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc. @@ -4639,7 +4639,7 @@ diff -Nur a/sysdeps/x86_64/setjmp.S b/sysdeps/x86_64/setjmp.S
ENTRY (__sigsetjmp) /* Save registers. */ -@@ -41,6 +42,7 @@ +@@ -41,6 +42,7 @@ ENTRY (__sigsetjmp) #endif movq %rdx, (JB_RSP*8)(%rdi) movq (%rsp), %rax /* Save PC we are returning to now. */ @@ -4647,10 +4647,10 @@ diff -Nur a/sysdeps/x86_64/setjmp.S b/sysdeps/x86_64/setjmp.S #ifdef PTR_MANGLE PTR_MANGLE (%rax) #endif -diff -Nur a/timezone/zic.c b/timezone/zic.c ---- a/timezone/zic.c 2011-12-22 16:50:52.000000000 +0000 -+++ b/timezone/zic.c 2011-12-22 17:59:24.625119322 +0000 -@@ -1921,7 +1921,7 @@ +diff -Nrup a/timezone/zic.c b/timezone/zic.c +--- a/timezone/zic.c 2012-01-01 05:16:32.000000000 -0700 ++++ b/timezone/zic.c 2012-01-01 20:41:26.705439831 -0700 +@@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) return; } diff --git a/glibc/patches/glibc-ports-2.15-add-arm-dependency-of-libmemusage.so.patch b/glibc/patches/glibc-ports-2.15-add-arm-dependency-of-libmemusage.so.patch new file mode 100644 index 0000000..9f7b1ee --- /dev/null +++ b/glibc/patches/glibc-ports-2.15-add-arm-dependency-of-libmemusage.so.patch @@ -0,0 +1,26 @@ +From 2d80bda39073a35af4b904d27fa1511cd309b26f Mon Sep 17 00:00:00 2001 +From: Nathan Sidwell nathan@codesourcery.com +Date: Fri, 6 Jan 2012 20:14:44 +0000 +Subject: [PATCH 01/17] Add ARM dependency of libmemusage.so on + libc_nonshared.a. + +--- + sysdeps/arm/Makefile | 5 +++++ + 1 file changed, 5 insertions(+), 0 deletions(-) + +diff --git a/ports/sysdeps/arm/Makefile b/ports/sysdeps/arm/Makefile +index 5651161..1a88430 100644 +--- a/ports/sysdeps/arm/Makefile ++++ b/ports/sysdeps/arm/Makefile +@@ -7,3 +7,8 @@ endif + ifeq ($(subdir),csu) + gen-as-const-headers += tlsdesc.sym + endif ++ ++# to pull in __aeabi_read_tp, needed for tls ++ifeq ($(subdir),malloc) ++$(objpfx)libmemusage.so: $(common-objpfx)libc_nonshared.a ++endif +-- +1.7.5.4 + diff --git a/python/patches/python-2.7.1-setup-db48.patch b/python/patches/python-2.7.1-setup-db48.patch new file mode 100644 index 0000000..c9f5f5c --- /dev/null +++ b/python/patches/python-2.7.1-setup-db48.patch @@ -0,0 +1,13 @@ +diff -up Python-2.6.4/Modules/Setup.dist.setup-db48 Python-2.6.4/Modules/Setup.dist +--- Python-2.6.4/Modules/Setup.dist.setup-db48 2009-12-17 22:05:07.000020150 -0500 ++++ Python-2.6.4/Modules/Setup.dist 2009-12-17 22:05:12.545015367 -0500 +@@ -411,7 +411,7 @@ gdbm gdbmmodule.c -lgdbm + # + # Edit the variables DB and DBLIBVERto point to the db top directory + # and the subdirectory of PORT where you built it. +-DBLIBVER=4.7 ++DBLIBVER=4.8 + DBINC=/usr/include/db4 + DBLIB=/usr/lib + _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) + diff --git a/python/python.nm b/python/python.nm index e6824d1..50cac58 100644 --- a/python/python.nm +++ b/python/python.nm @@ -6,7 +6,7 @@ name = python major_ver = 2.7 version = %{major_ver}.2 -release = 5 +release = 6 thisapp = Python-%{version}
groups = Development/Languages @@ -30,7 +30,7 @@ build autoconf automake bzip2-devel - db4-devel + db4-devel >= 4.8 expat-devel libffi-devel libselinux-devel
hooks/post-receive -- IPFire 3.x development tree