[Glibc-bsd-commits] r3266 - in trunk/kfreebsd-kernel-headers/debian: . patches
Petr Salinger
ps-guest at alioth.debian.org
Thu Feb 17 09:18:00 UTC 2011
Author: ps-guest
Date: 2011-02-17 09:17:54 +0000 (Thu, 17 Feb 2011)
New Revision: 3266
Added:
trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/control
trunk/kfreebsd-kernel-headers/debian/install
trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.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/033_pcpu.diff
trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff
trunk/kfreebsd-kernel-headers/debian/patches/series
trunk/kfreebsd-kernel-headers/debian/rules
Log:
kfreebsd-kernel-headers based on 8.2
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2011-02-16 19:18:59 UTC (rev 3265)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2011-02-17 09:17:54 UTC (rev 3266)
@@ -1,12 +1,14 @@
kfreebsd-kernel-headers (0.54) UNSTABLE; urgency=low
[ Petr Salinger ]
+ * Based on kfreebsd-source-8.2
* Fix __packed in <net80211/ieee80211_ioctl.h> for knemo
+ * Drop <legacy/dev/usb/usb.h>.
[ Robert Millan ]
* Add <sys/kerneldump.h> for savecore (freebsd-utils).
* Remove <sys/sbuf.h> (now provided by libsbuf-dev).
- * MIPS support.
+ * start MIPS support.
-- Robert Millan <rmh at debian.org> Thu, 27 Jan 2011 16:16:03 +0100
Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control 2011-02-16 19:18:59 UTC (rev 3265)
+++ trunk/kfreebsd-kernel-headers/debian/control 2011-02-17 09:17:54 UTC (rev 3266)
@@ -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>
-Build-Depends: debhelper (>= 5.0.0), quilt, kfreebsd-source-8.1 (>= 8.1-2)
+Build-Depends: debhelper (>= 5.0.0), quilt, kfreebsd-source-8.2
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.1
Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install 2011-02-16 19:18:59 UTC (rev 3265)
+++ trunk/kfreebsd-kernel-headers/debian/install 2011-02-17 09:17:54 UTC (rev 3266)
@@ -374,7 +374,6 @@
sys/dev/ipw/*.h usr/include/dev/ipw
sys/dev/iscsi/initiator/*.h usr/include/dev/iscsi/initiator
sys/dev/isp/*.h usr/include/dev/isp
-sys/dev/ispfw/*.h usr/include/dev/ispfw
sys/dev/iwi/*.h usr/include/dev/iwi
sys/dev/ixgb/*.h usr/include/dev/ixgb
sys/dev/ixgbe/*.h usr/include/dev/ixgbe
Modified: trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2011-02-16 19:18:59 UTC (rev 3265)
+++ trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2011-02-17 09:17:54 UTC (rev 3266)
@@ -1,7 +1,5 @@
-Index: kfreebsd-source-8.0/sys/dev/usb/usb.h
-===================================================================
---- kfreebsd-source-8.0.orig/sys/dev/usb/usb.h 2009-11-12 15:48:44.000000000 +0000
-+++ kfreebsd-source-8.0/sys/dev/usb/usb.h 2009-11-12 16:31:48.000000000 +0000
+--- a/sys/dev/usb/usb.h
++++ b/sys/dev/usb/usb.h
@@ -146,7 +146,7 @@
uWord wValue;
uWord wIndex;
@@ -11,7 +9,7 @@
typedef struct usb_device_request usb_device_request_t;
#define UT_WRITE 0x00
-@@ -268,7 +268,7 @@
+@@ -270,7 +270,7 @@
uByte bLength;
uByte bDescriptorType;
uByte bDescriptorSubtype;
@@ -20,7 +18,7 @@
typedef struct usb_descriptor usb_descriptor_t;
struct usb_device_descriptor {
-@@ -291,7 +291,7 @@
+@@ -293,7 +293,7 @@
uByte iProduct;
uByte iSerialNumber;
uByte bNumConfigurations;
@@ -29,7 +27,7 @@
typedef struct usb_device_descriptor usb_device_descriptor_t;
/* Binary Device Object Store (BOS) */
-@@ -300,7 +300,7 @@
+@@ -302,7 +302,7 @@
uByte bDescriptorType;
uWord wTotalLength;
uByte bNumDeviceCaps;
@@ -38,7 +36,7 @@
typedef struct usb_bos_descriptor usb_bos_descriptor_t;
/* Binary Device Object Store Capability */
-@@ -314,7 +314,7 @@
+@@ -316,7 +316,7 @@
#define USB_DEVCAP_SUPER_SPEED 0x03
#define USB_DEVCAP_CONTAINER_ID 0x04
/* data ... */
@@ -47,7 +45,7 @@
typedef struct usb_bos_cap_descriptor usb_bos_cap_descriptor_t;
struct usb_devcap_usb2ext_descriptor {
-@@ -323,7 +323,7 @@
+@@ -325,7 +325,7 @@
uByte bDevCapabilityType;
uByte bmAttributes;
#define USB_V2EXT_LPM 0x02
@@ -56,8 +54,8 @@
typedef struct usb_devcap_usb2ext_descriptor usb_devcap_usb2ext_descriptor_t;
struct usb_devcap_ss_descriptor {
-@@ -335,7 +335,7 @@
- uByte bFunctionaltySupport;
+@@ -337,7 +337,7 @@
+ uByte bFunctionalitySupport;
uByte bU1DevExitLat;
uByte bU2DevExitLat;
-} __packed;
@@ -65,16 +63,16 @@
typedef struct usb_devcap_ss_descriptor usb_devcap_ss_descriptor_t;
struct usb_devcap_container_id_descriptor {
-@@ -344,7 +344,7 @@
+@@ -346,7 +346,7 @@
uByte bDevCapabilityType;
uByte bReserved;
- uByte ContainerID;
+ uByte bContainerID;
-} __packed;
+} __attribute__ ((__packed__));
typedef struct usb_devcap_container_id_descriptor
usb_devcap_container_id_descriptor_t;
-@@ -376,7 +376,7 @@
+@@ -379,7 +379,7 @@
#define UC_REMOTE_WAKEUP 0x20
uByte bMaxPower; /* max current in 2 mA units */
#define UC_POWER_FACTOR 2
@@ -83,7 +81,7 @@
typedef struct usb_config_descriptor usb_config_descriptor_t;
struct usb_interface_descriptor {
-@@ -389,7 +389,7 @@
+@@ -392,7 +392,7 @@
uByte bInterfaceSubClass;
uByte bInterfaceProtocol;
uByte iInterface;
@@ -92,7 +90,7 @@
typedef struct usb_interface_descriptor usb_interface_descriptor_t;
struct usb_interface_assoc_descriptor {
-@@ -401,7 +401,7 @@
+@@ -404,7 +404,7 @@
uByte bFunctionSubClass;
uByte bFunctionProtocol;
uByte iFunction;
@@ -101,7 +99,7 @@
typedef struct usb_interface_assoc_descriptor usb_interface_assoc_descriptor_t;
/* Interface class codes */
-@@ -524,7 +524,7 @@
+@@ -530,7 +530,7 @@
uWord wMaxPacketSize;
#define UE_ZERO_MPS 0xFFFF /* for internal use only */
uByte bInterval;
@@ -110,8 +108,8 @@
typedef struct usb_endpoint_descriptor usb_endpoint_descriptor_t;
struct usb_endpoint_ss_comp_descriptor {
-@@ -533,7 +533,7 @@
- uWord bMaxBurst;
+@@ -539,7 +539,7 @@
+ uByte bMaxBurst;
uByte bmAttributes;
uWord wBytesPerInterval;
-} __packed;
@@ -119,7 +117,7 @@
typedef struct usb_endpoint_ss_comp_descriptor
usb_endpoint_ss_comp_descriptor_t;
-@@ -542,7 +542,7 @@
+@@ -548,7 +548,7 @@
uByte bDescriptorType;
uWord bString[126];
uByte bUnused;
@@ -128,7 +126,7 @@
typedef struct usb_string_descriptor usb_string_descriptor_t;
#define USB_MAKE_STRING_DESC(m,name) \
-@@ -550,7 +550,7 @@
+@@ -556,7 +556,7 @@
uByte bLength; \
uByte bDescriptorType; \
uByte bData[sizeof((uint8_t []){m})]; \
@@ -137,7 +135,7 @@
static const struct name name = { \
.bLength = sizeof(struct name), \
.bDescriptorType = UDESC_STRING, \
-@@ -584,7 +584,7 @@
+@@ -590,7 +590,7 @@
#define UHD_NOT_REMOV(desc, i) \
(((desc)->DeviceRemovable[(i)/8] >> ((i) % 8)) & 1)
uByte PortPowerCtrlMask[1]; /* deprecated */
@@ -146,16 +144,16 @@
typedef struct usb_hub_descriptor usb_hub_descriptor_t;
struct usb_hub_ss_descriptor {
-@@ -597,7 +597,7 @@
+@@ -603,7 +603,7 @@
uByte bHubHdrDecLat;
uWord wHubDelay;
- uByte DeviceRemovable[2]; /* max 15 ports */
+ uByte DeviceRemovable[32]; /* max 255 ports */
-} __packed;
+} __attribute__ ((__packed__));
typedef struct usb_hub_ss_descriptor usb_hub_ss_descriptor_t;
/* minimum HUB descriptor (8-ports maximum) */
-@@ -610,7 +610,7 @@
+@@ -616,7 +616,7 @@
uByte bHubContrCurrent;
uByte DeviceRemovable[1];
uByte PortPowerCtrlMask[1];
@@ -164,7 +162,7 @@
typedef struct usb_hub_descriptor_min usb_hub_descriptor_min_t;
struct usb_device_qualifier {
-@@ -623,7 +623,7 @@
+@@ -629,7 +629,7 @@
uByte bMaxPacketSize0;
uByte bNumConfigurations;
uByte bReserved;
@@ -173,7 +171,7 @@
typedef struct usb_device_qualifier usb_device_qualifier_t;
struct usb_otg_descriptor {
-@@ -632,7 +632,7 @@
+@@ -638,7 +638,7 @@
uByte bmAttributes;
#define UOTG_SRP 0x01
#define UOTG_HNP 0x02
@@ -182,7 +180,7 @@
typedef struct usb_otg_descriptor usb_otg_descriptor_t;
/* OTG feature selectors */
-@@ -647,7 +647,7 @@
+@@ -653,7 +653,7 @@
#define UDS_REMOTE_WAKEUP 0x0002
/* Endpoint status flags */
#define UES_HALT 0x0001
@@ -191,7 +189,7 @@
typedef struct usb_status usb_status_t;
struct usb_hub_status {
-@@ -655,7 +655,7 @@
+@@ -661,7 +661,7 @@
#define UHS_LOCAL_POWER 0x0001
#define UHS_OVER_CURRENT 0x0002
uWord wHubChange;
@@ -200,19 +198,17 @@
typedef struct usb_hub_status usb_hub_status_t;
struct usb_port_status {
-@@ -677,7 +677,7 @@
- #define UPS_C_SUSPEND 0x0004
- #define UPS_C_OVERCURRENT_INDICATOR 0x0008
- #define UPS_C_PORT_RESET 0x0010
+@@ -702,7 +702,7 @@
+ #define UPS_C_BH_PORT_RESET 0x0020
+ #define UPS_C_PORT_LINK_STATE 0x0040
+ #define UPS_C_PORT_CONFIG_ERROR 0x0080
-} __packed;
+} __attribute__ ((__packed__));
typedef struct usb_port_status usb_port_status_t;
/*
-Index: kfreebsd-source-8.0/sys/i386/include/cpufunc.h
-===================================================================
---- kfreebsd-source-8.0.orig/sys/i386/include/cpufunc.h 2009-11-12 15:48:49.000000000 +0000
-+++ kfreebsd-source-8.0/sys/i386/include/cpufunc.h 2009-11-12 16:30:50.000000000 +0000
+--- a/sys/i386/include/cpufunc.h
++++ b/sys/i386/include/cpufunc.h
@@ -38,6 +38,8 @@
#ifndef _MACHINE_CPUFUNC_H_
#define _MACHINE_CPUFUNC_H_
@@ -251,10 +247,8 @@
u_int rcr0(void);
u_int rcr2(void);
u_int rcr3(void);
-Index: kfreebsd-source-8.0/sys/sys/_types.h
-===================================================================
---- kfreebsd-source-8.0.orig/sys/sys/_types.h 2009-11-12 15:49:02.000000000 +0000
-+++ kfreebsd-source-8.0/sys/sys/_types.h 2009-11-12 16:30:50.000000000 +0000
+--- a/sys/sys/_types.h
++++ b/sys/sys/_types.h
@@ -31,6 +31,7 @@
#include <sys/cdefs.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2011-02-16 19:18:59 UTC (rev 3265)
+++ trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2011-02-17 09:17:54 UTC (rev 3266)
@@ -106,107 +106,3 @@
typedef __uint64_t __uintfptr_t;
typedef __uint64_t __uintmax_t;
typedef __uint64_t __uintptr_t;
---- a/sys/mips/include/_types.h
-+++ b/sys/mips/include/_types.h
-@@ -40,10 +40,13 @@
- #ifndef _MACHINE__TYPES_H_
- #define _MACHINE__TYPES_H_
-
-+#include <sys/types.h>
-+#include <sys/cdefs.h>
- #ifndef _SYS_CDEFS_H_
--#error this file needs sys/cdefs.h as a prerequisite
-+#include <sys/param.h>
- #endif
-
-+#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 __mips64
- typedef __int64_t __critical_t;
-@@ -88,11 +94,15 @@
- typedef double __float_t;
- #ifdef __mips64
- typedef __int64_t __intfptr_t;
-+#ifndef __GLIBC__
- typedef __int64_t __intptr_t;
-+#endif
- #else
- typedef __int32_t __intfptr_t;
-+#ifndef __GLIBC__
- 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 @@
- typedef __int32_t __int_least32_t;
- typedef __int64_t __int_least64_t;
- #if defined(__mips64) || defined(ISA_MIPS64)
-+#ifndef __GLIBC__
- typedef __int64_t __register_t;
-+#endif
- typedef __int64_t f_register_t;
- #else
-+#ifndef __GLIBC__
- typedef __int32_t __register_t;
-+#endif
- typedef __int32_t f_register_t;
- #endif
- #ifdef __mips64
-+#ifndef __GLIBC__
- typedef __int64_t __ptrdiff_t;
-+#endif
- typedef __int64_t __segsz_t;
-+#ifndef __GLIBC__
- typedef __uint64_t __size_t;
- typedef __int64_t __ssize_t;
-+#endif
- typedef __uint64_t __uintfptr_t;
-+#ifndef __GLIBC__
- typedef __uint64_t __uintptr_t;
-+#endif
- #else
-+#ifndef __GLIBC__
- typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
-+#endif
- 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 __uintfptr_t;
-+#ifndef __GLIBC__
- typedef __uint32_t __uintptr_t;
- #endif
-+#endif
-+#ifndef __GLIBC__
- typedef __int64_t __time_t; /* time()... */
-+#endif
- typedef __uint64_t __uintmax_t;
- typedef __uint32_t __uint_fast8_t;
- typedef __uint32_t __uint_fast16_t;
-@@ -163,7 +191,7 @@
- #endif
-
- typedef struct label_t {
-- __register_t val[13];
-+ register_t val[13];
- } label_t;
-
- #endif /* !_MACHINE__TYPES_H_ */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2011-02-16 19:18:59 UTC (rev 3265)
+++ trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2011-02-17 09:17:54 UTC (rev 3266)
@@ -1,5 +1,3 @@
-Index: b/sys/sys/conf.h
-===================================================================
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -43,6 +43,7 @@
@@ -10,7 +8,7 @@
#include <sys/queue.h>
#endif
-@@ -267,10 +268,10 @@
+@@ -268,10 +269,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,
@@ -20,16 +18,21 @@
struct ucred *_cr, uid_t _uid, gid_t _gid, int _perms,
- const char *_fmt, ...) __printflike(7, 8);
+ const char *_fmt, ...);
- #define MAKEDEV_REF 0x1
- #define MAKEDEV_WHTOUT 0x2
- #define MAKEDEV_NOWAIT 0x4
-@@ -278,8 +279,8 @@
+ #define MAKEDEV_REF 0x01
+ #define MAKEDEV_WHTOUT 0x02
+ #define MAKEDEV_NOWAIT 0x04
+@@ -280,12 +281,11 @@
struct cdev *make_dev_credf(int _flags,
struct cdevsw *_devsw, int _unit,
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, ...);
+ 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);
Modified: trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff 2011-02-16 19:18:59 UTC (rev 3265)
+++ trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff 2011-02-17 09:17:54 UTC (rev 3266)
@@ -1,10 +1,8 @@
-Index: src/sys/contrib/pf/net/pfvar.h
-===================================================================
---- src/sys/contrib/pf/net/pfvar.h.orig
-+++ src/sys/contrib/pf/net/pfvar.h
+--- a/sys/contrib/pf/net/pfvar.h
++++ b/sys/contrib/pf/net/pfvar.h
@@ -40,13 +40,14 @@
#include <sys/tree.h>
- #ifdef __FreeBSD_kernel__
+ #if 1
#include <sys/lock.h>
-#include <sys/sx.h>
#else
@@ -15,14 +13,14 @@
#include <net/radix.h>
#include <net/route.h>
+#ifdef _KERNEL
- #ifdef __FreeBSD_kernel__
+ #if 1
#include <net/if_clone.h>
#include <net/pf_mtag.h>
-@@ -54,6 +56,7 @@
+@@ -54,6 +55,7 @@
#else
#endif
+#endif
- #ifdef __FreeBSD_kernel__
+ #if 1
#include <netinet/in.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff 2011-02-16 19:18:59 UTC (rev 3265)
+++ trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff 2011-02-17 09:17:54 UTC (rev 3266)
@@ -1,5 +1,5 @@
---- src/sys/sys/pcpu.h~
-+++ src/sys/sys/pcpu.h
+--- a/sys/sys/pcpu.h
++++ b/sys/sys/pcpu.h
@@ -41,6 +41,8 @@
#include <sys/vmmeter.h>
#include <sys/resource.h>
@@ -7,14 +7,14 @@
+#include <sys/_types.h>
+#include <stdint.h>
- struct pcb;
- struct thread;
-@@ -57,7 +59,7 @@
+ /*
+ * Define a set for pcpu data.
+@@ -150,7 +152,7 @@
struct thread *pc_fpcurthread; /* Fp state owner */
struct thread *pc_deadthread; /* Zombie thread or NULL */
struct pcb *pc_curpcb; /* Current pcb */
-- uint64_t pc_switchtime;
-+ u_int64_t pc_switchtime;
- int pc_switchticks;
+- uint64_t pc_switchtime; /* cpu_ticks() at last csw */
++ 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 */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff 2011-02-16 19:18:59 UTC (rev 3265)
+++ trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff 2011-02-17 09:17:54 UTC (rev 3266)
@@ -235,7 +235,7 @@
#define fpgetprec() __fpgetprec()
--- a/sys/amd64/include/pcpu.h
+++ b/sys/amd64/include/pcpu.h
-@@ -90,7 +90,7 @@
+@@ -91,7 +91,7 @@
#define PCPU_PTR(member) (&pcpup->pc_ ## member)
#define PCPU_SET(member, val) (pcpup->pc_ ## member = (val))
@@ -563,7 +563,7 @@
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
-@@ -118,7 +118,7 @@
+@@ -103,7 +103,7 @@
#define PCPU_PTR(member) (&pcpup->pc_ ## member)
#define PCPU_SET(member, val) (pcpup->pc_ ## member = (val))
@@ -672,28 +672,6 @@
#define __MAKE_SET(set, sym) \
static void const * const __set_##set##_sym_##sym \
__section("set_" #set) __used = &sym
---- a/sys/mips/include/bus.h
-+++ b/sys/mips/include/bus.h
-@@ -820,7 +820,7 @@
- bus_size_t offset __unused, bus_size_t len __unused, int flags)
- {
- #if 0
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- if (flags & BUS_SPACE_BARRIER_READ)
- __asm __volatile("lock; addl $0,0(%%rsp)" : : : "memory");
- else
---- a/sys/mips/include/bus_octeon.h
-+++ b/sys/mips/include/bus_octeon.h
-@@ -793,7 +793,7 @@
- bus_size_t offset __unused, bus_size_t len __unused, int flags)
- {
- #if 0
--#ifdef __GNUCLIKE_ASM
-+#ifdef __GNUC__
- if (flags & BUS_SPACE_BARRIER_READ)
- __asm __volatile("lock; addl $0,0(%%rsp)" : : : "memory");
- else
--- a/sys/mips/include/endian.h
+++ b/sys/mips/include/endian.h
@@ -68,7 +68,7 @@
@@ -716,7 +694,7 @@
typedef int __attribute__((__mode__(__DI__))) __int64_t;
typedef unsigned int __attribute__((__mode__(__DI__))) __uint64_t;
#else
-@@ -151,11 +151,11 @@
+@@ -154,11 +154,11 @@
/*
* Unusual type definitions.
*/
Added: trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/039_mips_misc.diff 2011-02-17 09:17:54 UTC (rev 3266)
@@ -0,0 +1,115 @@
+--- a/sys/mips/include/bus_octeon.h
++++ b/sys/mips/include/bus_octeon.h
+@@ -793,7 +793,7 @@
+ bus_size_t offset __unused, bus_size_t len __unused, int flags)
+ {
+ #if 0
+-#ifdef __GNUCLIKE_ASM
++#ifdef __GNUC__
+ if (flags & BUS_SPACE_BARRIER_READ)
+ __asm __volatile("lock; addl $0,0(%%rsp)" : : : "memory");
+ else
+--- a/sys/mips/include/_types.h
++++ b/sys/mips/include/_types.h
+@@ -40,10 +40,13 @@
+ #ifndef _MACHINE__TYPES_H_
+ #define _MACHINE__TYPES_H_
+
++#include <sys/types.h>
++#include <sys/cdefs.h>
+ #ifndef _SYS_CDEFS_H_
+-#error this file needs sys/cdefs.h as a prerequisite
++#include <sys/param.h>
+ #endif
+
++#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 __mips64
+ typedef __int64_t __critical_t;
+@@ -88,11 +94,15 @@
+ typedef double __float_t;
+ #ifdef __mips64
+ typedef __int64_t __intfptr_t;
++#ifndef __GLIBC__
+ typedef __int64_t __intptr_t;
++#endif
+ #else
+ typedef __int32_t __intfptr_t;
++#ifndef __GLIBC__
+ 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 @@
+ typedef __int32_t __int_least32_t;
+ typedef __int64_t __int_least64_t;
+ #if defined(__mips64) || defined(ISA_MIPS64)
++#ifndef __GLIBC__
+ typedef __int64_t __register_t;
++#endif
+ typedef __int64_t f_register_t;
+ #else
++#ifndef __GLIBC__
+ typedef __int32_t __register_t;
++#endif
+ typedef __int32_t f_register_t;
+ #endif
+ #ifdef __mips64
++#ifndef __GLIBC__
+ typedef __int64_t __ptrdiff_t;
++#endif
+ typedef __int64_t __segsz_t;
++#ifndef __GLIBC__
+ typedef __uint64_t __size_t;
+ typedef __int64_t __ssize_t;
++#endif
+ typedef __uint64_t __uintfptr_t;
++#ifndef __GLIBC__
+ typedef __uint64_t __uintptr_t;
++#endif
+ #else
++#ifndef __GLIBC__
+ typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
++#endif
+ 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 __uintfptr_t;
++#ifndef __GLIBC__
+ typedef __uint32_t __uintptr_t;
+ #endif
++#endif
++#ifndef __GLIBC__
+ typedef __int64_t __time_t; /* time()... */
++#endif
+ typedef __uint64_t __uintmax_t;
+ typedef __uint32_t __uint_fast8_t;
+ typedef __uint32_t __uint_fast16_t;
+@@ -163,7 +191,7 @@
+ #endif
+
+ typedef struct label_t {
+- __register_t val[13];
++ register_t val[13];
+ } label_t;
+
+ #endif /* !_MACHINE__TYPES_H_ */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series 2011-02-16 19:18:59 UTC (rev 3265)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series 2011-02-17 09:17:54 UTC (rev 3266)
@@ -34,3 +34,4 @@
036_tcpvar.diff
037_ciss.diff
038_gnuclike.diff
+#039_mips_misc.diff
Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules 2011-02-16 19:18:59 UTC (rev 3265)
+++ trunk/kfreebsd-kernel-headers/debian/rules 2011-02-17 09:17:54 UTC (rev 3266)
@@ -5,17 +5,17 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-kfreebsd_cpu := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-ifeq ($(cpu), mipsel)
+ifeq ($(DEB_HOST_ARCH_CPU), mipsel)
kfreebsd_cpu := mips
else
-kfreebsd_cpu := $(cpu)
+kfreebsd_cpu := $(DEB_HOST_ARCH_CPU)
endif
HEADERS_PACKAGE := $(CURDIR)/debian/kfreebsd-kernel-headers
-SRC_TAR := /usr/src/kfreebsd-source-8.1.tar.xz
-SRC_DIR := kfreebsd-source-8.1
+SRC_TAR := /usr/src/kfreebsd-source-8.2.tar.xz
+SRC_DIR := kfreebsd-source-8.2
clean:
dh_testdir
@@ -42,8 +42,8 @@
dh_install --sourcedir=$(SRC_DIR)
# legacy USB stack
- mkdir -p $(HEADERS_PACKAGE)/usr/include/legacy/dev/usb
- install -p $(CURDIR)/debian/legacy-usb/*.h $(HEADERS_PACKAGE)/usr/include/legacy/dev/usb/
+ #mkdir -p $(HEADERS_PACKAGE)/usr/include/legacy/dev/usb
+ #install -p $(CURDIR)/debian/legacy-usb/*.h $(HEADERS_PACKAGE)/usr/include/legacy/dev/usb/
ifneq ($(filter i386 amd64, $(kfreebsd_cpu)),)
sh debian/generate-asm.sh $(kfreebsd_cpu) $(SRC_DIR)/sys $(HEADERS_PACKAGE)/usr/include
More information about the Glibc-bsd-commits
mailing list