From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5950 invoked by alias); 8 May 2014 12:14:38 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 5938 invoked by uid 89); 8 May 2014 12:14:37 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: smtp-relay.CeBiTec.Uni-Bielefeld.DE Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 08 May 2014 12:14:36 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 2484D7CE for ; Thu, 8 May 2014 14:14:34 +0200 (CEST) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id vcPs9lN1QeGG for ; Thu, 8 May 2014 14:14:32 +0200 (CEST) Received: from lokon.CeBiTec.Uni-Bielefeld.DE (lokon.CeBiTec.Uni-Bielefeld.DE [129.70.161.110]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 658017CD for ; Thu, 8 May 2014 14:14:32 +0200 (CEST) Received: (from ro@localhost) by lokon.CeBiTec.Uni-Bielefeld.DE (8.14.7+Sun/8.14.7/Submit) id s48CEWMl010120; Thu, 8 May 2014 14:14:32 +0200 (MEST) From: Rainer Orth To: gcc-patches@gcc.gnu.org Subject: [libgcc, build] Don't build libgcc-unwind.map with --disable-shared (PR libgcc/61097) Date: Thu, 08 May 2014 12:14:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (usg-unix-v) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-IsSubscribed: yes X-SW-Source: 2014-05/txt/msg00477.txt.bz2 --=-=-= Content-Type: text/plain Content-length: 633 As reported in the PR, libgcc fails to build on Solaris with --disable-shared: the creation of libgcc-unwind.map depends on libgcc-std.ver which isn't built in this case. Fixed as follows, tested by verifying that a --disable-shared i386-pc-solaris2.10 build gets into stage2 without trying to build map files, while a default (i.e. --enable-shared) build still correctly builds the maps. Installed on mainline; will backport to the 4.9 branch in a few days. Rainer 2014-05-08 Rainer Orth PR libgcc/61097 * config/t-slibgcc-sld: Only build and install libgcc-unwind.map if --enable-shared. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=sol2-libgcc-unwind-static.patch Content-length: 688 # HG changeset patch # Parent 8b4f4776ed04d118977a300b92559035f3b7a49b Don't build libgcc-unwind.map with --disable-shared (PR libgcc/61097) diff --git a/libgcc/config/t-slibgcc-sld b/libgcc/config/t-slibgcc-sld --- a/libgcc/config/t-slibgcc-sld +++ b/libgcc/config/t-slibgcc-sld @@ -4,6 +4,8 @@ SHLIB_LDFLAGS = -Wl,-h,$(SHLIB_SONAME) -Wl,-z,text -Wl,-z,defs \ -Wl,-M,$(SHLIB_MAP) +ifeq ($(enable_shared),yes) + # Linker mapfile to enforce direct binding to libgcc_s unwinder # (PR target/59788). libgcc-unwind.map: libgcc-std.ver @@ -26,3 +28,5 @@ install-libgcc-unwind-map: libgcc-unwind $(INSTALL_DATA) $< $(DESTDIR)$(slibdir) install: install-libgcc-unwind-map + +endif --=-=-= Content-Type: text/plain Content-length: 143 -- ----------------------------------------------------------------------------- Rainer Orth, Center for Biotechnology, Bielefeld University --=-=-=--