From owner-svn-src-user@FreeBSD.ORG  Wed Mar 10 22:34:00 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 503241065672;
	Wed, 10 Mar 2010 22:34:00 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4004A8FC1F;
	Wed, 10 Mar 2010 22:34:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2AMY0Fn082052;
	Wed, 10 Mar 2010 22:34:00 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2AMY0Uf082050;
	Wed, 10 Mar 2010 22:34:00 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003102234.o2AMY0Uf082050@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Wed, 10 Mar 2010 22:34:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204988 - user/jmallett/octeon/gnu/usr.bin/cc
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Mar 2010 22:34:00 -0000

Author: jmallett
Date: Wed Mar 10 22:33:59 2010
New Revision: 204988
URL: http://svn.freebsd.org/changeset/base/204988

Log:
  Pass on TARGET_CPUTYPE as a string rather than trying to parse it.

Modified:
  user/jmallett/octeon/gnu/usr.bin/cc/Makefile.inc

Modified: user/jmallett/octeon/gnu/usr.bin/cc/Makefile.inc
==============================================================================
--- user/jmallett/octeon/gnu/usr.bin/cc/Makefile.inc	Wed Mar 10 22:33:32 2010	(r204987)
+++ user/jmallett/octeon/gnu/usr.bin/cc/Makefile.inc	Wed Mar 10 22:33:59 2010	(r204988)
@@ -44,32 +44,15 @@ MIPS_ABI_DEFAULT=ABI_64
 .endif
 .endif
 
+MIPS_ABI_DEFAULT?=ABI_32
+CFLAGS += -DMIPS_ABI_DEFAULT=${MIPS_ABI_DEFAULT}
+
 # GCC by default takes the ISA from the ABI's requirements.  If world is built
 # with a superior ISA, since we lack multilib, we have to set the right
 # default ISA to be able to link against what's in /usr/lib.  Terrible stuff.
 .if defined(TARGET_CPUTYPE)
-.if ${TARGET_CPUTYPE} == "mips1"
-MIPS_ISA_DEFAULT=1
-.elif ${TARGET_CPUTYPE} == "mips2"
-MIPS_ISA_DEFAULT=2
-.elif ${TARGET_CPUTYPE} == "mips3"
-MIPS_ISA_DEFAULT=3
-.elif ${TARGET_CPUTYPE} == "mips4"
-MIPS_ISA_DEFAULT=4
-.elif ${TARGET_CPUTYPE} == "mips32"
-MIPS_ISA_DEFAULT=32
-.elif ${TARGET_CPUTYPE} == "mips32r2"
-MIPS_ISA_DEFAULT=32r2
-.elif ${TARGET_CPUTYPE} == "mips64"
-MIPS_ISA_DEFAULT=64
-.else
-# Let's hope from-abi is good enough.
+CFLAGS += -DMIPS_CPU_STRING_DEFAULT=\"${TARGET_CPUTYPE}\"
 .endif
-CFLAGS += -DMIPS_ISA_DEFAULT=${MIPS_ISA_DEFAULT}
-.endif
-
-MIPS_ABI_DEFAULT?=ABI_32
-CFLAGS += -DMIPS_ABI_DEFAULT=${MIPS_ABI_DEFAULT}
 .endif
 
 .if defined(WANT_FORCE_OPTIMIZATION_DOWNGRADE)