PERFORCE change 134396 for review

[Warner Losh]

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

Change 134396 by imp at imp_lighthouse on 2008/01/29 17:47:23

	Revert this part of cognet's patch.  It breaks a lot of things.

Affected files ...

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

Differences ...

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

@@ -44,6 +44,8 @@
 #error this file needs sys/cdefs.h as a prerequisite
 #endif
 
+#define	__NO_STRICT_ALIGNMENT
+
 /*
  * Basic types upon which most other types are built.
  */
@@ -54,10 +56,6 @@
 typedef	int			__int32_t;
 typedef	unsigned int		__uint32_t;
 
-#ifdef __mips64
-typedef long			__int64_t;
-typedef unsigned long		__uint64_t;
-#else
 #if defined(lint)
 /* LONGLONG */
 typedef	long long		__int64_t;
@@ -72,14 +70,13 @@
 /* LONGLONG */
 typedef	unsigned long long	__uint64_t;
 #endif
-#endif
 
 /*
  * Standard type definitions.
  */
 typedef	unsigned long	__clock_t;		/* clock()... */
 typedef	unsigned int	__cpumask_t;
-typedef	long		__critical_t;
+typedef	__int32_t	__critical_t;
 typedef	double		__double_t;
 typedef	double		__float_t;
 typedef	long		__intfptr_t;
@@ -93,15 +90,16 @@
 typedef	__int16_t	__int_least16_t;
 typedef	__int32_t	__int_least32_t;
 typedef	__int64_t	__int_least64_t;
-typedef	long		__ptrdiff_t;		/* ptr1 - ptr2 */
-typedef	long		__register_t;
-typedef	long		__segsz_t;		/* segment size (in pages) */
-typedef	long		__size_t;		/* sizeof() */
-typedef	long		__ssize_t;		/* byte count or error */
-typedef	__int64_t	__time_t;		/* time()... */
+typedef	__int32_t	__ptrdiff_t;		/* ptr1 - ptr2 */
+typedef	__int32_t	__register_t;
+typedef	__int32_t	f_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	__int32_t	__time_t;		/* time()... */
 typedef	unsigned long	__uintfptr_t;
 typedef	__uint64_t	__uintmax_t;
-typedef	unsigned long	__uintptr_t;
+typedef	__uint32_t	__uintptr_t;
 typedef	__uint32_t	__uint_fast8_t;
 typedef	__uint32_t	__uint_fast16_t;
 typedef	__uint32_t	__uint_fast32_t;
@@ -110,10 +108,10 @@
 typedef	__uint16_t	__uint_least16_t;
 typedef	__uint32_t	__uint_least32_t;
 typedef	__uint64_t	__uint_least64_t;
-typedef	unsigned long	__u_register_t;
-typedef	unsigned long	__vm_offset_t;
+typedef	__uint32_t	__u_register_t;
+typedef	__uint32_t	__vm_offset_t;
 typedef	__int64_t	__vm_ooffset_t;
-typedef	unsigned long	__vm_paddr_t;
+typedef	__uint32_t	__vm_paddr_t;
 typedef	__uint64_t	__vm_pindex_t;
 typedef	unsigned long	__vm_size_t;