From patchwork Fri Aug 20 20:14:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 62315 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 091A0B70E0 for ; Sat, 21 Aug 2010 06:14:59 +1000 (EST) Received: (qmail 23112 invoked by alias); 20 Aug 2010 20:14:54 -0000 Received: (qmail 23085 invoked by uid 22791); 20 Aug 2010 20:14:47 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, TW_LG X-Spam-Check-By: sourceware.org Received: from c2bthomr13.btconnect.com (HELO c2bthomr13.btconnect.com) (213.123.20.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 20 Aug 2010 20:14:40 +0000 Received: from thor.office (host81-138-1-83.in-addr.btopenworld.com [81.138.1.83]) by c2bthomr13.btconnect.com with ESMTP id FUS94341; Fri, 20 Aug 2010 21:14:36 +0100 (BST) X-Mirapoint-IP-Reputation: reputation=Fair-1, source=Queried, refid=0001.0A0B0301.4C6EE22B.01C0, actions=tag Cc: gcc patches , Jack Howarth , Dominique Dhumieres Message-Id: <1355E78A-603E-4711-A873-334D8ED57ED7@sandoe-acoustics.co.uk> From: IainS To: mrs@gcc.gnu.org In-Reply-To: Mime-Version: 1.0 (Apple Message framework v936) Subject: Re: [Patch darwin, ppc] lgcc to provide save/restFP for pre-exisitng libraries. Date: Fri, 20 Aug 2010 21:14:35 +0100 References: X-IsSubscribed: yes 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 20 Aug 2010, at 16:48, Mike Stump wrote: > On Aug 20, 2010, at 5:46 AM, IainS wrote: >> OK for trunk & 4.5 ? (since this is not a reversion - but an >> additional patch). > > Ok. It turns out that this is not enough - the cascading of rs6000/darwin{, 7,8}.h needs to be tidied up :-( Until I have a change to do that and bootstrap on darwin 8 - I've reverted this change and partially reverted r163267. sorry for the breakage, Iain applied as 163419: gcc/ revert r163410, partially revert r163267. * config/rs6000/darwin.h (LIB_SPEC): Remove. * config/darwin.h (REAL_LIBGCC_SPEC): Link lgcc for all Darwin versions. "%{!m64:%:version-compare(!> 10.4 mmacosx-version-min= crt2.o%s)}" Index: gcc/config/darwin.h =================================================================== --- gcc/config/darwin.h (revision 163418) +++ gcc/config/darwin.h (working copy) @@ -412,12 +412,12 @@ extern GTY(()) int darwin_ms_struct; %:version-compare(>< 10.5 10.6 mmacosx-version-min= -lgcc_s. 10.5) \ %:version-compare(!> 10.5 mmacosx-version-min= -lgcc_ext. 10.4) \ %:version-compare(>= 10.5 mmacosx-version-min= -lgcc_ext. 10.5) \ - %:version-compare(< 10.5 mmacosx-version-min= - lgcc) ; \ + - lgcc ; \ :%:version-compare(>< 10.3.9 10.5 mmacosx-version-min= -lgcc_s. 10.4) \ %:version-compare(>< 10.5 10.6 mmacosx-version-min= -lgcc_s. 10.5) \ %:version-compare(!> 10.5 mmacosx-version-min= -lgcc_ext. 10.4) \ %:version-compare(>= 10.5 mmacosx-version-min= -lgcc_ext. 10.5) \ - %:version-compare(< 10.5 mmacosx-version-min= -lgcc) }" + -lgcc }" /* We specify crt0.o as -lcrt0.o so that ld will search the library path. Index: gcc/config/rs6000/darwin.h =================================================================== --- gcc/config/rs6000/darwin.h (revision 163418) +++ gcc/config/rs6000/darwin.h (working copy) @@ -120,11 +120,6 @@ extern int darwin_emit_branch_islands; mcpu=G5:ppc970; \ :ppc}}" -/* Linked libs might refer to save/restFP - we still need to append - lgcc to - provide these. */ -#undef LIB_SPEC -#define LIB_SPEC "%{!static:-lgcc -lSystem}" - /* crt2.o is at least partially required for 10.3.x and earlier. */ #define DARWIN_CRT2_SPEC \