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

diff --cc ChangeLog
Simple merge

diff --cc Makeconfig
index b6386283bdf9549aba9018925f8e5efccaf7ca48,cd77fe16b81e91cc2866096efbce28846e50a76a..9aacc81e8a996e4e0f5ae86e23999987ed298237
--- 1/Makeconfig
--- 2/Makeconfig
+++ b/Makeconfig
@@@ -780,12 -780,12 +780,12 @@@ endi
  # The assembler can generate debug information too.
  ifndef ASFLAGS
  ifeq ($(have-cpp-asm-debuginfo),yes)
- ASFLAGS = $(filter -g%,$(CFLAGS))
 -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 --cc csu/Makefile
Simple merge

diff --cc elf/ldconfig.c
index 4886645dfa6a6dc6f9e1856223d9574b8d60bac9,b9f1cc2d1bc3c0423526dd669513cad53008a89a..1bebb11558e90e30b8d0bac922398cdcbbd0f991
--- 1/elf/ldconfig.c
--- 2/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@@ -1355,12 -1342,19 +1353,21 @@@ main (int argc, char **argv
        add_system_dir (SLIBDIR);
        if (strcmp (SLIBDIR, LIBDIR))
        add_system_dir (LIBDIR);
 +
 +      add_arch_dirs (config_file);
      }
  
+   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

diff --cc nptl/ChangeLog
Simple merge

diff --cc posix/Makefile
Simple merge