r3428 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: aurel32
Date: 2009-04-26 22:45:35 +0000 (Sun, 26 Apr 2009)
New Revision: 3428
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 2482 (from glibc-bsd).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-04-26 21:47:14 UTC (rev 3427)
+++ glibc-package/trunk/debian/changelog 2009-04-26 22:45:35 UTC (rev 3428)
@@ -31,14 +31,14 @@
with binutils 2.20.
[ Petr Salinger ]
- * kfreebsd/local-sysdeps.diff: update to revision 2450 (from glibc-bsd).
+ * kfreebsd/local-sysdeps.diff: update to revision 2482 (from glibc-bsd).
Closes: #522686. Thanks to Jan Christoph Nordholz.
[ Samuel Thibault ]
* hurd-i386/cvs-rtld.diff: new patch, fixes boot of glibc built with
binutils >= 2.19.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 26 Apr 2009 19:43:13 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 27 Apr 2009 00:44:59 +0200
glibc (2.9-7) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-04-26 21:47:14 UTC (rev 3427)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-04-26 22:45:35 UTC (rev 3428)
@@ -3870,7 +3870,7 @@
+#endif /* Use BSD */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/msq.h
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,69 @@
+/* Copyright (C) 1995, 1997, 2000, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -3928,8 +3928,6 @@
+
+# define msg_cbytes __msg_cbytes
+
-+# ifdef _KERNEL
-+
+/* buffer for msgctl calls IPC_INFO, MSG_INFO */
+struct msginfo
+ {
@@ -3941,8 +3939,6 @@
+ int msgseg;
+ };
+
-+# endif
-+
+#endif /* __USE_MISC */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/poll.h
@@ -4574,7 +4570,7 @@
+
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/shm.h
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,90 @@
+/* Copyright (C) 1995-1997, 2000, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -4610,11 +4606,11 @@
+#define SHM_RND 020000 /* round attach address to SHMLBA */
+
+/* Commands for `shmctl'. */
-+#if 0 /* FreeBSD does not have these yet. */
+#define SHM_LOCK 11 /* lock segment (root only) */
+#define SHM_UNLOCK 12 /* unlock segment (root only) */
-+#endif
+
++__BEGIN_DECLS
++
+/* Segment low boundary address multiple. */
+#define SHMLBA (__getpagesize ())
+extern int __getpagesize (void) __THROW __attribute__ ((__const__));
@@ -4637,18 +4633,34 @@
+ void *__shm_internal;
+ };
+
-+#ifdef _KERNEL
++#ifdef __USE_MISC
+
-+struct shminfo {
++/* ipcs ctl commands */
++# define SHM_STAT 13
++# define SHM_INFO 14
++
++struct shminfo
++ {
+ int shmmax, /* max shared memory segment size (bytes) */
+ shmmin, /* min shared memory segment size (bytes) */
+ shmmni, /* max number of shared memory identifiers */
+ shmseg, /* max shared memory segments per process */
+ shmall; /* max amount of shared memory (pages) */
-+};
++ };
+
-+#endif
++struct shm_info
++ {
++ int used_ids;
++ unsigned long int shm_tot; /* total allocated shm */
++ unsigned long int shm_rss; /* total resident shm */
++ unsigned long int shm_swp; /* total swapped shm */
++ unsigned long int swap_attempts;
++ unsigned long int swap_successes;
++ };
+
++#endif /* __USE_MISC */
++
++__END_DECLS
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/sigaction.h
@@ -0,0 +1,76 @@
Reply to: