[Glibc-bsd-commits] r3976 - in trunk/kfreebsd-kernel-headers/debian: . patches
Robert Millan
rmh at alioth.debian.org
Tue Jan 17 19:13:05 UTC 2012
Author: rmh
Date: 2012-01-17 19:13:05 +0000 (Tue, 17 Jan 2012)
New Revision: 3976
Removed:
trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff
trunk/kfreebsd-kernel-headers/debian/patches/041_gratuitous_sbuf_include.diff
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/control
trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.diff
trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff
trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff
trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff
trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff
trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff
trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff
trunk/kfreebsd-kernel-headers/debian/patches/034_usb.diff
trunk/kfreebsd-kernel-headers/debian/patches/035_devfs_int.diff
trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff
trunk/kfreebsd-kernel-headers/debian/patches/040_internal_types.patch
trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff
trunk/kfreebsd-kernel-headers/debian/patches/series
trunk/kfreebsd-kernel-headers/debian/rules
Log:
Upgrade to kFreeBSD 9.0.
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2012-01-17 19:13:05 UTC (rev 3976)
@@ -1,3 +1,9 @@
+kfreebsd-kernel-headers (0.63) UNRELEASED; urgency=low
+
+ * Upgrade to kFreeBSD 9.0.
+
+ -- Robert Millan <rmh at debian.org> Tue, 17 Jan 2012 20:11:59 +0100
+
kfreebsd-kernel-headers (0.62) unstable; urgency=low
* Bring back dev/pci/*.h. Despite that it isn't installed on FreeBSD,
Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/control 2012-01-17 19:13:05 UTC (rev 3976)
@@ -3,7 +3,7 @@
Priority: standard
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>, Cyril Brulebois <kibi at debian.org>, Robert Millan <rmh at debian.org>
-Build-Depends: debhelper (>= 7), quilt, kfreebsd-source-8.2
+Build-Depends: debhelper (>= 7), quilt, kfreebsd-source-9.0
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-kernel-headers/
Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-kernel-headers/
Standards-Version: 3.9.2
Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -89,7 +89,7 @@
/*
* Address Resolution Protocol.
*
-@@ -74,6 +79,15 @@ struct arphdr {
+@@ -75,6 +80,15 @@
#define ar_sha(ap) (((caddr_t)((ap)+1)) + 0)
#define ar_spa(ap) (((caddr_t)((ap)+1)) + (ap)->ar_hln)
@@ -118,7 +118,7 @@
/*
* A Link-Level Sockaddr may specify the interface in one of two
* ways: either by means of a system-provided index number (computed
-@@ -68,15 +72,9 @@ struct sockaddr_dl {
+@@ -68,15 +72,9 @@
#define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen))
@@ -158,9 +158,9 @@
+#include <features.h>
+
- #include <sys/queue.h>
+ #include <sys/_callout.h>
- struct lock_object;
+ #define CALLOUT_LOCAL_ALLOC 0x0001 /* was allocated from callfree */
--- a/sys/sys/dvdio.h
+++ b/sys/sys/dvdio.h
@@ -31,6 +31,8 @@
@@ -174,7 +174,7 @@
u_int8_t book_version :4;
--- a/sys/sys/extattr.h
+++ b/sys/sys/extattr.h
-@@ -68,36 +68,36 @@ int extattr_check_cred(struct vnode *vp,
+@@ -68,36 +68,36 @@
struct ucred *cred, struct thread *td, accmode_t accmode);
#else
@@ -249,7 +249,7 @@
#include <sys/lock.h>
--- a/sys/sys/jail.h
+++ b/sys/sys/jail.h
-@@ -39,6 +39,10 @@ struct jail_v0 {
+@@ -39,6 +39,10 @@
};
#endif
@@ -260,7 +260,7 @@
struct jail {
uint32_t version;
char *path;
-@@ -108,11 +112,13 @@ struct xprison {
+@@ -108,11 +112,13 @@
struct iovec;
@@ -281,7 +281,7 @@
--- a/sys/sys/linker.h
+++ b/sys/sys/linker.h
-@@ -189,6 +189,13 @@ int linker_search_symbol_name(caddr_t va
+@@ -189,6 +189,13 @@
/* HWPMC helper */
void *linker_hwpmc_list_objects(void);
@@ -295,7 +295,7 @@
#endif /* _KERNEL */
/*
-@@ -332,14 +339,13 @@ struct kld_sym_lookup {
+@@ -336,14 +343,13 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -329,24 +329,15 @@
--- a/sys/sys/memrange.h
+++ b/sys/sys/memrange.h
-@@ -4,6 +4,11 @@
- * $FreeBSD$
- */
+@@ -7,6 +7,8 @@
+ #ifndef _SYS_MEMRANGE_H_
+ #define _SYS_MEMRANGE_H_
-+#ifndef _SYS_MEMRANGE_H_
-+#define _SYS_MEMRANGE_H_
-+
+#include <sys/types.h>
+
/* Memory range attributes */
#define MDF_UNCACHEABLE (1<<0) /* region not cached */
#define MDF_WRITECOMBINE (1<<1) /* region supports "write combine" action */
-@@ -69,3 +74,5 @@ extern int mem_range_attr_get(struct mem
- extern int mem_range_attr_set(struct mem_range_desc *mrd, int *arg);
-
- #endif
-+
-+#endif /* _SYS_MEMRANGE_H_ */
--- a/sys/sys/pciio.h
+++ b/sys/sys/pciio.h
@@ -31,6 +31,8 @@
@@ -360,7 +351,7 @@
#define PCI_MAXNAMELEN 16
--- a/sys/sys/procfs.h
+++ b/sys/sys/procfs.h
-@@ -82,4 +82,8 @@ typedef struct prpsinfo {
+@@ -89,4 +89,8 @@
typedef uint64_t psaddr_t; /* An address in the target process. */
@@ -401,7 +392,7 @@
/*
* Scheduling class information.
*/
-@@ -79,14 +82,15 @@ struct thread;
+@@ -79,14 +82,15 @@
int rtp_to_pri(struct rtprio *, struct thread *);
void pri_to_rtp(struct thread *, struct rtprio *);
#endif
@@ -422,8 +413,8 @@
#endif /* !_SYS_RTPRIO_H_ */
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
-@@ -43,6 +43,9 @@
- * not exported to user programs.
+@@ -42,6 +42,9 @@
+ * Kernel signal definitions and data structures.
*/
+#define _SIG_WORDS 4
@@ -432,15 +423,15 @@
/*
* Logical process signal actions and state, needed only within the process
* The mapping between sigacts and proc structures is 1:1 except for rfork()
-@@ -95,6 +98,7 @@ struct osigaction {
+@@ -93,6 +96,7 @@
typedef void __osiginfohandler_t(int, osiginfo_t *, void *);
- #endif /* _KERNEL && COMPAT_43 */
+ #endif /* COMPAT_43 */
+#if 0
/* additional signal action values, used only temporarily/internally */
#define SIG_CATCH ((__sighandler_t *)2)
/* #define SIG_HOLD ((__sighandler_t *)3) See signal.h */
-@@ -181,7 +185,7 @@ __sigisempty(sigset_t *set)
+@@ -181,7 +185,7 @@
int i;
for (i = 0; i < _SIG_WORDS; i++) {
@@ -449,7 +440,7 @@
return (0);
}
return (1);
-@@ -193,7 +197,7 @@ __sigseteq(sigset_t *set1, sigset_t *set
+@@ -193,7 +197,7 @@
int i;
for (i = 0; i < _SIG_WORDS; i++) {
@@ -458,7 +449,7 @@
return (0);
}
return (1);
-@@ -208,6 +212,8 @@ struct osigevent {
+@@ -208,6 +212,8 @@
union sigval sigev_value; /* Signal value */
};
@@ -469,12 +460,14 @@
siginfo_t ksi_info;
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
-@@ -36,7 +36,103 @@
+@@ -36,7 +36,105 @@
#ifndef _SYS_SYSCTL_H_
#define _SYS_SYSCTL_H_
-#include <sys/queue.h>
+#include <features.h>
++#define __need_size_t
++#include <stddef.h>
+#include <vm/vm_param.h>
+
+/**************************************** Stolen from sys/mount.h */
@@ -574,32 +567,25 @@
struct thread;
/*
-@@ -712,13 +808,21 @@ void sysctl_unlock(void);
- int sysctl_wire_old_buffer(struct sysctl_req *req, size_t len);
+@@ -790,9 +888,15 @@
+ #include <sys/cdefs.h>
- #else /* !_KERNEL */
--#include <sys/cdefs.h>
-+#define __need_size_t
-+#include <stddef.h>
-
__BEGIN_DECLS
--int sysctl(int *, u_int, void *, size_t *, void *, size_t);
--int sysctlbyname(const char *, void *, size_t *, void *, size_t);
+-int sysctl(const int *, u_int, void *, size_t *, const void *, size_t);
+-int sysctlbyname(const char *, void *, size_t *, const void *, size_t);
-int sysctlnametomib(const char *, int *, size_t *);
-+extern int sysctl(int *, u_int, void *, size_t *, void *, size_t) __THROW;
-+extern int sysctlbyname(const char *, void *, size_t *, void *, size_t) __THROW;
++extern int sysctl(const int *, u_int, void *, size_t *, const void *, size_t) __THROW;
++extern int sysctlbyname(const char *, void *, size_t *, const void *, size_t) __THROW;
+extern int sysctlnametomib(const char *, int *, size_t *) __THROW;
+#ifdef _LIBC
+extern int __sysctlbyname (const char *__name,
-+ void *__oldval, size_t *__oldlenp,
-+ void *__newval, size_t __newlen) __THROW;
++ void *__oldval, size_t *__oldlenp,
++ void *__newval, size_t __newlen) __THROW;
+extern int __sysctlnametomib (const char *__name, int *mibp, size_t *sizep) __THROW;
+#endif
__END_DECLS
-+
#endif /* _KERNEL */
- #endif /* !_SYS_SYSCTL_H_ */
--- a/sys/sys/timepps.h
+++ b/sys/sys/timepps.h
@@ -15,6 +15,8 @@
@@ -642,7 +628,7 @@
struct timespec time; /* current time (ns) (ro) */
long maxerror; /* maximum error (us) (ro) */
long esterror; /* estimated error (us) (ro) */
-@@ -225,9 +229,12 @@ void ntp_update_second(int64_t *adjustme
+@@ -225,9 +229,12 @@
#else /* !_KERNEL */
#include <sys/cdefs.h>
@@ -668,7 +654,7 @@
+#include <time.h>
#include <bsm/audit.h>
- /*
+ struct loginclass;
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -63,6 +63,8 @@
Modified: trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -33,7 +33,7 @@
+++ b/sys/net/if_media.h
@@ -38,6 +38,8 @@
#ifndef _NET_IF_MEDIA_H_
- #define _NET_IF_MEDIA_H_
+ #define _NET_IF_MEDIA_H_
+#include <stdint.h>
+
@@ -51,26 +51,6 @@
#include <sys/endian.h>
/*
---- a/sys/amd64/include/apm_bios.h
-+++ b/sys/amd64/include/apm_bios.h
-@@ -20,6 +20,7 @@
-
- #ifndef _KERNEL
- #include <sys/types.h>
-+#include <stdint.h>
- #endif
- #include <sys/ioccom.h>
-
---- a/sys/i386/include/apm_bios.h
-+++ b/sys/i386/include/apm_bios.h
-@@ -20,6 +20,7 @@
-
- #ifndef _KERNEL
- #include <sys/types.h>
-+#include <stdint.h>
- #endif
- #include <sys/ioccom.h>
-
--- a/linux/videodev.h
+++ b/linux/videodev.h
@@ -12,6 +12,7 @@
@@ -98,9 +78,9 @@
#include <sys/cdefs.h>
+#include <stdint.h>
+ #include <machine/stdarg.h>
#ifdef _KERNEL
- /*
--- a/sys/dev/acpica/acpiio.h
+++ b/sys/dev/acpica/acpiio.h
@@ -30,6 +30,8 @@
@@ -176,7 +156,7 @@
* XXX: Should really be SPECNAMELEN
--- a/sys/sys/elf_common.h
+++ b/sys/sys/elf_common.h
-@@ -29,6 +29,8 @@
+@@ -30,6 +30,8 @@
#ifndef _SYS_ELF_COMMON_H_
#define _SYS_ELF_COMMON_H_ 1
@@ -185,7 +165,7 @@
/*
* ELF definitions that are independent of architecture or word size.
*/
-@@ -43,9 +45,9 @@
+@@ -44,9 +46,9 @@
*/
typedef struct {
@@ -210,12 +190,22 @@
#define EVFILT_READ (-1)
--- a/sys/sys/pcpu.h
+++ b/sys/sys/pcpu.h
-@@ -42,6 +42,8 @@
- #include <sys/resource.h>
- #include <machine/pcpu.h>
+@@ -48,6 +48,8 @@
+ #ifdef _KERNEL
+
+#include <stdint.h>
+
/*
* Define a set for pcpu data.
*/
+--- a/sys/x86/include/apm_bios.h
++++ b/sys/x86/include/apm_bios.h
+@@ -20,6 +20,7 @@
+
+ #ifndef _KERNEL
+ #include <sys/types.h>
++#include <stdint.h>
+ #endif
+ #include <sys/ioccom.h>
+
Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -63,7 +63,7 @@
#include <sys/sx.h> /* XXX */
#include <sys/event.h> /* XXX */
#include <sys/_task.h>
-@@ -710,8 +713,19 @@
+@@ -712,8 +715,19 @@
*/
struct ifaddr {
struct sockaddr *ifa_addr; /* address of interface */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -16,7 +16,7 @@
unsigned sd_type:5 ; /* segment type */
unsigned sd_dpl:2 ; /* segment descriptor priority level */
unsigned sd_p:1 ; /* segment descriptor present */
-@@ -156,7 +156,7 @@
+@@ -163,7 +163,7 @@
*/
struct region_descriptor {
unsigned rd_limit:16; /* segment extent */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -204,7 +204,7 @@
typedef struct usb_hub_status usb_hub_status_t;
struct usb_port_status {
-@@ -702,7 +702,7 @@
+@@ -703,7 +703,7 @@
#define UPS_C_BH_PORT_RESET 0x0020
#define UPS_C_PORT_LINK_STATE 0x0040
#define UPS_C_PORT_CONFIG_ERROR 0x0080
@@ -224,31 +224,27 @@
#ifndef _SYS_CDEFS_H_
#error this file needs sys/cdefs.h as a prerequisite
#endif
-@@ -687,16 +689,11 @@
+@@ -697,11 +699,6 @@
+ void enable_intr(void);
void halt(void);
void ia32_pause(void);
- u_char inb(u_int port);
+-u_char inb(u_int port);
-u_int inl(u_int port);
--void insb(u_int port, void *addr, size_t cnt);
--void insl(u_int port, void *addr, size_t cnt);
--void insw(u_int port, void *addr, size_t cnt);
+-void insb(u_int port, void *addr, size_t count);
+-void insl(u_int port, void *addr, size_t count);
+-void insw(u_int port, void *addr, size_t count);
register_t intr_disable(void);
void intr_restore(register_t ef);
void invd(void);
- void invlpg(u_int addr);
- void invltlb(void);
--u_short inw(u_int port);
- void lidt(struct region_descriptor *addr);
- void lldt(u_short sel);
- void load_cr0(u_int cr0);
-@@ -714,11 +711,6 @@
- void load_gs(u_int sel);
+@@ -724,12 +721,6 @@
+ void load_fs(u_short sel);
+ void load_gs(u_short sel);
void ltr(u_short sel);
- void outb(u_int port, u_char data);
+-void outb(u_int port, u_char data);
-void outl(u_int port, u_int data);
--void outsb(u_int port, const void *addr, size_t cnt);
--void outsl(u_int port, const void *addr, size_t cnt);
--void outsw(u_int port, const void *addr, size_t cnt);
+-void outsb(u_int port, const void *addr, size_t count);
+-void outsl(u_int port, const void *addr, size_t count);
+-void outsw(u_int port, const void *addr, size_t count);
-void outw(u_int port, u_short data);
u_int rcr0(void);
u_int rcr2(void);
@@ -263,9 +259,9 @@
/*
* Standard type definitions.
-@@ -39,10 +40,14 @@
- typedef __int64_t __blkcnt_t; /* file block count */
+@@ -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;
@@ -278,7 +274,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) */
-@@ -93,13 +98,4 @@
+@@ -94,13 +99,4 @@
typedef __uint32_t __fixpt_t; /* fixed point number */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -85,14 +85,11 @@
/*
--- a/sys/sys/timespec.h
+++ b/sys/sys/timespec.h
-@@ -43,10 +43,7 @@
- #define _TIME_T_DECLARED
- #endif
+@@ -35,7 +35,7 @@
+ #define _SYS_TIMESPEC_H_
--struct timespec {
-- time_t tv_sec; /* seconds */
-- long tv_nsec; /* and nanoseconds */
--};
+ #include <sys/cdefs.h>
+-#include <sys/_timespec.h>
+#include <sys/time.h>
#if __BSD_VISIBLE
Modified: trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -5,7 +5,7 @@
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
-@@ -63,7 +63,6 @@
+@@ -64,7 +64,6 @@
typedef __uint8_t __sa_family_t;
typedef __uint32_t __socklen_t;
typedef long __suseconds_t; /* microseconds (signed) */
@@ -13,7 +13,7 @@
typedef struct __mq *__mqd_t; /* mq_open()... */
typedef __uint32_t __uid_t;
typedef unsigned int __useconds_t; /* microseconds (unsigned) */
-@@ -98,4 +97,62 @@
+@@ -99,4 +98,62 @@
typedef __uint32_t __fixpt_t; /* fixed point number */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -5,27 +5,27 @@
--- a/sys/amd64/include/param.h
+++ b/sys/amd64/include/param.h
-@@ -55,6 +55,10 @@
- #define _ALIGN(p) (((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES)
- #endif
+@@ -81,6 +81,10 @@
+ */
+ #define ALIGNED_POINTER(p, t) 1
+#ifndef EXEC_PAGESIZE
+#define EXEC_PAGESIZE 4096
+#endif
+
- #ifndef _NO_NAMESPACE_POLLUTION
-
- #define __HAVE_ACPI
+ /*
+ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an
+ * architecture. It should be used with appropriate caution.
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
-@@ -49,6 +49,10 @@
- #define _ALIGN(p) (((unsigned)(p) + _ALIGNBYTES) & ~_ALIGNBYTES)
- #endif
+@@ -85,6 +85,10 @@
+ */
+ #define ALIGNED_POINTER(p, t) 1
+#ifndef EXEC_PAGESIZE
+#define EXEC_PAGESIZE 4096
+#endif
+
- #ifndef _NO_NAMESPACE_POLLUTION
-
- #define __HAVE_ACPI
+ /*
+ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an
+ * architecture. It should be used with appropriate caution.
Modified: trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -5,7 +5,7 @@
--- a/sys/i386/include/_types.h
+++ b/sys/i386/include/_types.h
-@@ -39,12 +39,15 @@
+@@ -39,33 +39,15 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
@@ -18,33 +18,39 @@
#define __NO_STRICT_ALIGNMENT
-+#ifndef __GLIBC__
/*
- * Basic types upon which most other types are built.
- */
-@@ -69,18 +72,19 @@
- /* LONGLONG */
- typedef unsigned long long __uint64_t;
- #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;
+-#ifndef lint
+-__extension__
+-#endif
+-/* LONGLONG */
+-typedef long long __int64_t;
+-#ifndef lint
+-__extension__
+-#endif
+-/* LONGLONG */
+-typedef unsigned long long __uint64_t;
-
-+#endif /* __GLIBC__ */
- /*
+-/*
* Standard type definitions.
*/
--typedef unsigned long __clock_t; /* clock()... */
- typedef unsigned int __cpumask_t;
- typedef __int32_t __critical_t;
- typedef long double __double_t;
+ typedef unsigned long __clock_t; /* clock()... */
+@@ -74,7 +56,6 @@
typedef long double __float_t;
typedef __int32_t __intfptr_t;
typedef __int64_t __intmax_t;
-+#ifndef __GLIBC__
- typedef __int32_t __intptr_t;
-+#endif
+-typedef __int32_t __intptr_t;
typedef __int32_t __int_fast8_t;
typedef __int32_t __int_fast16_t;
typedef __int32_t __int_fast32_t;
-@@ -92,9 +96,11 @@
+@@ -86,9 +67,11 @@
typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
typedef __int32_t __register_t;
typedef __int32_t __segsz_t; /* segment size (in pages) */
@@ -58,7 +64,7 @@
typedef __uint32_t __uintptr_t;
--- a/sys/amd64/include/_types.h
+++ b/sys/amd64/include/_types.h
-@@ -39,12 +39,15 @@
+@@ -39,32 +39,21 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
@@ -71,31 +77,30 @@
#define __NO_STRICT_ALIGNMENT
-+#ifndef __GLIBC__
/*
- * Basic types upon which most other types are built.
- */
-@@ -56,16 +59,18 @@
- typedef unsigned int __uint32_t;
- typedef long __int64_t;
- typedef unsigned long __uint64_t;
-+#endif /* __GLIBC__ */
-
- /*
+- * 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 unsigned int __cpumask_t;
+ typedef __int32_t __clock_t; /* clock()... */
typedef __int64_t __critical_t;
typedef double __double_t;
typedef float __float_t;
-+#ifndef __GLIBC__
- typedef __int64_t __intfptr_t;
-+#endif
+-typedef __int64_t __intfptr_t;
typedef __int64_t __intmax_t;
typedef __int64_t __intptr_t;
typedef __int32_t __int_fast8_t;
-@@ -79,9 +84,11 @@
+@@ -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) */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -60,7 +60,7 @@
#define IEEE80211_FC0_VERSION_MASK 0x03
#define IEEE80211_FC0_VERSION_SHIFT 0
-@@ -218,7 +218,7 @@
+@@ -219,7 +219,7 @@
uint8_t wme_subtype; /* OUI subtype */
uint8_t wme_version; /* spec revision */
uint8_t wme_info; /* QoS info */
@@ -69,7 +69,7 @@
/*
* WME/802.11e Tspec Element
-@@ -246,7 +246,7 @@
+@@ -247,7 +247,7 @@
uint8_t ts_delay[4];
uint8_t ts_surplus[2];
uint8_t ts_medium_time[2];
@@ -78,7 +78,7 @@
/*
* WME AC parameter field
-@@ -255,7 +255,7 @@
+@@ -256,7 +256,7 @@
uint8_t acp_aci_aifsn;
uint8_t acp_logcwminmax;
uint16_t acp_txop;
@@ -87,7 +87,7 @@
#define WME_NUM_AC 4 /* 4 AC categories */
#define WME_NUM_TID 16 /* 16 tids */
-@@ -297,7 +297,7 @@
+@@ -298,7 +298,7 @@
#define WME_QOSINFO_COUNT 0x0f /* Mask for param count field */
uint8_t param_reserved;
struct ieee80211_wme_acparams params_acParams[WME_NUM_AC];
@@ -96,7 +96,7 @@
/*
* Management Notification Frame
-@@ -307,7 +307,7 @@
+@@ -308,7 +308,7 @@
uint8_t mnf_action;
uint8_t mnf_dialog;
uint8_t mnf_status;
@@ -105,7 +105,7 @@
#define MNF_SETUP_REQ 0
#define MNF_SETUP_RESP 1
#define MNF_TEARDOWN 2
-@@ -319,7 +319,7 @@
+@@ -320,7 +320,7 @@
struct ieee80211_action {
uint8_t ia_category;
uint8_t ia_action;
@@ -114,7 +114,7 @@
#define IEEE80211_ACTION_CAT_SM 0 /* Spectrum Management */
#define IEEE80211_ACTION_CAT_QOS 1 /* QoS */
-@@ -335,7 +335,7 @@
+@@ -336,7 +336,7 @@
struct ieee80211_action_ht_txchwidth {
struct ieee80211_action at_header;
uint8_t at_chwidth;
@@ -123,7 +123,7 @@
#define IEEE80211_A_HT_TXCHWIDTH_20 0
#define IEEE80211_A_HT_TXCHWIDTH_2040 1
-@@ -344,7 +344,7 @@
+@@ -345,7 +345,7 @@
struct ieee80211_action_ht_mimopowersave {
struct ieee80211_action am_header;
uint8_t am_control;
@@ -132,7 +132,7 @@
#define IEEE80211_A_HT_MIMOPWRSAVE_ENA 0x01 /* PS enabled */
#define IEEE80211_A_HT_MIMOPWRSAVE_MODE 0x02
-@@ -388,7 +388,7 @@
+@@ -389,7 +389,7 @@
uint16_t rq_baparamset;
uint16_t rq_batimeout; /* in TUs */
uint16_t rq_baseqctl;
@@ -141,7 +141,7 @@
/* BA - ADDBA response */
struct ieee80211_action_ba_addbaresponse {
-@@ -397,14 +397,14 @@
+@@ -398,14 +398,14 @@
uint16_t rs_statuscode;
uint16_t rs_baparamset;
uint16_t rs_batimeout; /* in TUs */
@@ -158,7 +158,7 @@
/* BAR Control */
#define IEEE80211_BAR_TID 0xf000 /* TID */
-@@ -420,7 +420,7 @@
+@@ -421,7 +421,7 @@
struct ieee80211_ba_request {
uint16_t rq_barctl;
uint16_t rq_barseqctl;
@@ -167,7 +167,7 @@
/*
* Control frames.
-@@ -431,7 +431,7 @@
+@@ -432,7 +432,7 @@
uint8_t i_addr1[IEEE80211_ADDR_LEN];
uint8_t i_addr2[IEEE80211_ADDR_LEN];
/* FCS */
@@ -176,7 +176,7 @@
struct ieee80211_frame_rts {
uint8_t i_fc[2];
-@@ -439,21 +439,21 @@
+@@ -440,21 +440,21 @@
uint8_t i_ra[IEEE80211_ADDR_LEN];
uint8_t i_ta[IEEE80211_ADDR_LEN];
/* FCS */
@@ -201,7 +201,7 @@
struct ieee80211_frame_pspoll {
uint8_t i_fc[2];
-@@ -461,7 +461,7 @@
+@@ -462,7 +462,7 @@
uint8_t i_bssid[IEEE80211_ADDR_LEN];
uint8_t i_ta[IEEE80211_ADDR_LEN];
/* FCS */
@@ -210,7 +210,7 @@
struct ieee80211_frame_cfend { /* NB: also CF-End+CF-Ack */
uint8_t i_fc[2];
-@@ -469,7 +469,7 @@
+@@ -470,7 +470,7 @@
uint8_t i_ra[IEEE80211_ADDR_LEN];
uint8_t i_bssid[IEEE80211_ADDR_LEN];
/* FCS */
@@ -219,7 +219,7 @@
struct ieee80211_frame_bar {
uint8_t i_fc[2];
-@@ -479,7 +479,7 @@
+@@ -480,7 +480,7 @@
uint16_t i_ctl;
uint16_t i_seq;
/* FCS */
@@ -228,7 +228,7 @@
/*
* BEACON management packets
-@@ -536,7 +536,7 @@
+@@ -537,7 +537,7 @@
uint16_t wpa_caps; /* 802.11i capabilities */
uint16_t wpa_pmkidcnt; /* 802.11i pmkid count */
uint16_t wpa_pmkids[8]; /* 802.11i pmkids */
@@ -237,7 +237,7 @@
/*
* 802.11n HT Capability IE
-@@ -551,7 +551,7 @@
+@@ -552,7 +552,7 @@
uint16_t hc_extcap; /* extended HT capabilities */
uint32_t hc_txbf; /* txbf capabilities */
uint8_t hc_antenna; /* antenna capabilities */
@@ -246,7 +246,7 @@
/* HT capability flags (ht_cap) */
#define IEEE80211_HTCAP_LDPC 0x0001 /* LDPC supported */
-@@ -631,7 +631,7 @@
+@@ -632,7 +632,7 @@
uint8_t hi_byte3; /* ht ie byte 3 */
uint16_t hi_byte45; /* ht ie bytes 4+5 */
uint8_t hi_basicmcsset[16]; /* basic MCS set */
@@ -255,7 +255,7 @@
/* byte1 */
#define IEEE80211_HTINFO_2NDCHAN 0x03 /* secondary/ext chan offset */
-@@ -740,7 +740,7 @@
+@@ -741,7 +741,7 @@
uint8_t tim_period; /* DTIM period */
uint8_t tim_bitctl; /* bitmap control */
uint8_t tim_bitmap[1]; /* variable-length bitmap */
@@ -264,7 +264,7 @@
struct ieee80211_country_ie {
uint8_t ie; /* IEEE80211_ELEMID_COUNTRY */
-@@ -750,8 +750,8 @@
+@@ -751,8 +751,8 @@
uint8_t schan; /* starting channel */
uint8_t nchan; /* number channels */
uint8_t maxtxpwr; /* tx power cap */
@@ -275,7 +275,7 @@
#define IEEE80211_COUNTRY_MAX_BANDS 84 /* max possible bands */
#define IEEE80211_COUNTRY_MAX_SIZE \
-@@ -766,7 +766,7 @@
+@@ -767,7 +767,7 @@
uint8_t csa_mode; /* Channel Switch Mode */
uint8_t csa_newchan; /* New Channel Number */
uint8_t csa_count; /* Channel Switch Count */
@@ -286,7 +286,7 @@
* Note the min acceptable CSA count is used to guard against
--- a/sys/sys/ata.h
+++ b/sys/sys/ata.h
-@@ -185,7 +185,7 @@
+@@ -186,7 +186,7 @@
#define ATA_SUPPORT_WRITEDMAQFUAEXT 0x0080
#define ATA_SUPPORT_64BITWWN 0x0100
#define ATA_SUPPORT_UNLOAD 0x2000
@@ -295,7 +295,7 @@
/*088*/ u_int16_t udmamodes; /* UltraDMA modes */
/*089*/ u_int16_t erase_time;
-@@ -258,7 +258,7 @@
+@@ -259,7 +259,7 @@
/*223*/ u_int16_t transport_minor;
u_int16_t reserved224[31];
/*255*/ u_int16_t integrity;
@@ -304,7 +304,7 @@
/* ATA transfer modes */
-@@ -474,7 +474,7 @@
+@@ -475,7 +475,7 @@
u_int8_t specific1; /* sense key specific */
u_int8_t specific2; /* sense key specific */
@@ -438,9 +438,9 @@
-} __packed;
+} __attribute__((__packed__));
- /*
- * System segment descriptors (128 bit wide)
-@@ -86,11 +86,11 @@
+ #define USD_GETBASE(sd) (((sd)->sd_lobase) | (sd)->sd_hibase << 24)
+ #define USD_SETBASE(sd, b) (sd)->sd_lobase = (b); \
+@@ -93,11 +93,11 @@
u_int64_t sd_hilimit:4; /* segment extent (msb) */
u_int64_t sd_xx0:3; /* unused */
u_int64_t sd_gran:1; /* limit granularity (byte/page units)*/
@@ -454,7 +454,7 @@
/*
* Gate descriptors (e.g. indirect descriptors, trap, interrupt etc. 128 bit)
-@@ -104,9 +104,9 @@
+@@ -111,9 +111,9 @@
u_int64_t gd_type:5; /* segment type */
u_int64_t gd_dpl:2; /* segment descriptor priority level */
u_int64_t gd_p:1; /* segment descriptor present */
@@ -466,7 +466,7 @@
/*
* Generic descriptor
-@@ -167,15 +167,15 @@
+@@ -174,15 +174,15 @@
unsigned long ssd_long:1; /* long mode (for %cs) */
unsigned long ssd_def32:1; /* default 32 vs 16 bit size */
unsigned long ssd_gran:1; /* limit granularity (byte/page units)*/
Modified: trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -4,7 +4,7 @@
--- a/sys/sys/iconv.h
+++ b/sys/sys/iconv.h
-@@ -94,7 +94,7 @@
+@@ -88,7 +88,7 @@
#define ENCODING_UNICODE "UTF-16BE"
#define KICONV_VENDOR_MICSFT 1 /* Microsoft Vendor Code for quirk */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -12,7 +12,7 @@
#include <sys/queue.h>
#endif
-@@ -268,10 +269,10 @@
+@@ -259,10 +260,10 @@
void dev_rel(struct cdev *dev);
void dev_strategy(struct cdev *dev, struct buf *bp);
struct cdev *make_dev(struct cdevsw *_devsw, int _unit, uid_t _uid, gid_t _gid,
@@ -22,10 +22,10 @@
struct ucred *_cr, uid_t _uid, gid_t _gid, int _perms,
- const char *_fmt, ...) __printflike(7, 8);
+ const char *_fmt, ...);
- #define MAKEDEV_REF 0x01
- #define MAKEDEV_WHTOUT 0x02
- #define MAKEDEV_NOWAIT 0x04
-@@ -280,12 +281,11 @@
+ #define MAKEDEV_REF 0x01
+ #define MAKEDEV_WHTOUT 0x02
+ #define MAKEDEV_NOWAIT 0x04
+@@ -272,14 +273,14 @@
struct cdev *make_dev_credf(int _flags,
struct cdevsw *_devsw, int _unit,
struct ucred *_cr, uid_t _uid, gid_t _gid, int _mode,
@@ -34,10 +34,12 @@
int make_dev_p(int _flags, struct cdev **_cdev, struct cdevsw *_devsw,
struct ucred *_cr, uid_t _uid, gid_t _gid, int _mode,
- const char *_fmt, ...) __printflike(8, 9);
--struct cdev *make_dev_alias(struct cdev *_pdev, const char *_fmt, ...)
-- __printflike(2, 3);
+ const char *_fmt, ...);
-+struct cdev *make_dev_alias(struct cdev *_pdev, const char *_fmt, ...);
- void dev_lock(void);
- void dev_unlock(void);
- void setconf(void);
+ struct cdev *make_dev_alias(struct cdev *_pdev, const char *_fmt, ...)
+ __printflike(2, 3);
+ int make_dev_alias_p(int _flags, struct cdev **_cdev, struct cdev *_pdev,
+- const char *_fmt, ...) __printflike(4, 5);
++ const char *_fmt, ...);
+ int make_dev_physpath_alias(int _flags, struct cdev **_cdev,
+ struct cdev *_pdev, struct cdev *_old_alias,
+ const char *_physpath);
Modified: trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -4,7 +4,7 @@
--- a/sys/contrib/pf/net/pfvar.h
+++ b/sys/contrib/pf/net/pfvar.h
-@@ -40,13 +40,14 @@
+@@ -39,13 +39,14 @@
#include <sys/tree.h>
#if 1
#include <sys/lock.h>
@@ -20,9 +20,9 @@
#if 1
#include <net/if_clone.h>
#include <net/pf_mtag.h>
-@@ -54,6 +55,7 @@
+@@ -53,6 +54,7 @@
#else
-
+ #include <netinet/ip_ipsp.h>
#endif
+#endif
Modified: trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -4,11 +4,11 @@
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
-@@ -205,7 +205,6 @@
- int quotaon(struct thread *td, struct mount *, int, void *);
+@@ -237,7 +237,6 @@
int setquota(struct thread *, struct mount *, u_long, int, void *);
int setuse(struct thread *, struct mount *, u_long, int, void *);
+ int getquotasize(struct thread *, struct mount *, u_long, int, void *);
-vfs_quotactl_t ufs_quotactl;
- #else /* !_KERNEL */
-
+ #ifdef SOFTUPDATES
+ int quotaref(struct vnode *, struct dquot **);
Modified: trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -4,16 +4,16 @@
--- a/sys/sys/pcpu.h
+++ b/sys/sys/pcpu.h
-@@ -41,6 +41,8 @@
+@@ -42,6 +42,8 @@
#include <sys/vmmeter.h>
#include <sys/resource.h>
#include <machine/pcpu.h>
+#include <sys/_types.h>
+#include <stdint.h>
- #include <stdint.h>
-
-@@ -152,7 +154,7 @@
+ #define DPCPU_SETNAME "set_pcpu"
+ #define DPCPU_SYMPREFIX "pcpu_entry_"
+@@ -160,7 +162,7 @@
struct thread *pc_fpcurthread; /* Fp state owner */
struct thread *pc_deadthread; /* Zombie thread or NULL */
struct pcb *pc_curpcb; /* Current pcb */
@@ -21,4 +21,4 @@
+ u_int64_t pc_switchtime; /* cpu_ticks() at last csw */
int pc_switchticks; /* `ticks' at last csw */
u_int pc_cpuid; /* This cpu number */
- cpumask_t pc_cpumask; /* This cpu mask */
+ STAILQ_ENTRY(pcpu) pc_allcpu;
Modified: trunk/kfreebsd-kernel-headers/debian/patches/034_usb.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/034_usb.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/034_usb.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -8,7 +8,7 @@
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
-@@ -752,4 +752,12 @@
+@@ -753,4 +753,12 @@
USB_STATE_CONFIGURED,
};
#define USB_STATE_MAX (USB_STATE_CONFIGURED+1)
Modified: trunk/kfreebsd-kernel-headers/debian/patches/035_devfs_int.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/035_devfs_int.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/035_devfs_int.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -4,7 +4,7 @@
--- a/sys/fs/devfs/devfs_int.h
+++ b/sys/fs/devfs/devfs_int.h
-@@ -68,6 +68,9 @@
+@@ -69,6 +69,9 @@
LIST_HEAD(, cdev_privdata) cdp_fdpriv;
};
@@ -13,4 +13,4 @@
+
#define cdev2priv(c) member2struct(cdev_priv, cdp_c, c)
- struct cdev *devfs_alloc(int);
+ struct cdev *devfs_alloc(int);
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -1,737 +0,0 @@
----
- sys/amd64/include/_types.h | 2 +-
- sys/amd64/include/atomic.h | 4 ++--
- sys/amd64/include/bus.h | 38 +++++++++++++++++++-------------------
- sys/amd64/include/cpufunc.h | 2 +-
- sys/amd64/include/endian.h | 2 +-
- sys/amd64/include/ieeefp.h | 4 ++--
- sys/amd64/include/pcpu.h | 2 +-
- sys/amd64/include/profile.h | 6 +++---
- sys/amd64/include/stdarg.h | 2 +-
- sys/amd64/include/varargs.h | 4 ++--
- sys/i386/include/_types.h | 4 ++--
- sys/i386/include/atomic.h | 4 ++--
- sys/i386/include/bus.h | 38 +++++++++++++++++++-------------------
- sys/i386/include/cpufunc.h | 2 +-
- sys/i386/include/endian.h | 2 +-
- sys/i386/include/ieeefp.h | 2 +-
- sys/i386/include/in_cksum.h | 4 ++--
- sys/i386/include/pcpu.h | 2 +-
- sys/i386/include/profile.h | 6 +++---
- sys/i386/include/stdarg.h | 4 ++--
- sys/i386/include/varargs.h | 4 ++--
- sys/mips/include/_types.h | 6 +++---
- sys/mips/include/endian.h | 2 +-
- sys/sys/linker_set.h | 2 +-
- 24 files changed, 74 insertions(+), 74 deletions(-)
-
---- a/sys/amd64/include/atomic.h
-+++ b/sys/amd64/include/atomic.h
-@@ -71,7 +71,7 @@
- * Kernel modules call real functions which are built into the kernel.
- * This allows kernel modules to be portable between UP and SMP systems.
- */
--#if defined(KLD_MODULE) || !defined(__GNUCLIKE_ASM)
-+#if defined(KLD_MODULE) || !defined(__GNUC__)
- #define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \
- void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v); \
- void atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v)
-@@ -303,7 +303,7 @@
- #ifndef WANT_FUNCTIONS
-
- /* Read the current value and store a zero in the destination. */
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
-
- static __inline u_int
- atomic_readandclear_int(volatile u_int *addr)
---- a/sys/amd64/include/bus.h
-+++ b/sys/amd64/include/bus.h
-@@ -272,7 +272,7 @@
- if (tag == AMD64_BUS_SPACE_IO)
- insb(bsh + offset, addr, count);
- else {
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: movb (%2),%%al \n\
-@@ -293,7 +293,7 @@
- if (tag == AMD64_BUS_SPACE_IO)
- insw(bsh + offset, addr, count);
- else {
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: movw (%2),%%ax \n\
-@@ -314,7 +314,7 @@
- if (tag == AMD64_BUS_SPACE_IO)
- insl(bsh + offset, addr, count);
- else {
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: movl (%2),%%eax \n\
-@@ -359,7 +359,7 @@
-
- if (tag == AMD64_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: inb %w2,%%al \n\
-@@ -372,7 +372,7 @@
- #endif
- } else {
- bus_space_handle_t _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- repne \n\
-@@ -391,7 +391,7 @@
-
- if (tag == AMD64_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: inw %w2,%%ax \n\
-@@ -404,7 +404,7 @@
- #endif
- } else {
- bus_space_handle_t _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- repne \n\
-@@ -423,7 +423,7 @@
-
- if (tag == AMD64_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: inl %w2,%%eax \n\
-@@ -436,7 +436,7 @@
- #endif
- } else {
- bus_space_handle_t _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- repne \n\
-@@ -536,7 +536,7 @@
- if (tag == AMD64_BUS_SPACE_IO)
- outsb(bsh + offset, addr, count);
- else {
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: lodsb \n\
-@@ -557,7 +557,7 @@
- if (tag == AMD64_BUS_SPACE_IO)
- outsw(bsh + offset, addr, count);
- else {
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: lodsw \n\
-@@ -578,7 +578,7 @@
- if (tag == AMD64_BUS_SPACE_IO)
- outsl(bsh + offset, addr, count);
- else {
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: lodsl \n\
-@@ -624,7 +624,7 @@
-
- if (tag == AMD64_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: lodsb \n\
-@@ -637,7 +637,7 @@
- #endif
- } else {
- bus_space_handle_t _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- repne \n\
-@@ -656,7 +656,7 @@
-
- if (tag == AMD64_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: lodsw \n\
-@@ -669,7 +669,7 @@
- #endif
- } else {
- bus_space_handle_t _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- repne \n\
-@@ -688,7 +688,7 @@
-
- if (tag == AMD64_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: lodsl \n\
-@@ -701,7 +701,7 @@
- #endif
- } else {
- bus_space_handle_t _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- repne \n\
-@@ -996,7 +996,7 @@
- bus_space_barrier(bus_space_tag_t tag __unused, bus_space_handle_t bsh __unused,
- bus_size_t offset __unused, bus_size_t len __unused, int flags)
- {
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- if (flags & BUS_SPACE_BARRIER_READ)
- __asm __volatile("lock; addl $0,0(%%rsp)" : : : "memory");
- else
---- a/sys/amd64/include/cpufunc.h
-+++ b/sys/amd64/include/cpufunc.h
-@@ -57,7 +57,7 @@
- #define writel(va, d) (*(volatile u_int32_t *) (va) = (d))
- #define writeq(va, d) (*(volatile u_int64_t *) (va) = (d))
-
--#if defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE)
-+#if defined(__GNUC__) && defined(__CC_SUPPORTS___INLINE)
-
- static __inline void
- breakpoint(void)
---- a/sys/amd64/include/endian.h
-+++ b/sys/amd64/include/endian.h
-@@ -67,7 +67,7 @@
- #define BYTE_ORDER _BYTE_ORDER
- #endif
-
--#if defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE_BUILTIN_CONSTANT_P)
-+#if defined(__GNUC__)
-
- #define __byte_swap_int_var(x) \
- __extension__ ({ register __uint32_t __X = (x); \
---- a/sys/amd64/include/ieeefp.h
-+++ b/sys/amd64/include/ieeefp.h
-@@ -122,7 +122,7 @@
- #define SSE_RND_OFF 13 /* rounding control offset */
- #define SSE_FZ_OFF 15 /* flush to zero offset */
-
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
-
- #define __fldcw(addr) __asm __volatile("fldcw %0" : : "m" (*(addr)))
- #define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr)))
-@@ -277,7 +277,7 @@
-
- #endif /* __GNUCLIKE_ASM */
-
--#if !defined(__IEEEFP_NOINLINES__) && defined(__GNUCLIKE_ASM)
-+#if !defined(__IEEEFP_NOINLINES__) && defined(__GNUC__)
-
- #define fpgetmask() __fpgetmask()
- #define fpgetprec() __fpgetprec()
---- a/sys/amd64/include/pcpu.h
-+++ b/sys/amd64/include/pcpu.h
-@@ -93,7 +93,7 @@
- #define PCPU_PTR(member) (&pcpup->pc_ ## member)
- #define PCPU_SET(member, val) (pcpup->pc_ ## member = (val))
-
--#elif defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF)
-+#elif defined(__GNUC__) && defined(__GNUC__)
-
- /*
- * Evaluates to the byte offset of the per-cpu variable name.
---- a/sys/amd64/include/profile.h
-+++ b/sys/amd64/include/profile.h
-@@ -59,7 +59,7 @@
- #define MCOUNT_DECL(s)
- #define MCOUNT_ENTER(s)
- #define MCOUNT_EXIT(s)
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- #define MCOUNT_OVERHEAD(label) \
- __asm __volatile("pushq %0; call __mcount; popq %%rcx" \
- : \
-@@ -114,7 +114,7 @@
- static void _mcount(uintfptr_t frompc, uintfptr_t selfpc) __used; \
- static void _mcount
-
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- #define MCOUNT __asm(" \n\
- .text \n\
- .p2align 4,0x90 \n\
-@@ -193,7 +193,7 @@
- #include <sys/cdefs.h>
-
- __BEGIN_DECLS
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- void mcount(void) __asm(".mcount");
- #endif
- __END_DECLS
---- a/sys/amd64/include/stdarg.h
-+++ b/sys/amd64/include/stdarg.h
-@@ -39,7 +39,7 @@
- typedef __va_list va_list;
- #endif
-
--#ifdef __GNUCLIKE_BUILTIN_STDARG
-+#ifdef __GNUC__
-
- #define va_start(ap, last) \
- __builtin_va_start((ap), (last))
---- a/sys/amd64/include/_types.h
-+++ b/sys/amd64/include/_types.h
-@@ -110,7 +110,7 @@
- /*
- * Unusual type definitions.
- */
--#ifdef __GNUCLIKE_BUILTIN_VARARGS
-+#ifdef __GNUC__
- typedef __builtin_va_list __va_list; /* internally known to gcc */
- #elif defined(lint)
- typedef char * __va_list; /* pretend */
---- a/sys/amd64/include/varargs.h
-+++ b/sys/amd64/include/varargs.h
-@@ -47,7 +47,7 @@
- #error this file needs sys/cdefs.h as a prerequisite
- #endif
-
--#ifdef __GNUCLIKE_BUILTIN_VARARGS
-+#ifdef __GNUC__
-
- #include <sys/_types.h>
-
-@@ -71,7 +71,7 @@
- #define __va_size(type) \
- (((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
-
--#if defined(__GNUCLIKE_BUILTIN_VAALIST)
-+#if defined(__GNUC__)
- #define va_alist __builtin_va_alist
- #endif
- #define va_dcl int va_alist; ...
---- a/sys/i386/include/atomic.h
-+++ b/sys/i386/include/atomic.h
-@@ -71,7 +71,7 @@
- * Kernel modules call real functions which are built into the kernel.
- * This allows kernel modules to be portable between UP and SMP systems.
- */
--#if defined(KLD_MODULE) || !defined(__GNUCLIKE_ASM)
-+#if defined(KLD_MODULE) || !defined(__GNUC__)
- #define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \
- void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v); \
- void atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v)
-@@ -307,7 +307,7 @@
- }
-
- /* Read the current value and store a zero in the destination. */
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
-
- static __inline u_int
- atomic_readandclear_int(volatile u_int *addr)
---- a/sys/i386/include/bus.h
-+++ b/sys/i386/include/bus.h
-@@ -276,7 +276,7 @@
- if (tag == I386_BUS_SPACE_IO)
- insb(bsh + offset, addr, count);
- else {
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: movb (%2),%%al \n\
-@@ -301,7 +301,7 @@
- if (tag == I386_BUS_SPACE_IO)
- insw(bsh + offset, addr, count);
- else {
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: movw (%2),%%ax \n\
-@@ -326,7 +326,7 @@
- if (tag == I386_BUS_SPACE_IO)
- insl(bsh + offset, addr, count);
- else {
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: movl (%2),%%eax \n\
-@@ -375,7 +375,7 @@
-
- if (tag == I386_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: inb %w2,%%al \n\
-@@ -392,7 +392,7 @@
- #endif
- } else {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- repne \n\
-@@ -415,7 +415,7 @@
-
- if (tag == I386_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: inw %w2,%%ax \n\
-@@ -432,7 +432,7 @@
- #endif
- } else {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- repne \n\
-@@ -455,7 +455,7 @@
-
- if (tag == I386_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: inl %w2,%%eax \n\
-@@ -472,7 +472,7 @@
- #endif
- } else {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- repne \n\
-@@ -576,7 +576,7 @@
- if (tag == I386_BUS_SPACE_IO)
- outsb(bsh + offset, addr, count);
- else {
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: lodsb \n\
-@@ -601,7 +601,7 @@
- if (tag == I386_BUS_SPACE_IO)
- outsw(bsh + offset, addr, count);
- else {
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: lodsw \n\
-@@ -626,7 +626,7 @@
- if (tag == I386_BUS_SPACE_IO)
- outsl(bsh + offset, addr, count);
- else {
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: lodsl \n\
-@@ -676,7 +676,7 @@
-
- if (tag == I386_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: lodsb \n\
-@@ -693,7 +693,7 @@
- #endif
- } else {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- repne \n\
-@@ -716,7 +716,7 @@
-
- if (tag == I386_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: lodsw \n\
-@@ -733,7 +733,7 @@
- #endif
- } else {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- repne \n\
-@@ -756,7 +756,7 @@
-
- if (tag == I386_BUS_SPACE_IO) {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- 1: lodsl \n\
-@@ -773,7 +773,7 @@
- #endif
- } else {
- int _port_ = bsh + offset;
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- __asm __volatile(" \n\
- cld \n\
- repne \n\
-@@ -1072,7 +1072,7 @@
- bus_space_barrier(bus_space_tag_t tag __unused, bus_space_handle_t bsh __unused,
- bus_size_t offset __unused, bus_size_t len __unused, int flags)
- {
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- if (flags & BUS_SPACE_BARRIER_READ)
- __asm __volatile("lock; addl $0,0(%%esp)" : : : "memory");
- else
---- a/sys/i386/include/cpufunc.h
-+++ b/sys/i386/include/cpufunc.h
-@@ -69,7 +69,7 @@
- #define writew(va, d) (*(volatile u_int16_t *) (va) = (d))
- #define writel(va, d) (*(volatile u_int32_t *) (va) = (d))
-
--#if defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE)
-+#if defined(__GNUC__) && defined(__CC_SUPPORTS___INLINE)
-
- static __inline void
- breakpoint(void)
---- a/sys/i386/include/endian.h
-+++ b/sys/i386/include/endian.h
-@@ -67,7 +67,7 @@
- #define BYTE_ORDER _BYTE_ORDER
- #endif
-
--#if defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE_BUILTIN_CONSTANT_P)
-+#if defined(__GNUC__)
-
- #define __byte_swap_int_var(x) \
- __extension__ ({ register __uint32_t __X = (x); \
---- a/sys/i386/include/ieeefp.h
-+++ b/sys/i386/include/ieeefp.h
-@@ -104,7 +104,7 @@
- */
- #define FP_STKY_OFF 0 /* sticky flags offset */
-
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
-
- #define __fldcw(addr) __asm __volatile("fldcw %0" : : "m" (*(addr)))
- #define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr)))
---- a/sys/i386/include/in_cksum.h
-+++ b/sys/i386/include/in_cksum.h
-@@ -53,7 +53,7 @@
- * in the normal case (where there are no options and the header length is
- * therefore always exactly five 32-bit words.
- */
--#if defined(__GNUCLIKE_ASM) && !defined(__INTEL_COMPILER)
-+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
- static __inline u_int
- in_cksum_hdr(const struct ip *ip)
- {
-@@ -131,7 +131,7 @@
- #endif
-
- #ifdef _KERNEL
--#if !defined(__GNUCLIKE_ASM) || defined(__INTEL_COMPILER)
-+#if !defined(__GNUC__) || defined(__INTEL_COMPILER)
- u_int in_cksum_hdr(const struct ip *ip);
- u_short in_addword(u_short sum, u_short b);
- u_short in_pseudo(u_int sum, u_int b, u_int c);
---- a/sys/i386/include/pcpu.h
-+++ b/sys/i386/include/pcpu.h
-@@ -103,7 +103,7 @@
- #define PCPU_PTR(member) (&pcpup->pc_ ## member)
- #define PCPU_SET(member, val) (pcpup->pc_ ## member = (val))
-
--#elif defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF)
-+#elif __GNUC__
-
- /*
- * Evaluates to the byte offset of the per-cpu variable name.
---- a/sys/i386/include/profile.h
-+++ b/sys/i386/include/profile.h
-@@ -59,7 +59,7 @@
- #define MCOUNT_DECL(s)
- #define MCOUNT_ENTER(s)
- #define MCOUNT_EXIT(s)
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- #define MCOUNT_OVERHEAD(label) \
- __asm __volatile("pushl %0; call __mcount; popl %%ecx" \
- : \
-@@ -112,7 +112,7 @@
-
- #define _MCOUNT_DECL static __inline void _mcount
-
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- #define MCOUNT \
- void \
- mcount() \
-@@ -167,7 +167,7 @@
- #include <sys/cdefs.h>
-
- __BEGIN_DECLS
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- void mcount(void) __asm(".mcount");
- #endif
- __END_DECLS
---- a/sys/i386/include/stdarg.h
-+++ b/sys/i386/include/stdarg.h
-@@ -46,7 +46,7 @@
- typedef __va_list va_list;
- #endif
-
--#ifdef __GNUCLIKE_BUILTIN_STDARG
-+#ifdef __GNUC__
-
- #define va_start(ap, last) \
- __builtin_va_start((ap), (last))
-@@ -67,7 +67,7 @@
- #define __va_size(type) \
- (((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
-
--#ifdef __GNUCLIKE_BUILTIN_NEXT_ARG
-+#ifdef __GNUC__
- #define va_start(ap, last) \
- ((ap) = (va_list)__builtin_next_arg(last))
- #else /* !__GNUCLIKE_BUILTIN_NEXT_ARG */
---- a/sys/i386/include/_types.h
-+++ b/sys/i386/include/_types.h
-@@ -63,7 +63,7 @@
- typedef long long __int64_t;
- /* LONGLONG */
- typedef unsigned long long __uint64_t;
--#elif defined(__GNUCLIKE_ATTRIBUTE_MODE_DI)
-+#elif defined(__GNUC__)
- typedef int __attribute__((__mode__(__DI__))) __int64_t;
- typedef unsigned int __attribute__((__mode__(__DI__))) __uint64_t;
- #else
-@@ -126,7 +126,7 @@
- /*
- * Unusual type definitions.
- */
--#ifdef __GNUCLIKE_BUILTIN_VARARGS
-+#ifdef __GNUC__
- typedef __builtin_va_list __va_list; /* internally known to gcc */
- #else
- typedef char * __va_list;
---- a/sys/i386/include/varargs.h
-+++ b/sys/i386/include/varargs.h
-@@ -43,7 +43,7 @@
- #error this file needs sys/cdefs.h as a prerequisite
- #endif
-
--#ifdef __GNUCLIKE_BUILTIN_VARARGS
-+#ifdef __GNUC__
-
- #include <sys/_types.h>
-
-@@ -67,7 +67,7 @@
- #define __va_size(type) \
- (((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
-
--#if defined(__GNUCLIKE_BUILTIN_VAALIST)
-+#if defined(__GNUC__)
- #define va_alist __builtin_va_alist
- #endif
- #ifdef __CC_SUPPORTS_VARADIC_XXX
---- a/sys/sys/linker_set.h
-+++ b/sys/sys/linker_set.h
-@@ -43,7 +43,7 @@
- /*
- * Private macros, not to be used outside this header file.
- */
--#ifdef __GNUCLIKE___SECTION
-+#ifdef __GNUC__
- #define __MAKE_SET(set, sym) \
- __GLOBL(__CONCAT(__start_set_,set)); \
- __GLOBL(__CONCAT(__stop_set_,set)); \
---- a/sys/mips/include/endian.h
-+++ b/sys/mips/include/endian.h
-@@ -68,7 +68,7 @@
- #endif
-
- #ifndef __ASSEMBLER__
--#if defined(__GNUCLIKE_BUILTIN_CONSTANT_P) && defined(__OPTIMIZE__)
-+#if defined(__GNUC__) && defined(__OPTIMIZE__)
- #define __is_constant(x) __builtin_constant_p(x)
- #else
- #define __is_constant(x) 0
---- a/sys/mips/include/_types.h
-+++ b/sys/mips/include/_types.h
-@@ -63,7 +63,7 @@
- typedef long long __int64_t;
- /* LONGLONG */
- typedef unsigned long long __uint64_t;
--#elif defined(__GNUCLIKE_ATTRIBUTE_MODE_DI)
-+#elif defined(__GNUC__)
- typedef int __attribute__((__mode__(__DI__))) __int64_t;
- typedef unsigned int __attribute__((__mode__(__DI__))) __uint64_t;
- #else
-@@ -154,11 +154,11 @@
- /*
- * Unusual type definitions.
- */
--#ifdef __GNUCLIKE_BUILTIN_VARARGS
-+#ifdef __GNUC__
- typedef __builtin_va_list __va_list; /* internally known to gcc */
- #else
- typedef char * __va_list;
--#endif /* __GNUCLIKE_BUILTIN_VARARGS */
-+#endif /* __GNUC__ */
- #if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \
- && !defined(__NO_GNUC_VA_LIST)
- #define __GNUC_VA_LIST
Modified: trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -1,6 +1,6 @@
--- a/sys/mips/include/_types.h
+++ b/sys/mips/include/_types.h
-@@ -40,10 +40,13 @@
+@@ -40,49 +40,23 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
@@ -8,88 +8,77 @@
+#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
-+#ifndef __GLIBC__
/*
- * Basic types upon which most other types are built.
- */
-@@ -73,11 +76,14 @@
- typedef unsigned long long __uint64_t;
- #endif
- #endif
-+#endif
-
- /*
* Standard type definitions.
*/
-+#ifndef __GLIBC__
- typedef __int32_t __clock_t; /* clock()... */
-+#endif
- typedef unsigned int __cpumask_t;
- #ifdef __mips_n64
- typedef __int64_t __critical_t;
-@@ -88,11 +94,15 @@
+-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;
-+#ifndef __GLIBC__
- typedef __int64_t __intptr_t;
-+#endif
+-typedef __int64_t __intptr_t;
#else
+ typedef __int32_t __critical_t;
typedef __int32_t __intfptr_t;
-+#ifndef __GLIBC__
- typedef __int32_t __intptr_t;
+-typedef __int32_t __intptr_t;
#endif
-+#endif
typedef __int64_t __intmax_t;
typedef __int32_t __int_fast8_t;
- typedef __int32_t __int_fast16_t;
-@@ -103,28 +113,46 @@
+@@ -94,28 +68,17 @@
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 __register_t;
typedef __int64_t f_register_t;
#else
-+#ifndef __GLIBC__
- typedef __int32_t __register_t;
-+#endif
+-typedef __int32_t __register_t;
typedef __int32_t f_register_t;
#endif
#ifdef __mips_n64
-+#ifndef __GLIBC__
- typedef __int64_t __ptrdiff_t;
-+#endif
+-typedef __int64_t __ptrdiff_t;
typedef __int64_t __segsz_t;
-+#ifndef __GLIBC__
- typedef __uint64_t __size_t;
- typedef __int64_t __ssize_t;
-+#endif
+-typedef __uint64_t __size_t;
+-typedef __int64_t __ssize_t;
typedef __uint64_t __uintfptr_t;
-+#ifndef __GLIBC__
- typedef __uint64_t __uintptr_t;
-+#endif
+-typedef __uint64_t __uintptr_t;
#else
-+#ifndef __GLIBC__
- typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
-+#endif
+-typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
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 */
-+#endif
+-typedef __uint32_t __size_t; /* sizeof() */
+-typedef __int32_t __ssize_t; /* byte count or error */
typedef __uint32_t __uintfptr_t;
-+#ifndef __GLIBC__
- typedef __uint32_t __uintptr_t;
+-typedef __uint32_t __uintptr_t;
#endif
-+#endif
-+#ifndef __GLIBC__
- typedef __int64_t __time_t; /* time()... */
-+#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/040_internal_types.patch
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/040_internal_types.patch 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/040_internal_types.patch 2012-01-17 19:13:05 UTC (rev 3976)
@@ -4,7 +4,7 @@
--- a/sys/sys/ucred.h
+++ b/sys/sys/ucred.h
-@@ -46,7 +46,7 @@
+@@ -48,7 +48,7 @@
*/
#if defined(_KERNEL) || defined(_WANT_UCRED)
struct ucred {
@@ -13,16 +13,16 @@
#define cr_startcopy cr_uid
uid_t cr_uid; /* effective user id */
uid_t cr_ruid; /* real user id */
-@@ -58,7 +58,7 @@
+@@ -60,7 +60,7 @@
struct uidinfo *cr_ruidinfo; /* per ruid resource consumption */
struct prison *cr_prison; /* jail(2) */
- void *cr_pspare; /* general use */
+ struct loginclass *cr_loginclass; /* login class */
- u_int cr_flags; /* credential flags */
+ __u_int cr_flags; /* credential flags */
void *cr_pspare2[2]; /* general use 2 */
#define cr_endcopy cr_label
struct label *cr_label; /* MAC label */
-@@ -76,7 +76,7 @@
+@@ -83,7 +83,7 @@
* This is the external representation of struct ucred.
*/
struct xucred {
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/041_gratuitous_sbuf_include.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/041_gratuitous_sbuf_include.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/041_gratuitous_sbuf_include.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -1,10 +0,0 @@
---- a/sys/geom/geom.h
-+++ b/sys/geom/geom.h
-@@ -43,7 +43,6 @@
- #include <sys/sx.h>
- #include <sys/queue.h>
- #include <sys/ioccom.h>
--#include <sys/sbuf.h>
- #include <sys/module.h>
-
- struct g_class;
Modified: trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff 2012-01-17 19:13:05 UTC (rev 3976)
@@ -1,8 +1,8 @@
--- a/sys/amd64/include/sysarch.h
+++ b/sys/amd64/include/sysarch.h
@@ -71,11 +71,11 @@
- #include <sys/cdefs.h>
+ #ifndef _KERNEL
__BEGIN_DECLS
-int amd64_get_fsbase(void **);
-int amd64_get_gsbase(void **);
Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series 2012-01-17 19:13:05 UTC (rev 3976)
@@ -36,8 +36,6 @@
033_pcpu.diff
034_usb.diff
035_devfs_int.diff
-038_gnuclike.diff
039_mips_misc.diff
040_internal_types.patch
-041_gratuitous_sbuf_include.diff
042_syscall_stubs.diff
Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules 2012-01-15 15:18:57 UTC (rev 3975)
+++ trunk/kfreebsd-kernel-headers/debian/rules 2012-01-17 19:13:05 UTC (rev 3976)
@@ -13,8 +13,8 @@
kfreebsd_cpu := $(DEB_HOST_ARCH_CPU)
endif
-major=8
-minor=2
+major=9
+minor=0
HEADERS_PACKAGE := $(CURDIR)/debian/kfreebsd-kernel-headers
SRC_TAR := /usr/src/kfreebsd-source-$(major).$(minor).tar.xz
@@ -47,6 +47,10 @@
-e 's/__FreeBSD__/$(major)/g' \
\
-e "s/__FreeBSD_version/$$fbsd_version/g" \
+ \
+ -e 's/defined\s*(\s*__GNUCLIKE_[A-Z_]\+\s*)/1/g' \
+ -e 's/#\s*ifdef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if 1/g' \
+ -e 's/#\s*ifndef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if 0/g' \
; done)
QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a || test $$? = 2
More information about the Glibc-bsd-commits
mailing list