From owner-p4-projects@FreeBSD.ORG  Mon Apr 28 22:57:10 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2A5021065677; Mon, 28 Apr 2008 22:57:10 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E098D1065670
	for <perforce@FreeBSD.org>; Mon, 28 Apr 2008 22:57:09 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CA8858FC17
	for <perforce@FreeBSD.org>; Mon, 28 Apr 2008 22:57:09 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3SMv9EM073760
	for <perforce@FreeBSD.org>; Mon, 28 Apr 2008 22:57:09 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3SMv94b073758
	for perforce@freebsd.org; Mon, 28 Apr 2008 22:57:09 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Mon, 28 Apr 2008 22:57:09 GMT
Message-Id: <200804282257.m3SMv94b073758@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 140817 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Apr 2008 22:57:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=140817

Change 140817 by gonzo@gonzo_jeeves on 2008/04/28 22:56:22

	o Handle mips like other architectures in cc/cc_tools/Makefile
	o Place TARGET_CPU_DEFAULT for mips to proper place (cc/Makefile.tgt)
	    Its value is definitly wrong. It's origin unknown but now
	    it shifted to MASK_DSP. Need to come out with reasonable defaults.

Affected files ...

.. //depot/projects/mips2-jnpr/src/gnu/usr.bin/cc/Makefile.tgt#2 edit
.. //depot/projects/mips2-jnpr/src/gnu/usr.bin/cc/cc_tools/Makefile#2 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/cc/Makefile.tgt#2 (text+ko) ====

@@ -11,6 +11,7 @@
 GCC_CPU=	ia64
 .elif ${TARGET_ARCH} == "mips"
 GCC_CPU=	mips
+TARGET_CPU_DEFAULT=	16
 .elif ${TARGET_ARCH} == "powerpc"
 GCC_CPU=	rs6000
 .elif ${TARGET_ARCH} == "sparc64"

==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/cc/cc_tools/Makefile#2 (text+ko) ====

@@ -37,9 +37,6 @@
 TARGET_INC+=	freebsd-native.h
 TARGET_INC+=	freebsd-spec.h
 TARGET_INC+=	freebsd.h
-.if ${TARGET_ARCH} == "mips"
-TARGET_INC+=	${GCC_CPU}/elf.h
-.endif
 .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
 .if exists(${GCCDIR}/config/${GCC_CPU}/sysv4.h)
 TARGET_INC+=	${GCC_CPU}/sysv4.h
@@ -55,13 +52,13 @@
 TARGET_INC+=	${GCC_CPU}/aout.h
 TARGET_INC+=	${GCC_CPU}/freebsd.h
 TARGET_INC+=	${GCC_CPU}/arm.h
+.elif ${TARGET_ARCH} == "mips"
+TARGET_INC+=	${GCC_CPU}/elf.h
+TARGET_INC+=	${GCC_CPU}/freebsd.h
 .else
 TARGET_INC+=	${GCC_CPU}/freebsd.h
 .endif
 TARGET_INC+=	defaults.h
-.if ${TARGET_ARCH} == "mips"
-TARGET_CPU_DEFAULT=	16
-.endif
 .for H in ${TARGET_INC}
 .for D in ${GCCDIR}/config ${GCCDIR} ${.CURDIR}
 .if exists($D/$H)