From: Andreas Schwab <schwab@redhat.com>
Date: Tue, 6 Apr 2010 09:15:58 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into fedora/master
X-Git-Tag: fedora/glibc-2.11.90-17~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32e5e786daa69be1f153f01cd428ac18634bb7bc;p=thirdparty%2Fglibc.git

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

32e5e786daa69be1f153f01cd428ac18634bb7bc
diff --cc Makeconfig
index b6386283bdf,cd77fe16b81..9aacc81e8a9
--- a/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 elf/ldconfig.c
index 4886645dfa6,b9f1cc2d1bc..1bebb11558e
--- a/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 ();