From patchwork Fri Jan 14 00:17:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 78848 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 DD560B6EF2 for ; Fri, 14 Jan 2011 11:17:24 +1100 (EST) Received: (qmail 23028 invoked by alias); 14 Jan 2011 00:17:17 -0000 Received: (qmail 23018 invoked by uid 22791); 14 Jan 2011 00:17:15 -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, 14 Jan 2011 00:17:05 +0000 Received: (qmail 15212 invoked from network); 14 Jan 2011 00:17:03 -0000 Received: from unknown (HELO digraph.polyomino.org.uk) (joseph@127.0.0.2) by mail.codesourcery.com with ESMTPA; 14 Jan 2011 00:17:03 -0000 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.72) (envelope-from ) id 1PdXLi-0002TD-PN; Fri, 14 Jan 2011 00:17:02 +0000 Date: Fri, 14 Jan 2011 00:17:02 +0000 (UTC) From: "Joseph S. Myers" To: gcc-patches@gcc.gnu.org cc: rth@redhat.com, davem@redhat.com, jakub@redhat.com, ebotcazou@libertysurf.fr Subject: [20/25] Specs cleanup: SPARC -sun4 -target In-Reply-To: Message-ID: References: MIME-Version: 1.0 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 Various SPARC targets have support for -sun4 and -target options in the form of %{sun4:} %{target:} specs (meaning the options are accepted by the driver, with no arguments, and do nothing). I don't know whether these are accepted by Sun's current Solaris compilers and there might be a case for keeping them for Solaris for compatibility with those, but they certainly don't make sense for other target OSes. This patch accordingly removes them for non-Solaris targets (sparc*-*-solaris2* always uses sparc/sol2-bi.h, which still has these options). OK to commit? 2011-01-13 Joseph Myers * config/sparc/linux.h (CC1_SPEC): Remove %{sun4:} %{target:}. * config/sparc/linux64.h (CC1_SPEC): Likewise. * config/sparc/netbsd-elf.h (CC1_SPEC32, CC1_SPEC64): Likewise. * config/sparc/sparc.h (CC1_SPEC): Likewise. diff -rupN --exclude=.svn gcc-mainline-19/gcc/config/sparc/linux.h gcc-mainline/gcc/config/sparc/linux.h --- gcc-mainline-19/gcc/config/sparc/linux.h 2011-01-12 14:47:01.000000000 -0800 +++ gcc-mainline/gcc/config/sparc/linux.h 2011-01-12 14:58:56.000000000 -0800 @@ -42,7 +42,6 @@ along with GCC; see the file COPYING3. /* This is for -profile to use -lc_p instead of -lc. */ #undef CC1_SPEC #define CC1_SPEC "%{profile:-p} \ -%{sun4:} %{target:} \ " #undef TARGET_VERSION diff -rupN --exclude=.svn gcc-mainline-19/gcc/config/sparc/linux64.h gcc-mainline/gcc/config/sparc/linux64.h --- gcc-mainline-19/gcc/config/sparc/linux64.h 2011-01-12 14:48:02.000000000 -0800 +++ gcc-mainline/gcc/config/sparc/linux64.h 2011-01-12 14:59:05.000000000 -0800 @@ -148,7 +148,6 @@ along with GCC; see the file COPYING3. #undef CC1_SPEC #if DEFAULT_ARCH32_P #define CC1_SPEC "%{profile:-p} \ -%{sun4:} %{target:} \ %{m32:%{m64:%emay not use both -m32 and -m64}} \ %{m64:-mptr64 -mstack-bias -mlong-double-128 \ %{!mcpu*:-mcpu=ultrasparc} \ @@ -156,7 +155,6 @@ along with GCC; see the file COPYING3. " #else #define CC1_SPEC "%{profile:-p} \ -%{sun4:} %{target:} \ %{m32:%{m64:%emay not use both -m32 and -m64}} \ %{m32:-mptr32 -mno-stack-bias %{!mlong-double-128:-mlong-double-64} \ %{!mcpu*:-mcpu=cypress}} \ diff -rupN --exclude=.svn gcc-mainline-19/gcc/config/sparc/netbsd-elf.h gcc-mainline/gcc/config/sparc/netbsd-elf.h --- gcc-mainline-19/gcc/config/sparc/netbsd-elf.h 2011-01-12 14:51:50.000000000 -0800 +++ gcc-mainline/gcc/config/sparc/netbsd-elf.h 2011-01-12 14:59:18.000000000 -0800 @@ -115,8 +115,7 @@ along with GCC; see the file COPYING3. /* CC1_SPEC for NetBSD/sparc. */ #define CC1_SPEC32 \ - "%{sun4:} %{target:} \ - %{m32:%{m64:%emay not use both -m32 and -m64}} \ + "%{m32:%{m64:%emay not use both -m32 and -m64}} \ %{m64: \ -mptr64 -mstack-bias -mno-v8plus -mlong-double-128 \ %{!mcpu*:%{!mv8plus:-mcpu=ultrasparc}} \ @@ -125,8 +124,7 @@ along with GCC; see the file COPYING3. %{pg:-mcmodel=medlow}}" #define CC1_SPEC64 \ - "%{sun4:} %{target:} \ - %{m32:%{m64:%emay not use both -m32 and -m64}} \ + "%{m32:%{m64:%emay not use both -m32 and -m64}} \ %{m32: \ -mptr32 -mno-stack-bias \ %{!mlong-double-128:-mlong-double-64} \ diff -rupN --exclude=.svn gcc-mainline-19/gcc/config/sparc/sparc.h gcc-mainline/gcc/config/sparc/sparc.h --- gcc-mainline-19/gcc/config/sparc/sparc.h 2011-01-12 14:55:28.000000000 -0800 +++ gcc-mainline/gcc/config/sparc/sparc.h 2011-01-12 14:59:59.000000000 -0800 @@ -398,15 +398,10 @@ extern enum cmodel sparc_cmodel; #define CPP_SPEC "%(cpp_cpu) %(cpp_arch) %(cpp_endian) %(cpp_subtarget)" -/* Prevent error on `-sun4' and `-target sun4' options. */ /* This used to translate -dalign to -malign, but that is no good because it can't turn off the usual meaning of making debugging dumps. */ -/* Translate old style -m into new style -mcpu=. - ??? Delete support for -m for 2.9. */ -#define CC1_SPEC "\ -%{sun4:} %{target:} \ -" +#define CC1_SPEC "" /* Override in target specific files. */ #define ASM_CPU_SPEC "\