2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6803147..48bdfec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@
 
 	* elf/rtld.c (dl_main) [HAVE_AUX_VECTOR]: Add a cast.
 
+2010-03-30  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	* Makeconfig: Propagate -fdebug-prefix-map from CFLAGS to ASFLAGS.
+
 2010-03-30  Joseph Myers  <joseph@codesourcery.com>
 
 	* elf/elf.h (ELFOSABI_ARM_AEABI): Define.
diff --git a/Makeconfig b/Makeconfig
index 15cd4ca..cd77fe1 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2003,2004,2005,2006,2007,2008,2009
+# Copyright (C) 1991-2003,2004,2005,2006,2007,2008,2009,2010
 #	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -780,7 +780,7 @@ endif
 # 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))
 else
 ASFLAGS :=
 endif