diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 6dd2636d1a52..d8c0729814d1 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-27  Bernd Schmidt  <bernds@codesourcery.com>
+
+	PR bootstrap/49173
+	* config/t-slibgcc-darwin (SHLIB_MAPFILES): Look for
+	libgcc-std.ver in the build directory.
+	* config/s390/t-linux (SHLIB_MAPFILES): Likewise.
+	* config/sh/t-linux (SHLIB_MAPFILES): Likewise.
+
 2011-05-25  Bernd Schmidt  <bernds@codesourcery.com>
 
 	* libgcc-std.ver.in: New file.
diff --git a/libgcc/config/s390/t-linux b/libgcc/config/s390/t-linux
index a0f10cb29953..b7670828d531 100644
--- a/libgcc/config/s390/t-linux
+++ b/libgcc/config/s390/t-linux
@@ -2,6 +2,6 @@ DFP_ENABLE = true
 
 # Override t-slibgcc-elf-ver to export some libgcc symbols with
 # the symbol versions that glibc used.
-SHLIB_MAPFILES = $(gcc_srcdir)/libgcc-std.ver $(srcdir)/config/s390/libgcc-glibc.ver
+SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/s390/libgcc-glibc.ver
 
 HOST_LIBGCC2_CFLAGS += -mlong-double-128
\ No newline at end of file
diff --git a/libgcc/config/sh/t-linux b/libgcc/config/sh/t-linux
index 8fce1091547e..a98fb18e8d1d 100644
--- a/libgcc/config/sh/t-linux
+++ b/libgcc/config/sh/t-linux
@@ -5,7 +5,7 @@ HOST_LIBGCC2_CFLAGS = -fpic -mieee -DNO_FPSCR_VALUES
 # routines which should not be called via PLT.  We have to create
 # the list from scratch.
 SHLIB_MAPFILES = \
-	$(gcc_srcdir)/libgcc-std.ver \
+	libgcc-std.ver \
 	$(gcc_srcdir)/config/sh/libgcc-excl.ver \
 	$(gcc_srcdir)/config/sh/libgcc-glibc.ver
 
diff --git a/libgcc/config/t-slibgcc-darwin b/libgcc/config/t-slibgcc-darwin
index 0ba8f79134be..bb6569a87d99 100644
--- a/libgcc/config/t-slibgcc-darwin
+++ b/libgcc/config/t-slibgcc-darwin
@@ -24,7 +24,7 @@ SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -dynamiclib -nodefaultlibs \
 
 SHLIB_MKMAP = $(gcc_srcdir)/mkmap-flat.awk
 SHLIB_MKMAP_OPTS = -v leading_underscore=1
-SHLIB_MAPFILES += $(gcc_srcdir)/libgcc-std.ver $(gcc_srcdir)/libgcc-libsystem.ver
+SHLIB_MAPFILES += libgcc-std.ver $(gcc_srcdir)/libgcc-libsystem.ver
 
 # we're only going to build the stubs if the target slib is /usr/lib
 # there is no other case in which they're useful in a live system.