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

[Petr Salinger]

Author: ps-guest
Date: 2006-05-02 17:03:53 +0000 (Tue, 02 May 2006)
New Revision: 1536

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
   trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
   trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
   trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
Log:
* misc cleanup of patches in kfreebsd-kernel-headers



Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2006-05-02 14:13:00 UTC (rev 1535)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2006-05-02 17:03:53 UTC (rev 1536)
@@ -2,6 +2,7 @@
   [ Petr Salinger ]
   * workaround glibc behaviour of __CONCAT() macro
   * drop 004_sys_ioctl_compat_h.diff
+  * misc cleanup of patches
 
  -- Robert Millan <rmh at aybabtu.com>  Wed, 29 Mar 2006 20:33:38 +0200
 

Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2006-05-02 14:13:00 UTC (rev 1535)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2006-05-02 17:03:53 UTC (rev 1536)
@@ -533,27 +533,6 @@
  #endif	/* _KERNEL */
  
  /*
-@@ -268,13 +275,19 @@
-     size_t	size;		/* size in bytes */
- };
- 
-+/* Possible commands for kldsym.  */
-+enum
-+{
-+  KLDSYM_LOOKUP = 1		/* Kernel symbol lookup.  */
-+#define KLDSYM_LOOKUP KLDSYM_LOOKUP
-+};
-+
- struct kld_sym_lookup {
-     int		version;	/* set to sizeof(struct kld_sym_lookup) */
-     char	*symname;	/* Symbol name we are looking up */
-     u_long	symvalue;
-     size_t	symsize;
- };
--#define KLDSYM_LOOKUP	1
- 
- /*
-  * Flags for kldunloadf() and linker_file_unload()
 @@ -287,14 +300,13 @@
  #include <sys/cdefs.h>
  
@@ -618,17 +597,6 @@
  #include <sys/ioccom.h>
  
  #define PCI_MAXNAMELEN	16
-diff -ur sys.orig/sys/proc.h sys/sys/proc.h
---- sys.orig/sys/proc.h	2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/proc.h	2004-12-07 23:48:37.000000000 +0100
-@@ -58,6 +58,7 @@
- #endif
- #include <sys/ucontext.h>
- #include <sys/ucred.h>
-+
- #include <machine/proc.h>		/* Machine-dependent proc substruct. */
- 
- /*
 diff -ur sys.orig/sys/procfs.h sys/sys/procfs.h
 --- sys.orig/sys/procfs.h	2004-12-07 23:50:18.000000000 +0100
 +++ sys/sys/procfs.h	2004-12-07 23:48:37.000000000 +0100

Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff	2006-05-02 14:13:00 UTC (rev 1535)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff	2006-05-02 17:03:53 UTC (rev 1536)
@@ -130,9 +130,7 @@
  {
  	const u_int8_t *s = (const u_int8_t *)str;
 -	u_register_t c;		 /* 32 bit on i386, 64 bit on alpha,ia64 */
-+	long int c;		 /* 32 bit on i386, 64 bit on alpha,ia64 */
++	unsigned long int c;	 /* 32 bit on i386, 64 bit on alpha,ia64 */
  
  	while ((c = *s++) != 0) {
  		hval *= FNV_64_PRIME;
-Only in sys.orig/sys: ioctl_compat.h.orig
-Only in sys.orig/vm: vm_param.h.orig

Modified: trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff	2006-05-02 14:13:00 UTC (rev 1535)
+++ trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff	2006-05-02 17:03:53 UTC (rev 1536)
@@ -5,7 +5,7 @@
  	struct xmmacc	sv_xmm[8];
  	u_char sv_pad[224];
 -} __aligned(16);
-+};
++} __attribute__((aligned(16)));
  
  union	savefpu {
  	struct	save87	sv_87;

Modified: trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff	2006-05-02 14:13:00 UTC (rev 1535)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff	2006-05-02 17:03:53 UTC (rev 1536)
@@ -209,7 +209,7 @@
  	struct xmmacc	sv_xmm[16];
  	u_char sv_pad[96];
 -} __aligned(16);
-+};
++} __attribute__((aligned(16)));
  
  /*
   * The hardware default control word for i387's and later coprocessors is