[Glibc-bsd-commits] r4000 - in trunk/kfreebsd-kernel-headers/debian: . patches
Robert Millan
rmh at alioth.debian.org
Mon Jan 23 21:24:02 UTC 2012
Author: rmh
Date: 2012-01-23 21:24:02 +0000 (Mon, 23 Jan 2012)
New Revision: 4000
Added:
trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
Removed:
trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
trunk/kfreebsd-kernel-headers/debian/patches/series
Log:
Cleanup and document type collision fixes, merge them into one patch (type_collision.diff), discard unnecessary type removal.
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2012-01-23 19:55:08 UTC (rev 3999)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2012-01-23 21:24:02 UTC (rev 4000)
@@ -1,8 +1,10 @@
kfreebsd-kernel-headers (0.66) UNRELEASED; urgency=low
* Redefine clock_t as signed to match with Glibc type. (Closes: #656947)
+ * Cleanup and document type collision fixes, merge them into one patch
+ (type_collision.diff), discard unnecessary type removal.
- -- Robert Millan <rmh at debian.org> Mon, 23 Jan 2012 20:40:16 +0100
+ -- Robert Millan <rmh at debian.org> Mon, 23 Jan 2012 22:23:53 +0100
kfreebsd-kernel-headers (0.65) unstable; urgency=low
Modified: trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2012-01-23 19:55:08 UTC (rev 3999)
+++ trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2012-01-23 21:24:02 UTC (rev 4000)
@@ -34,42 +34,3 @@
unsigned int rcr0(void);
unsigned int rcr2(void);
unsigned int rcr3(void);
---- a/sys/sys/_types.h
-+++ b/sys/sys/_types.h
-@@ -31,6 +31,7 @@
-
- #include <sys/cdefs.h>
- #include <machine/_types.h>
-+#include <sys/types.h>
-
- /*
- * Standard type definitions.
-@@ -40,10 +41,14 @@
- typedef __int32_t __clockid_t; /* clock_gettime()... */
- typedef __uint64_t __cap_rights_t; /* capability rights */
- typedef __uint32_t __fflags_t; /* file flags */
-+#ifndef __GLIBC__
- typedef __uint64_t __fsblkcnt_t;
- typedef __uint64_t __fsfilcnt_t;
-+#endif
- typedef __uint32_t __gid_t;
-+#ifndef __GLIBC__
- typedef __int64_t __id_t; /* can hold a gid_t, pid_t, or uid_t */
-+#endif
- typedef __uint32_t __ino_t; /* inode number */
- typedef long __key_t; /* IPC key (for Sys V IPC) */
- typedef __int32_t __lwpid_t; /* Thread ID (a.k.a. LWP) */
-@@ -94,13 +99,4 @@
-
- typedef __uint32_t __fixpt_t; /* fixed point number */
-
--/*
-- * mbstate_t is an opaque object to keep conversion state during multibyte
-- * stream conversions.
-- */
--typedef union {
-- char __mbstate8[128];
-- __int64_t _mbstateL; /* for alignment */
--} __mbstate_t;
--
- #endif /* !_SYS__TYPES_H_ */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff 2012-01-23 19:55:08 UTC (rev 3999)
+++ trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff 2012-01-23 21:24:02 UTC (rev 4000)
@@ -1,22 +1,9 @@
----
- sys/sys/_types.h | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
- sys/sys/proc.h | 1
- 2 files changed, 59 insertions(+), 1 deletion(-)
-
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
-@@ -64,7 +64,6 @@
- typedef __uint8_t __sa_family_t;
- typedef __uint32_t __socklen_t;
- typedef long __suseconds_t; /* microseconds (signed) */
--typedef struct __timer *__timer_t; /* timer_gettime()... */
- typedef struct __mq *__mqd_t; /* mq_open()... */
- typedef __uint32_t __uid_t;
- typedef unsigned int __useconds_t; /* microseconds (unsigned) */
-@@ -99,4 +98,66 @@
+@@ -119,4 +119,66 @@
+ } __mbstate_t;
+ #endif
- typedef __uint32_t __fixpt_t; /* fixed point number */
-
+/* Types below are defined in <sys/types.h> on FreeBSD. We have to define them
+ here because <sys/types.h> is GNU-owned (some of them are also GNU types, but
+ thanks to _GNU_SOURCE non-sense they can't be used unconditionally). */
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2012-01-23 19:55:08 UTC (rev 3999)
+++ trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2012-01-23 21:24:02 UTC (rev 4000)
@@ -1,117 +0,0 @@
----
- sys/amd64/include/_types.h | 11 +++++++++--
- sys/i386/include/_types.h | 12 +++++++++---
- 2 files changed, 18 insertions(+), 5 deletions(-)
-
---- a/sys/i386/include/_types.h
-+++ b/sys/i386/include/_types.h
-@@ -39,42 +39,24 @@
- #ifndef _MACHINE__TYPES_H_
- #define _MACHINE__TYPES_H_
-
-+#include <sys/types.h>
-+#include <sys/cdefs.h>
- #ifndef _SYS_CDEFS_H_
--#error this file needs sys/cdefs.h as a prerequisite
-+#include <sys/param.h>
- #endif
-
- #define __NO_STRICT_ALIGNMENT
-
- /*
-- * Basic types upon which most other types are built.
-- */
--typedef __signed char __int8_t;
--typedef unsigned char __uint8_t;
--typedef short __int16_t;
--typedef unsigned short __uint16_t;
--typedef int __int32_t;
--typedef unsigned int __uint32_t;
--#ifndef lint
--__extension__
--#endif
--/* LONGLONG */
--typedef long long __int64_t;
--#ifndef lint
--__extension__
--#endif
--/* LONGLONG */
--typedef unsigned long long __uint64_t;
--
--/*
- * Standard type definitions.
- */
--typedef unsigned long __clock_t; /* clock()... */
-+// clock_t is signed on i386-kfreebsd-gnu
-+typedef __int32_t __clock_t; /* clock()... */
- typedef __int32_t __critical_t;
- typedef long double __double_t;
- typedef long double __float_t;
- typedef __int32_t __intfptr_t;
- typedef __int64_t __intmax_t;
--typedef __int32_t __intptr_t;
- typedef __int32_t __int_fast8_t;
- typedef __int32_t __int_fast16_t;
- typedef __int32_t __int_fast32_t;
-@@ -86,9 +68,11 @@
- typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
- typedef __int32_t __register_t;
- typedef __int32_t __segsz_t; /* segment size (in pages) */
-+#ifndef __GLIBC__
- typedef __uint32_t __size_t; /* sizeof() */
- typedef __int32_t __ssize_t; /* byte count or error */
- typedef __int32_t __time_t; /* time()... */
-+#endif
- typedef __uint32_t __uintfptr_t;
- typedef __uint64_t __uintmax_t;
- typedef __uint32_t __uintptr_t;
---- a/sys/amd64/include/_types.h
-+++ b/sys/amd64/include/_types.h
-@@ -39,32 +39,21 @@
- #ifndef _MACHINE__TYPES_H_
- #define _MACHINE__TYPES_H_
-
-+#include <sys/types.h>
-+#include <sys/cdefs.h>
- #ifndef _SYS_CDEFS_H_
--#error this file needs sys/cdefs.h as a prerequisite
-+#include <sys/param.h>
- #endif
-
- #define __NO_STRICT_ALIGNMENT
-
- /*
-- * Basic types upon which most other types are built.
-- */
--typedef __signed char __int8_t;
--typedef unsigned char __uint8_t;
--typedef short __int16_t;
--typedef unsigned short __uint16_t;
--typedef int __int32_t;
--typedef unsigned int __uint32_t;
--typedef long __int64_t;
--typedef unsigned long __uint64_t;
--
--/*
- * Standard type definitions.
- */
- typedef __int32_t __clock_t; /* clock()... */
- typedef __int64_t __critical_t;
- typedef double __double_t;
- typedef float __float_t;
--typedef __int64_t __intfptr_t;
- typedef __int64_t __intmax_t;
- typedef __int64_t __intptr_t;
- typedef __int32_t __int_fast8_t;
-@@ -78,9 +67,11 @@
- typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
- typedef __int64_t __register_t;
- typedef __int64_t __segsz_t; /* segment size (in pages) */
-+#ifndef __GLIBC__
- typedef __uint64_t __size_t; /* sizeof() */
- typedef __int64_t __ssize_t; /* byte count or error */
- typedef __int64_t __time_t; /* time()... */
-+#endif
- typedef __uint64_t __uintfptr_t;
- typedef __uint64_t __uintmax_t;
- typedef __uint64_t __uintptr_t;
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff 2012-01-23 19:55:08 UTC (rev 3999)
+++ trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff 2012-01-23 21:24:02 UTC (rev 4000)
@@ -1,84 +0,0 @@
---- a/sys/mips/include/_types.h
-+++ b/sys/mips/include/_types.h
-@@ -40,49 +40,23 @@
- #ifndef _MACHINE__TYPES_H_
- #define _MACHINE__TYPES_H_
-
-+#include <sys/types.h>
-+#include <sys/cdefs.h>
- #ifndef _SYS_CDEFS_H_
--#error this file needs sys/cdefs.h as a prerequisite
--#endif
--
--/*
-- * Basic types upon which most other types are built.
-- */
--typedef __signed char __int8_t;
--typedef unsigned char __uint8_t;
--typedef short __int16_t;
--typedef unsigned short __uint16_t;
--typedef int __int32_t;
--typedef unsigned int __uint32_t;
--#ifdef __mips_n64
--typedef long __int64_t;
--typedef unsigned long __uint64_t;
--#else
--#ifndef lint
--__extension__
--#endif
--/* LONGLONG */
--typedef long long __int64_t;
--#ifndef lint
--__extension__
--#endif
--/* LONGLONG */
--typedef unsigned long long __uint64_t;
-+#include <sys/param.h>
- #endif
-
- /*
- * Standard type definitions.
- */
--typedef __int32_t __clock_t; /* clock()... */
- typedef double __double_t;
- typedef double __float_t;
- #ifdef __mips_n64
- typedef __int64_t __critical_t;
- typedef __int64_t __intfptr_t;
--typedef __int64_t __intptr_t;
- #else
- typedef __int32_t __critical_t;
- typedef __int32_t __intfptr_t;
--typedef __int32_t __intptr_t;
- #endif
- typedef __int64_t __intmax_t;
- typedef __int32_t __int_fast8_t;
-@@ -94,28 +68,17 @@
- typedef __int32_t __int_least32_t;
- typedef __int64_t __int_least64_t;
- #if defined(__mips_n64) || defined(__mips_n32)
--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 __mips_n64
--typedef __int64_t __ptrdiff_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;
- #else
--typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
- 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;
- #endif
--typedef __int64_t __time_t; /* time()... */
- typedef __uint64_t __uintmax_t;
- typedef __uint32_t __uint_fast8_t;
- typedef __uint32_t __uint_fast16_t;
Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series 2012-01-23 19:55:08 UTC (rev 3999)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series 2012-01-23 21:24:02 UTC (rev 4000)
@@ -1,4 +1,5 @@
# Patches that come from upstream
+type_collision.diff
000_v4l.diff
# Other patches that might or might not be mergeable
@@ -20,7 +21,6 @@
018_sys__types.diff
019_exec_pagesize.diff
020_concat_elf_generic.diff
-021_machine__types.diff
022_sys_buf_h.diff
024_ioccom.diff
026_acpiio.diff
@@ -33,6 +33,5 @@
033_pcpu.diff
034_usb.diff
035_devfs_int.diff
-039_mips_misc.diff
042_syscall_stubs.diff
ctltype_quad.diff
Added: trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff 2012-01-23 21:24:02 UTC (rev 4000)
@@ -0,0 +1,123 @@
+--- a/sys/i386/include/_types.h
++++ b/sys/i386/include/_types.h
+@@ -68,7 +68,12 @@
+ /*
+ * Standard type definitions.
+ */
++#if defined(__GLIBC__) && !defined(_KERNEL)
++/* This divergence is probably accidental, but it can't be fixed now. */
++typedef __int32_t __clock_t;
++#else
+ typedef unsigned long __clock_t; /* clock()... */
++#endif
+ typedef __int32_t __critical_t;
+ typedef long double __double_t;
+ typedef long double __float_t;
+--- a/sys/sys/_types.h
++++ b/sys/sys/_types.h
+@@ -40,10 +40,19 @@
+ typedef __int32_t __clockid_t; /* clock_gettime()... */
+ typedef __uint64_t __cap_rights_t; /* capability rights */
+ typedef __uint32_t __fflags_t; /* file flags */
++#if defined(__GLIBC__) && !defined(_KERNEL)
++/* User-selectable types. Leave them to Glibc headers. */
++#else
+ typedef __uint64_t __fsblkcnt_t;
+ typedef __uint64_t __fsfilcnt_t;
++#endif
+ typedef __uint32_t __gid_t;
++#if defined(__GLIBC__) && !defined(_KERNEL)
++/* This divergence is probably accidental, but it can't be fixed now. */
++typedef __uint32_t __id_t;
++#else
+ typedef __int64_t __id_t; /* can hold a gid_t, pid_t, or uid_t */
++#endif
+ typedef __uint32_t __ino_t; /* inode number */
+ typedef long __key_t; /* IPC key (for Sys V IPC) */
+ typedef __int32_t __lwpid_t; /* Thread ID (a.k.a. LWP) */
+@@ -59,7 +68,11 @@
+ typedef __uint8_t __sa_family_t;
+ typedef __uint32_t __socklen_t;
+ typedef long __suseconds_t; /* microseconds (signed) */
++#if defined(__GLIBC__) && !defined(_KERNEL)
++typedef __int32_t __timer_t;
++#else
+ typedef struct __timer *__timer_t; /* timer_gettime()... */
++#endif
+ typedef struct __mq *__mqd_t; /* mq_open()... */
+ typedef __uint32_t __uid_t;
+ typedef unsigned int __useconds_t; /* microseconds (unsigned) */
+@@ -98,9 +111,13 @@
+ * mbstate_t is an opaque object to keep conversion state during multibyte
+ * stream conversions.
+ */
++#if defined(__GLIBC__) && !defined(_KERNEL)
++/* Defined in <wchar.h> */
++#else
+ typedef union {
+ char __mbstate8[128];
+ __int64_t _mbstateL; /* for alignment */
+ } __mbstate_t;
++#endif
+
+ #endif /* !_SYS__TYPES_H_ */
+--- a/sys/amd64/include/_types.h
++++ b/sys/amd64/include/_types.h
+@@ -76,7 +76,9 @@
+ typedef __int32_t __int_least32_t;
+ typedef __int64_t __int_least64_t;
+ typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
++#ifndef __GLIBC__
+ typedef __int64_t __register_t;
++#endif
+ typedef __int64_t __segsz_t; /* segment size (in pages) */
+ typedef __uint64_t __size_t; /* sizeof() */
+ typedef __int64_t __ssize_t; /* byte count or error */
+--- a/sys/ia64/include/_types.h
++++ b/sys/ia64/include/_types.h
+@@ -74,7 +74,9 @@
+ typedef __int32_t __int_least32_t;
+ typedef __int64_t __int_least64_t;
+ typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
++#ifndef __GLIBC__
+ typedef __int64_t __register_t;
++#endif
+ typedef __int64_t __segsz_t; /* segment size (in pages) */
+ typedef __uint64_t __size_t; /* sizeof() */
+ typedef __int64_t __ssize_t; /* byte count or error */
+--- a/sys/mips/include/_types.h
++++ b/sys/mips/include/_types.h
+@@ -94,7 +94,9 @@
+ typedef __int32_t __int_least32_t;
+ typedef __int64_t __int_least64_t;
+ #if defined(__mips_n64) || defined(__mips_n32)
++# ifndef __GLIBC__
+ typedef __int64_t __register_t;
++# endif
+ typedef __int64_t f_register_t;
+ #else
+ typedef __int32_t __register_t;
+--- a/sys/powerpc/include/_types.h
++++ b/sys/powerpc/include/_types.h
+@@ -94,7 +94,9 @@
+ typedef __int64_t __int_least64_t;
+ #ifdef __LP64__
+ typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
++#ifndef __GLIBC__
+ typedef __int64_t __register_t;
++#endif
+ typedef __int64_t __segsz_t; /* segment size (in pages) */
+ typedef __uint64_t __size_t; /* sizeof() */
+ typedef __int64_t __ssize_t; /* byte count or error */
+--- a/sys/sparc64/include/_types.h
++++ b/sys/sparc64/include/_types.h
+@@ -70,7 +70,9 @@
+ typedef __int32_t __int_least32_t;
+ typedef __int64_t __int_least64_t;
+ typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
++#ifndef __GLIBC__
+ typedef __int64_t __register_t;
++#endif
+ typedef __int64_t __segsz_t; /* segment size (in pages) */
+ typedef __uint64_t __size_t; /* sizeof() */
+ typedef __int64_t __ssize_t; /* byte count or error */
More information about the Glibc-bsd-commits
mailing list