From owner-p4-projects@FreeBSD.ORG  Thu Jan 31 07:01:21 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4977C16A49A; Thu, 31 Jan 2008 07:01:21 +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 D535C16A417
	for <perforce@freebsd.org>; Thu, 31 Jan 2008 07:01:20 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BDAFA13C4D3
	for <perforce@freebsd.org>; Thu, 31 Jan 2008 07:01:20 +0000 (UTC)
	(envelope-from imp@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 m0V71KF4076186
	for <perforce@freebsd.org>; Thu, 31 Jan 2008 07:01:20 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V71KjK076183
	for perforce@freebsd.org; Thu, 31 Jan 2008 07:01:20 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 31 Jan 2008 07:01:20 GMT
Message-Id: <200801310701.m0V71KjK076183@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 134530 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: Thu, 31 Jan 2008 07:01:21 -0000

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

Change 134530 by imp@imp_lighthouse on 2008/01/31 07:01:02

	No need to test for both _LOCORE and __ASSEMBLER__, the latter
	suffices.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/include/_types.h#8 edit

Differences ...

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

@@ -102,24 +102,27 @@
 typedef	__int16_t	__int_least16_t;
 typedef	__int32_t	__int_least32_t;
 typedef	__int64_t	__int_least64_t;
+#if defined(__mips64) || defined(ISA_MIPS64)
+typedef	__int64_t	__register_t;
+typedef	__int64_t	f_register_t;
+#else
+typedef	__int32_t	__register_t;
+typedef	__int32_t	f_register_t;
+#endif
 #ifdef __mips64
 typedef	__int64_t	__ptrdiff_t;
-typedef	__int64_t	__register_t;
 typedef	__int64_t	__segsz_t;
 typedef	__uint64_t	__size_t;
 typedef	__int64_t	__ssize_t;
 typedef	__uint64_t	__uintfptr_t;
 typedef	__uint64_t	__uintptr_t;
-typedef	__int64_t	f_register_t;
 #else
 typedef	__int32_t	__ptrdiff_t;		/* ptr1 - ptr2 */
-typedef	__int32_t	__register_t;
 typedef	__int32_t	__segsz_t;		/* segment size (in pages) */
 typedef	__uint32_t	__size_t;		/* sizeof() */
 typedef	__int32_t	__ssize_t;		/* byte count or error */
 typedef	__uint32_t	__uintfptr_t;
 typedef	__uint32_t	__uintptr_t;
-typedef	__int32_t	f_register_t;
 #endif
 typedef	__int64_t	__time_t;		/* time()... */
 typedef	__uint64_t	__uintmax_t;
@@ -131,7 +134,7 @@
 typedef	__uint16_t	__uint_least16_t;
 typedef	__uint32_t	__uint_least32_t;
 typedef	__uint64_t	__uint_least64_t;
-#ifdef __mips64
+#if defined(__mips64) || defined(ISA_MIPS64)
 typedef	__uint64_t	__u_register_t;
 typedef	__uint64_t	__vm_offset_t;
 typedef	__uint64_t	__vm_paddr_t;