diff -Nrup a/ChangeLog b/ChangeLog

--- a/ChangeLog	2012-06-05 07:42:49.000000000 -0600

+++ b/ChangeLog	2012-06-07 12:15:21.516319798 -0600

@@ -12178,6 +12178,11 @@

 	* sysdeps/mach/hurd/sys/param.h (DEV_BSIZE): New macro.

+2011-09-02  Andreas Schwab  <schwab@redhat.com>

+

+	* nscd/selinux.c (avc_create_thread): Set PR_SET_KEEPCAPS before

+	spawning AVC thread.

+

 2011-09-08  Andreas Schwab  <schwab@redhat.com>

 	* elf/dl-load.c (lose): Check for non-null L.

@@ -12440,6 +12445,11 @@

 	* sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi

 	directive.

+2011-08-31  Andreas Schwab  <schwab@redhat.com>

+

+	* include/link.h (FORCED_DYNAMIC_TLS_OFFSET) [NO_TLS_OFFSET == 0]:

+	Change to -1.

+

 2011-08-24  David S. Miller  <davem@davemloft.net>

 	* sysdeps/sparc/sparc64/strcmp.S: Rewrite.

@@ -13245,6 +13255,14 @@

 	* config.make.in: Likewise.

 	* malloc/Makefile: Likewise.

+2011-06-28  Andreas Schwab  <schwab@redhat.com>

+

+	* iconvdata/gb18030.c: Update tables.

+	(BODY for FROM_LOOP): Handle non-BMP characters specially.

+

+	* sysdeps/posix/getaddrinfo.c (gaih_inet): Don't use gethostbyaddr

+	to determine canonical name.

+

 2011-06-27  Andreas Schwab  <schwab@redhat.com>

 	* iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP

@@ -13376,6 +13394,10 @@

 	* inet/getnetgrent_r.c: Use DL_CALL_FCT in several places.

+2011-06-21  Andreas Schwab  <schwab@redhat.com>

+

+	* iconvdata/gb18030.c: Regenerate tables.

+

 2011-06-20  David S. Miller  <davem@davemloft.net>

 	* sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple

@@ -13998,6 +14020,13 @@

 	* libio/Makefile (tests): Add bug-fclose1.

 	* libio/bug-fclose1.c: New file.

+2011-05-13  Andreas Schwab  <schwab@redhat.com>

+

+	* elf/dl-load.c (is_dst): Remove parameter secure, all callers

+	changed.  Move check for valid use of $ORIGIN ...

+	(_dl_dst_substitute): ... here.  Reset check_for_trusted when a

+	path element is skipped.

