PERFORCE change 134530 for review

[Warner Losh]

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

Change 134530 by imp at 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;