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

[Robert Millan]

Author: rmh
Date: 2013-09-28 15:27:18 +0000 (Sat, 28 Sep 2013)
New Revision: 4975

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/signal_collision.diff
   trunk/kfreebsd-kernel-headers/test/sig_atomic_collision.c
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/test/Makefile
Log:
Fix sig_atomic_t collision and add sig_atomic_collision.c test.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2013-09-28 15:20:59 UTC (rev 4974)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2013-09-28 15:27:18 UTC (rev 4975)
@@ -12,6 +12,7 @@
   * Filter out __used in debian/rules.
   * Install trimmed version of <sys/socket.h> and check for collisions
     in testsuite.
+  * Fix sig_atomic_t collision and add sig_atomic_collision.c test.
 
  -- Robert Millan <rmh at debian.org>  Sat, 21 Sep 2013 17:07:34 +0200
 

Added: trunk/kfreebsd-kernel-headers/debian/patches/signal_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/signal_collision.diff	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/signal_collision.diff	2013-09-28 15:27:18 UTC (rev 4975)
@@ -0,0 +1,79 @@
+--- a/sys/sys/_sigset.h
++++ b/sys/sys/_sigset.h
+@@ -48,9 +48,11 @@
+ #define	_SIG_BIT(sig)	(1 << (_SIG_IDX(sig) & 31))
+ #define	_SIG_VALID(sig)	((sig) <= _SIG_MAXSIG && (sig) > 0)
+ 
++#if 0
+ typedef struct __sigset {
+ 	__uint32_t __bits[_SIG_WORDS];
+ } __sigset_t;
++#endif
+ 
+ #if defined(_KERNEL) && defined(COMPAT_43)
+ typedef unsigned int osigset_t;
+--- a/sys/amd64/include/signal.h
++++ b/sys/amd64/include/signal.h
+@@ -41,11 +41,19 @@
+  * Machine-dependent signal definitions
+  */
+ 
++#if 1
++#define __need_sig_atomic_t
++#include <signal.h>
++#else
+ typedef long sig_atomic_t;
++#endif
+ 
+ #if __BSD_VISIBLE
+ #include <machine/trap.h>	/* codes for SIGILL, SIGFPE */
+ 
++#if 1
++#include <signal.h>
++#else
+ /*
+  * Information pushed on stack when a signal is delivered.
+  * This is used by the kernel to restore state following
+@@ -104,6 +112,9 @@
+ 
+ 	long	sc_spare[4];
+ };
++
++#endif
++
+ #endif /* __BSD_VISIBLE */
+ 
+ #endif /* !_MACHINE_SIGNAL_H_ */
+--- a/sys/i386/include/signal.h
++++ b/sys/i386/include/signal.h
+@@ -40,7 +40,12 @@
+  * Machine-dependent signal definitions
+  */
+ 
++#if 1
++#define __need_sig_atomic_t
++#include <signal.h>
++#else
+ typedef int sig_atomic_t;
++#endif
+ 
+ #if __BSD_VISIBLE
+ #include <machine/trap.h>	/* codes for SIGILL, SIGFPE */
+@@ -82,6 +87,9 @@
+ };
+ #endif
+ 
++#if 1
++#include <signal.h>
++#else
+ /*
+  * The sequence of the fields/registers in struct sigcontext should match
+  * those in mcontext_t and struct trapframe.
+@@ -132,6 +140,7 @@
+ #define	sc_pc		sc_eip
+ #define	sc_ps		sc_efl
+ #define	sc_eflags	sc_efl
++#endif
+ 
+ #endif /* __BSD_VISIBLE */
+ 

Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile	2013-09-28 15:20:59 UTC (rev 4974)
+++ trunk/kfreebsd-kernel-headers/test/Makefile	2013-09-28 15:27:18 UTC (rev 4975)
@@ -3,6 +3,7 @@
 	endian_collision.o \
 	socket_collision.o \
 	signal_collision.o \
+	sig_atomic_collision.o \
 	termios_collision.o \
 	type_collision.o \
 	time_collision.o \

Added: trunk/kfreebsd-kernel-headers/test/sig_atomic_collision.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/sig_atomic_collision.c	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/sig_atomic_collision.c	2013-09-28 15:27:18 UTC (rev 4975)
@@ -0,0 +1,3 @@
+#define __need_sig_atomic_t
+#include <signal.h>
+#include <machine/signal.h>