[Glibc-bsd-commits] r5869 - in trunk/kfreebsd-10/debian: . patches
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Sat Feb 6 17:23:26 UTC 2016
Author: stevenc-guest
Date: 2016-02-06 17:23:26 +0000 (Sat, 06 Feb 2016)
New Revision: 5869
Modified:
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/patches/004_xargs.diff
trunk/kfreebsd-10/debian/patches/902_version.diff
trunk/kfreebsd-10/debian/patches/904_dev_full.diff
trunk/kfreebsd-10/debian/patches/908_linprocfs_is_not_proc.diff
trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff
trunk/kfreebsd-10/debian/patches/921_signal_watchdog.diff
trunk/kfreebsd-10/debian/patches/922_cc_version.diff
trunk/kfreebsd-10/debian/patches/923_newvers_timestamp.diff
trunk/kfreebsd-10/debian/patches/userland.diff
Log:
Refresh patches:
- userland.diff
- 004_xargs.diff
- 902_version.diff
- 904_dev_full.diff
- 908_linprocfs_is_not_proc.diff
- 920_linux_cflags.diff
- 921_signal_watchdog.diff
- 922_cc_version.diff
- 923_newvers_timestamp.diff
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2016-02-06 17:22:05 UTC (rev 5868)
+++ trunk/kfreebsd-10/debian/changelog 2016-02-06 17:23:26 UTC (rev 5869)
@@ -1,6 +1,16 @@
kfreebsd-10 (10.3~svn295289-1) UNRELEASED; urgency=medium
* New upstream snapshot of 10.3-BETA1
+ * Refresh patches:
+ - userland.diff
+ - 004_xargs.diff
+ - 902_version.diff
+ - 904_dev_full.diff
+ - 908_linprocfs_is_not_proc.diff
+ - 920_linux_cflags.diff
+ - 921_signal_watchdog.diff
+ - 922_cc_version.diff
+ - 923_newvers_timestamp.diff
-- Steven Chamberlain <steven at pyro.eu.org> Sat, 06 Feb 2016 16:23:08 +0000
Modified: trunk/kfreebsd-10/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/004_xargs.diff 2016-02-06 17:22:05 UTC (rev 5868)
+++ trunk/kfreebsd-10/debian/patches/004_xargs.diff 2016-02-06 17:23:26 UTC (rev 5869)
@@ -4,11 +4,9 @@
http://savannah.gnu.org/patch/?4916
-Index: kfreebsd-10/sys/conf/kmod.mk
-===================================================================
---- kfreebsd-10.orig/sys/conf/kmod.mk
-+++ kfreebsd-10/sys/conf/kmod.mk
-@@ -222,7 +222,7 @@ ${FULLPROG}: ${OBJS}
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
+@@ -229,7 +229,7 @@
grep -v '^#' < ${EXPORT_SYMS} > export_syms
.endif
awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
@@ -17,11 +15,9 @@
.endif
.endif
.if !defined(DEBUG_FLAGS) && ${__KLD_SHARED} == no
-Index: kfreebsd-10/sys/contrib/dev/acpica/acpica_prep.sh
-===================================================================
---- kfreebsd-10.orig/sys/contrib/dev/acpica/acpica_prep.sh
-+++ kfreebsd-10/sys/contrib/dev/acpica/acpica_prep.sh
-@@ -60,10 +60,10 @@ done
+--- a/sys/contrib/dev/acpica/acpica_prep.sh
++++ b/sys/contrib/dev/acpica/acpica_prep.sh
+@@ -60,10 +60,10 @@
# copy files
echo copying full dirs
for i in ${fulldirs}; do
@@ -34,11 +30,9 @@
# canonify include paths
for H in ${src_headers}; do
-Index: kfreebsd-10/sys/conf/kern.post.mk
-===================================================================
---- kfreebsd-10.orig/sys/conf/kern.post.mk
-+++ kfreebsd-10/sys/conf/kern.post.mk
-@@ -199,12 +199,9 @@ SRCS= assym.s vnode_if.h ${BEFORE_DEPEND
+--- a/sys/conf/kern.post.mk
++++ b/sys/conf/kern.post.mk
+@@ -199,12 +199,9 @@
rm -f .newdep
${MAKE} -V CFILES_NOZFS -V SYSTEM_CFILES -V GEN_CFILES | \
MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS}
Modified: trunk/kfreebsd-10/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/902_version.diff 2016-02-06 17:22:05 UTC (rev 5868)
+++ trunk/kfreebsd-10/debian/patches/902_version.diff 2016-02-06 17:23:26 UTC (rev 5869)
@@ -1,6 +1,6 @@
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
-@@ -209,7 +209,7 @@
+@@ -217,7 +217,7 @@
cat << EOF > vers.c
$COPYRIGHT
#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}${hg}${p4version}: ${t}"
Modified: trunk/kfreebsd-10/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/904_dev_full.diff 2016-02-06 17:22:05 UTC (rev 5868)
+++ trunk/kfreebsd-10/debian/patches/904_dev_full.diff 2016-02-06 17:23:26 UTC (rev 5869)
@@ -3,7 +3,7 @@
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
-@@ -46,9 +46,11 @@
+@@ -45,9 +45,11 @@
/* For use with destroy_dev(9). */
static struct cdev *null_dev;
@@ -15,7 +15,7 @@
static d_ioctl_t null_ioctl;
static d_ioctl_t zero_ioctl;
static d_read_t zero_read;
-@@ -61,6 +63,14 @@
+@@ -60,6 +62,14 @@
.d_name = "null",
};
@@ -30,7 +30,7 @@
static struct cdevsw zero_cdevsw = {
.d_version = D_VERSION,
.d_read = zero_read,
-@@ -81,6 +91,15 @@
+@@ -80,6 +90,15 @@
/* ARGSUSED */
static int
@@ -46,7 +46,7 @@
null_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t data __unused,
int flags __unused, struct thread *td)
{
-@@ -158,12 +177,15 @@
+@@ -155,12 +174,15 @@
printf("null: <null device, zero device>\n");
null_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &null_cdevsw, 0,
NULL, UID_ROOT, GID_WHEEL, 0666, "null");
Modified: trunk/kfreebsd-10/debian/patches/908_linprocfs_is_not_proc.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/908_linprocfs_is_not_proc.diff 2016-02-06 17:22:05 UTC (rev 5868)
+++ trunk/kfreebsd-10/debian/patches/908_linprocfs_is_not_proc.diff 2016-02-06 17:23:26 UTC (rev 5869)
@@ -1,6 +1,6 @@
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
-@@ -357,10 +357,6 @@
+@@ -354,10 +354,6 @@
/* determine fs type */
fstype = mp->mnt_stat.f_fstypename;
Modified: trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff 2016-02-06 17:22:05 UTC (rev 5868)
+++ trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff 2016-02-06 17:23:26 UTC (rev 5869)
@@ -16,7 +16,7 @@
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -92,6 +92,8 @@
+@@ -99,6 +99,8 @@
CFLAGS+= -D_KERNEL
CFLAGS+= -DKLD_MODULE
Modified: trunk/kfreebsd-10/debian/patches/921_signal_watchdog.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/921_signal_watchdog.diff 2016-02-06 17:22:05 UTC (rev 5868)
+++ trunk/kfreebsd-10/debian/patches/921_signal_watchdog.diff 2016-02-06 17:23:26 UTC (rev 5869)
@@ -37,7 +37,7 @@
};
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
-@@ -1557,8 +1557,8 @@
+@@ -1556,8 +1556,8 @@
* pretty safe to do since the only way to create two processes
* with the same p_leader is via rfork(2).
*/
Modified: trunk/kfreebsd-10/debian/patches/922_cc_version.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/922_cc_version.diff 2016-02-06 17:22:05 UTC (rev 5868)
+++ trunk/kfreebsd-10/debian/patches/922_cc_version.diff 2016-02-06 17:23:26 UTC (rev 5869)
@@ -3,9 +3,9 @@
version.
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
-@@ -89,7 +89,7 @@
- touch version
- v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
+@@ -97,7 +97,7 @@
+ t=`date`
+ fi
i=`${MAKE:-make} -V KERN_IDENT`
-compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version')
+compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep ' version ')
Modified: trunk/kfreebsd-10/debian/patches/923_newvers_timestamp.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/923_newvers_timestamp.diff 2016-02-06 17:22:05 UTC (rev 5868)
+++ trunk/kfreebsd-10/debian/patches/923_newvers_timestamp.diff 2016-02-06 17:23:26 UTC (rev 5869)
@@ -9,7 +9,7 @@
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
-@@ -91,6 +91,12 @@
+@@ -99,6 +99,12 @@
i=`${MAKE:-make} -V KERN_IDENT`
compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep ' version ')
Modified: trunk/kfreebsd-10/debian/patches/userland.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/userland.diff 2016-02-06 17:22:05 UTC (rev 5868)
+++ trunk/kfreebsd-10/debian/patches/userland.diff 2016-02-06 17:23:26 UTC (rev 5869)
@@ -1,11 +1,9 @@
Staging area for fixes needed by userland.
-Index: kfreebsd-10/sys/ia64/include/_types.h
-===================================================================
---- kfreebsd-10.orig/sys/ia64/include/_types.h
-+++ kfreebsd-10/sys/ia64/include/_types.h
-@@ -74,7 +74,9 @@ typedef __int16_t __int_least16_t;
+--- 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 */
@@ -15,11 +13,9 @@
typedef __int64_t __segsz_t; /* segment size (in pages) */
typedef __uint64_t __size_t; /* sizeof() */
typedef __int64_t __ssize_t; /* byte count or error */
-Index: kfreebsd-10/sys/mips/include/_types.h
-===================================================================
---- kfreebsd-10.orig/sys/mips/include/_types.h
-+++ kfreebsd-10/sys/mips/include/_types.h
-@@ -94,10 +94,14 @@ typedef __int16_t __int_least16_t;
+--- a/sys/mips/include/_types.h
++++ b/sys/mips/include/_types.h
+@@ -94,10 +94,14 @@
typedef __int32_t __int_least32_t;
typedef __int64_t __int_least64_t;
#if defined(__mips_n64) || defined(__mips_n32)
@@ -34,11 +30,9 @@
typedef __int32_t f_register_t;
#endif
#ifdef __mips_n64
-Index: kfreebsd-10/sys/powerpc/include/_types.h
-===================================================================
---- kfreebsd-10.orig/sys/powerpc/include/_types.h
-+++ kfreebsd-10/sys/powerpc/include/_types.h
-@@ -94,7 +94,9 @@ typedef __int32_t __int_least32_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 */
@@ -48,7 +42,7 @@
typedef __int64_t __segsz_t; /* segment size (in pages) */
typedef __uint64_t __size_t; /* sizeof() */
typedef __int64_t __ssize_t; /* byte count or error */
-@@ -103,7 +105,9 @@ typedef __uint64_t __uintfptr_t;
+@@ -103,7 +105,9 @@
typedef __uint64_t __uintptr_t;
#else
typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
@@ -58,11 +52,9 @@
typedef __int32_t __segsz_t; /* segment size (in pages) */
typedef __uint32_t __size_t; /* sizeof() */
typedef __int32_t __ssize_t; /* byte count or error */
-Index: kfreebsd-10/sys/sparc64/include/_types.h
-===================================================================
---- kfreebsd-10.orig/sys/sparc64/include/_types.h
-+++ kfreebsd-10/sys/sparc64/include/_types.h
-@@ -70,7 +70,9 @@ typedef __int16_t __int_least16_t;
+--- 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 */
@@ -72,11 +64,9 @@
typedef __int64_t __segsz_t; /* segment size (in pages) */
typedef __uint64_t __size_t; /* sizeof() */
typedef __int64_t __ssize_t; /* byte count or error */
-Index: kfreebsd-10/sys/sys/_timespec.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/_timespec.h
-+++ kfreebsd-10/sys/sys/_timespec.h
-@@ -41,9 +41,14 @@ typedef __time_t time_t;
+--- a/sys/sys/_timespec.h
++++ b/sys/sys/_timespec.h
+@@ -41,9 +41,14 @@
#define _TIME_T_DECLARED
#endif
@@ -91,11 +81,9 @@
+#endif
#endif /* !_SYS__TIMESPEC_H_ */
-Index: kfreebsd-10/sys/sys/_timeval.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/_timeval.h
-+++ kfreebsd-10/sys/sys/_timeval.h
-@@ -41,6 +41,10 @@ typedef __time_t time_t;
+--- a/sys/sys/_timeval.h
++++ b/sys/sys/_timeval.h
+@@ -41,6 +41,10 @@
#define _TIME_T_DECLARED
#endif
@@ -106,18 +94,16 @@
/*
* Structure returned by gettimeofday(2) system call, and used in other calls.
*/
-@@ -48,5 +52,6 @@ struct timeval {
+@@ -48,5 +52,6 @@
time_t tv_sec; /* seconds */
suseconds_t tv_usec; /* and microseconds */
};
+#endif
#endif /* !_SYS__TIMEVAL_H_ */
-Index: kfreebsd-10/sys/sys/_types.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/_types.h
-+++ kfreebsd-10/sys/sys/_types.h
-@@ -39,10 +39,19 @@ typedef __uint32_t __blksize_t; /* file
+--- a/sys/sys/_types.h
++++ b/sys/sys/_types.h
+@@ -39,10 +39,19 @@
typedef __int64_t __blkcnt_t; /* file block count */
typedef __int32_t __clockid_t; /* clock_gettime()... */
typedef __uint32_t __fflags_t; /* file flags */
@@ -137,7 +123,7 @@
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) */
-@@ -58,7 +67,11 @@ typedef __int64_t __rlim_t; /* resource
+@@ -58,7 +67,11 @@
typedef __uint8_t __sa_family_t;
typedef __uint32_t __socklen_t;
typedef long __suseconds_t; /* microseconds (signed) */
@@ -149,7 +135,7 @@
typedef struct __mq *__mqd_t; /* mq_open()... */
typedef __uint32_t __uid_t;
typedef unsigned int __useconds_t; /* microseconds (unsigned) */
-@@ -107,9 +120,13 @@ typedef __uint32_t __fixpt_t; /* fixed p
+@@ -107,9 +120,13 @@
* mbstate_t is an opaque object to keep conversion state during multibyte
* stream conversions.
*/
@@ -163,10 +149,8 @@
+#endif
#endif /* !_SYS__TYPES_H_ */
-Index: kfreebsd-10/sys/sys/elf32.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/elf32.h
-+++ kfreebsd-10/sys/sys/elf32.h
+--- a/sys/sys/elf32.h
++++ b/sys/sys/elf32.h
@@ -31,15 +31,21 @@
#include <sys/elf_common.h>
@@ -189,7 +173,7 @@
typedef uint64_t Elf32_Lword;
typedef Elf32_Word Elf32_Hashelt;
-@@ -48,6 +54,7 @@ typedef Elf32_Word Elf32_Hashelt;
+@@ -48,6 +54,7 @@
typedef Elf32_Word Elf32_Size;
typedef Elf32_Sword Elf32_Ssize;
@@ -197,7 +181,7 @@
/*
* ELF header.
*/
-@@ -165,6 +172,8 @@ typedef struct {
+@@ -177,6 +184,8 @@
#define ELF32_M_SIZE(info) ((unsigned char)(info))
#define ELF32_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size))
@@ -206,7 +190,7 @@
/*
* Hardware/Software capabilities entry
*/
-@@ -176,6 +185,7 @@ typedef struct {
+@@ -188,6 +197,7 @@
} c_un;
} Elf32_Cap;
@@ -214,7 +198,7 @@
/*
* Symbol table entries.
*/
-@@ -234,12 +244,15 @@ typedef struct
+@@ -246,12 +256,15 @@
Elf32_Word vna_name;
Elf32_Word vna_next;
} Elf32_Vernaux;
@@ -230,10 +214,8 @@
+#endif
#endif /* !_SYS_ELF32_H_ */
-Index: kfreebsd-10/sys/sys/elf64.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/elf64.h
-+++ kfreebsd-10/sys/sys/elf64.h
+--- a/sys/sys/elf64.h
++++ b/sys/sys/elf64.h
@@ -31,18 +31,26 @@
#include <sys/elf_common.h>
@@ -261,7 +243,7 @@
/*
* Types of dynamic symbol hash table bucket and chain elements.
-@@ -57,6 +65,7 @@ typedef Elf64_Word Elf64_Hashelt;
+@@ -57,6 +65,7 @@
typedef Elf64_Xword Elf64_Size;
typedef Elf64_Sxword Elf64_Ssize;
@@ -269,7 +251,7 @@
/*
* ELF header.
*/
-@@ -172,6 +181,8 @@ typedef struct {
+@@ -184,6 +193,8 @@
#define ELF64_M_SIZE(info) ((unsigned char)(info))
#define ELF64_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size))
@@ -278,7 +260,7 @@
/*
* Hardware/Software capabilities entry
*/
-@@ -183,6 +194,7 @@ typedef struct {
+@@ -195,6 +206,7 @@
} c_un;
} Elf64_Cap;
@@ -286,7 +268,7 @@
/*
* Symbol table entries.
*/
-@@ -237,12 +249,15 @@ typedef struct {
+@@ -249,12 +261,15 @@
Elf64_Word vna_name;
Elf64_Word vna_next;
} Elf64_Vernaux;
@@ -302,11 +284,9 @@
+#endif
#endif /* !_SYS_ELF64_H_ */
-Index: kfreebsd-10/sys/sys/endian.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/endian.h
-+++ kfreebsd-10/sys/sys/endian.h
-@@ -53,6 +53,10 @@ typedef __uint64_t uint64_t;
+--- a/sys/sys/endian.h
++++ b/sys/sys/endian.h
+@@ -53,6 +53,10 @@
#define _UINT64_T_DECLARED
#endif
@@ -317,7 +297,7 @@
/*
* General byte order swapping functions.
*/
-@@ -93,6 +97,7 @@ typedef __uint64_t uint64_t;
+@@ -93,6 +97,7 @@
#define le32toh(x) bswap32((x))
#define le64toh(x) bswap64((x))
#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */
@@ -325,10 +305,8 @@
/* Alignment-agnostic encode/decode bytestream to/from little/big endian. */
-Index: kfreebsd-10/sys/sys/limits.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/limits.h
-+++ kfreebsd-10/sys/sys/limits.h
+--- a/sys/sys/limits.h
++++ b/sys/sys/limits.h
@@ -35,6 +35,11 @@
#include <sys/cdefs.h>
#include <machine/_limits.h>
@@ -349,10 +327,8 @@
#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
#define SIZE_T_MAX __SIZE_T_MAX /* max value for a size_t */
-Index: kfreebsd-10/sys/sys/param.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/param.h
-+++ kfreebsd-10/sys/sys/param.h
+--- a/sys/sys/param.h
++++ b/sys/sys/param.h
@@ -40,9 +40,15 @@
#include <sys/_null.h>
@@ -439,10 +415,8 @@
/* Macros for min/max. */
#define MIN(a,b) (((a)<(b))?(a):(b))
-Index: kfreebsd-10/sys/sys/queue.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/queue.h
-+++ kfreebsd-10/sys/sys/queue.h
+--- a/sys/sys/queue.h
++++ b/sys/sys/queue.h
@@ -30,8 +30,12 @@
* $FreeBSD$
*/
@@ -458,7 +432,7 @@
#include <sys/cdefs.h>
-@@ -166,10 +170,12 @@ struct { \
+@@ -187,10 +191,12 @@
#define SLIST_FIRST(head) ((head)->slh_first)
@@ -471,7 +445,7 @@
#define SLIST_FOREACH_FROM(var, head, field) \
for ((var) = ((var) ? (var) : SLIST_FIRST((head))); \
-@@ -191,6 +197,7 @@ struct { \
+@@ -212,6 +218,7 @@
((var) = *(varp)) != NULL; \
(varp) = &SLIST_NEXT((var), field))
@@ -479,7 +453,7 @@
#define SLIST_INIT(head) do { \
SLIST_FIRST((head)) = NULL; \
} while (0)
-@@ -204,9 +211,11 @@ struct { \
+@@ -225,9 +232,11 @@
SLIST_NEXT((elm), field) = SLIST_FIRST((head)); \
SLIST_FIRST((head)) = (elm); \
} while (0)
@@ -491,7 +465,7 @@
#define SLIST_REMOVE(head, elm, type, field) do { \
QMD_SAVELINK(oldnext, (elm)->field.sle_next); \
if (SLIST_FIRST((head)) == (elm)) { \
-@@ -220,7 +229,9 @@ struct { \
+@@ -241,7 +250,9 @@
} \
TRASHIT(*oldnext); \
} while (0)
@@ -501,15 +475,15 @@
#define SLIST_REMOVE_AFTER(elm, field) do { \
SLIST_NEXT(elm, field) = \
SLIST_NEXT(SLIST_NEXT(elm, field), field); \
-@@ -229,6 +240,7 @@ struct { \
+@@ -250,6 +261,7 @@
#define SLIST_REMOVE_HEAD(head, field) do { \
SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \
} while (0)
+#endif
#define SLIST_SWAP(head1, head2, type) do { \
- struct type *swap_first = SLIST_FIRST(head1); \
-@@ -256,6 +268,7 @@ struct { \
+ QUEUE_TYPEOF(type) *swap_first = SLIST_FIRST(head1); \
+@@ -288,6 +300,7 @@
/*
* Singly-linked Tail queue functions.
*/
@@ -517,7 +491,7 @@
#define STAILQ_CONCAT(head1, head2) do { \
if (!STAILQ_EMPTY((head2))) { \
*(head1)->stqh_last = (head2)->stqh_first; \
-@@ -263,36 +276,44 @@ struct { \
+@@ -295,36 +308,44 @@
STAILQ_INIT((head2)); \
} \
} while (0)
@@ -562,15 +536,15 @@
#define STAILQ_INSERT_AFTER(head, tqelm, elm, field) do { \
if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\
(head)->stqh_last = &STAILQ_NEXT((elm), field); \
-@@ -310,6 +331,7 @@ struct { \
+@@ -342,6 +363,7 @@
*(head)->stqh_last = (elm); \
(head)->stqh_last = &STAILQ_NEXT((elm), field); \
} while (0)
+#endif
- #define STAILQ_LAST(head, type, field) \
- (STAILQ_EMPTY((head)) ? NULL : \
-@@ -317,6 +339,7 @@ struct { \
+ #define STAILQ_LAST(head, type, field) \
+ (STAILQ_EMPTY((head)) ? NULL : \
+@@ -350,6 +372,7 @@
#define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next)
@@ -578,7 +552,7 @@
#define STAILQ_REMOVE(head, elm, type, field) do { \
QMD_SAVELINK(oldnext, (elm)->field.stqe_next); \
if (STAILQ_FIRST((head)) == (elm)) { \
-@@ -330,6 +353,7 @@ struct { \
+@@ -363,6 +386,7 @@
} \
TRASHIT(*oldnext); \
} while (0)
@@ -586,7 +560,7 @@
#define STAILQ_REMOVE_AFTER(head, elm, field) do { \
if ((STAILQ_NEXT(elm, field) = \
-@@ -337,11 +361,13 @@ struct { \
+@@ -370,11 +394,13 @@
(head)->stqh_last = &STAILQ_NEXT((elm), field); \
} while (0)
@@ -599,8 +573,8 @@
+#endif
#define STAILQ_SWAP(head1, head2, type) do { \
- struct type *swap_first = STAILQ_FIRST(head1); \
-@@ -407,30 +433,37 @@ struct { \
+ QUEUE_TYPEOF(type) *swap_first = STAILQ_FIRST(head1); \
+@@ -451,30 +477,37 @@
#define LIST_FIRST(head) ((head)->lh_first)
@@ -638,7 +612,7 @@
#define LIST_INSERT_AFTER(listelm, elm, field) do { \
QMD_LIST_CHECK_NEXT(listelm, field); \
if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\
-@@ -455,6 +488,7 @@ struct { \
+@@ -499,6 +532,7 @@
LIST_FIRST((head)) = (elm); \
(elm)->field.le_prev = &LIST_FIRST((head)); \
} while (0)
@@ -646,23 +620,23 @@
#define LIST_NEXT(elm, field) ((elm)->field.le_next)
-@@ -462,6 +496,7 @@ struct { \
- ((elm)->field.le_prev == &LIST_FIRST((head)) ? NULL : \
- __containerof((elm)->field.le_prev, struct type, field.le_next))
+@@ -507,6 +541,7 @@
+ __containerof((elm)->field.le_prev, \
+ QUEUE_TYPEOF(type), field.le_next))
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define LIST_REMOVE(elm, field) do { \
QMD_SAVELINK(oldnext, (elm)->field.le_next); \
QMD_SAVELINK(oldprev, (elm)->field.le_prev); \
-@@ -474,6 +509,7 @@ struct { \
+@@ -519,6 +554,7 @@
TRASHIT(*oldnext); \
TRASHIT(*oldprev); \
} while (0)
+#endif
#define LIST_SWAP(head1, head2, type, field) do { \
- struct type *swap_tmp = LIST_FIRST((head1)); \
-@@ -488,22 +524,26 @@ struct { \
+ QUEUE_TYPEOF(type) *swap_tmp = LIST_FIRST(head1); \
+@@ -533,29 +569,35 @@
/*
* Tail queue declarations.
*/
@@ -675,6 +649,15 @@
}
+#endif
++#if !defined(__GLIBC__) || defined(_KERNEL)
+ #define TAILQ_CLASS_HEAD(name, type) \
+ struct name { \
+ class type *tqh_first; /* first element */ \
+ class type **tqh_last; /* addr of last next element */ \
+ TRACEBUF \
+ }
++#endif
+
#define TAILQ_HEAD_INITIALIZER(head) \
{ NULL, &(head).tqh_first, TRACEBUF_INITIALIZER }
@@ -687,9 +670,9 @@
}
+#endif
- /*
- * Tail queue functions.
-@@ -539,6 +579,7 @@ struct { \
+ #define TAILQ_CLASS_ENTRY(type) \
+ struct { \
+@@ -598,6 +640,7 @@
#define QMD_TAILQ_CHECK_PREV(elm, field)
#endif /* (_KERNEL && INVARIANTS) */
@@ -697,7 +680,7 @@
#define TAILQ_CONCAT(head1, head2, field) do { \
if (!TAILQ_EMPTY(head2)) { \
*(head1)->tqh_last = (head2)->tqh_first; \
-@@ -549,51 +590,61 @@ struct { \
+@@ -608,51 +651,61 @@
QMD_TRACE_HEAD(head2); \
} \
} while (0)
@@ -759,7 +742,7 @@
#define TAILQ_INIT(head) do { \
TAILQ_FIRST((head)) = NULL; \
(head)->tqh_last = &TAILQ_FIRST((head)); \
-@@ -647,6 +698,7 @@ struct { \
+@@ -706,6 +759,7 @@
QMD_TRACE_HEAD(head); \
QMD_TRACE_ELEM(&(elm)->field); \
} while (0)
@@ -767,7 +750,7 @@
#define TAILQ_LAST(head, headname) \
(*(((struct headname *)((head)->tqh_last))->tqh_last))
-@@ -656,6 +708,7 @@ struct { \
+@@ -715,6 +769,7 @@
#define TAILQ_PREV(elm, headname, field) \
(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
@@ -775,18 +758,16 @@
#define TAILQ_REMOVE(head, elm, field) do { \
QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \
QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \
-@@ -673,6 +726,7 @@ struct { \
+@@ -732,6 +787,7 @@
TRASHIT(*oldprev); \
QMD_TRACE_ELEM(&(elm)->field); \
} while (0)
+#endif
#define TAILQ_SWAP(head1, head2, type, field) do { \
- struct type *swap_first = (head1)->tqh_first; \
-Index: kfreebsd-10/sys/sys/time.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/time.h
-+++ kfreebsd-10/sys/sys/time.h
+ QUEUE_TYPEOF(type) *swap_first = (head1)->tqh_first; \
+--- a/sys/sys/time.h
++++ b/sys/sys/time.h
@@ -37,10 +37,16 @@
#include <sys/types.h>
#include <sys/timespec.h>
@@ -804,7 +785,7 @@
#define DST_NONE 0 /* not on dst */
#define DST_USA 1 /* USA style dst */
#define DST_AUST 2 /* Australian style dst */
-@@ -49,7 +55,7 @@ struct timezone {
+@@ -49,7 +55,7 @@
#define DST_EET 5 /* Eastern European dst */
#define DST_CAN 6 /* Canada */
@@ -813,7 +794,7 @@
struct bintime {
time_t sec;
uint64_t frac;
-@@ -282,7 +288,7 @@ tvtosbt(struct timeval _tv)
+@@ -282,7 +288,7 @@
#endif /* _KERNEL */
@@ -822,7 +803,7 @@
#define timerclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0)
#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
-@@ -310,6 +316,7 @@ tvtosbt(struct timeval _tv)
+@@ -310,6 +316,7 @@
} while (0)
#endif
@@ -830,7 +811,7 @@
/*
* Names of the interval timers, and structure
* defining a timer setting.
-@@ -362,6 +369,8 @@ struct clockinfo {
+@@ -362,6 +369,8 @@
#define CPUCLOCK_WHICH_TID 1
#endif
@@ -839,7 +820,7 @@
#ifdef _KERNEL
/*
-@@ -473,6 +482,7 @@ int tvtohz(struct timeval *tv);
+@@ -473,6 +482,7 @@
#include <sys/cdefs.h>
#include <sys/select.h>
@@ -847,7 +828,7 @@
__BEGIN_DECLS
int setitimer(int, const struct itimerval *, struct itimerval *);
int utimes(const char *, const struct timeval *);
-@@ -492,6 +502,7 @@ int gettimeofday(struct timeval *, struc
+@@ -492,6 +502,7 @@
#endif
__END_DECLS
@@ -855,10 +836,8 @@
#endif /* !_KERNEL */
-Index: kfreebsd-10/sys/sys/timespec.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/timespec.h
-+++ kfreebsd-10/sys/sys/timespec.h
+--- a/sys/sys/timespec.h
++++ b/sys/sys/timespec.h
@@ -37,7 +37,9 @@
#include <sys/cdefs.h>
#include <sys/_timespec.h>
@@ -878,17 +857,15 @@
/*
* Structure defined by POSIX.1b to be like a itimerval, but with
* timespecs. Used in the timer_*() system calls.
-@@ -59,5 +62,6 @@ struct itimerspec {
+@@ -59,5 +62,6 @@
struct timespec it_interval;
struct timespec it_value;
};
+#endif
#endif /* _SYS_TIMESPEC_H_ */
-Index: kfreebsd-10/sys/sys/types.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/types.h
-+++ kfreebsd-10/sys/sys/types.h
+--- a/sys/sys/types.h
++++ b/sys/sys/types.h
@@ -44,7 +44,21 @@
#include <machine/endian.h>
#include <sys/_types.h>
@@ -911,7 +888,7 @@
#if __BSD_VISIBLE
typedef unsigned char u_char;
-@@ -179,7 +193,9 @@ typedef __pid_t pid_t; /* process id *
+@@ -179,7 +193,9 @@
#define _PID_T_DECLARED
#endif
@@ -921,19 +898,20 @@
#ifndef _RLIM_T_DECLARED
typedef __rlim_t rlim_t; /* resource limit */
-@@ -285,10 +301,10 @@ typedef _Bool bool;
- * The following are all things that really shouldn't exist in this header,
- * since its purpose is to provide typedefs, not miscellaneous doodads.
- */
+@@ -348,10 +364,11 @@
+ #define __bitcount(x) __bitcount32((unsigned int)(x))
+ #endif
+
-#if __BSD_VISIBLE
#include <sys/select.h>
+#ifdef __FreeBSD__
- #ifdef __POPCNT__
- #define __bitcount64(x) __builtin_popcountll((__uint64_t)(x))
- #define __bitcount32(x) __builtin_popcount((__uint32_t)(x))
-@@ -365,7 +381,7 @@ __bitcount64(__uint64_t _x)
++
+ /*
+ * minor() gives a cookie instead of an index since we don't want to
+ * change the meanings of bits 0-15 or waste time and space shifting
+@@ -366,7 +383,7 @@
* <stdio.h> to give broken programs a better chance of working with
* 64-bit off_t's.
*/
@@ -942,10 +920,8 @@
__BEGIN_DECLS
#ifndef _FTRUNCATE_DECLARED
#define _FTRUNCATE_DECLARED
-Index: kfreebsd-10/sys/sys/_sigset.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/_sigset.h
-+++ kfreebsd-10/sys/sys/_sigset.h
+--- a/sys/sys/_sigset.h
++++ b/sys/sys/_sigset.h
@@ -48,9 +48,11 @@
#define _SIG_BIT(sig) (1 << (_SIG_IDX(sig) & 31))
#define _SIG_VALID(sig) ((sig) <= _SIG_MAXSIG && (sig) > 0)
@@ -958,10 +934,8 @@
#if defined(_KERNEL) && defined(COMPAT_43)
typedef unsigned int osigset_t;
-Index: kfreebsd-10/sys/sys/socket.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/socket.h
-+++ kfreebsd-10/sys/sys/socket.h
+--- a/sys/sys/socket.h
++++ b/sys/sys/socket.h
@@ -38,6 +38,8 @@
#include <sys/_iovec.h>
#include <machine/_align.h>
@@ -971,7 +945,7 @@
/*
* Definitions related to sockets: types, address families, options.
*/
-@@ -360,6 +362,10 @@ struct sockproto {
+@@ -360,6 +362,10 @@
#define PF_MAX AF_MAX
@@ -982,7 +956,7 @@
/*
* Definitions for network related sysctl, CTL_NET.
*
-@@ -388,6 +394,8 @@ struct sockproto {
+@@ -388,6 +394,8 @@
#endif /* __BSD_VISIBLE */
@@ -991,18 +965,16 @@
/*
* Maximum queue length specifiable by listen.
*/
-@@ -661,5 +669,6 @@ void so_listeners_apply_all(struct socke
+@@ -661,5 +669,6 @@
#endif
+#endif
#endif /* !_SYS_SOCKET_H_ */
-Index: kfreebsd-10/sys/sys/_iovec.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/_iovec.h
-+++ kfreebsd-10/sys/sys/_iovec.h
-@@ -40,9 +40,13 @@ typedef __size_t size_t;
+--- a/sys/sys/_iovec.h
++++ b/sys/sys/_iovec.h
+@@ -40,9 +40,13 @@
#define _SIZE_T_DECLARED
#endif
@@ -1016,11 +988,9 @@
+#endif
#endif /* !_SYS__IOVEC_H_ */
-Index: kfreebsd-10/sys/x86/include/_types.h
-===================================================================
---- kfreebsd-10.orig/sys/x86/include/_types.h
-+++ kfreebsd-10/sys/x86/include/_types.h
-@@ -81,7 +81,10 @@ typedef float __float_t;
+--- a/sys/x86/include/_types.h
++++ b/sys/x86/include/_types.h
+@@ -81,7 +81,10 @@
typedef __int64_t __intfptr_t;
typedef __int64_t __intptr_t;
#else
@@ -1031,7 +1001,7 @@
typedef __int32_t __critical_t;
typedef long double __double_t;
typedef long double __float_t;
-@@ -99,11 +102,15 @@ typedef __int32_t __int_least32_t;
+@@ -99,11 +102,15 @@
typedef __int64_t __int_least64_t;
#ifdef __LP64__
typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
@@ -1047,7 +1017,7 @@
typedef __uint64_t __uintfptr_t;
typedef __uint64_t __uintptr_t;
#else
-@@ -112,7 +119,9 @@ typedef __int32_t __register_t;
+@@ -112,7 +119,9 @@
typedef __int32_t __segsz_t;
typedef __uint32_t __size_t;
typedef __int32_t __ssize_t;
@@ -1057,10 +1027,8 @@
typedef __uint32_t __uintfptr_t;
typedef __uint32_t __uintptr_t;
#endif
-Index: kfreebsd-10/sys/x86/include/signal.h
-===================================================================
---- kfreebsd-10.orig/sys/x86/include/signal.h
-+++ kfreebsd-10/sys/x86/include/signal.h
+--- a/sys/x86/include/signal.h
++++ b/sys/x86/include/signal.h
@@ -46,9 +46,15 @@
#endif
@@ -1078,7 +1046,7 @@
struct sigcontext {
struct __sigset sc_mask; /* signal mask to restore */
int sc_onstack; /* sigstack state to restore */
-@@ -100,9 +106,15 @@ struct sigcontext {
+@@ -100,9 +106,15 @@
#endif /* __i386__ */
#ifdef __amd64__
@@ -1095,10 +1063,8 @@
/*
* Information pushed on stack when a signal is delivered.
* This is used by the kernel to restore state following
-Index: kfreebsd-10/sys/x86/include/endian.h
-===================================================================
---- kfreebsd-10.orig/sys/x86/include/endian.h
-+++ kfreebsd-10/sys/x86/include/endian.h
+--- a/sys/x86/include/endian.h
++++ b/sys/x86/include/endian.h
@@ -56,7 +56,9 @@
* Deprecated variants that don't have enough underscores to be useful in more
* strict namespaces.
@@ -1110,10 +1076,8 @@
#define LITTLE_ENDIAN _LITTLE_ENDIAN
#define BIG_ENDIAN _BIG_ENDIAN
#define PDP_ENDIAN _PDP_ENDIAN
-Index: kfreebsd-10/sys/x86/include/stdarg.h
-===================================================================
---- kfreebsd-10.orig/sys/x86/include/stdarg.h
-+++ kfreebsd-10/sys/x86/include/stdarg.h
+--- a/sys/x86/include/stdarg.h
++++ b/sys/x86/include/stdarg.h
@@ -34,6 +34,8 @@
#include <sys/cdefs.h>
#include <sys/_types.h>
@@ -1123,17 +1087,15 @@
#ifndef _VA_LIST_DECLARED
#define _VA_LIST_DECLARED
typedef __va_list va_list;
-@@ -74,4 +76,6 @@ typedef __va_list va_list;
+@@ -74,4 +76,6 @@
#error this file needs to be ported to your compiler
#endif
+#endif
+
#endif /* !_MACHINE_STDARG_H_ */
-Index: kfreebsd-10/sys/sys/syslimits.h
-===================================================================
---- kfreebsd-10.orig/sys/sys/syslimits.h
-+++ kfreebsd-10/sys/sys/syslimits.h
+--- a/sys/sys/syslimits.h
++++ b/sys/sys/syslimits.h
@@ -33,15 +33,6 @@
#ifndef _SYS_SYSLIMITS_H_
#define _SYS_SYSLIMITS_H_
More information about the Glibc-bsd-commits
mailing list