From patchwork Wed Feb 16 22:48:24 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Joseph Myers <joseph@codesourcery.com>
X-Patchwork-Id: 83409
Return-Path: 
 <gcc-patches-return-285411-incoming=patchwork.ozlabs.org@gcc.gnu.org>
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 2DD5DB711B
	for <incoming@patchwork.ozlabs.org>;
	Thu, 17 Feb 2011 09:48:34 +1100 (EST)
Received: (qmail 27983 invoked by alias); 16 Feb 2011 22:48:33 -0000
Received: (qmail 27973 invoked by uid 22791); 16 Feb 2011 22:48:32 -0000
X-SWARE-Spam-Status: No, hits=-1.8 required=5.0	tests=AWL, BAYES_00, TW_XG,
	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; Wed, 16 Feb 2011 22:48:28 +0000
Received: (qmail 15725 invoked from network); 16 Feb 2011 22:48:26 -0000
Received: from unknown (HELO digraph.polyomino.org.uk) (joseph@127.0.0.2) by
	mail.codesourcery.com with ESMTPA; 16 Feb 2011 22:48:26 -0000
Received: from jsm28 (helo=localhost)	by digraph.polyomino.org.uk with
	local-esmtp (Exim 4.72)	(envelope-from
	<joseph@codesourcery.com>)	id 1PpqAa-0004zp-Sk;
	Wed, 16 Feb 2011 22:48:24 +0000
Date: Wed, 16 Feb 2011 22:48:24 +0000 (UTC)
From: "Joseph S. Myers" <joseph@codesourcery.com>
To: gcc-patches@gcc.gnu.org
cc: dj@redhat.com
Subject: Fix m32c LIB_SPEC to match -msim not -msim*
Message-ID: <Pine.LNX.4.64.1102162246460.15478@digraph.polyomino.org.uk>
MIME-Version: 1.0
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

m32c's LIB_SPEC matches -msim* in various places, but the option is
just -msim according to m32c.opt, with no optional joined argument.
This patch restricts the spec to match to .opt file (the alternative
would be to use JoinedOrMissing on the option in m32c.opt).

Tested building cc1 and xgcc for cross to m32c-elf.  OK to commit?

2011-02-16  Joseph Myers  <joseph@codesourcery.com>

	* config/m32c/m32c.h (LIB_SPEC): Match -msim not -msim*.

Index: gcc/config/m32c/m32c.h
===================================================================
--- gcc/config/m32c/m32c.h	(revision 170224)
+++ gcc/config/m32c/m32c.h	(working copy)
@@ -54,13 +54,13 @@
    family.  Most of the logic here is making sure we do the right
    thing when no CPU is specified, which defaults to R8C.  */
 #undef  LIB_SPEC
-#define LIB_SPEC "-( -lc %{msim*:-lsim}%{!msim*:-lnosys} -) \
-%{msim*:%{!T*: %{mcpu=m32cm:%Tsim24.ld}%{mcpu=m32c:%Tsim24.ld} \
-	%{!mcpu=m32cm:%{!mcpu=m32c:%Tsim16.ld}}}} \
-%{!T*:%{!msim*: %{mcpu=m16c:%Tm16c.ld} \
-		%{mcpu=m32cm:%Tm32cm.ld} \
-		%{mcpu=m32c:%Tm32c.ld} \
-		%{!mcpu=m16c:%{!mcpu=m32cm:%{!mcpu=m32c:%Tr8c.ld}}}}} \
+#define LIB_SPEC "-( -lc %{msim:-lsim}%{!msim:-lnosys} -) \
+%{msim:%{!T*: %{mcpu=m32cm:%Tsim24.ld}%{mcpu=m32c:%Tsim24.ld} \
+       %{!mcpu=m32cm:%{!mcpu=m32c:%Tsim16.ld}}}} \
+%{!T*:%{!msim: %{mcpu=m16c:%Tm16c.ld} \
+	       %{mcpu=m32cm:%Tm32cm.ld} \
+	       %{mcpu=m32c:%Tm32c.ld} \
+	       %{!mcpu=m16c:%{!mcpu=m32cm:%{!mcpu=m32c:%Tr8c.ld}}}}} \
 "
 
 /* Run-time Target Specification */