[Glibc-bsd-commits] r4205 - in trunk/kfreebsd-kernel-headers: debian debian/patches test
Robert Millan
rmh at alioth.debian.org
Wed Apr 18 21:20:43 UTC 2012
Author: rmh
Date: 2012-04-18 21:20:43 +0000 (Wed, 18 Apr 2012)
New Revision: 4205
Added:
trunk/kfreebsd-kernel-headers/debian/patches/sys_types.diff
trunk/kfreebsd-kernel-headers/test/bus.c
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/install
trunk/kfreebsd-kernel-headers/debian/patches/series
trunk/kfreebsd-kernel-headers/debian/rules
trunk/kfreebsd-kernel-headers/test/Makefile
Log:
Fix misc buildability problems with <machine/bus.h>, and add test/bus.c test to verify it.
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2012-04-18 21:15:37 UTC (rev 4204)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2012-04-18 21:20:43 UTC (rev 4205)
@@ -4,8 +4,10 @@
* Do not remove out[bwl] from <machine/cpufunc.h>, rename them instead
(and rename their users) to avoid conflict with glibc <sys/io.h>.
This will help un-breaking <machine/bus.h>.
+ * Fix misc buildability problems with <machine/bus.h>, and add
+ test/bus.c test to verify it.
- -- Robert Millan <rmh at debian.org> Wed, 18 Apr 2012 23:08:39 +0200
+ -- Robert Millan <rmh at debian.org> Wed, 18 Apr 2012 23:16:05 +0200
kfreebsd-kernel-headers (0.78) unstable; urgency=low
Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install 2012-04-18 21:15:37 UTC (rev 4204)
+++ trunk/kfreebsd-kernel-headers/debian/install 2012-04-18 21:20:43 UTC (rev 4205)
@@ -168,6 +168,9 @@
sys/nfsserver/*.h usr/include/nfsserver
sys/nfsclient/*.h usr/include/nfsclient
sys/opencrypto/*.h usr/include/opencrypto
+sys/sys/_bus_dma.h usr/include/sys
+sys/sys/_callout.h usr/include/sys
+sys/sys/_cpuset.h usr/include/sys
sys/sys/_iovec.h usr/include/sys
sys/sys/_lock.h usr/include/sys
sys/sys/_lockmgr.h usr/include/sys
@@ -191,8 +194,8 @@
sys/sys/buf.h usr/include/sys
sys/sys/bufobj.h usr/include/sys
sys/sys/bus.h usr/include/sys
+sys/sys/bus_dma.h usr/include/sys
sys/sys/callout.h usr/include/sys
-sys/sys/_callout.h usr/include/sys
sys/sys/cdio.h usr/include/sys
sys/sys/cdrio.h usr/include/sys
sys/sys/chio.h usr/include/sys
@@ -202,7 +205,6 @@
sys/sys/consio.h usr/include/sys
sys/sys/copyright.h usr/include/sys
sys/sys/cpuset.h usr/include/sys
-sys/sys/_cpuset.h usr/include/sys
sys/sys/ctype.h usr/include/sys
sys/sys/dataacq.h usr/include/sys
sys/sys/device_port.h usr/include/sys
Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series 2012-04-18 21:15:37 UTC (rev 4204)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series 2012-04-18 21:20:43 UTC (rev 4205)
@@ -3,7 +3,7 @@
hide_inpcbgroup.diff
# Patches that are in good shape for merging upstream
-type_collision.diff
+sys_types.diff
# Other patches that might or might not be mergeable
000_bruno_haible.diff
@@ -37,3 +37,4 @@
042_syscall_stubs.diff
ctltype_quad.diff
endian_collision.diff
+type_collision.diff
Added: trunk/kfreebsd-kernel-headers/debian/patches/sys_types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/sys_types.diff (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/sys_types.diff 2012-04-18 21:20:43 UTC (rev 4205)
@@ -0,0 +1,48 @@
+--- a/sys/amd64/include/_bus.h
++++ b/sys/amd64/include/_bus.h
+@@ -31,16 +31,18 @@
+ #ifndef AMD64_INCLUDE__BUS_H
+ #define AMD64_INCLUDE__BUS_H
+
++#include <sys/_types.h>
++
+ /*
+ * Bus address and size types
+ */
+-typedef uint64_t bus_addr_t;
+-typedef uint64_t bus_size_t;
++typedef __uint64_t bus_addr_t;
++typedef __uint64_t bus_size_t;
+
+ /*
+ * Access methods for bus resources and address space.
+ */
+-typedef uint64_t bus_space_tag_t;
+-typedef uint64_t bus_space_handle_t;
++typedef __uint64_t bus_space_tag_t;
++typedef __uint64_t bus_space_handle_t;
+
+ #endif /* AMD64_INCLUDE__BUS_H */
+--- a/sys/i386/include/_bus.h
++++ b/sys/i386/include/_bus.h
+@@ -31,15 +31,17 @@
+ #ifndef I386_INCLUDE__BUS_H
+ #define I386_INCLUDE__BUS_H
+
++#include <sys/_types.h>
++
+ /*
+ * Bus address and size types
+ */
+ #ifdef PAE
+-typedef uint64_t bus_addr_t;
++typedef __uint64_t bus_addr_t;
+ #else
+-typedef uint32_t bus_addr_t;
++typedef __uint32_t bus_addr_t;
+ #endif
+-typedef uint32_t bus_size_t;
++typedef __uint32_t bus_size_t;
+
+ /*
+ * Access methods for bus resources and address space.
Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules 2012-04-18 21:15:37 UTC (rev 4204)
+++ trunk/kfreebsd-kernel-headers/debian/rules 2012-04-18 21:20:43 UTC (rev 4205)
@@ -60,6 +60,7 @@
-e 's/#\s*ifdef\s*__CC_SUPPORTS_\(INLINE\|__INLINE\|__INLINE__\|__FUNC__\|WARNING\|VARADIC_XXX\|DYNAMIC_ARRAY_INIT\)\(\s\|$$\)/#if 1/g' \
-e 's/#\s*ifndef\s*__CC_SUPPORTS_\(INLINE\|__INLINE\|__INLINE__\|__FUNC__\|WARNING\|VARADIC_XXX\|DYNAMIC_ARRAY_INIT\)\(\s\|$$\)/#if 0/g' \
\
+ -e 's/__unused/__attribute__((__unused__))/g' \
-e 's/__packed\(\s\|;\)/ __attribute__((__packed__))\1/g' \
-e 's/__aligned(\([^)]*\?\))/ __attribute__((aligned(\1)))/g' \
-e 's/\(\s\|^\|(\)u_\(char\|int\|short\|long\)\(\s\)/\1unsigned \2\3/g' \
Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile 2012-04-18 21:15:37 UTC (rev 4204)
+++ trunk/kfreebsd-kernel-headers/test/Makefile 2012-04-18 21:20:43 UTC (rev 4205)
@@ -1,4 +1,5 @@
TESTS = \
+ bus.o \
cpufunc.o \
in_pcb.o \
ppp.o \
Added: trunk/kfreebsd-kernel-headers/test/bus.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/bus.c (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/bus.c 2012-04-18 21:20:43 UTC (rev 4205)
@@ -0,0 +1,3 @@
+#include <sys/cdefs.h>
+#include <sys/types.h>
+#include <machine/bus.h>
More information about the Glibc-bsd-commits
mailing list