Author: aurel32
Date: 2013-05-07 21:49:12 +0000 (Tue, 07 May 2013)
New Revision: 5555
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 4409 (from glibc-bsd).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-05-07 21:47:59 UTC (rev
5554)
+++ glibc-package/trunk/debian/changelog 2013-05-07 21:49:12 UTC (rev
5555)
@@ -7,6 +7,7 @@
[ Aurelien Jarno ]
* patches/any/submitted-sys-param-h-DEV_BSIZE.diff: New patch to fix
conflict with kFreeBSD kernel headers.
+ * kfreebsd/local-sysdeps.diff: update to revision 4409 (from glibc-bsd).
-- Adam Conrad <[email protected]> Tue, 07 May 2013 13:58:05 -0600
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
2013-05-07 21:47:59 UTC (rev 5554)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
2013-05-07 21:49:12 UTC (rev 5555)
@@ -410,6 +410,34 @@
+
+#endif /* _G_config.h */
--- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/_exit.S
+@@ -0,0 +1,25 @@
++/* Copyright (C) 1991,92,97,99,2002 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <sysdep.h>
++
++PSEUDO (_exit, exit, 1)
++ /* Shouldn't get here. */
++PSEUDO_END(_exit)
++libc_hidden_def (_exit)
++weak_alias (_exit, _Exit)
+--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/a.out.h
@@ -0,0 +1,140 @@
+#ifndef __A_OUT_GNU_H__
@@ -1862,6 +1890,202 @@
+
+#endif /* __USE_MISC */
--- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/param.h
+@@ -0,0 +1,193 @@
++/* Copyright (C) 1995,1996,1997,2000,2001,2003 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#ifndef _SYS_PARAM_H
++# error "Never use <bits/param.h> directly; include <sys/param.h> instead."
++#endif
++
++#include <limits.h>
++#include <sys/syslimits.h>
++
++/*
++ * __FreeBSD_version numbers are documented in the Porter's Handbook.
++ * If you bump the version for any reason, you should update the documentation
++ * there.
++ * Currently this lives here:
++ *
++ * doc/en_US.ISO8859-1/books/porters-handbook/book.sgml
++ *
++ * scheme is: <major><two digit minor><0 if release branch, otherwise 1>xx
++ */
++#include <osreldate.h>
++
++/* Some inet code expects that this file defines the 'u_int32_t' type. */
++#include <stdint.h>
++
++/* FreeBSD code expects that this file implicitly defines SIG* macros. */
++#include <signal.h>
++
++/*
++ * Machine-independent constants (some used in following include files).
++ * Redefined constants are from POSIX 1003.1 limits file.
++ *
++ * MAXCOMLEN should be >= sizeof(ac_comm) (see <acct.h>)
++ * MAXLOGNAME should be == UT_NAMESIZE+1 (see <utmp.h>)
++ */
++
++#define MAXCOMLEN 19 /* max command name remembered */
++#define MAXINTERP 32 /* max interpreter file name length */
++#define MAXLOGNAME 17 /* max login name length (incl. NUL)
*/
++#define MAXUPRC CHILD_MAX /* max simultaneous processes */
++#define NGROUPS NGROUPS_MAX /* max number groups */
++#define MAXHOSTNAMELEN 256 /* max hostname size */
++#define SPECNAMELEN 63 /* max length of devicename */
++#define TTY_NAME_MAX SPECNAMELEN
++
++/* BSD names for some <limits.h> values. */
++
++#define MAXSYMLINKS 32
++#define CANBSIZ MAX_CANON
++
++/* Machine type dependent parameters. */
++#include <machine/param.h>
++
++#ifndef BLKDEV_IOSIZE
++#define BLKDEV_IOSIZE PAGE_SIZE /* default block device I/O size */
++#endif
++#ifndef DFLTPHYS
++#define DFLTPHYS (64 * 1024) /* default max raw I/O transfer size */
++#endif
++#ifndef MAXPHYS
++#define MAXPHYS (128 * 1024) /* max raw I/O transfer size */
++#endif
++#ifndef MAXDUMPPGS
++#define MAXDUMPPGS (DFLTPHYS/PAGE_SIZE)
++#ifndef MAXHOSTNAMELEN
++#define MAXHOSTNAMELEN 64 /* XXX */
++#endif /* No MAXHOSTNAMELEN. */
++
++/*
++ * Constants related to network buffer management.
++ * MCLBYTES must be no larger than PAGE_SIZE.
++ */
++#ifndef MSIZE
++#define MSIZE 256 /* size of an mbuf */
++#endif /* MSIZE */
++
++#ifndef MCLSHIFT
++#define MCLSHIFT 11 /* convert bytes to mbuf clusters */
++#endif /* MCLSHIFT */
++
++#define MCLBYTES (1 << MCLSHIFT) /* size of an mbuf cluster */
++
++/*
++ * Some macros for units conversion
++ */
++
++/* clicks to bytes */
++#ifndef ctob
++#define ctob(x) ((x)<<PAGE_SHIFT)
++#endif
++
++/* bytes to clicks */
++#ifndef btoc
++#define btoc(x) (((vm_offset_t)(x)+PAGE_MASK)>>PAGE_SHIFT)
++#endif
++
++/*
++ * btodb() is messy and perhaps slow because `bytes' may be an off_t. We
++ * want to shift an unsigned type to avoid sign extension and we don't
++ * want to widen `bytes' unnecessarily. Assume that the result fits in
++ * a daddr_t.
++ */
++#ifndef btodb
++#define btodb(bytes) /* calculates (bytes / DEV_BSIZE) */ \
++ (sizeof (bytes) > sizeof(long) \
++ ? (daddr_t)((unsigned long long)(bytes) >> DEV_BSHIFT) \
++ : (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT))
++#endif
++
++#ifndef dbtob
++#define dbtob(db) /* calculates (db * DEV_BSIZE) */ \
++ ((off_t)(db) << DEV_BSHIFT)
++#endif
++
++#endif /* _NO_NAMESPACE_POLLUTION */
++
++#define PRIMASK 0x0ff
++#define PCATCH 0x100 /* OR'd with pri for tsleep to check
signals */
++#define PDROP 0x200 /* OR'd with pri to stop re-entry of interlock
mutex */
++
++#define NBPW sizeof(int) /* number of bytes per word (integer) */
++
++#define CMASK 022 /* default file mask: S_IWGRP|S_IWOTH */
++
++#define NODEV (dev_t)(-1) /* non-existent device */
++
++#define CBLOCK 128 /* Clist block size, must be a power of
2. */
++#define CBQSIZE (CBLOCK/NBBY) /* Quote bytes/cblock - can do better.
*/
++ /* Data chars/clist. */
++#define CBSIZE (CBLOCK - sizeof(struct cblock *) - CBQSIZE)
++#define CROUND (CBLOCK - 1) /* Clist rounding. */
++
++/*
++ * File system parameters and macros.
++ *
++ * MAXBSIZE - Filesystems are made out of blocks of at most MAXBSIZE bytes
++ * per block. MAXBSIZE may be made larger without effecting
++ * any existing filesystems as long as it does not exceed MAXPHYS,
++ * and may be made smaller at the risk of not being able to use
++ * filesystems which require a block size exceeding MAXBSIZE.
++ *
++ * BKVASIZE - Nominal buffer space per buffer, in bytes. BKVASIZE is the
++ * minimum KVM memory reservation the kernel is willing to make.
++ * Filesystems can of course request smaller chunks. Actual
++ * backing memory uses a chunk size of a page (PAGE_SIZE).
++ *
++ * If you make BKVASIZE too small you risk seriously fragmenting
++ * the buffer KVM map which may slow things down a bit. If you
++ * make it too big the kernel will not be able to optimally use
++ * the KVM memory reserved for the buffer cache and will wind
++ * up with too-few buffers.
++ *
++ * The default is 16384, roughly 2x the block size used by a
++ * normal UFS filesystem.
++ */
++#define MAXBSIZE 65536 /* must be power of 2 */
++#define BKVASIZE 16384 /* must be power of 2 */
++#define BKVAMASK (BKVASIZE-1)
++
++/*
++ * Scale factor for scaled integers used to count %cpu time and load avgs.
++ *
++ * The number of CPU `tick's that map to a unique `%age' can be expressed
++ * by the formula (1 / (2 ^ (FSHIFT - 11))). The maximum load average that
++ * can be calculated (assuming 32 bits) can be closely approximated using
++ * the formula (2 ^ (2 * (16 - FSHIFT))) for (FSHIFT < 15).
++ *
++ * For the scheduler to maintain a 1:1 mapping of CPU `tick' to `%age',
++ * FSHIFT must be at least 11; this gives us a maximum load avg of ~1024.
++ */
++#define FSHIFT 11 /* bits to right of fixed binary point
*/
++#define FSCALE (1<<FSHIFT)
++
++#define dbtoc(db) /* calculates devblks to pages */ \
++ ((db + (ctodb(1) - 1)) >> (PAGE_SHIFT - DEV_BSHIFT))
++
++#define ctodb(db) /* calculates pages to devblks */ \
++ ((db) << (PAGE_SHIFT - DEV_BSHIFT))
+--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/poll.h
@@ -0,0 +1,62 @@
+/* Copyright (C) 1997, 2001-2002 Free Software Foundation, Inc.
@@ -6324,12 +6548,12 @@
+
+ __libc_stack_end = DL_STACK_END (start_argptr);
+ DL_FIND_ARG_COMPONENTS (start_argptr, _dl_argc, INTUSE(_dl_argv), _environ,
-+ _dl_auxv);
++ GLRO(dl_auxv));
+
+ user_entry = (ElfW(Addr)) ENTRY_POINT;
+ GLRO(dl_platform) = NULL; /* Default to nothing known about the platform.
*/
+
-+ for (av = _dl_auxv; av->a_type != AT_NULL; av++)
++ for (av = GLRO(dl_auxv); av->a_type != AT_NULL; av++)
+ switch (av->a_type)
+ {
+ case AT_PHDR:
@@ -6408,7 +6632,7 @@
+ if (__builtin_expect (INTUSE(__libc_enable_secure), 0))
+ __libc_check_standard_fds ();
+
-+ (*dl_main) (phdr, phnum, &user_entry, _dl_auxv);
++ (*dl_main) (phdr, phnum, &user_entry, GLRO(dl_auxv));
+ return user_entry;
+}
+
@@ -6427,7 +6651,7 @@
+ close by (otherwise the array will be too large). In case we have
+ to support a platform where these requirements are not fulfilled
+ some alternative implementation has to be used. */
-+ for (av = _dl_auxv; av->a_type != AT_NULL; ++av)
++ for (av = GLRO(dl_auxv); av->a_type != AT_NULL; ++av)
+ {
+ static const struct
+ {
@@ -10517,7 +10741,7 @@
+
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/linuxthreads/tls.h
-@@ -0,0 +1,93 @@
+@@ -0,0 +1,92 @@
+/* Definition for thread-local data handling. linuxthreads/i386 version.
+ Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -10551,8 +10775,7 @@
+ But some of the code below can cause problems in building libpthread
+*/
+
-+#if defined HAVE_TLS_SUPPORT \
-+ && (defined FLOATING_STACKS || !defined IS_IN_libpthread)
++#if defined FLOATING_STACKS || !defined IS_IN_libpthread
+
+# ifndef __ASSEMBLER__
+
@@ -10608,7 +10831,7 @@
+
+# endif /* __ASSEMBLER__ */
+
-+#endif /* HAVE_TLS_SUPPORT && (FLOATING_STACKS || !IS_IN_libpthread) */
++#endif /* FLOATING_STACKS || !IS_IN_libpthread */
+
+#endif /* _FREEBSD_TLS_H */
--- /dev/null
@@ -15485,7 +15708,7 @@
+#endif
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/mips/linuxthreads/tls.h
-@@ -0,0 +1,206 @@
+@@ -0,0 +1,205 @@
+/* Definitions for thread-local data handling. linuxthreads/MIPS version.
+ Copyright (C) 2005 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -15557,8 +15780,7 @@
+ To avoid bothering with the TLS support code at all, use configure
+ --without-tls. */
+
-+#if defined HAVE_TLS_SUPPORT \
-+ && (defined FLOATING_STACKS || !defined IS_IN_libpthread)
++#if defined FLOATING_STACKS || !defined IS_IN_libpthread
+
+/* Signal that TLS support is available. */
+# define USE_TLS 1
@@ -15689,7 +15911,7 @@
+
+# endif /* __ASSEMBLER__ */
+
-+#endif /* HAVE_TLS_SUPPORT */
++#endif /* FLOATING_STACKS || !IS_IN_libpthread */
+
+#endif /* tls.h */
--- /dev/null
@@ -20549,7 +20771,7 @@
+
+#define readdir64 __no_readdir64_decl
+#define __readdir64 __no___readdir64_decl
-+#include <sysdeps/unix/readdir.c>
++#include <sysdeps/posix/readdir.c>
+#undef __readdir64
+#undef readdir64
+
@@ -20573,7 +20795,7 @@
+
+#define readdir64_r __no_readdir64_r_decl
+#define __readdir64_r __no___readdir64_r_decl
-+#include <sysdeps/unix/readdir_r.c>
++#include <sysdeps/posix/readdir_r.c>
+#undef __readdir64_r
+#undef readdir64_r
+
@@ -21499,7 +21721,7 @@
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/seekdir.c
@@ -0,0 +1,2 @@
+/* Avoid <sysdeps/unix/bsd/telldir.c>, which doesn't pass the testsuite. */
-+#include <sysdeps/unix/seekdir.c>
++#include <sysdeps/posix/seekdir.c>
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/semctl.c
@@ -0,0 +1,89 @@
@@ -22620,6 +22842,15 @@
+/* use stub only variant */
+#include <misc/stty.c>
--- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/svn-commit.tmp
+@@ -0,0 +1,6 @@
++
++--Cette ligne, et les suivantes ci-dessous, seront ignorées--
++
++M mips/linuxthreads/tls.h
++M x86_64/linuxthreads/tls.h
++M i386/linuxthreads/tls.h
+--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/symlinkat.c
@@ -0,0 +1,126 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
@@ -23301,251 +23532,6 @@
+
+#endif /* _SYS_MOUNT_H */
--- /dev/null
-+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/param.h
-@@ -0,0 +1,242 @@
-+/* Copyright (C) 1995,1996,1997,2000,2001,2003 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#ifndef _SYS_PARAM_H
-+#define _SYS_PARAM_H 1
-+
-+#include <limits.h>
-+#include <sys/syslimits.h>
-+
-+#ifndef NULL
-+#define NULL 0
-+#endif
-+
-+/*
-+ * __FreeBSD_version numbers are documented in the Porter's Handbook.
-+ * If you bump the version for any reason, you should update the documentation
-+ * there.
-+ * Currently this lives here:
-+ *
-+ * doc/en_US.ISO8859-1/books/porters-handbook/book.sgml
-+ *
-+ * scheme is: <major><two digit minor><0 if release branch, otherwise 1>xx
-+ */
-+#include <osreldate.h>
-+
-+/* Some inet code expects that this file defines the 'u_int32_t' type. */
-+#include <sys/types.h>
-+#include <stdint.h>
-+
-+/* FreeBSD code expects that this file implicitly defines SIG* macros. */
-+#include <signal.h>
-+
-+/*
-+ * Machine-independent constants (some used in following include files).
-+ * Redefined constants are from POSIX 1003.1 limits file.
-+ *
-+ * MAXCOMLEN should be >= sizeof(ac_comm) (see <acct.h>)
-+ * MAXLOGNAME should be == UT_NAMESIZE+1 (see <utmp.h>)
-+ */
-+
-+#define MAXCOMLEN 19 /* max command name remembered */
-+#define MAXINTERP 32 /* max interpreter file name length */
-+#define MAXLOGNAME 17 /* max login name length (incl. NUL)
*/
-+#define MAXUPRC CHILD_MAX /* max simultaneous processes */
-+#define NCARGS ARG_MAX /* max bytes for an exec function */
-+#define NGROUPS NGROUPS_MAX /* max number groups */
-+#define NOGROUP 65535 /* marker for empty group set member
*/
-+#define MAXHOSTNAMELEN 256 /* max hostname size */
-+#define SPECNAMELEN 63 /* max length of devicename */
-+#define TTY_NAME_MAX SPECNAMELEN
-+
-+/* BSD names for some <limits.h> values. */
-+
-+#define NBBY CHAR_BIT
-+#ifndef NGROUPS
-+# define NGROUPS NGROUPS_MAX
-+#endif
-+#define MAXSYMLINKS 32
-+#define CANBSIZ MAX_CANON
-+#define NCARGS ARG_MAX
-+#define MAXPATHLEN PATH_MAX
-+
-+/* The following is not really correct but it is a value we used for a
-+ long time and which seems to be usable. People should not use NOFILE
-+ anyway. */
-+#define NOFILE OPEN_MAX
-+
-+/* Bit map related macros. */
-+#define setbit(a,i) ((a)[(i)/NBBY] |= 1<<((i)%NBBY))
-+#define clrbit(a,i) ((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-+#define isset(a,i) ((a)[(i)/NBBY] & (1<<((i)%NBBY)))
-+#define isclr(a,i) (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-+
-+/* Macros for counting and rounding. */
-+#ifndef howmany
-+# define howmany(x, y) (((x) + ((y) - 1)) / (y))
-+#endif
-+#ifdef __GNUC__
-+# define roundup(x, y) (__builtin_constant_p (y) && powerof2 (y)
\
-+ ? (((x) + (y) - 1) & ~((y) - 1)) \
-+ : ((((x) + ((y) - 1)) / (y)) * (y)))
-+#else
-+# define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
-+#endif
-+#define roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) /* if y is powers of
two */
-+#define powerof2(x) ((((x) - 1) & (x)) == 0)
-+
-+/* Macros for min/max. */
-+#define MIN(a,b) (((a)<(b))?(a):(b))
-+#define MAX(a,b) (((a)>(b))?(a):(b))
-+
-+/* Machine type dependent parameters. */
-+#include <machine/param.h>
-+
-+#ifndef DEV_BSHIFT
-+#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
-+#endif
-+#define DEV_BSIZE (1<<DEV_BSHIFT)
-+
-+#ifndef BLKDEV_IOSIZE
-+#define BLKDEV_IOSIZE PAGE_SIZE /* default block device I/O size */
-+#endif
-+#ifndef DFLTPHYS
-+#define DFLTPHYS (64 * 1024) /* default max raw I/O transfer size */
-+#endif
-+#ifndef MAXPHYS
-+#define MAXPHYS (128 * 1024) /* max raw I/O transfer size */
-+#endif
-+#ifndef MAXDUMPPGS
-+#define MAXDUMPPGS (DFLTPHYS/PAGE_SIZE)
-+#ifndef MAXHOSTNAMELEN
-+#define MAXHOSTNAMELEN 64 /* XXX */
-+#endif /* No MAXHOSTNAMELEN. */
-+
-+/*
-+ * Constants related to network buffer management.
-+ * MCLBYTES must be no larger than PAGE_SIZE.
-+ */
-+#ifndef MSIZE
-+#define MSIZE 256 /* size of an mbuf */
-+#endif /* MSIZE */
-+
-+#ifndef MCLSHIFT
-+#define MCLSHIFT 11 /* convert bytes to mbuf clusters */
-+#endif /* MCLSHIFT */
-+
-+#define MCLBYTES (1 << MCLSHIFT) /* size of an mbuf cluster */
-+
-+/*
-+ * Some macros for units conversion
-+ */
-+
-+/* clicks to bytes */
-+#ifndef ctob
-+#define ctob(x) ((x)<<PAGE_SHIFT)
-+#endif
-+
-+/* bytes to clicks */
-+#ifndef btoc
-+#define btoc(x) (((vm_offset_t)(x)+PAGE_MASK)>>PAGE_SHIFT)
-+#endif
-+
-+/*
-+ * btodb() is messy and perhaps slow because `bytes' may be an off_t. We
-+ * want to shift an unsigned type to avoid sign extension and we don't
-+ * want to widen `bytes' unnecessarily. Assume that the result fits in
-+ * a daddr_t.
-+ */
-+#ifndef btodb
-+#define btodb(bytes) /* calculates (bytes / DEV_BSIZE) */ \
-+ (sizeof (bytes) > sizeof(long) \
-+ ? (daddr_t)((unsigned long long)(bytes) >> DEV_BSHIFT) \
-+ : (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT))
-+#endif
-+
-+#ifndef dbtob
-+#define dbtob(db) /* calculates (db * DEV_BSIZE) */ \
-+ ((off_t)(db) << DEV_BSHIFT)
-+#endif
-+
-+#endif /* _NO_NAMESPACE_POLLUTION */
-+
-+#define PRIMASK 0x0ff
-+#define PCATCH 0x100 /* OR'd with pri for tsleep to check
signals */
-+#define PDROP 0x200 /* OR'd with pri to stop re-entry of interlock
mutex */
-+
-+#define NBPW sizeof(int) /* number of bytes per word (integer) */
-+
-+#define CMASK 022 /* default file mask: S_IWGRP|S_IWOTH */
-+
-+#define NODEV (dev_t)(-1) /* non-existent device */
-+
-+#define CBLOCK 128 /* Clist block size, must be a power of
2. */
-+#define CBQSIZE (CBLOCK/NBBY) /* Quote bytes/cblock - can do better.
*/
-+ /* Data chars/clist. */
-+#define CBSIZE (CBLOCK - sizeof(struct cblock *) - CBQSIZE)
-+#define CROUND (CBLOCK - 1) /* Clist rounding. */
-+
-+/*
-+ * File system parameters and macros.
-+ *
-+ * MAXBSIZE - Filesystems are made out of blocks of at most MAXBSIZE bytes
-+ * per block. MAXBSIZE may be made larger without effecting
-+ * any existing filesystems as long as it does not exceed MAXPHYS,
-+ * and may be made smaller at the risk of not being able to use
-+ * filesystems which require a block size exceeding MAXBSIZE.
-+ *
-+ * BKVASIZE - Nominal buffer space per buffer, in bytes. BKVASIZE is the
-+ * minimum KVM memory reservation the kernel is willing to make.
-+ * Filesystems can of course request smaller chunks. Actual
-+ * backing memory uses a chunk size of a page (PAGE_SIZE).
-+ *
-+ * If you make BKVASIZE too small you risk seriously fragmenting
-+ * the buffer KVM map which may slow things down a bit. If you
-+ * make it too big the kernel will not be able to optimally use
-+ * the KVM memory reserved for the buffer cache and will wind
-+ * up with too-few buffers.
-+ *
-+ * The default is 16384, roughly 2x the block size used by a
-+ * normal UFS filesystem.
-+ */
-+#define MAXBSIZE 65536 /* must be power of 2 */
-+#define BKVASIZE 16384 /* must be power of 2 */
-+#define BKVAMASK (BKVASIZE-1)
-+
-+/*
-+ * Scale factor for scaled integers used to count %cpu time and load avgs.
-+ *
-+ * The number of CPU `tick's that map to a unique `%age' can be expressed
-+ * by the formula (1 / (2 ^ (FSHIFT - 11))). The maximum load average that
-+ * can be calculated (assuming 32 bits) can be closely approximated using
-+ * the formula (2 ^ (2 * (16 - FSHIFT))) for (FSHIFT < 15).
-+ *
-+ * For the scheduler to maintain a 1:1 mapping of CPU `tick' to `%age',
-+ * FSHIFT must be at least 11; this gives us a maximum load avg of ~1024.
-+ */
-+#define FSHIFT 11 /* bits to right of fixed binary point
*/
-+#define FSCALE (1<<FSHIFT)
-+
-+#define dbtoc(db) /* calculates devblks to pages */ \
-+ ((db + (ctodb(1) - 1)) >> (PAGE_SHIFT - DEV_BSHIFT))
-+
-+#define ctodb(db) /* calculates pages to devblks */ \
-+ ((db) << (PAGE_SHIFT - DEV_BSHIFT))
-+
-+#endif /* _SYS_PARAM_H_ */
-+
---- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/ptrace.h
@@ -0,0 +1,113 @@
+/*-
@@ -25283,7 +25269,7 @@
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/telldir.c
@@ -0,0 +1,2 @@
+/* Avoid <sysdeps/unix/bsd/telldir.c>, which doesn't pass the testsuite. */
-+#include <sysdeps/unix/telldir.c>
++#include <sysdeps/posix/telldir.c>
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/testrtsig.h
@@ -0,0 +1,37 @@
@@ -27764,7 +27750,7 @@
+#endif
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/linuxthreads/tls.h
-@@ -0,0 +1,62 @@
+@@ -0,0 +1,59 @@
+/* Definitions for thread-local data handling. linuxthreads/x86-64 version.
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -27790,10 +27776,8 @@
+
+#include <linuxthreads/sysdeps/x86_64/tls.h>
+
-+#ifdef HAVE_TLS_SUPPORT
++#ifndef __ASSEMBLER__
+
-+# ifndef __ASSEMBLER__
-+
+#include <sysarch.h>
+#include <sys/syscall.h>
+
@@ -27823,7 +27807,6 @@
+ })
+
+
-+# endif /* HAVE_TLS_SUPPORT */
+#endif /* __ASSEMBLER__ */
+
+#endif /* tls.h */
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
