Merge remote branch 'origin/release/2.11/master' into fedora/2.11/master

diff --cc ChangeLog
index 1b4bff098d86d8776bbc46c63cad214600caf488,5e6a6b20f8912aac2945f1d49201a19f275ccaf6..a296b53690c533332aae34881c8fc183f319fb5d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -3,19 -151,127 +151,140 @@@
        * sysdeps/posix/getaddrinfo.c (gaih_inet): Reset no_data before
        each action.
  
+ 2010-03-25  Andreas Schwab  <schwab@redhat.com>
+ 
+       * sysdeps/posix/cuserid.c: Fix typo.
+ 
+ 2010-03-24  Ulrich Drepper  <drepper@redhat.com>
+ 
+       [BZ #11397]
+       * sysdeps/posix/cuserid.c (cuserid): Make sure the returned string
+       is NUL terminated.
+       Patch by Jonathan Geisler <jgeisler@cse.taylor.edu>.
+ 
+ 2010-03-02  Richard Guenther  <rguenther@suse.de>
+ 
+       * sysdeps/x86_64/dl-machine.h (elf_machine_rela): R_X86_64_PC32
+       is sign-extending.
+ 
+ 2010-02-24  Ulrich Drepper  <drepper@redhat.com>
+ 
+       [BZ #11319]
+       * libio/iovdprintf.c (_IO_vdprintf): Explicitly flush stream before
+       undoing the stream because _IO_FINISH doesn't report failures.
+ 
+       [BZ #5553]
+       * malloc/malloc.c (public_vALLOc): Set ar_ptr when trying main_arena.
+       (public_pVALLOc): Likewise.
+       Patch by Petr Baudis.
+ 
+ 2010-02-22  Jim Meyering  <meyering@redhat.com>
+ 
+       * manual/math.texi (BSD Random): Fix a typo: s/are/is/
+ 
+       * manual/charset.texi: Adjust grammar.
+ 
+       * manual/errno.texi (Error Messages): Fix doubled-words and typos.
+       * manual/charset.texi (Selecting the Conversion): Likewise.
+       * manual/getopt.texi (Getopt Long Options): Likewise.
+       * manual/memory.texi (Resizing the Data Segment): Likewise.
+       * manual/message.texi (GUI program problems): Likewise.
+       * manual/resource.texi (CPU Affinity): Likewise.
+       * manual/stdio.texi (Streams and Threads): Likewise.
+       * manual/time.texi (High Accuracy Clock): Likewise.
+ 
+ 2010-02-11  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+ 
+       * sysdeps/s390/s390-64/utf8-utf16-z9.c: Disable hardware
+       instructions cu21 and cu24.  Add well-formedness checking
+       parameter and adjust the software implementation.
+       * sysdeps/s390/s390-64/utf16-utf32-z9.c: Likewise.
+ 
+ 2010-02-10  Ulrich Drepper  <drepper@redhat.com>
+ 
+       [BZ #11271]
+       * io/ftw.c (ftw_startup): Close descriptor for initial directory
+       after changing back to it.
+ 
+ 2010-02-09  Ulrich Drepper  <drepper@redhat.com>
+ 
+       * sysdeps/i386/lshift.S: Fix unwind information.
+ 
+ 2010-02-03  Ulrich Drepper  <drepper@redhat.com>
+ 
+       [BZ #11242]
+       * misc/getusershell.c (initshells): Allocate one more byte in input
+       buffer so that fgets doesn't loop undefinitely.
+ 
+ 2010-01-25  Andreas Schwab  <schwab@redhat.com>
+ 
+       * iconv/iconv_prog.c (write_output): Fix check for open failure.
+ 
+ 2010-01-22  Ulrich Drepper  <drepper@redhat.com>
+ 
+       [BZ #11200]
+       * locale/loadlocale.c (_nl_load_locale): Fix recognition of genuine
+       mmap resource problem.  Patch by Joe Landers <jlanders@vmware.com>.
+ 
+ 2010-01-22  Jim Meyering  <jim@meyering.net>
+ 
+       [BZ #11184]
+       * posix/regex_internal.c (re_dfa_add_node): Extend the overflow
+       detection test.  Patch by Paul Eggert.
+ 
+       [BZ #11183]
+       * posix/regex_internal.c (re_string_realloc_buffers):
+       Detect and handle internal overflow.  Patch by Paul Eggert
+ 
+ 2010-01-20  Andreas Schwab  <schwab@redhat.com>
+ 
+       * sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c
+       (CHECK_SP): Fix check for alternate stack.
+       * sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c
+       (CHECK_SP): Likewise.
+ 
+ 2010-01-19  Ulrich Drepper  <drepper@redhat.com>
+ 
+       [BZ #11194]
+       * misc/bits/syslog.h (syslog, vsyslog): Remove unnecessary return.
+ 
+ 2010-01-18  Andreas Schwab  <schwab@redhat.com>
+ 
+       * elf/dynamic-link.h (elf_get_dynamic_info): Use correct type when
+       casting d_tag.
+ 
+       * elf/dynamic-link.h (elf_get_dynamic_info): Ignore negative
+       dynamic entry types.
+ 
+ 2010-01-14  Ulrich Drepper  <drepper@redhat.com>
+ 
+       * bits/confname.h: Make pre-C99-safe.
+ 
+ 2010-02-05  H.J. Lu  <hongjiu.lu@intel.com>
+ 
+       [BZ #11230]
+       * sysdeps/ia64/memchr.S: Don't read beyond the last byte
+       during recovery.
+ 
+ 2010-03-25  Ryan S. Arnold  <rsa@us.ibm.com>
+ 
+       * sysdeps/unix/sysv/linux/getsysstats.c (next_line): Remove
+       redundant and incorrect else block which overwrites current line
+       with the partial next line.
+ 
 +2010-03-09  David S. Miller  <davem@davemloft.net>
 +
 +      * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Handling
 +      of R_SPARC_TLS_LE_* needs to use 32-bit loads and stores, not
 +      64-bit ones.
 +
 +2009-10-27  Aurelien Jarno  <aurelien@aurel32.net>
 +
 +      [BZ #10855]
 +      * locale/programs/locarchive.c: use MMAP_SHARED to reserve memory
 +      used later with MMAP_FIXED | MMAP_SHARED to cope with different
 +      alignment restrictions.
 +
  2010-01-14  Ulrich Drepper  <drepper@redhat.com>
  
        [BZ #11127]

diff --cc csu/Makefile
Simple merge

diff --cc elf/ldconfig.c
index 4886645dfa6a6dc6f9e1856223d9574b8d60bac9,6e71b098d4394163197a5ef6411747a8fb1ed89c..5cae93897eecd08161a6f913067b206ab84ee24b
--- 1/elf/ldconfig.c
--- 2/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@@ -1355,12 -1355,19 +1366,21 @@@ main (int argc, char **argv
        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;
+   if (opt_chroot)
+     {
+       aux_cache_file = chroot_canon (opt_chroot, aux_cache_file);
+       if (aux_cache_file == NULL)
+       error (EXIT_FAILURE, errno, _("Can't open cache file %s\n"),
+              _PATH_LDCONFIG_AUX_CACHE);
+     }
+ 
    if (! opt_ignore_aux_cache)
-     load_aux_cache (_PATH_LDCONFIG_AUX_CACHE);
+     load_aux_cache (aux_cache_file);
    else
      init_aux_cache ();
  

diff --cc localedata/Makefile
Simple merge