From owner-p4-projects@FreeBSD.ORG  Fri Jan  4 23:01:56 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CF0BF16A419; Fri,  4 Jan 2008 23:01:55 +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 947DC16A417
	for <perforce@FreeBSD.org>; Fri,  4 Jan 2008 23:01:55 +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 812A013C455
	for <perforce@FreeBSD.org>; Fri,  4 Jan 2008 23:01:55 +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 m04N1tfd070173
	for <perforce@FreeBSD.org>; Fri, 4 Jan 2008 23:01:55 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m04N1tVW070170
	for perforce@freebsd.org; Fri, 4 Jan 2008 23:01:55 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Fri, 4 Jan 2008 23:01:55 GMT
Message-Id: <200801042301.m04N1tVW070170@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 132534 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: Fri, 04 Jan 2008 23:01:56 -0000

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

Change 132534 by gonzo@gonzo_jeeves on 2008/01/04 23:01:44

	o Define MACHINE and MACHINE_ARCH properly
	o Get rid of several netbsdism that prevented userland from successfull 
	    build.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/include/param.h#5 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/include/param.h#5 (text+ko) ====

@@ -51,8 +51,12 @@
 #endif
 #endif
 
+#ifndef MACHINE
+#define	MACHINE		"mips"
+#endif
+#ifndef MACHINE_ARCH
 #define	MACHINE_ARCH	"mips"
-#define	_MACHINE_ARCH	mips
+#endif
 
 /*
  * OBJFORMAT_NAMES is a comma-separated list of the object formats
@@ -115,10 +119,6 @@
 #define	CLBYTES		(CLSIZE * NBPG)
 #define	CLSIZELOG2	0
 
-/* NOTE: SSIZE, SINCR and UPAGES must be multiples of CLSIZE */
-#define	SSIZE		1		/* initial stack size/NBPG */
-#define	SINCR		1		/* increment of stack/NBPG */
-
 /*
  * NOTE: In FreeBSD, Uarea's don't have a fixed address.
  *	 Therefore, any code imported from OpenBSD which depends on