[ChangeLog]
2009-08-18  Chris Demetriou  <cgd@google.com>

	* configure.ac (CXX_NO_DEBUG_PREFIX_MAP)
        (CXXFLAGS_NO_DEBUG_PREFIX_MAP): New variables.
        * testsuite/Makefile.am (CXXCOMPILE_NO_DEBUG_PREFIX_MAP): New variable.
        (debug_msg.o): Build using CXXCOMPILE_NO_DEBUG_PREFIX_MAP.
        * Makefile.in: Regenerate.
        * configure: Likewise.
        * testsuite/Makefile.in: Likewise.

diff -rup gold.CLEAN/gold/configure.ac gold/gold/configure.ac
--- gold.CLEAN/gold/configure.ac	2009-06-23 11:10:41.000000000 -0700
+++ gold/gold/configure.ac	2009-08-19 00:41:05.545548000 -0700
@@ -314,6 +314,13 @@ dnl host dependent.  If build == host, w
 LFS_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 AC_SUBST(LFS_CFLAGS)
 
+dnl Versions of CXX and CXXFLAGS without -fdebug-prefix-map= arguments.
+dnl These are used for the debug_msg test.
+CXX_NO_DEBUG_PREFIX_MAP=`echo ${CXX} | sed -e 's/-fdebug-prefix-map=[[^ ]]*//g'`
+AC_SUBST(CXX_NO_DEBUG_PREFIX_MAP)
+CXXFLAGS_NO_DEBUG_PREFIX_MAP=`echo ${CXXFLAGS} | sed -e 's/-fdebug-prefix-map=[[^ ]]*//g'`
+AC_SUBST(CXXFLAGS_NO_DEBUG_PREFIX_MAP)
+
 AC_CHECK_FUNCS(chsize)
 AC_REPLACE_FUNCS(pread ftruncate mremap ffsll)
 
diff -rup gold.CLEAN/gold/testsuite/Makefile.am gold/gold/testsuite/Makefile.am
--- gold.CLEAN/gold/testsuite/Makefile.am	2009-08-12 12:03:16.000000000 -0700
+++ gold/gold/testsuite/Makefile.am	2009-08-19 00:25:05.160018000 -0700
@@ -18,6 +18,10 @@ INCLUDES = \
 	-DLOCALEDIR="\"$(datadir)/locale\"" \
 	@INCINTL@
 
+CXXCOMPILE_NO_DEBUG_PREFIX_MAP = \
+        $(CXX_NO_DEBUG_PREFIX_MAP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_NO_DEBUG_PREFIX_MAP)
+
 TEST_READELF = $(top_builddir)/../binutils/readelf
 TEST_OBJDUMP = $(top_builddir)/../binutils/objdump
 TEST_CXXFILT = $(top_builddir)/../binutils/cxxfilt
@@ -668,7 +672,7 @@ check_SCRIPTS += debug_msg.sh
 check_DATA += debug_msg.err
 MOSTLYCLEANFILES += debug_msg.err
 debug_msg.o: debug_msg.cc
-	$(CXXCOMPILE) -O0 -g -c -w -o $@ $(srcdir)/debug_msg.cc
+	$(CXXCOMPILE_NO_DEBUG_PREFIX_MAP) -O0 -g -c -w -o $@ $(srcdir)/debug_msg.cc
 odr_violation1.o: odr_violation1.cc
 	$(CXXCOMPILE) -O0 -g -c -w -o $@ $(srcdir)/odr_violation1.cc
 odr_violation2.o: odr_violation2.cc