On 05/27/2011 02:32 AM, Jack Howarth wrote:
> This patch breaks the bootstrap on all darwin targets...
> 
> http://gcc.gnu.org/regtest/HEAD/native-lastbuild.txt.gzip
> 
> make[3]: *** No rule to make target 
> `/Users/regress/tbox/svn-gcc/libgcc/../gcc/libgcc-std.ver', needed by 
> `libgcc.map'.  Stop.
> make[3]: *** Waiting for unfinished jobs....

Yeah, I'd grepped gcc/config for occurrences of that file, but didn't
account for the half-transition to libgcc/. As reported in PR49173, the
following fixes it, and I've committed it.


Bernd
Index: libgcc/ChangeLog
===================================================================
--- libgcc/ChangeLog    (revision 174320)
+++ libgcc/ChangeLog    (working copy)
@@ -1,3 +1,11 @@
+2011-05-27  Bernd Schmidt  <ber...@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  <ber...@codesourcery.com>
 
        * libgcc-std.ver.in: New file.
Index: libgcc/config/t-slibgcc-darwin
===================================================================
--- libgcc/config/t-slibgcc-darwin      (revision 174179)
+++ libgcc/config/t-slibgcc-darwin      (working copy)
@@ -24,7 +24,7 @@ SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -dy
 
 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.
Index: libgcc/config/s390/t-linux
===================================================================
--- libgcc/config/s390/t-linux  (revision 174179)
+++ libgcc/config/s390/t-linux  (working copy)
@@ -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
Index: libgcc/config/sh/t-linux
===================================================================
--- libgcc/config/sh/t-linux    (revision 174179)
+++ libgcc/config/sh/t-linux    (working copy)
@@ -5,7 +5,7 @@ HOST_LIBGCC2_CFLAGS = -fpic -mieee -DNO_
 # 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
 

Reply via email to