r1418 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: aurel32
Date: 2006-04-12 07:34:39 +0000 (Wed, 12 Apr 2006)
New Revision: 1418
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* debian/sysdeps/kfreebsd/local-sysdeps.diff: update from the latest SVN.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-04-11 23:26:45 UTC (rev 1417)
+++ glibc-package/trunk/debian/changelog 2006-04-12 07:34:39 UTC (rev 1418)
@@ -14,6 +14,7 @@
testsuite logs. (Closes: #155690)
* debian/sysdeps/sparc.mk: build sparcv9b optimized libraries with
-mtune=ultrasparc3.
+ * debian/sysdeps/kfreebsd/local-sysdeps.diff: update from the latest SVN.
[ Denis Barbier ]
* Remove ldd calls in libc.preinst.
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2006-04-11 23:26:45 UTC (rev 1417)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2006-04-12 07:34:39 UTC (rev 1418)
@@ -5053,7 +5053,7 @@
+#endif /* ! _SIGSET_H_fns */
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/bits/socket.h sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/socket.h
--- null/unix/bsd/bsd4.4/kfreebsd/bits/socket.h 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/socket.h 2006-03-18 17:31:11.000000000 +0100
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/socket.h 2006-04-12 09:33:08.000000000 +0200
@@ -0,0 +1,381 @@
+/* System-specific socket constants and types. FreeBSD version.
+ Copyright (C) 1991-1992,1994-1999,2000-2002 Free Software Foundation, Inc.
@@ -5263,10 +5263,10 @@
+ socklen_t msg_namelen; /* Length of address data. */
+
+ struct iovec *msg_iov; /* Vector of data to send/receive into. */
-+ size_t msg_iovlen; /* Number of elements in the vector. */
++ int msg_iovlen; /* Number of elements in the vector. */
+
+ void *msg_control; /* Ancillary data (eg BSD filedesc passing). */
-+ size_t msg_controllen; /* Ancillary data buffer length. */
++ socklen_t msg_controllen; /* Ancillary data buffer length. */
+
+ int msg_flags; /* Flags in received message. */
+ };
@@ -5279,17 +5279,10 @@
+ int cmsg_level; /* Originating protocol. */
+ int cmsg_type; /* Protocol specific type. */
+#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
-+ __extension__ unsigned char __cmsg_data __flexarr; /* Ancillary data. */
++ __extension__ unsigned char __cmsg_data __flexarr __attribute__ ((aligned (__alignof__(size_t)))); /* Ancillary data. */
+#endif
+ };
+
-+/* Ancillary data object manipulation macros. */
-+#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
-+# define CMSG_DATA(cmsg) ((cmsg)->__cmsg_data)
-+#else
-+# define CMSG_DATA(cmsg) ((unsigned char *) ((struct cmsghdr *) (cmsg) + 1))
-+#endif
-+
+#define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr (mhdr, cmsg)
+
+#define CMSG_FIRSTHDR(mhdr) \
@@ -5302,6 +5295,13 @@
+ + CMSG_ALIGN (sizeof (struct cmsghdr)))
+#define CMSG_LEN(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
+
++/* Ancillary data object manipulation macros. */
++#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
++# define CMSG_DATA(cmsg) ((cmsg)->__cmsg_data)
++#else
++# define CMSG_DATA(cmsg) ((unsigned char *) (cmsg) + CMSG_ALIGN(sizeof (struct cmsghdr)))
++#endif
++
+extern struct cmsghdr *__cmsg_nxthdr (struct msghdr *__mhdr,
+ struct cmsghdr *__cmsg) __THROW;
+#ifdef __USE_EXTERN_INLINES
@@ -9824,7 +9824,7 @@
+weak_alias(__getcontext, getcontext)
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/i386/i386_get_ioperm.c sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/i386_get_ioperm.c
--- null/unix/bsd/bsd4.4/kfreebsd/i386/i386_get_ioperm.c 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/i386_get_ioperm.c 2006-01-02 19:10:53.000000000 +0100
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/i386_get_ioperm.c 2006-04-11 09:22:30.000000000 +0200
@@ -0,0 +1,36 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -9848,7 +9848,7 @@
+#include <sysarch.h>
+
+int
-+i386_get_ioperm (unsigned int from, unsigned int *num, int *turned_on)
++i386_get_ioperm (unsigned long int from, unsigned long int *num, int *turned_on)
+{
+ struct i386_ioperm_args args;
+
@@ -9906,7 +9906,7 @@
+}
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/i386/i386_set_ioperm.c sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/i386_set_ioperm.c
--- null/unix/bsd/bsd4.4/kfreebsd/i386/i386_set_ioperm.c 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/i386_set_ioperm.c 2006-01-02 19:10:53.000000000 +0100
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/i386_set_ioperm.c 2006-04-11 07:46:26.000000000 +0200
@@ -0,0 +1,34 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -9930,7 +9930,7 @@
+#include <sysarch.h>
+
+int
-+i386_set_ioperm (unsigned int from, unsigned int num, int turn_on)
++i386_set_ioperm (unsigned long int from, unsigned long int num, int turn_on)
+{
+ struct i386_ioperm_args args;
+
@@ -10721,7 +10721,7 @@
+#endif /* _SYS_IO_H */
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/i386/sys/perm.h sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/sys/perm.h
--- null/unix/bsd/bsd4.4/kfreebsd/i386/sys/perm.h 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/sys/perm.h 2006-04-10 23:30:44.000000000 +0200
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/sys/perm.h 2006-04-11 09:21:14.000000000 +0200
@@ -0,0 +1,43 @@
+/* Copyright (C) 1996, 1999, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -10756,11 +10756,11 @@
+/* Change I/O privilege level. */
+extern int iopl (int __level) __THROW;
+
-+extern int i386_set_ioperm (unsigned int __from, unsigned int __num,
++extern int i386_set_ioperm (unsigned long int __from, unsigned long int __num,
+ int __turn_on) __THROW;
+
+/* Retrieve a contiguous range of port input/output permissions. */
-+extern int i386_get_ioperm (unsigned int __from, unsigned int *__num,
++extern int i386_get_ioperm (unsigned long int __from, unsigned long int *__num,
+ int *__turned_on) __THROW;
+
+__END_DECLS
@@ -20436,7 +20436,7 @@
+#endif /* _SYS_IO_H */
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/x86_64/sys/perm.h sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/sys/perm.h
--- null/unix/bsd/bsd4.4/kfreebsd/x86_64/sys/perm.h 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/sys/perm.h 2006-04-10 23:30:44.000000000 +0200
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/sys/perm.h 2006-04-11 09:22:14.000000000 +0200
@@ -0,0 +1,43 @@
+/* Copyright (C) 1996, 1999, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -20471,11 +20471,11 @@
+/* Change I/O privilege level. */
+extern int iopl (int __level) __THROW;
+
-+extern int i386_set_ioperm (unsigned int __from, unsigned int __num,
++extern int i386_set_ioperm (unsigned long int __from, unsigned long int __num,
+ int __turn_on) __THROW;
+
+/* Retrieve a contiguous range of port input/output permissions. */
-+extern int i386_get_ioperm (unsigned int __from, unsigned int *__num,
++extern int i386_get_ioperm (unsigned long int __from, unsigned long int *__num,
+ int *__turned_on) __THROW;
+
+__END_DECLS
Reply to: