[Glibc-bsd-commits] r4270 - in trunk/kfreebsd-kernel-headers: debian debian/patches test

[Robert Millan]

Author: rmh
Date: 2012-05-21 15:20:39 +0000 (Mon, 21 May 2012)
New Revision: 4270

Added:
   trunk/kfreebsd-kernel-headers/test/stdarg.c
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
   trunk/kfreebsd-kernel-headers/test/Makefile
Log:
Fix stdarg.h collisions and add a new test (stdarg.c) to detect them.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-05-21 15:16:12 UTC (rev 4269)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-05-21 15:20:39 UTC (rev 4270)
@@ -8,6 +8,8 @@
   * Unexpose a few more macros which collide with glibc:
     CLOCK_THREAD_CPUTIME_ID, TIMER_RELTIME and TIMER_ABSTIME.
   * Fix NZERO collision.
+  * Fix stdarg.h collisions and add a new test (stdarg.c) to detect
+    them.
 
  -- Robert Millan <rmh at debian.org>  Sat, 19 May 2012 14:19:56 +0200
 

Modified: trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff	2012-05-21 15:16:12 UTC (rev 4269)
+++ trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff	2012-05-21 15:20:39 UTC (rev 4270)
@@ -276,3 +276,29 @@
 +#endif
  
  #endif /* _SYS_TIMESPEC_H_ */
+--- a/sys/amd64/include/stdarg.h
++++ b/sys/amd64/include/stdarg.h
+@@ -34,6 +34,10 @@
+ #include <sys/cdefs.h>
+ #include <sys/_types.h>
+ 
++#include <stdarg.h>
++#endif
++#if 0
++
+ #ifndef _VA_LIST_DECLARED
+ #define	_VA_LIST_DECLARED
+ typedef	__va_list	va_list;
+--- a/sys/i386/include/stdarg.h
++++ b/sys/i386/include/stdarg.h
+@@ -41,6 +41,10 @@
+ #include <sys/cdefs.h>
+ #include <sys/_types.h>
+ 
++#include <stdarg.h>
++#endif
++#if 0
++
+ #ifndef _VA_LIST_DECLARED
+ #define	_VA_LIST_DECLARED
+ typedef	__va_list	va_list;

Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile	2012-05-21 15:16:12 UTC (rev 4269)
+++ trunk/kfreebsd-kernel-headers/test/Makefile	2012-05-21 15:20:39 UTC (rev 4270)
@@ -8,18 +8,20 @@
 	bus.o \
 	cpufunc.o \
 	devicestat.o \
-	elf.o \
 	in_pcb.o \
 	ppp.o \
 	soundcard.o \
 	sys_sysctl.o \
+	stdarg.o \
 	usb.o \
 	$()
 
+#	elf.o
+
 CFLAGS = -Iinclude -I../debian/kfreebsd-kernel-headers/usr/include
 
 # Enable all the stuff in glibc to probe for collisions
-CFLAGS += -D_GNU_SOURCE -Werror
+CFLAGS += -D_GNU_SOURCE -Werror -Wsystem-headers
 
 all: $(TESTS)
 

Added: trunk/kfreebsd-kernel-headers/test/stdarg.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/stdarg.c	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/stdarg.c	2012-05-21 15:20:39 UTC (rev 4270)
@@ -0,0 +1,2 @@
+#include <stdarg.h>
+#include <machine/stdarg.h>