[Glibc-bsd-commits] r5294 - trunk/kfreebsd-11/debian/patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Thu Jan 2 18:56:11 UTC 2014
Author: rmh
Date: 2014-01-02 18:56:11 +0000 (Thu, 02 Jan 2014)
New Revision: 5294
Modified:
trunk/kfreebsd-11/debian/patches/userland.diff
Log:
Resync with kfreebsd-kernel-headers 10.0
Modified: trunk/kfreebsd-11/debian/patches/userland.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/userland.diff 2014-01-02 18:54:11 UTC (rev 5293)
+++ trunk/kfreebsd-11/debian/patches/userland.diff 2014-01-02 18:56:11 UTC (rev 5294)
@@ -483,7 +483,18 @@
#define SLIST_SWAP(head1, head2, type) do { \
struct type *swap_first = SLIST_FIRST(head1); \
-@@ -256,6 +268,7 @@
+@@ -245,8 +257,10 @@
+ struct type **stqh_last;/* addr of last next element */ \
+ }
+
++#if defined(__FreeBSD__) || defined(_KERNEL)
+ #define STAILQ_HEAD_INITIALIZER(head) \
+ { NULL, &(head).stqh_first }
++#endif
+
+ #define STAILQ_ENTRY(type) \
+ struct { \
+@@ -256,6 +270,7 @@
/*
* Singly-linked Tail queue functions.
*/
@@ -491,7 +502,7 @@
#define STAILQ_CONCAT(head1, head2) do { \
if (!STAILQ_EMPTY((head2))) { \
*(head1)->stqh_last = (head2)->stqh_first; \
-@@ -263,36 +276,44 @@
+@@ -263,36 +278,44 @@
STAILQ_INIT((head2)); \
} \
} while (0)
@@ -536,7 +547,7 @@
#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 @@
+@@ -310,6 +333,7 @@
*(head)->stqh_last = (elm); \
(head)->stqh_last = &STAILQ_NEXT((elm), field); \
} while (0)
@@ -544,7 +555,7 @@
#define STAILQ_LAST(head, type, field) \
(STAILQ_EMPTY((head)) ? NULL : \
-@@ -317,6 +339,7 @@
+@@ -317,6 +341,7 @@
#define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next)
@@ -552,7 +563,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 @@
+@@ -330,6 +355,7 @@
} \
TRASHIT(*oldnext); \
} while (0)
@@ -560,7 +571,7 @@
#define STAILQ_REMOVE_AFTER(head, elm, field) do { \
if ((STAILQ_NEXT(elm, field) = \
-@@ -337,11 +361,13 @@
+@@ -337,11 +363,13 @@
(head)->stqh_last = &STAILQ_NEXT((elm), field); \
} while (0)
@@ -574,7 +585,7 @@
#define STAILQ_SWAP(head1, head2, type) do { \
struct type *swap_first = STAILQ_FIRST(head1); \
-@@ -407,30 +433,37 @@
+@@ -407,30 +435,37 @@
#define LIST_FIRST(head) ((head)->lh_first)
@@ -612,7 +623,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 @@
+@@ -455,6 +490,7 @@
LIST_FIRST((head)) = (elm); \
(elm)->field.le_prev = &LIST_FIRST((head)); \
} while (0)
@@ -620,7 +631,7 @@
#define LIST_NEXT(elm, field) ((elm)->field.le_next)
-@@ -462,6 +496,7 @@
+@@ -462,6 +498,7 @@
((elm)->field.le_prev == &LIST_FIRST((head)) ? NULL : \
__containerof((elm)->field.le_prev, struct type, field.le_next))
@@ -628,7 +639,7 @@
#define LIST_REMOVE(elm, field) do { \
QMD_SAVELINK(oldnext, (elm)->field.le_next); \
QMD_SAVELINK(oldprev, (elm)->field.le_prev); \
-@@ -474,6 +509,7 @@
+@@ -474,6 +511,7 @@
TRASHIT(*oldnext); \
TRASHIT(*oldprev); \
} while (0)
@@ -636,7 +647,7 @@
#define LIST_SWAP(head1, head2, type, field) do { \
struct type *swap_tmp = LIST_FIRST((head1)); \
-@@ -488,22 +524,26 @@
+@@ -488,22 +526,28 @@
/*
* Tail queue declarations.
*/
@@ -649,8 +660,10 @@
}
+#endif
++#if defined(__FreeBSD__) || defined(_KERNEL)
#define TAILQ_HEAD_INITIALIZER(head) \
{ NULL, &(head).tqh_first, TRACEBUF_INITIALIZER }
++#endif
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define TAILQ_ENTRY(type) \
@@ -663,7 +676,7 @@
/*
* Tail queue functions.
-@@ -539,6 +579,7 @@
+@@ -539,6 +583,7 @@
#define QMD_TAILQ_CHECK_PREV(elm, field)
#endif /* (_KERNEL && INVARIANTS) */
@@ -671,7 +684,7 @@
#define TAILQ_CONCAT(head1, head2, field) do { \
if (!TAILQ_EMPTY(head2)) { \
*(head1)->tqh_last = (head2)->tqh_first; \
-@@ -549,51 +590,61 @@
+@@ -549,51 +594,61 @@
QMD_TRACE_HEAD(head2); \
} \
} while (0)
@@ -733,7 +746,7 @@
#define TAILQ_INIT(head) do { \
TAILQ_FIRST((head)) = NULL; \
(head)->tqh_last = &TAILQ_FIRST((head)); \
-@@ -647,6 +698,7 @@
+@@ -647,6 +702,7 @@
QMD_TRACE_HEAD(head); \
QMD_TRACE_ELEM(&(elm)->field); \
} while (0)
@@ -741,7 +754,7 @@
#define TAILQ_LAST(head, headname) \
(*(((struct headname *)((head)->tqh_last))->tqh_last))
-@@ -656,6 +708,7 @@
+@@ -656,6 +712,7 @@
#define TAILQ_PREV(elm, headname, field) \
(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
@@ -749,7 +762,7 @@
#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 @@
+@@ -673,6 +730,7 @@
TRASHIT(*oldprev); \
QMD_TRACE_ELEM(&(elm)->field); \
} while (0)
@@ -980,7 +993,21 @@
#endif /* !_SYS__IOVEC_H_ */
--- a/sys/x86/include/_types.h
+++ b/sys/x86/include/_types.h
-@@ -81,7 +81,10 @@
+@@ -43,6 +43,13 @@
+ #error this file needs sys/cdefs.h as a prerequisite
+ #endif
+
++/* What "ifdef __FreeBSD__" taketh, "ifndef __FreeBSD__" giveth */
++#ifndef __FreeBSD__
++#define __need_time_t
++#define __need_clock_t
++#include <time.h>
++#endif
++
+ #define __NO_STRICT_ALIGNMENT
+
+ /*
+@@ -81,7 +88,10 @@
typedef __int64_t __intfptr_t;
typedef __int64_t __intptr_t;
#else
@@ -991,7 +1018,7 @@
typedef __int32_t __critical_t;
typedef long double __double_t;
typedef long double __float_t;
-@@ -99,11 +102,15 @@
+@@ -99,11 +109,15 @@
typedef __int64_t __int_least64_t;
#ifdef __LP64__
typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
@@ -1007,7 +1034,7 @@
typedef __uint64_t __uintfptr_t;
typedef __uint64_t __uintptr_t;
#else
-@@ -112,7 +119,9 @@
+@@ -112,7 +126,9 @@
typedef __int32_t __segsz_t;
typedef __uint32_t __size_t;
typedef __int32_t __ssize_t;
More information about the Glibc-bsd-commits
mailing list