From patchwork Mon Jun 6 09:32:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 98857 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 2A32EB6FAD for ; Mon, 6 Jun 2011 19:32:25 +1000 (EST) Received: (qmail 530 invoked by alias); 6 Jun 2011 09:32:23 -0000 Received: (qmail 519 invoked by uid 22791); 6 Jun 2011 09:32:23 -0000 X-SWARE-Spam-Status: No, hits=-0.4 required=5.0 tests=AWL, BAYES_50, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 06 Jun 2011 09:32:09 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 3459655E; Mon, 6 Jun 2011 11:32:08 +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 c2kFXsKw5dfE; Mon, 6 Jun 2011 11:32:06 +0200 (CEST) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (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 EB3E955C; Mon, 6 Jun 2011 11:32:05 +0200 (CEST) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.4+Sun/8.14.4/Submit) id p569W5cH003010; Mon, 6 Jun 2011 11:32:05 +0200 (MEST) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: Paolo Bonzini Subject: [build] Use crtfastmath.c on IRIX 6 Date: Mon, 06 Jun 2011 11:32:05 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (usg-unix-v) MIME-Version: 1.0 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 top of the IRIX 6 toplevel libgcc move, I noticed that IRIX doesn't use crtfastmath.o yet. This patch corrects this, bootstrapped without regressions on mips-sgi-irix6.5. While doing this, I noticed that libgcc/config/mips/t-crtfm is identical (modulo $(cpu_type)) to the generic libgcc/config/t-crtfm, so I've changed the other mips targets that used it, too. Ok for mainline? Rainer 2011-05-21 Rainer Orth gcc: * config/mips/iris6.h (ENDFILE_SPEC): Use crtfastmath.o if -ffast-math etc. libgcc: * config.host (mips-sgi-irix6.5*): Add t-crtfm to tmake_file. Add crtfastmath.o to extra_parts. (mips64*-*-linux*, mips*-*-linux*): Use t-crtfm instead of mips/t-crtfm. * config/mips/t-crtfm: Remove. diff --git a/gcc/config/mips/iris6.h b/gcc/config/mips/iris6.h --- a/gcc/config/mips/iris6.h +++ b/gcc/config/mips/iris6.h @@ -256,7 +256,8 @@ along with GCC; see the file COPYING3. #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "crtend.o%s irix-crtn.o%s \ + "%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \ + crtend.o%s irix-crtn.o%s \ %{!shared: \ %{mabi=n32:%{mips4:/usr/lib32/mips4/crtn.o%s}\ %{!mips4:/usr/lib32/mips3/crtn.o%s}}\ diff --git a/libgcc/config.host b/libgcc/config.host --- a/libgcc/config.host +++ b/libgcc/config.host @@ -438,19 +438,19 @@ microblaze*-*-*) tmake_file="microblaze/t-microblaze" ;; mips-sgi-irix6.5*) - tmake_file="mips/t-irix6 t-slibgcc mips/t-slibgcc-irix" - extra_parts="crtbegin.o crtend.o irix-crti.o irix-crtn.o" + tmake_file="mips/t-irix6 t-crtfm t-slibgcc mips/t-slibgcc-irix" + extra_parts="crtbegin.o crtend.o crtfastmath.o irix-crti.o irix-crtn.o" ;; mips*-*-netbsd*) # NetBSD/mips, either endian. ;; mips64*-*-linux*) extra_parts="$extra_parts crtfastmath.o" - tmake_file="{$tmake_file} mips/t-crtfm" + tmake_file="{$tmake_file} t-crtfm" md_unwind_header=mips/linux-unwind.h ;; mips*-*-linux*) # Linux MIPS, either endian. extra_parts="$extra_parts crtfastmath.o" - tmake_file="{$tmake_file} mips/t-crtfm" + tmake_file="{$tmake_file} t-crtfm" md_unwind_header=mips/linux-unwind.h ;; mips*-*-openbsd*) diff --git a/libgcc/config/mips/t-crtfm b/libgcc/config/mips/t-crtfm deleted file mode 100644 --- a/libgcc/config/mips/t-crtfm +++ /dev/null @@ -1,3 +0,0 @@ -crtfastmath.o: $(gcc_srcdir)/config/mips/crtfastmath.c - $(gcc_compile) -c $(gcc_srcdir)/config/mips/crtfastmath.c -