From patchwork Tue Jun 8 07:56:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 54946 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 11FEBB7D81 for ; Tue, 8 Jun 2010 17:57:31 +1000 (EST) Received: (qmail 12499 invoked by alias); 8 Jun 2010 07:57:30 -0000 Received: (qmail 12491 invoked by uid 22791); 8 Jun 2010 07:57:29 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from c2beaomr05.btconnect.com (HELO c2beaomr05.btconnect.com) (213.123.26.183) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 08 Jun 2010 07:57:24 +0000 Received: from thor.office (host81-138-1-83.in-addr.btopenworld.com [81.138.1.83]) by c2beaomr05.btconnect.com with ESMTP id EXD32673; Tue, 8 Jun 2010 08:57:03 +0100 (BST) X-Mirapoint-IP-Reputation: reputation=Fair-1, source=Queried, refid=0001.0A0B0301.4C0DF7CC.013E, actions=tag Message-Id: From: IainS To: GCC Patches Mime-Version: 1.0 (Apple Message framework v936) Subject: [Patch][4.5] backport darwin t-make fragment fixes to 4.5 Date: Tue, 8 Jun 2010 08:56:59 +0100 Cc: Richard Guenther , Mike Stump 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 x86_64-darwin10 has a fault in config.gcc causing t-make fragments to be included twice. This has been fixed on trunk for a while now and the attached is a back-port of that fix to 4.5. bootstrapped on x86_64-apple-darwin10, powerpc-apple-darwin9, (with http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00463.html applied to ensure no config race condition). OK for 4.5? Iain gcc/ChangeLog: Backport from mainline: 2010-05-28 Iain Sandoe * config.gcc (*-*-darwin*): Adjust t-make fragments for Darwin. Index: gcc/config.gcc =================================================================== --- gcc/config.gcc (revision 160410) +++ gcc/config.gcc (working copy) @@ -411,6 +411,7 @@ esac # Common parts for widely ported systems. case ${target} in *-*-darwin*) + tmake_file="t-darwin ${cpu_type}/t-darwin" tm_file="${tm_file} darwin.h" case ${target} in *-*-darwin9*) @@ -422,7 +423,6 @@ case ${target} in esac tm_file="${tm_file} ${cpu_type}/darwin.h" tm_p_file="${tm_p_file} darwin-protos.h" - tmake_file="t-darwin ${cpu_type}/t-darwin t-slibgcc-darwin" target_gtfiles="\$(srcdir)/config/darwin.c" extra_options="${extra_options} darwin.opt" c_target_objs="${c_target_objs} darwin-c.o" @@ -1091,11 +1091,11 @@ i[34567]86-*-darwin*) # then this file using that to set --with-cpu=i386 which has no -m64 # support. with_cpu=${with_cpu:-generic} - tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm" + tmake_file="${tmake_file} t-slibgcc-darwin i386/t-crtpc i386/t-crtfm" ;; x86_64-*-darwin*) with_cpu=${with_cpu:-generic} - tmake_file="${tmake_file} t-darwin ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-crtpc i386/t-crtfm" + tmake_file="${tmake_file} ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-crtpc i386/t-crtfm" tm_file="${tm_file} ${cpu_type}/darwin64.h" ;; i[34567]86-*-elf*) @@ -1930,12 +1930,14 @@ powerpc-*-darwin*) *-darwin[0-6]*) ;; esac + tmake_file="${tmake_file} t-slibgcc-darwin" extra_headers=altivec.h ;; powerpc64-*-darwin*) tm_file="${tm_file} ${cpu_type}/darwin8.h ${cpu_type}/darwin64.h" extra_options="${extra_options} ${cpu_type}/darwin.opt" - # We're omitting t-darwin8 to avoid building any multilibs + # We're not including any t-darwin* fragments to build multilibs. + tmake_file="${tmake_file} t-slibgcc-darwin" extra_headers=altivec.h ;; powerpc*-*-freebsd*)