From patchwork Fri May 27 07:55:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Schmidt X-Patchwork-Id: 97659 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 55696B6F8F for ; Fri, 27 May 2011 17:55:41 +1000 (EST) Received: (qmail 3821 invoked by alias); 27 May 2011 07:55:39 -0000 Received: (qmail 3809 invoked by uid 22791); 27 May 2011 07:55:38 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 27 May 2011 07:55:24 +0000 Received: (qmail 22065 invoked from network); 27 May 2011 07:55:23 -0000 Received: from unknown (HELO ?84.152.188.110?) (bernds@127.0.0.2) by mail.codesourcery.com with ESMTPA; 27 May 2011 07:55:23 -0000 Message-ID: <4DDF58E6.5000600@codesourcery.com> Date: Fri, 27 May 2011 07:55:18 +0000 From: Bernd Schmidt User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110516 Lightning/1.0b3pre Thunderbird/3.1.10 MIME-Version: 1.0 To: Jack Howarth CC: Ian Lance Taylor , GCC Patches Subject: Re: Prefixes for libgcc symbols (C6X 9.5/11) References: <4DC956D0.3040306@codesourcery.com> <4DCD34BC.3080506@codesourcery.com> <4DDE41DB.2060608@codesourcery.com> <20110527023226.GA17457@bromo.med.uc.edu> In-Reply-To: <20110527023226.GA17457@bromo.med.uc.edu> Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org 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 + + 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 * 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