[Glibc-bsd-commits] r3620 - in trunk/kfreebsd-kernel-headers/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-07-20 15:19:32 +0000 (Wed, 20 Jul 2011)
New Revision: 3620

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff
   trunk/kfreebsd-kernel-headers/debian/patches/series
Log:
Renable 039_mips_misc.diff.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2011-07-19 20:28:57 UTC (rev 3619)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2011-07-20 15:19:32 UTC (rev 3620)
@@ -1,3 +1,9 @@
+kfreebsd-kernel-headers (0.57) UNRELEASED; urgency=low
+
+  * Renable 039_mips_misc.diff.
+
+ -- Robert Millan <rmh at debian.org>  Wed, 20 Jul 2011 17:19:17 +0200
+
 kfreebsd-kernel-headers (0.56) unstable; urgency=low
 
   * Remove <sys/sbuf.h> again, now that libsbuf-dev provides a usable

Modified: trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff	2011-07-19 20:28:57 UTC (rev 3619)
+++ trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff	2011-07-20 15:19:32 UTC (rev 3620)
@@ -1,14 +1,3 @@
---- a/sys/mips/include/bus_octeon.h
-+++ b/sys/mips/include/bus_octeon.h
-@@ -793,7 +793,7 @@
- 		  bus_size_t offset __unused, bus_size_t len __unused, int flags)
- {
- #if 0
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- 	if (flags & BUS_SPACE_BARRIER_READ)
- 		__asm __volatile("lock; addl $0,0(%%rsp)" : : : "memory");
- 	else
 --- a/sys/mips/include/_types.h
 +++ b/sys/mips/include/_types.h
 @@ -40,10 +40,13 @@
@@ -39,11 +28,11 @@
  typedef	__int32_t	__clock_t;		/* clock()... */
 +#endif
  typedef	unsigned int	__cpumask_t;
- #ifdef __mips64
+ #ifdef __mips_n64
  typedef	__int64_t	__critical_t;
 @@ -88,11 +94,15 @@
  typedef	double		__float_t;
- #ifdef __mips64
+ #ifdef __mips_n64
  typedef	__int64_t	__intfptr_t;
 +#ifndef __GLIBC__
  typedef	__int64_t	__intptr_t;
@@ -60,7 +49,7 @@
 @@ -103,28 +113,46 @@
  typedef	__int32_t	__int_least32_t;
  typedef	__int64_t	__int_least64_t;
- #if defined(__mips64) || defined(ISA_MIPS64)
+ #if defined(__mips_n64) || defined(__mips_n32)
 +#ifndef __GLIBC__
  typedef	__int64_t	__register_t;
 +#endif
@@ -71,7 +60,7 @@
 +#endif
  typedef	__int32_t	f_register_t;
  #endif
- #ifdef __mips64
+ #ifdef __mips_n64
 +#ifndef __GLIBC__
  typedef	__int64_t	__ptrdiff_t;
 +#endif
@@ -104,12 +93,3 @@
  typedef	__uint64_t	__uintmax_t;
  typedef	__uint32_t	__uint_fast8_t;
  typedef	__uint32_t	__uint_fast16_t;
-@@ -163,7 +191,7 @@
- #endif
- 
- typedef struct label_t {
--	__register_t val[13];
-+	register_t val[13];
- } label_t;
- 
- #endif /* !_MACHINE__TYPES_H_ */

Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series	2011-07-19 20:28:57 UTC (rev 3619)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2011-07-20 15:19:32 UTC (rev 3620)
@@ -34,6 +34,6 @@
 036_tcpvar.diff
 037_ciss.diff
 038_gnuclike.diff
-#039_mips_misc.diff
+039_mips_misc.diff
 040_internal_types.patch
 041_gratuitous_sbuf_include.diff