+

 2011-05-12  Ulrich Drepper  <drepper@gmail.com>

 	[BZ #12511]

@@ -14275,13 +14304,6 @@

 	* stdlib/bug-getcontext.c: New file.

 	* stdlib/Makefile: Add rules to build and run bug-getcontext.

-2011-04-13  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

-

-	* sysdeps/s390/s390-64/utf16-utf32-z9.c: Wrap the z9-109

-	instructions into .machine "z9-109".

-	* sysdeps/s390/s390-64/utf8-utf16-z9.c: Likewise.

-	* sysdeps/s390/s390-64/utf8-utf32-z9.c: Likewise.

-

 2011-04-11  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

 	* sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes

@@ -14579,6 +14601,10 @@

 	$LDFLAGS and -nostdlib -nostartfiles to linking step.  Change main

 	to _start.

+2011-03-18  Andreas Schwab  <schwab@redhat.com>

+

+	* elf/ldd.bash.in: Never run file directly.

+

 2011-03-06  Ulrich Drepper  <drepper@gmail.com>

 	* elf/dl-load.c (_dl_map_object): If we are looking for the first

@@ -14795,6 +14821,12 @@

 	* shadow/sgetspent.c: Check return value of __sgetspent_r instead

 	of errno.

+2011-02-03  Andreas Schwab  <schwab@redhat.com>

+

+	* login/programs/pt_chown.c (main): Check for valid file

+	descriptor instead of privileges.  Be careful to drop all

+	capabilities when not needed.

+

 2011-01-19  Ulrich Drepper  <drepper@gmail.com>

 	[BZ #11724]

@@ -15482,6 +15514,19 @@

 	* sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS):

 	Mask out sign-bit copies when constructing f_fsid.

+2010-09-27  Andreas Schwab  <schwab@redhat.com>

+

+	[BZ #11561]

+	* posix/regcomp.c (parse_bracket_exp): When looking up collating

+	elements compare against the byte sequence of it, not its name.

+

+	[BZ #6530]

+	* stdio-common/vfprintf.c (process_string_arg): Revert 2000-07-22

+	change.

+

+	* nss/nss_files/files-XXX.c (internal_getent): Declare linebuflen

+	as size_t.

+

 2010-09-24  Petr Baudis <pasky@suse.cz>

 	* debug/stack_chk_fail_local.c: Add missing licence exception.

@@ -16274,6 +16319,17 @@

 	call returning > 0 value.

 	* sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise.

+2010-07-01  Andreas Schwab  <schwab@redhat.com>

+

+	* include/sys/resource.h (__getrlimit): Add hidden proto.

+	* sysdeps/unix/sysv/linux/i386/getrlimit.c: Add libc_hidden_weak.

+	* sysdeps/mach/hurd/getrlimit.c: Add libc_hidden_def.

+	* resource/getrlimit.c: Likewise.

+

+2010-06-21  Andreas Schwab  <schwab@redhat.com>

+

+	* sysdeps/i386/i686/Makefile: Don't pass -mtune to assembler.

+

 2010-06-07  Andreas Schwab  <schwab@redhat.com>

 	* dlfcn/Makefile: Remove explicit dependencies on libc.so and

@@ -16326,6 +16382,21 @@

 	* hurd/hurd/fd.h (__file_name_lookup_at): Update comment.

 	* sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS.

+2010-06-11  Andreas Schwab  <schwab@redhat.com>

+

+	* elf/rtld.c (_dl_starting_up): Always define.

+	(dl_main): Always set _dl_starting_up.

+	* elf/dl-support.c (_dl_starting_up): Always define.

+	* elf/dl-init.c (_dl_init): Always clear _dl_starting_up.

+

+2010-06-10  Andreas Schwab  <schwab@redhat.com>

+

+	* sysdeps/unix/sysv/linux/i386/Versions: Export __uname under

+	GLIBC_PRIVATE.

+	* nptl/Versions: Export __getrlimit under GLIBC_PRIVATE.

+	* sysdeps/unix/sysv/linux/i386/smp.h: Call __uname instead of uname.

+	* nptl/nptl-init.c: Call __getrlimit instead of getrlimit.

+

 2010-05-28  Luis Machado  <luisgpm@br.ibm.com>

 	* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.

diff -Nrup a/ChangeLog.15 b/ChangeLog.15

--- a/ChangeLog.15	2012-06-05 07:42:49.000000000 -0600

+++ b/ChangeLog.15	2012-06-07 12:15:21.518319790 -0600

@@ -477,6 +477,14 @@

 2004-11-26  Jakub Jelinek  <jakub@redhat.com>

+	* posix/Makefile (generated: Add getconf.speclist.

+	($(inst_libexecdir)/getconf): Use getconf.speclist instead of

+	getconf output.

+	($(objpfx)getconf.speclist): New rule.

+	* posix/getconf.speclist.h: New file.

+

+2004-11-26  Jakub Jelinek  <jakub@redhat.com>

+

 	* sysdeps/generic/unsecvars.h (UNSECURE_ENVVARS): Add GETCONF_DIR.

 2004-11-26  Kaz Kojima  <kkojima@rr.iij4u.or.jp>

@@ -3182,6 +3190,17 @@

 	before return type.

 	* locale/localename.c (__current_locale_name): Likewise.

+2004-08-31  Jakub Jelinek  <jakub@redhat.com>

+

+	* elf/ldconfig.c (parse_conf): Add prefix argument, prepend it

+	before arguments to add_dir and pass to parse_conf_include.

+	(parse_conf_include): Add prefix argument, pass it down to

+	parse_conf.

+	(main): Call arch_startup.  Adjust parse_conf caller.

+	Call add_arch_dirs.

+	* sysdeps/generic/dl-cache.h (arch_startup, add_arch_dirs): Define.

+	* sysdeps/unix/sysv/linux/i386/dl-cache.h: New file.

+

 2004-08-30  Roland McGrath  <roland@frob.com>

 	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit

diff -Nrup a/ChangeLog.16 b/ChangeLog.16

--- a/ChangeLog.16	2012-06-05 07:42:49.000000000 -0600

+++ b/ChangeLog.16	2012-06-07 12:15:21.523319772 -0600

@@ -2042,6 +2042,9 @@

 	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT

 	followed by __THROW.

+	* sysdeps/unix/sysv/linux/futimesat.c (futimesat): If

+	file == NULL, use __futimes unconditionally.

+

 2006-02-02  Ulrich Drepper  <drepper@redhat.com>

 	* sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat]

@@ -2101,6 +2104,11 @@

 	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.

 	* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.

+2006-01-30  Jakub Jelinek  <jakub@redhat.com>

+

+	* include/bits/stdlib-ldbl.h: New file.

+	* include/bits/wchar-ldbl.h: New file.

+

 2006-01-19  Thomas Schwinge  <tschwinge@gnu.org>

 	* libio/genops.c: Include <stdbool.h>.

diff -Nrup a/ChangeLog.17 b/ChangeLog.17

--- a/ChangeLog.17	2012-06-05 07:42:49.000000000 -0600

+++ b/ChangeLog.17	2012-06-07 12:15:21.564319619 -0600

@@ -256,6 +256,12 @@

 	* Makerules (libc-abis): Fix search for libc-abis in add-ons.

+2010-04-06  Ulrich Drepper  <drepper@redhat.com>

+

+	* sysdeps/posix/getaddrinfo.c (default_scopes): Assign global

+	scope to RFC 1918 addresses.

+	* posix/gai.conf: Document difference from RFC 3484.

+

 2010-04-05  Thomas Schwinge  <thomas@schwinge.name>

 	* sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/.

@@ -2953,6 +2959,11 @@ d2009-10-30  Ulrich Drepper  

 	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in

 	the unique symbol hash table should not be const.

+2009-07-22  Jakub Jelinek  <jakub@redhat.com>

+

+	* Makeconfig (ASFLAGS): Append $(sysdep-ASFLAGS).

+	* sysdeps/i386/Makefile (sysdep-ASFLAGS): Add -U__i686.

+

 2009-07-21  Ulrich Drepper  <drepper@redhat.com>

 	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove

@@ -11818,6 +11829,10 @@ d2009-10-30  Ulrich Drepper  

 	[BZ #4368]

 	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.

+2007-04-16  Jakub Jelinek  <jakub@redhat.com>

+

+	* locale/programs/locarchive.c (add_alias, insert_name): Remove static.

+

 2007-04-16  Ulrich Drepper  <drepper@redhat.com>

 	[BZ #4364]

@@ -13075,6 +13090,15 @@ d2009-10-30  Ulrich Drepper  

 	separators also if no non-zero digits found.

 	* stdlib/Makefile (tests): Add tst-strtod3.

+2006-12-10  Jakub Jelinek  <jakub@redhat.com>

+

+	* sysdeps/unix/sysv/linux/netlinkaccess.h: Include linux/if_addr.h

+	if IFA_MAX is not defined.

+	(IFA_RTA, IFA_PAYLOAD, IFLA_RTA, IFLA_PAYLOAD): Define if not

+	defined.

+	* sysdeps/unix/sysv/linux/check_pf.c: Include netlinkaccess.h

+	instead of asm/types.h, linux/netlink.h and linux/rtnetlink.h.

+

 2006-12-09  Ulrich Drepper  <drepper@redhat.com>

 	[BZ #3632]

diff -Nrup a/Makeconfig b/Makeconfig

--- a/Makeconfig	2012-06-05 07:42:49.000000000 -0600

+++ b/Makeconfig	2012-06-07 12:15:21.568319604 -0600

@@ -753,12 +753,12 @@ endif

 # The assembler can generate debug information too.

 ifndef ASFLAGS

 ifeq ($(have-cpp-asm-debuginfo),yes)

-ASFLAGS := $(filter -g% -fdebug-prefix-map=%,$(CFLAGS))

+ASFLAGS = $(filter -g% -fdebug-prefix-map=%,$(CFLAGS))

 else

-ASFLAGS :=

+ASFLAGS =

 endif

 endif

-ASFLAGS += $(ASFLAGS-config) $(asflags-cpu)

+ASFLAGS += $(ASFLAGS-config) $(asflags-cpu) $(sysdep-ASFLAGS)

 ifndef BUILD_CC

 BUILD_CC = $(CC)

diff -Nrup a/NEWS b/NEWS

--- a/NEWS	2012-06-05 07:42:49.000000000 -0600

+++ b/NEWS	2012-06-07 12:15:21.569319601 -0600

@@ -196,16 +196,6 @@ Version 2.14

   12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792,

   12795, 12811, 12813, 12814, 12841

-* The RPC implementation in libc is obsoleted.  Old programs keep working

-  but new programs cannot be linked with the routines in libc anymore.

-  Programs in need of RPC functionality must be linked against TI-RPC.

-  The TI-RPC implementation is IPv6 enabled and there are other benefits.

-

-  Visible changes of this change include (obviously) the inability to link

-  programs using RPC functions without referencing the TI-RPC library and the

-  removal of the RPC headers from the glibc headers.

-  Implemented by Ulrich Drepper.

-

 * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at,

   syncfs, setns, sendmmsg

diff -Nrup a/csu/elf-init.c b/csu/elf-init.c

--- a/csu/elf-init.c	2012-06-05 07:42:49.000000000 -0600

+++ b/csu/elf-init.c	2012-06-07 12:15:21.570319597 -0600

@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int,

 extern void (*__fini_array_start []) (void) attribute_hidden;

 extern void (*__fini_array_end []) (void) attribute_hidden;

+#if defined HAVE_VISIBILITY_ATTRIBUTE \

+    && (defined SHARED || defined LIBC_NONSHARED)

+# define hidden_undef_2(x) #x

+# define hidden_undef_1(x) hidden_undef_2 (x)

+# define hidden_undef(x) \

+  __asm (hidden_undef_1 (ASM_GLOBAL_DIRECTIVE) " " #x); \

+  __asm (".hidden " #x);

+#else

+# define hidden_undef(x)

+#endif

+

+hidden_undef (__preinit_array_start)

+hidden_undef (__preinit_array_end)

+hidden_undef (__init_array_start)

+hidden_undef (__init_array_end)

+hidden_undef (__fini_array_start)

+hidden_undef (__fini_array_end)

 /* These function symbols are provided for the .init/.fini section entry

    points automagically by the linker.  */

diff -Nrup a/debug/tst-chk1.c b/debug/tst-chk1.c

--- a/debug/tst-chk1.c	2012-06-05 07:42:49.000000000 -0600

+++ b/debug/tst-chk1.c	2012-06-07 12:15:21.571319593 -0600

@@ -16,6 +16,9 @@

    License along with the GNU C Library; if not, see

    <http://www.gnu.org/licenses/>.  */

+/* Hack: make sure GCC doesn't know __chk_fail () will not return.  */

+#define __noreturn__

+

 #include <assert.h>

 #include <fcntl.h>

 #include <locale.h>

@@ -244,7 +247,7 @@ do_test (void)

   if (memcmp (a.buf1, "aabcdabcjj", 10))

     FAIL ();

-#if __USE_FORTIFY_LEVEL < 2

+#if __USE_FORTIFY_LEVEL < 2 || !__GNUC_PREREQ (4, 0)

   /* 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.  */

@@ -359,7 +362,7 @@ do_test (void)

   memset (a.buf1 + 9, 'j', l0 + 2);

   CHK_FAIL_END

-# if __USE_FORTIFY_LEVEL >= 2

+# if __USE_FORTIFY_LEVEL >= 2 && __GNUC_PREREQ (4, 0)

 #  define O 0

 # else

 #  define O 1

diff -Nrup a/elf/Makefile b/elf/Makefile

--- a/elf/Makefile	2012-06-05 07:42:49.000000000 -0600

+++ b/elf/Makefile	2012-06-07 12:15:21.572319589 -0600

@@ -50,6 +50,7 @@ include ../Makeconfig

 ifeq ($(unwind-find-fde),yes)

 routines += unwind-dw2-fde-glibc

 shared-only-routines += unwind-dw2-fde-glibc

+CFLAGS-unwind-dw2-fde-glibc.c += -fno-strict-aliasing

 endif

 before-compile  = $(objpfx)trusted-dirs.h

diff -Nrup a/elf/dl-init.c b/elf/dl-init.c

--- a/elf/dl-init.c	2012-06-05 07:42:49.000000000 -0600

+++ b/elf/dl-init.c	2012-06-07 12:15:21.573319585 -0600

@@ -23,11 +23,9 @@

 /* Type of the initializer.  */

 typedef void (*init_t) (int, char **, char **);

-#ifndef HAVE_INLINED_SYSCALLS

 /* Flag, nonzero during startup phase.  */

 extern int _dl_starting_up;

 extern int _dl_starting_up_internal attribute_hidden;

-#endif

 static void

@@ -132,9 +130,7 @@ _dl_init (struct link_map *main_map, int

   while (i-- > 0)

     call_init (main_map->l_initfini[i], argc, argv, env);

-#ifndef HAVE_INLINED_SYSCALLS

   /* Finished starting up.  */

   INTUSE(_dl_starting_up) = 0;

-#endif

 }

 INTDEF (_dl_init)

diff -Nrup a/elf/dl-load.c b/elf/dl-load.c

--- a/elf/dl-load.c	2012-06-05 07:42:49.000000000 -0600

+++ b/elf/dl-load.c	2012-06-07 12:15:21.575319577 -0600

@@ -249,8 +249,7 @@ is_trusted_path_normalize (const char *p

 static size_t

-is_dst (const char *start, const char *name, const char *str,

-	int is_path, int secure)

+is_dst (const char *start, const char *name, const char *str, int is_path)

 {

   size_t len;

   bool is_curly = false;

@@ -279,12 +278,6 @@ is_dst (const char *start, const char *n

 	   && (!is_path || name[len] != ':'))

     return 0;

-  if (__builtin_expect (secure, 0)

-      && ((name[len] != '\0' && name[len] != '/'

-	   && (!is_path || name[len] != ':'))

-	  || (name != start + 1 && (!is_path || name[-2] != ':'))))

-    return 0;

-

   return len;

 }

@@ -299,13 +292,10 @@ _dl_dst_count (const char *name, int is_

     {

       size_t len;

-      /* $ORIGIN is not expanded for SUID/GUID programs (except if it

-	 is $ORIGIN alone) and it must always appear first in path.  */

       ++name;

-      if ((len = is_dst (start, name, "ORIGIN", is_path,

-			 INTUSE(__libc_enable_secure))) != 0

-	  || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0

-	  || (len = is_dst (start, name, "LIB", is_path, 0)) != 0)

+      if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0

+	  || (len = is_dst (start, name, "PLATFORM", is_path)) != 0

+	  || (len = is_dst (start, name, "LIB", is_path)) != 0)

 	++cnt;

       name = strchr (name + len, '$');

@@ -338,9 +328,16 @@ _dl_dst_substitute (struct link_map *l,

 	  size_t len;

 	  ++name;

-	  if ((len = is_dst (start, name, "ORIGIN", is_path,

-			     INTUSE(__libc_enable_secure))) != 0)

+	  if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0)

 	    {

+	      /* For SUID/GUID programs $ORIGIN must always appear

+		 first in a path element.  */

+	      if (__builtin_expect (INTUSE(__libc_enable_secure), 0)

+		  && ((name[len] != '\0' && name[len] != '/'

+		       && (!is_path || name[len] != ':'))

+		      || (name != start + 1 && (!is_path || name[-2] != ':'))))

+		repl = (const char *) -1;

+	      else

 #ifndef SHARED

 	      if (l == NULL)

 		repl = _dl_get_origin ();

@@ -351,9 +348,9 @@ _dl_dst_substitute (struct link_map *l,

 	      check_for_trusted = (INTUSE(__libc_enable_secure)

 				   && l->l_type == lt_executable);

 	    }

-	  else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0)

+	  else if ((len = is_dst (start, name, "PLATFORM", is_path)) != 0)

 	    repl = GLRO(dl_platform);

-	  else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0)

+	  else if ((len = is_dst (start, name, "LIB", is_path)) != 0)

 	    repl = DL_DST_LIB;

 	  if (repl != NULL && repl != (const char *) -1)

@@ -373,6 +370,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;

+	      check_for_trusted = false;

 	    }

 	  else

 	    /* No DST we recognize.  */

diff -Nrup a/elf/dl-support.c b/elf/dl-support.c

--- a/elf/dl-support.c	2012-06-05 07:42:49.000000000 -0600

+++ b/elf/dl-support.c	2012-06-07 12:15:21.576319573 -0600

@@ -81,10 +81,8 @@ unsigned long long _dl_load_adds;

    create a fake scope containing nothing.  */

 struct r_scope_elem _dl_initial_searchlist;

-#ifndef HAVE_INLINED_SYSCALLS

 /* Nonzero during startup.  */

 int _dl_starting_up = 1;

-#endif

 /* Random data provided by the kernel.  */

 void *_dl_random;

diff -Nrup a/elf/ldconfig.c b/elf/ldconfig.c

--- a/elf/ldconfig.c	2012-06-05 07:42:49.000000000 -0600

+++ b/elf/ldconfig.c	2012-06-07 12:15:21.577319570 -0600

@@ -1033,17 +1033,19 @@ search_dirs (void)

 static void parse_conf_include (const char *config_file, unsigned int lineno,

-				bool do_chroot, const char *pattern);

+				const char *prefix, bool do_chroot,

+				const char *pattern);

 /* Parse configuration file.  */

 static void

-parse_conf (const char *filename, bool do_chroot)

+parse_conf (const char *filename, const char *prefix, bool do_chroot)

 {

   FILE *file = NULL;

   char *line = NULL;

   const char *canon;

   size_t len = 0;

   unsigned int lineno;

+  size_t prefix_len = prefix ? strlen (prefix) : 0;

   if (do_chroot && opt_chroot)

     {

@@ -1106,7 +1108,14 @@ Warning: ignoring configuration file tha

 	  cp += 8;

 	  while ((dir = strsep (&cp, " \t")) != NULL)

 	    if (dir[0] != '\0')

-	      parse_conf_include (filename, lineno, do_chroot, dir);

+	      parse_conf_include (filename, lineno, prefix, do_chroot, dir);

+	}

+      else if (prefix != NULL)

+	{

+	  size_t cp_len = strlen (cp);

+	  char new_cp [prefix_len + cp_len + 1];

+	  memcpy (mempcpy (new_cp, prefix, prefix_len), cp, cp_len + 1);

+	  add_dir (new_cp);

 	}

       else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5]))

 	{

@@ -1169,7 +1178,7 @@ Warning: ignoring configuration file tha

    config files to read.  */

 static void

 parse_conf_include (const char *config_file, unsigned int lineno,

-		    bool do_chroot, const char *pattern)

+		    const char *prefix, bool do_chroot, const char *pattern)

 {

   if (opt_chroot && pattern[0] != '/')

     error (EXIT_FAILURE, 0,

@@ -1201,7 +1210,7 @@ parse_conf_include (const char *config_f

     {

     case 0:

       for (size_t i = 0; i < gl.gl_pathc; ++i)

-	parse_conf (gl.gl_pathv[i], false);

+	parse_conf (gl.gl_pathv[i], prefix, false);

       globfree64 (&gl);

       break;

@@ -1244,6 +1253,8 @@ main (int argc, char **argv)

   /* Set the text message domain.  */

   textdomain (_libc_intl_domainname);

+  arch_startup (argc, argv);

+

   /* Parse and process arguments.  */

   int remaining;

   argp_parse (&argp, argc, argv, 0, &remaining, NULL);

@@ -1353,12 +1364,14 @@ main (int argc, char **argv)

   if (!opt_only_cline)

     {

-      parse_conf (config_file, true);

+      parse_conf (config_file, NULL, true);

       /* Always add the standard search paths.  */

       add_system_dir (SLIBDIR);

       if (strcmp (SLIBDIR, LIBDIR))

 	add_system_dir (LIBDIR);

+

+      add_arch_dirs (config_file);

     }

   const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;

diff -Nrup a/elf/ldd.bash.in b/elf/ldd.bash.in

--- a/elf/ldd.bash.in	2012-06-05 07:42:49.000000000 -0600

+++ b/elf/ldd.bash.in	2012-06-07 12:15:21.577319570 -0600

@@ -166,18 +166,6 @@ warning: you do not have execution permi

       fi

     done

     case $ret in

-    0)

-      # If the program exits with exit code 5, it means the process has been

-      # invoked with __libc_enable_secure.  Fall back to running it through

-      # the dynamic linker.

-      try_trace "$file"

-      rc=$?

-      if [ $rc = 5 ]; then

-	try_trace "$RTLD" "$file"

-	rc=$?

-      fi

-      [ $rc = 0 ] || result=1

-      ;;

     1)

       # This can be a non-ELF binary or no binary at all.

       nonelf "$file" || {

@@ -185,7 +173,7 @@ warning: you do not have execution permi

 	result=1

       }

       ;;

-    2)

+    0|2)

       try_trace "$RTLD" "$file" || result=1

       ;;

     *)

diff -Nrup a/elf/rtld.c b/elf/rtld.c

--- a/elf/rtld.c	2012-06-05 07:42:49.000000000 -0600

+++ b/elf/rtld.c	2012-06-07 12:15:21.579319564 -0600

@@ -106,7 +106,6 @@ static struct audit_list

   struct audit_list *next;

 } *audit_list;

-#ifndef HAVE_INLINED_SYSCALLS

 /* 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

@@ -116,7 +115,6 @@ static struct audit_list

    never be called.  */

 int _dl_starting_up = 0;

 INTVARDEF(_dl_starting_up)

-#endif

 /* This is the structure which defines all variables global to ld.so

    (except those which cannot be added for some reason).  */

@@ -929,10 +927,8 @@ dl_main (const ElfW(Phdr) *phdr,

   /* Process the environment variable which control the behaviour.  */

   process_envvars (&mode);

-#ifndef HAVE_INLINED_SYSCALLS

   /* Set up a flag which tells we are just starting.  */

   INTUSE(_dl_starting_up) = 1;

-#endif

   if (*user_entry == (ElfW(Addr)) ENTRY_POINT)

     {

@@ -1408,7 +1404,9 @@ of this helper program; chances are you

 	      char *copy = malloc (len);

 	      if (copy == NULL)

 		_dl_fatal_printf ("out of memory\n");

-	      l->l_libname->name = l->l_name = memcpy (copy, dsoname, len);

+	      l->l_libname->name = memcpy (copy, dsoname, len);

+	      if (GLRO(dl_debug_mask))

+		l->l_name = copy;

 	    }

 	  /* Add the vDSO to the object list.  */

@@ -2343,7 +2341,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));

-

   if (! prelinked && rtld_multiple_ref)

     {

       /* There was an explicit ref to the dynamic linker as a shared lib.

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-06-07 12:15:21.580319560 -0600

@@ -0,0 +1 @@

+#include <stdlib/bits/stdlib-ldbl.h>

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-06-07 12:15:21.580319560 -0600

@@ -0,0 +1 @@

+#include <wcsmbs/bits/wchar-ldbl.h>

diff -Nrup a/include/link.h b/include/link.h

--- a/include/link.h	2012-06-05 07:42:49.000000000 -0600

+++ b/include/link.h	2012-06-07 12:15:21.581319556 -0600

@@ -289,7 +289,7 @@ struct link_map

 #endif

 #ifndef FORCED_DYNAMIC_TLS_OFFSET

 # if NO_TLS_OFFSET == 0

-#  define FORCED_DYNAMIC_TLS_OFFSET 1

+#  define FORCED_DYNAMIC_TLS_OFFSET -1

 # elif NO_TLS_OFFSET == -1

 #  define FORCED_DYNAMIC_TLS_OFFSET -2

 # else

diff -Nrup a/include/sys/resource.h b/include/sys/resource.h

--- a/include/sys/resource.h	2012-06-05 07:42:49.000000000 -0600

+++ b/include/sys/resource.h	2012-06-07 12:15:21.582319552 -0600

@@ -14,5 +14,6 @@ extern int __getrusage (enum __rusage_wh

 extern int __setrlimit (enum __rlimit_resource __resource,

 			const struct rlimit *__rlimits);

+libc_hidden_proto (__getrlimit)

 #endif

 #endif

diff -Nrup a/inet/Makefile b/inet/Makefile

--- a/inet/Makefile	2012-06-05 07:42:49.000000000 -0600

+++ b/inet/Makefile	2012-06-07 12:15:21.582319552 -0600

@@ -54,6 +54,8 @@ tests := htontest test_ifindex tst-ntoa

 include ../Rules

+CFLAGS-tst-inet6_rth.c += -fno-strict-aliasing

+

 ifeq ($(have-thread-library),yes)

 CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions

diff -Nrup a/intl/locale.alias b/intl/locale.alias

--- a/intl/locale.alias	2012-06-05 07:42:49.000000000 -0600

+++ b/intl/locale.alias	2012-06-07 12:15:21.583319548 -0600

@@ -56,8 +56,6 @@ korean		ko_KR.eucKR

 korean.euc 	ko_KR.eucKR

 ko_KR		ko_KR.eucKR

 lithuanian      lt_LT.ISO-8859-13

-no_NO		nb_NO.ISO-8859-1

-no_NO.ISO-8859-1 nb_NO.ISO-8859-1

 norwegian       nb_NO.ISO-8859-1

 nynorsk		nn_NO.ISO-8859-1

 polish          pl_PL.ISO-8859-2

diff -Nrup a/libio/stdio.h b/libio/stdio.h

--- a/libio/stdio.h	2012-06-05 07:42:49.000000000 -0600

+++ b/libio/stdio.h	2012-06-07 12:15:21.584319544 -0600

@@ -168,10 +168,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.  */

+#ifdef __STDC__

 /* C89/C99 say they're macros.  Make them happy.  */

 #define stdin stdin

 #define stdout stdout

 #define stderr stderr

+#endif

 __BEGIN_NAMESPACE_STD

 /* Remove file FILENAME.  */

diff -Nrup a/locale/iso-4217.def b/locale/iso-4217.def

--- a/locale/iso-4217.def	2012-06-05 07:42:49.000000000 -0600

+++ b/locale/iso-4217.def	2012-06-07 12:15:21.584319544 -0600

@@ -8,6 +8,7 @@

  *

  * !!! The list has to be sorted !!!

  */