[Glibc-bsd-commits] r4515 - in trunk/kfreebsd-kernel-headers/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2013-06-11 17:50:45 +0000 (Tue, 11 Jun 2013)
New Revision: 4515

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/050_sigframe.diff
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/series
Log:
 Make <machine/sigframe.h> compileable



Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2013-06-08 17:10:10 UTC (rev 4514)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2013-06-11 17:50:45 UTC (rev 4515)
@@ -6,11 +6,12 @@
 
   [ Petr Salinger ]
   * <sys/sysctl.h> "u_int" -> "unsigned int". Closes: #705407
+  * Make <machine/sigframe.h> compileable
 
   [ Guillem Jover ]
   * Switch to canonical Vcs URLs.
 
- -- Robert Millan <rmh at debian.org>  Fri, 17 Aug 2012 13:08:05 +0200
+ -- Robert Millan <rmh at debian.org>  Tue, 11 Jun 2013 18:08:05 +0200
 
 kfreebsd-kernel-headers (0.83) unstable; urgency=low
 

Added: trunk/kfreebsd-kernel-headers/debian/patches/050_sigframe.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/050_sigframe.diff	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/050_sigframe.diff	2013-06-11 17:50:45 UTC (rev 4515)
@@ -0,0 +1,30 @@
+
+we do not define __siginfohandler_t anywhere,
+but these structures are used by unwind library
+in mean time, hack it ;-)
+
+
+--- a/sys/amd64/include/sigframe.h
++++ b/sys/amd64/include/sigframe.h
+@@ -36,7 +36,8 @@
+  */
+ struct sigframe {
+ 	union {
+-		__siginfohandler_t	*sf_action;
++		__sighandler_t		*sf_action;
++/* should be:	__siginfohandler_t	*sf_action; */
+ 		__sighandler_t		*sf_handler;
+ 	} sf_ahu;
+ 	ucontext_t	sf_uc;		/* = *sf_ucontext */
+--- a/sys/i386/include/sigframe.h
++++ b/sys/i386/include/sigframe.h
+@@ -105,7 +105,8 @@
+ 	register_t	sf_addr;	/* undocumented 4th arg */
+ 
+ 	union {
+-		__siginfohandler_t	*sf_action;
++		__sighandler_t		*sf_action;
++/* should be	__siginfohandler_t	*sf_action; */
+ 		__sighandler_t		*sf_handler;
+ 	} sf_ahu;
+ 	ucontext_t	sf_uc;		/* = *sf_ucontext */

Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series	2013-06-08 17:10:10 UTC (rev 4514)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2013-06-11 17:50:45 UTC (rev 4515)
@@ -35,3 +35,4 @@
 type_collision.diff
 param_collision.diff
 bsd_visible.diff
+050_sigframe.diff