CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: mrg Date: Fri Apr 15 08:43:12 UTC 2011 Modified Files: src/sys/arch/sparc64/sparc64: db_trace.c Log Message: remove a tray empty line. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/arch/sparc64/sparc64/db_trace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/sparc64/db_trace.c diff -u src/sys/arch/sparc64/sparc64/db_trace.c:1.46 src/sys/arch/sparc64/sparc64/db_trace.c:1.47 --- src/sys/arch/sparc64/sparc64/db_trace.c:1.46 Wed Apr 13 03:32:28 2011 +++ src/sys/arch/sparc64/sparc64/db_trace.c Fri Apr 15 08:43:12 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: db_trace.c,v 1.46 2011/04/13 03:32:28 mrg Exp $ */ +/* $NetBSD: db_trace.c,v 1.47 2011/04/15 08:43:12 mrg Exp $ */ /* * Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved. @@ -28,7 +28,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: db_trace.c,v 1.46 2011/04/13 03:32:28 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: db_trace.c,v 1.47 2011/04/15 08:43:12 mrg Exp $); #include sys/param.h #include sys/proc.h @@ -120,7 +120,6 @@ #else (*pr)(no proc_find_raw() in crash\n); return; - #endif } (*pr)(lid %d , l-l_lid);
CVS commit: src
Module Name:src
Committed By: plunky
Date: Fri Apr 15 08:47:02 UTC 2011
Modified Files:
src/rescue: list.ldd
src/usr.bin/ldd: Makefile
Added Files:
src/usr.bin/ldd/build: Makefile
Log Message:
move the build of ldd binary to a subdir in order to allow
explict ordering. This makes make all work the same as
make dependall
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/rescue/list.ldd
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/ldd/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.bin/ldd/build/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/list.ldd
diff -u src/rescue/list.ldd:1.6 src/rescue/list.ldd:1.7
--- src/rescue/list.ldd:1.6 Fri Mar 25 18:07:07 2011
+++ src/rescue/list.ldd Fri Apr 15 08:47:02 2011
@@ -1,6 +1,7 @@
-# $NetBSD: list.ldd,v 1.6 2011/03/25 18:07:07 joerg Exp $
+# $NetBSD: list.ldd,v 1.7 2011/04/15 08:47:02 plunky Exp $
PROG ldd
+SPECIAL ldd srcdir usr.bin/ldd/build
LIBS ${LDD_ELF32DIR}/libldd_elf32.a
LIBS ${LDD_ELF64DIR}/libldd_elf64.a
Index: src/usr.bin/ldd/Makefile
diff -u src/usr.bin/ldd/Makefile:1.15 src/usr.bin/ldd/Makefile:1.16
--- src/usr.bin/ldd/Makefile:1.15 Tue Dec 15 04:06:43 2009
+++ src/usr.bin/ldd/Makefile Fri Apr 15 08:47:02 2011
@@ -1,44 +1,5 @@
-# $NetBSD: Makefile,v 1.15 2009/12/15 04:06:43 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2011/04/15 08:47:02 plunky Exp $
-WARNS?= 3 # XXX: -Wsign-compare issues ld.elf_so source
+SUBDIR+= elf32 elf64 elf32_compat .WAIT build
-.include bsd.own.mk # for MKDYNAMICROOT definition
-
-PROG= ldd
-SRCS= ldd.c
-MAN= ldd.1
-
-
-SUBDIR+= elf32 elf64 elf32_compat
-
-.if (${MACHINE_ARCH} != alpha)
-LIB_ELF32DIR!= cd ${.CURDIR}/elf32 ${PRINTOBJDIR}
-EXTRA_LIBS+= ${LIB_ELF32DIR}/libldd_elf32.a
-.endif
-
-.if (${MACHINE_ARCH} == mips64el) || (${MACHINE_ARCH} == mips64eb)
-LIB_ELF32COMPATDIR!= cd ${.CURDIR}/elf32_compat ${PRINTOBJDIR}
-EXTRA_LIBS+= ${LIB_ELF32COMPATDIR}/libldd_elf32_compat.a
-.endif
-
-.if (${MACHINE_ARCH} == alpha) || (${MACHINE_ARCH} == sparc64) || \
-(${MACHINE_ARCH} == x86_64) || (${MACHINE_ARCH} == powerpc64) || \
-(${MACHINE_ARCH} == mips64el) || (${MACHINE_ARCH} == mips64eb)
-LIB_ELF64DIR!= cd ${.CURDIR}/elf64 ${PRINTOBJDIR}
-EXTRA_LIBS+= ${LIB_ELF64DIR}/libldd_elf64.a
-CPPFLAGS.ldd.c= -DELFSIZE=64
-.else
-CPPFLAGS.ldd.c= -DELFSIZE=32
-.endif
-
-LDADD+= ${EXTRA_LIBS}
-DPADD+= ${EXTRA_LIBS}
-
-.include Makefile.common
-
-.if (${MKDYNAMICROOT} == no)
-LDSTATIC?= -static
-.endif
-
-.include bsd.prog.mk
.include bsd.subdir.mk
Added files:
Index: src/usr.bin/ldd/build/Makefile
diff -u /dev/null src/usr.bin/ldd/build/Makefile:1.1
--- /dev/null Fri Apr 15 08:47:02 2011
+++ src/usr.bin/ldd/build/Makefile Fri Apr 15 08:47:02 2011
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile,v 1.1 2011/04/15 08:47:02 plunky Exp $
+
+.include bsd.own.mk # for MKDYNAMICROOT definition
+
+PROG= ldd
+SRCS= ldd.c
+MAN= ldd.1
+
+.PATH: ${.CURDIR}/..
+
+.if (${MACHINE_ARCH} != alpha)
+LIB_ELF32DIR!= cd ${.CURDIR}/../elf32 ${PRINTOBJDIR}
+EXTRA_LIBS+= ${LIB_ELF32DIR}/libldd_elf32.a
+.endif
+
+.if (${MACHINE_ARCH} == mips64el) || (${MACHINE_ARCH} == mips64eb)
+LIB_ELF32COMPATDIR!= cd ${.CURDIR}/../elf32_compat ${PRINTOBJDIR}
+EXTRA_LIBS+= ${LIB_ELF32COMPATDIR}/libldd_elf32_compat.a
+.endif
+
+.if (${MACHINE_ARCH} == alpha) || (${MACHINE_ARCH} == sparc64) || \
+(${MACHINE_ARCH} == x86_64) || (${MACHINE_ARCH} == powerpc64) || \
+(${MACHINE_ARCH} == mips64el) || (${MACHINE_ARCH} == mips64eb)
+LIB_ELF64DIR!= cd ${.CURDIR}/../elf64 ${PRINTOBJDIR}
+EXTRA_LIBS+= ${LIB_ELF64DIR}/libldd_elf64.a
+CPPFLAGS.ldd.c= -DELFSIZE=64
+.else
+CPPFLAGS.ldd.c= -DELFSIZE=32
+.endif
+
+LDADD+= ${EXTRA_LIBS}
+DPADD+= ${EXTRA_LIBS}
+
+.include Makefile.common
+
+.if (${MKDYNAMICROOT} == no)
+LDSTATIC?= -static
+.endif
+
+.include bsd.prog.mk
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: elric
Date: Fri Apr 15 12:16:31 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.rules.inc
Log Message:
Quick makefile bits that will use a version-script.map file if it exists
when building libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/Makefile.rules.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/Makefile.rules.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.1 src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.2
--- src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.1 Wed Apr 13 19:16:44 2011
+++ src/crypto/external/bsd/heimdal/Makefile.rules.inc Fri Apr 15 12:16:31 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rules.inc,v 1.1 2011/04/13 19:16:44 elric Exp $
+# $NetBSD: Makefile.rules.inc,v 1.2 2011/04/15 12:16:31 elric Exp $
SRCS+= ${HEIMSRCS:N*.et:N*.in:N*.asn1}
@@ -90,3 +90,9 @@
.if defined(PROG) defined(OBJS)
OBJS.${PROG} += ${OBJS}
.endif
+
+.if defined(LIB) exists(version-script.map)
+version-script.map:
+
+LDFLAGS.lib${LIB} += -Wl,--version-script=${version-script.map:P}
+.endif
CVS commit: src/crypto/external/bsd/heimdal/include
Module Name:src Committed By: elric Date: Fri Apr 15 12:18:22 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/include: krb5-types.h Log Message: For the duration of the import and upgrade, we eliminate the marking of older interfaces as deprecated as this breaks the build and we want to commit the changes in logical chunks. We will revert this commit later. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/include/krb5-types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/include/krb5-types.h diff -u src/crypto/external/bsd/heimdal/include/krb5-types.h:1.1 src/crypto/external/bsd/heimdal/include/krb5-types.h:1.2 --- src/crypto/external/bsd/heimdal/include/krb5-types.h:1.1 Wed Apr 13 19:03:58 2011 +++ src/crypto/external/bsd/heimdal/include/krb5-types.h Fri Apr 15 12:18:22 2011 @@ -1,5 +1,5 @@ /* krb5-types.h -- this file was generated for x86_64-unknown-netbsd5.99.41 by - $Id: krb5-types.h,v 1.1 2011/04/13 19:03:58 elric Exp $ */ + $Id: krb5-types.h,v 1.2 2011/04/15 12:18:22 elric Exp $ */ #ifndef __krb5_types_h__ #define __krb5_types_h__ @@ -15,6 +15,8 @@ typedef int krb5_socket_t; +#define HEIMDAL_DEPRECATED + #ifndef HEIMDAL_DEPRECATED #if defined(__GNUC__) ((__GNUC__ 3) || ((__GNUC__ == 3) (__GNUC_MINOR__ = 1 ))) #define HEIMDAL_DEPRECATED __attribute__((deprecated))
CVS commit: src/crypto/external/bsd/heimdal/include
Module Name:src Committed By: elric Date: Fri Apr 15 12:19:20 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/include: krb5-types.h Log Message: Fix $Id$ - $NetBSD$ in our own include. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/include/krb5-types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/include/krb5-types.h diff -u src/crypto/external/bsd/heimdal/include/krb5-types.h:1.2 src/crypto/external/bsd/heimdal/include/krb5-types.h:1.3 --- src/crypto/external/bsd/heimdal/include/krb5-types.h:1.2 Fri Apr 15 12:18:22 2011 +++ src/crypto/external/bsd/heimdal/include/krb5-types.h Fri Apr 15 12:19:20 2011 @@ -1,5 +1,4 @@ -/* krb5-types.h -- this file was generated for x86_64-unknown-netbsd5.99.41 by - $Id: krb5-types.h,v 1.2 2011/04/15 12:18:22 elric Exp $ */ +/* $NetBSD: krb5-types.h,v 1.3 2011/04/15 12:19:20 elric Exp $ */ #ifndef __krb5_types_h__ #define __krb5_types_h__
CVS commit: src/sys/compat/linux/arch
Module Name:src
Committed By: he
Date: Fri Apr 15 13:04:53 UTC 2011
Modified Files:
src/sys/compat/linux/arch/alpha: syscalls.master
src/sys/compat/linux/arch/arm: syscalls.master
src/sys/compat/linux/arch/m68k: syscalls.master
src/sys/compat/linux/arch/mips: syscalls.master
src/sys/compat/linux/arch/powerpc: syscalls.master
Log Message:
Add dup3() and pipe2() for these archs as well.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.44 -r1.45 src/sys/compat/linux/arch/arm/syscalls.master
cvs rdiff -u -r1.69 -r1.70 src/sys/compat/linux/arch/m68k/syscalls.master
cvs rdiff -u -r1.39 -r1.40 src/sys/compat/linux/arch/mips/syscalls.master
cvs rdiff -u -r1.45 -r1.46 src/sys/compat/linux/arch/powerpc/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/alpha/syscalls.master
diff -u src/sys/compat/linux/arch/alpha/syscalls.master:1.72 src/sys/compat/linux/arch/alpha/syscalls.master:1.73
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.72 Wed Jul 7 01:30:33 2010
+++ src/sys/compat/linux/arch/alpha/syscalls.master Fri Apr 15 13:04:52 2011
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.72 2010/07/07 01:30:33 chs Exp $
+ $NetBSD: syscalls.master,v 1.73 2011/04/15 13:04:52 he Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -734,8 +734,8 @@
484 UNIMPL signalfd4
485 UNIMPL eventfd2
486 UNIMPL epoll_create1
-487 UNIMPL dup3
-488 UNIMPL pipe2
+487 STD { int|linux_sys||dup3(int from, int to, int flags); }
+488 STD { int|linux_sys||pipe2(int *pfds, int flags); }
489 UNIMPL inotify_init1
490 UNIMPL preadv
491 UNIMPL pwritev
Index: src/sys/compat/linux/arch/arm/syscalls.master
diff -u src/sys/compat/linux/arch/arm/syscalls.master:1.44 src/sys/compat/linux/arch/arm/syscalls.master:1.45
--- src/sys/compat/linux/arch/arm/syscalls.master:1.44 Wed Jul 7 01:30:33 2010
+++ src/sys/compat/linux/arch/arm/syscalls.master Fri Apr 15 13:04:52 2011
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.44 2010/07/07 01:30:33 chs Exp $
+ $NetBSD: syscalls.master,v 1.45 2011/04/15 13:04:52 he Exp $
; Derived from sys/compat/linux/arch/*/syscalls.master
; and from Linux 2.4.12 arch/arm/kernel/calls.S
@@ -538,8 +538,8 @@
355 UNIMPL signalfd4
356 UNIMPL eventfd2
357 UNIMPL epoll_create1
-358 UNIMPL dup3
-359 UNIMPL pipe2
+358 STD { int|linux_sys||dup3(int from, int to, int flags); }
+359 STD { int|linux_sys||pipe2(int *pfds, int flags); }
360 UNIMPL inotify_init1
361 UNIMPL preadv
362 UNIMPL pwritev
Index: src/sys/compat/linux/arch/m68k/syscalls.master
diff -u src/sys/compat/linux/arch/m68k/syscalls.master:1.69 src/sys/compat/linux/arch/m68k/syscalls.master:1.70
--- src/sys/compat/linux/arch/m68k/syscalls.master:1.69 Wed Jul 7 01:30:34 2010
+++ src/sys/compat/linux/arch/m68k/syscalls.master Fri Apr 15 13:04:53 2011
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.69 2010/07/07 01:30:34 chs Exp $
+ $NetBSD: syscalls.master,v 1.70 2011/04/15 13:04:53 he Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -522,8 +522,8 @@
323 UNIMPL signalfd4
324 UNIMPL eventfd2
325 UNIMPL epoll_create1
-326 UNIMPL dup3
-327 UNIMPL pipe2
+326 STD { int|linux_sys||dup3(int from, int to, int flags); }
+327 STD { int|linux_sys||pipe2(int *pfds, int flags); }
328 UNIMPL inotify_init1
329 UNIMPL preadv
330 UNIMPL pwritev
Index: src/sys/compat/linux/arch/mips/syscalls.master
diff -u src/sys/compat/linux/arch/mips/syscalls.master:1.39 src/sys/compat/linux/arch/mips/syscalls.master:1.40
--- src/sys/compat/linux/arch/mips/syscalls.master:1.39 Sun Feb 20 08:09:46 2011
+++ src/sys/compat/linux/arch/mips/syscalls.master Fri Apr 15 13:04:53 2011
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.39 2011/02/20 08:09:46 matt Exp $
+ $NetBSD: syscalls.master,v 1.40 2011/04/15 13:04:53 he Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -511,8 +511,8 @@
324 UNIMPL signalfd4
325 UNIMPL eventfd2
326 UNIMPL epoll_create1
-327 UNIMPL dup3
-328 UNIMPL pipe2
+327 STD { int|linux_sys||dup3(int from, int to, int flags); }
+328 STD { int|linux_sys||pipe2(int *pfds, int flags); }
329 UNIMPL inotify_init1
330 UNIMPL preadv
331 UNIMPL pwritev
Index: src/sys/compat/linux/arch/powerpc/syscalls.master
diff -u src/sys/compat/linux/arch/powerpc/syscalls.master:1.45 src/sys/compat/linux/arch/powerpc/syscalls.master:1.46
--- src/sys/compat/linux/arch/powerpc/syscalls.master:1.45 Wed Jul 7 01:30:34 2010
+++ src/sys/compat/linux/arch/powerpc/syscalls.master Fri Apr 15 13:04:53 2011
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.45 2010/07/07 01:30:34 chs Exp $
+ $NetBSD: syscalls.master,v 1.46 2011/04/15 13:04:53 he Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -509,8 +509,8 @@
313 UNIMPL signalfd4
314 UNIMPL eventfd2
315
CVS commit: src/sys/compat/linux/arch
Module Name:src
Committed By: he
Date: Fri Apr 15 13:07:38 UTC 2011
Modified Files:
src/sys/compat/linux/arch/alpha: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
src/sys/compat/linux/arch/arm: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
src/sys/compat/linux/arch/m68k: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
src/sys/compat/linux/arch/mips: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
src/sys/compat/linux/arch/powerpc: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
Log Message:
Regenerate these files after adding pipe2() and dup3().
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/compat/linux/arch/alpha/linux_syscall.h \
src/sys/compat/linux/arch/alpha/linux_sysent.c
cvs rdiff -u -r1.77 -r1.78 \
src/sys/compat/linux/arch/alpha/linux_syscallargs.h
cvs rdiff -u -r1.79 -r1.80 src/sys/compat/linux/arch/alpha/linux_syscalls.c
cvs rdiff -u -r1.47 -r1.48 src/sys/compat/linux/arch/arm/linux_syscall.h \
src/sys/compat/linux/arch/arm/linux_syscallargs.h \
src/sys/compat/linux/arch/arm/linux_syscalls.c \
src/sys/compat/linux/arch/arm/linux_sysent.c
cvs rdiff -u -r1.75 -r1.76 src/sys/compat/linux/arch/m68k/linux_syscall.h \
src/sys/compat/linux/arch/m68k/linux_syscalls.c \
src/sys/compat/linux/arch/m68k/linux_sysent.c
cvs rdiff -u -r1.74 -r1.75 src/sys/compat/linux/arch/m68k/linux_syscallargs.h
cvs rdiff -u -r1.44 -r1.45 src/sys/compat/linux/arch/mips/linux_syscall.h
cvs rdiff -u -r1.43 -r1.44 src/sys/compat/linux/arch/mips/linux_syscallargs.h \
src/sys/compat/linux/arch/mips/linux_syscalls.c \
src/sys/compat/linux/arch/mips/linux_sysent.c
cvs rdiff -u -r1.51 -r1.52 src/sys/compat/linux/arch/powerpc/linux_syscall.h \
src/sys/compat/linux/arch/powerpc/linux_sysent.c
cvs rdiff -u -r1.50 -r1.51 \
src/sys/compat/linux/arch/powerpc/linux_syscallargs.h \
src/sys/compat/linux/arch/powerpc/linux_syscalls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/alpha/linux_syscall.h
diff -u src/sys/compat/linux/arch/alpha/linux_syscall.h:1.78 src/sys/compat/linux/arch/alpha/linux_syscall.h:1.79
--- src/sys/compat/linux/arch/alpha/linux_syscall.h:1.78 Wed Jul 7 01:31:51 2010
+++ src/sys/compat/linux/arch/alpha/linux_syscall.h Fri Apr 15 13:07:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_syscall.h,v 1.78 2010/07/07 01:31:51 chs Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.79 2011/04/15 13:07:37 he Exp $ */
/*
* System call numbers.
@@ -594,6 +594,12 @@
/* syscall: get_robust_list ret: int args: int struct linux_robust_list_head ** size_t * */
#define LINUX_SYS_get_robust_list 467
+/* syscall: dup3 ret: int args: int int int */
+#define LINUX_SYS_dup3 487
+
+/* syscall: pipe2 ret: int args: int * int */
+#define LINUX_SYS_pipe2 488
+
#define LINUX_SYS_MAXSYSCALL 494
#define LINUX_SYS_NSYSENT 512
#endif /* _LINUX_SYS_SYSCALL_H_ */
Index: src/sys/compat/linux/arch/alpha/linux_sysent.c
diff -u src/sys/compat/linux/arch/alpha/linux_sysent.c:1.78 src/sys/compat/linux/arch/alpha/linux_sysent.c:1.79
--- src/sys/compat/linux/arch/alpha/linux_sysent.c:1.78 Wed Jul 7 01:31:51 2010
+++ src/sys/compat/linux/arch/alpha/linux_sysent.c Fri Apr 15 13:07:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sysent.c,v 1.78 2010/07/07 01:31:51 chs Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.79 2011/04/15 13:07:37 he Exp $ */
/*
* System call switch table.
@@ -8,7 +8,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_sysent.c,v 1.78 2010/07/07 01:31:51 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_sysent.c,v 1.79 2011/04/15 13:07:37 he Exp $);
#if defined(_KERNEL_OPT)
#include opt_sysv.h
@@ -1044,10 +1044,10 @@
linux_sys_nosys }, /* 485 = unimplemented eventfd2 */
{ 0, 0, 0,
linux_sys_nosys }, /* 486 = unimplemented epoll_create1 */
- { 0, 0, 0,
- linux_sys_nosys }, /* 487 = unimplemented dup3 */
- { 0, 0, 0,
- linux_sys_nosys }, /* 488 = unimplemented pipe2 */
+ { ns(struct linux_sys_dup3_args), 0,
+ (sy_call_t *)linux_sys_dup3 }, /* 487 = dup3 */
+ { ns(struct linux_sys_pipe2_args), 0,
+ (sy_call_t *)linux_sys_pipe2 }, /* 488 = pipe2 */
{ 0, 0, 0,
linux_sys_nosys }, /* 489 = unimplemented inotify_init1 */
{ 0, 0, 0,
Index: src/sys/compat/linux/arch/alpha/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/alpha/linux_syscallargs.h:1.77 src/sys/compat/linux/arch/alpha/linux_syscallargs.h:1.78
--- src/sys/compat/linux/arch/alpha/linux_syscallargs.h:1.77 Wed Jul 7 01:31:51 2010
+++ src/sys/compat/linux/arch/alpha/linux_syscallargs.h Fri Apr 15 13:07:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_syscallargs.h,v 1.77 2010/07/07 01:31:51 chs Exp $ */
+/* $NetBSD:
CVS commit: src
Module Name:src Committed By: joerg Date: Fri Apr 15 13:42:23 UTC 2011 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: ad.powerpc md.amd64 md.i386 src/etc/mtree: NetBSD.dist.base src/gnu/dist/gcc4/gcc/config: netbsd.h src/gnu/usr.bin/gcc4/include: Makefile Log Message: Move the headers for compiler and platform specific intrinsincs from /usr/include to /usr/include/gcc-4.1. To generate a diff of this commit: cvs rdiff -u -r1.928 -r1.929 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/comp/ad.powerpc cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.115 -r1.116 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.80 -r1.81 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.8 -r1.9 src/gnu/dist/gcc4/gcc/config/netbsd.h cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/gcc4/include/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.928 src/distrib/sets/lists/base/mi:1.929 --- src/distrib/sets/lists/base/mi:1.928 Mon Apr 11 22:09:56 2011 +++ src/distrib/sets/lists/base/mi Fri Apr 15 13:42:22 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.928 2011/04/11 22:09:56 martin Exp $ +# $NetBSD: mi,v 1.929 2011/04/15 13:42:22 joerg Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -795,6 +795,7 @@ ./usr/include/g++/genbase-obsolete obsolete ./usr/include/g++/stdbase-cxx-usr ./usr/include/g++/tr1base-cxx-usr +./usr/include/gcc-4.1base-c-usr ./usr/include/gssapibase-c-usr ./usr/include/gssapi/rpc base-obsolete obsolete ./usr/include/dev/pci/hdaudio base-c-usr Index: src/distrib/sets/lists/comp/ad.powerpc diff -u src/distrib/sets/lists/comp/ad.powerpc:1.47 src/distrib/sets/lists/comp/ad.powerpc:1.48 --- src/distrib/sets/lists/comp/ad.powerpc:1.47 Sun Mar 14 09:52:00 2010 +++ src/distrib/sets/lists/comp/ad.powerpc Fri Apr 15 13:42:22 2011 @@ -1,7 +1,8 @@ -# $NetBSD: ad.powerpc,v 1.47 2010/03/14 09:52:00 mrg Exp $ +# $NetBSD: ad.powerpc,v 1.48 2011/04/15 13:42:22 joerg Exp $ ./usr/bin/elf2aoutcomp-sysutil-bin ./usr/bin/psim comp-debug-bin gdb,gdb=6 -./usr/include/altivec.hcomp-c-include gcccmds +./usr/include/altivec.hcomp-obsolete obsolete +./usr/include/gcc-4.1/altivec.h comp-c-include gcccmds,gcc=4 ./usr/include/powerpccomp-c-include ./usr/include/powerpc/ansi.h comp-c-include ./usr/include/powerpc/aout_machdep.h comp-c-include Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.105 src/distrib/sets/lists/comp/md.amd64:1.106 --- src/distrib/sets/lists/comp/md.amd64:1.105 Wed Mar 30 19:57:15 2011 +++ src/distrib/sets/lists/comp/md.amd64 Fri Apr 15 13:42:22 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.105 2011/03/30 19:57:15 roy Exp $ +# $NetBSD: md.amd64,v 1.106 2011/04/15 13:42:22 joerg Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -67,7 +67,12 @@ ./usr/include/amd64/varargs.h comp-c-include ./usr/include/amd64/vmparam.h comp-c-include ./usr/include/amd64/wchar_limits.h comp-c-include -./usr/include/emmintrin.h comp-c-include gcccmds +./usr/include/emmintrin.h comp-obsolete obsolete +./usr/include/gcc-4.1/emmintrin.h comp-c-include gcccmds,gcc=4 +./usr/include/gcc-4.1/mm_malloc.h comp-c-include gcccmds,gcc=4 +./usr/include/gcc-4.1/mmintrin.h comp-c-include gcccmds,gcc=4 +./usr/include/gcc-4.1/pmmintrin.h comp-c-include gcccmds,gcc=4 +./usr/include/gcc-4.1/xmmintrin.h comp-c-include gcccmds,gcc=4 ./usr/include/i386comp-c-include ./usr/include/i386/ansi.h comp-c-include ./usr/include/i386/aout_machdep.h comp-c-include @@ -139,9 +144,9 @@ ./usr/include/i386/vmparam.h comp-c-include ./usr/include/i386/wchar_limits.h comp-c-include ./usr/include/ieeefp.hcomp-c-include -./usr/include/mm_malloc.h comp-c-include gcccmds,gcc=4 -./usr/include/mmintrin.h comp-c-include gcccmds -./usr/include/pmmintrin.h comp-c-include gcccmds,gcc=4 +./usr/include/mm_malloc.h comp-obsolete obsolete +./usr/include/mmintrin.h comp-obsolete obsolete +./usr/include/pmmintrin.h comp-obsolete obsolete ./usr/include/x64_64comp-obsolete obsolete ./usr/include/x64_64/ansi.h comp-obsolete obsolete ./usr/include/x64_64/aout_machdep.h comp-obsolete obsolete @@ -232,7 +237,7 @@ ./usr/include/xencomp-c-include ./usr/include/xen/xenio.h comp-c-include ./usr/include/xen/xenio3.h comp-c-include -./usr/include/xmmintrin.h comp-c-include gcccmds +./usr/include/xmmintrin.h comp-obsolete obsolete ./usr/lib/i386/crt0.ocomp-c-lib compat ./usr/lib/i386/crtbegin.o comp-c-lib compat
CVS commit: src/external/bsd/mdocml/dist
Module Name:src Committed By: joerg Date: Fri Apr 15 13:45:43 UTC 2011 Update of /cvsroot/src/external/bsd/mdocml/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28680 Log Message: Import mdocml-1.11.1 with a few additional fixes from CVS: Merge the libraries into a single frontend, libmandoc. Iinitial support for eqn(1) functionality. Additional changes: Portability fixes (tbl_opts.c 1.11, tbl_layout.c 1.18, tbl.c 1.25) HTML space fixe (mdocml_html.c 1.163) ROFF conditional nesting bug (roff.c 1.131) Status: Vendor Tag: KRISTAPS Release Tags: mdocml-1-11-1 U src/external/bsd/mdocml/dist/Makefile U src/external/bsd/mdocml/dist/roff.c U src/external/bsd/mdocml/dist/arch.c U src/external/bsd/mdocml/dist/arch.in U src/external/bsd/mdocml/dist/att.c U src/external/bsd/mdocml/dist/att.in U src/external/bsd/mdocml/dist/chars.c U src/external/bsd/mdocml/dist/chars.in U src/external/bsd/mdocml/dist/compat.c U src/external/bsd/mdocml/dist/config.h.post U src/external/bsd/mdocml/dist/tbl_term.c U src/external/bsd/mdocml/dist/config.h.pre U src/external/bsd/mdocml/dist/term.c U src/external/bsd/mdocml/dist/example.style.css U src/external/bsd/mdocml/dist/html.c U src/external/bsd/mdocml/dist/html.h N src/external/bsd/mdocml/dist/eqn.7 U src/external/bsd/mdocml/dist/lib.c N src/external/bsd/mdocml/dist/eqn.c U src/external/bsd/mdocml/dist/lib.in U src/external/bsd/mdocml/dist/libman.h U src/external/bsd/mdocml/dist/libmandoc.h U src/external/bsd/mdocml/dist/libmdoc.h U src/external/bsd/mdocml/dist/libroff.h U src/external/bsd/mdocml/dist/main.c U src/external/bsd/mdocml/dist/main.h N src/external/bsd/mdocml/dist/mandoc.3 U src/external/bsd/mdocml/dist/man.7 U src/external/bsd/mdocml/dist/man.c U src/external/bsd/mdocml/dist/man.h N src/external/bsd/mdocml/dist/mandoc-db.1 U src/external/bsd/mdocml/dist/man_hash.c U src/external/bsd/mdocml/dist/man_html.c U src/external/bsd/mdocml/dist/man_macro.c C src/external/bsd/mdocml/dist/man_term.c U src/external/bsd/mdocml/dist/man_validate.c U src/external/bsd/mdocml/dist/mandoc.1 U src/external/bsd/mdocml/dist/mandoc.c U src/external/bsd/mdocml/dist/mandoc.h U src/external/bsd/mdocml/dist/mandoc_char.7 N src/external/bsd/mdocml/dist/read.c U src/external/bsd/mdocml/dist/mdoc.7 U src/external/bsd/mdocml/dist/mdoc.c U src/external/bsd/mdocml/dist/mdoc.h U src/external/bsd/mdocml/dist/mdoc_argv.c U src/external/bsd/mdocml/dist/mdoc_hash.c U src/external/bsd/mdocml/dist/mdoc_html.c U src/external/bsd/mdocml/dist/mdoc_macro.c N src/external/bsd/mdocml/dist/mandoc-db.c C src/external/bsd/mdocml/dist/mdoc_term.c U src/external/bsd/mdocml/dist/mdoc_validate.c U src/external/bsd/mdocml/dist/msec.c U src/external/bsd/mdocml/dist/msec.in U src/external/bsd/mdocml/dist/out.c U src/external/bsd/mdocml/dist/out.h C src/external/bsd/mdocml/dist/tbl_opts.c U src/external/bsd/mdocml/dist/roff.7 U src/external/bsd/mdocml/dist/st.c U src/external/bsd/mdocml/dist/st.in U src/external/bsd/mdocml/dist/tbl.7 C src/external/bsd/mdocml/dist/tbl.c U src/external/bsd/mdocml/dist/tbl_data.c U src/external/bsd/mdocml/dist/tbl_html.c U src/external/bsd/mdocml/dist/term.h U src/external/bsd/mdocml/dist/term_ascii.c U src/external/bsd/mdocml/dist/term_ps.c U src/external/bsd/mdocml/dist/test-strlcat.c U src/external/bsd/mdocml/dist/test-strlcpy.c U src/external/bsd/mdocml/dist/tree.c U src/external/bsd/mdocml/dist/vol.c U src/external/bsd/mdocml/dist/vol.in C src/external/bsd/mdocml/dist/tbl_layout.c U src/external/bsd/mdocml/dist/external.png.uu 5 conflicts created by this import. Use the following command to help the merge: cvs checkout -jKRISTAPS:yesterday -jKRISTAPS src/external/bsd/mdocml/dist
CVS commit: src/external/bsd/mdocml/dist
Module Name:src
Committed By: joerg
Date: Fri Apr 15 13:47:18 UTC 2011
Modified Files:
src/external/bsd/mdocml/dist: man_term.c mdoc_term.c tbl.c tbl_layout.c
tbl_opts.c
Removed Files:
src/external/bsd/mdocml/dist: chars.h man.3 man_argv.c mdoc.3
mdoc_strings.c roff.3 roff.h
Log Message:
Merge for mdocml-1.11.1
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r0 src/external/bsd/mdocml/dist/chars.h \
src/external/bsd/mdocml/dist/man_argv.c
cvs rdiff -u -r1.1.1.6 -r0 src/external/bsd/mdocml/dist/man.3 \
src/external/bsd/mdocml/dist/mdoc.3
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/mdocml/dist/man_term.c \
src/external/bsd/mdocml/dist/mdoc_term.c
cvs rdiff -u -r1.1.1.9 -r0 src/external/bsd/mdocml/dist/mdoc_strings.c
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/mdocml/dist/roff.3
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/mdocml/dist/roff.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/mdocml/dist/tbl.c \
src/external/bsd/mdocml/dist/tbl_layout.c \
src/external/bsd/mdocml/dist/tbl_opts.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/dist/man_term.c
diff -u src/external/bsd/mdocml/dist/man_term.c:1.6 src/external/bsd/mdocml/dist/man_term.c:1.7
--- src/external/bsd/mdocml/dist/man_term.c:1.6 Wed Jan 12 22:58:42 2011
+++ src/external/bsd/mdocml/dist/man_term.c Fri Apr 15 13:47:17 2011
@@ -1,6 +1,6 @@
-/* $Vendor-Id: man_term.c,v 1.94 2011/01/04 01:23:18 schwarze Exp $ */
+/* $Vendor-Id: man_term.c,v 1.105 2011/03/22 10:13:01 kristaps Exp $ */
/*
- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons krist...@bsd.lv
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons krist...@bsd.lv
* Copyright (c) 2010, 2011 Ingo Schwarze schwa...@openbsd.org
*
* Permission to use, copy, modify, and distribute this software for any
@@ -31,7 +31,6 @@
#include out.h
#include man.h
#include term.h
-#include chars.h
#include main.h
#define INDENT 7
@@ -126,7 +125,7 @@
{ pre_I, NULL, 0 }, /* I */
{ pre_alternate, NULL, 0 }, /* IR */
{ pre_alternate, NULL, 0 }, /* RI */
- { NULL, NULL, MAN_NOTEXT }, /* na */
+ { pre_ign, NULL, MAN_NOTEXT }, /* na */
{ pre_sp, NULL, MAN_NOTEXT }, /* sp */
{ pre_literal, NULL, 0 }, /* nf */
{ pre_literal, NULL, 0 }, /* fi */
@@ -212,6 +211,9 @@
{
term_newln(p);
+ if (n-body n-body-child MAN_TBL == n-body-child-type)
+ return;
+
if (NULL == n-prev)
return;
@@ -255,7 +257,7 @@
else
mt-fl = ~MANT_LITERAL;
- return(1);
+ return(0);
}
/* ARGSUSED */
@@ -397,6 +399,11 @@
else
p-offset = v;
+ /* Don't let this creep beyond the right margin. */
+
+ if (p-offset p-rmargin)
+ p-offset = p-rmargin;
+
return(0);
}
@@ -850,20 +857,31 @@
size_t rm, rmax;
int c;
- c = 1;
-
switch (n-type) {
case(MAN_TEXT):
- if (0 == *n-string) {
+ /*
+ * If we have a blank line, output a vertical space.
+ * If we have a space as the first character, break
+ * before printing the line's data.
+ */
+ if ('\0' == *n-string) {
term_vspace(p);
- break;
- }
+ return;
+ } else if (' ' == *n-string MAN_LINE n-flags)
+ term_newln(p);
term_word(p, n-string);
- /* FIXME: this means that macro lines are munged! */
-
- if (MANT_LITERAL mt-fl) {
+ /*
+ * If we're in a literal context, make sure that words
+ * togehter on the same line stay together. This is a
+ * POST-printing call, so we check the NEXT word. Since
+ * -man doesn't have nested macros, we don't need to be
+ * more specific than this.
+ */
+ if (MANT_LITERAL mt-fl
+(NULL == n-next ||
+ n-next-line n-line)) {
rm = p-rmargin;
rmax = p-maxrmargin;
p-rmargin = p-maxrmargin = TERM_MAXMARGIN;
@@ -873,35 +891,40 @@
p-rmargin = rm;
p-maxrmargin = rmax;
}
- break;
+
+ if (MAN_EOS n-flags)
+ p-flags |= TERMP_SENTENCE;
+ return;
+ case (MAN_EQN):
+ term_word(p, n-eqn-data);
+ return;
case (MAN_TBL):
+ /*
+ * Tables are preceded by a newline. Then process a
+ * table line, which will cause line termination,
+ */
if (TBL_SPAN_FIRST n-span-flags)
term_newln(p);
term_tbl(p, n-span);
- break;
+ return;
default:
- if ( ! (MAN_NOTEXT termacts[n-tok].flags))
- term_fontrepl(p, TERMFONT_NONE);
- if (termacts[n-tok].pre)
- c = (*termacts[n-tok].pre)(p, mt, n, m);
break;
}
+ if ( ! (MAN_NOTEXT termacts[n-tok].flags))
+ term_fontrepl(p, TERMFONT_NONE);
+
+ c = 1;
+ if (termacts[n-tok].pre)
+ c = (*termacts[n-tok].pre)(p, mt, n, m);
+
if (c n-child)
print_man_nodelist(p, mt, n-child, m);
- switch (n-type) {
- case (MAN_TEXT):
- /* FALLTHROUGH */
- case (MAN_TBL):
- break;
- default:
- if (termacts[n-tok].post)
- (*termacts[n-tok].post)(p, mt, n, m);
- if ( ! (MAN_NOTEXT termacts[n-tok].flags))
- term_fontrepl(p, TERMFONT_NONE);
- break;
- }
+ if (termacts[n-tok].post)
CVS commit: src
Module Name:src Committed By: joerg Date: Fri Apr 15 14:36:31 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi src/external/bsd/mdocml: Makefile.inc src/external/bsd/mdocml/bin/mandoc: Makefile src/external/bsd/mdocml/lib: Makefile Added Files: src/external/bsd/mdocml/lib/libmandoc: Makefile Removed Files: src/external/bsd/mdocml/lib/libman: Makefile src/external/bsd/mdocml/lib/libmdoc: Makefile src/external/bsd/mdocml/lib/libroff: Makefile Log Message: Update build glue for mdocml 1.11.1. To generate a diff of this commit: cvs rdiff -u -r1.1614 -r1.1615 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.12 -r1.13 src/external/bsd/mdocml/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/external/bsd/mdocml/bin/mandoc/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/bsd/mdocml/lib/Makefile cvs rdiff -u -r1.2 -r0 src/external/bsd/mdocml/lib/libman/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/mdocml/lib/libmandoc/Makefile cvs rdiff -u -r1.2 -r0 src/external/bsd/mdocml/lib/libmdoc/Makefile cvs rdiff -u -r1.2 -r0 src/external/bsd/mdocml/lib/libroff/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1614 src/distrib/sets/lists/comp/mi:1.1615 --- src/distrib/sets/lists/comp/mi:1.1614 Tue Apr 12 08:22:48 2011 +++ src/distrib/sets/lists/comp/mi Fri Apr 15 14:36:28 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1614 2011/04/12 08:22:48 jruoho Exp $ +# $NetBSD: mi,v 1.1615 2011/04/15 14:36:28 joerg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -7348,7 +7348,8 @@ ./usr/share/man/cat3/makecontext.0 comp-c-catman .cat ./usr/share/man/cat3/makedev.0 comp-c-catman .cat ./usr/share/man/cat3/malloc.0 comp-c-catman .cat -./usr/share/man/cat3/man.0 comp-mdocml-catman .cat +./usr/share/man/cat3/man.0 comp-obsolete obsolete +./usr/share/man/cat3/mandoc.0 comp-mdocml-catman .cat ./usr/share/man/cat3/math.0 comp-c-catman .cat ./usr/share/man/cat3/mblen.0 comp-c-catman .cat ./usr/share/man/cat3/mbrlen.0 comp-c-catman .cat @@ -7361,7 +7362,7 @@ ./usr/share/man/cat3/md4.0 comp-c-catman .cat ./usr/share/man/cat3/md5.0 comp-c-catman .cat ./usr/share/man/cat3/mdc2.0 comp-obsolete obsolete -./usr/share/man/cat3/mdoc.0 comp-mdocml-catman .cat +./usr/share/man/cat3/mdoc.0 comp-obsolete obsolete ./usr/share/man/cat3/membar_consumer.0 comp-c-catman .cat ./usr/share/man/cat3/membar_enter.0 comp-c-catman .cat ./usr/share/man/cat3/membar_exit.0 comp-c-catman .cat @@ -13400,7 +13401,8 @@ ./usr/share/man/html3/makecontext.html comp-c-htmlman html ./usr/share/man/html3/makedev.html comp-c-htmlman html ./usr/share/man/html3/malloc.html comp-c-htmlman html -./usr/share/man/html3/man.html comp-mdocml-htmlman html +./usr/share/man/html3/man.html comp-obsolete obsolete +./usr/share/man/html3/mandoc.html comp-mdocml-htmlman html ./usr/share/man/html3/math.html comp-c-htmlman html ./usr/share/man/html3/mblen.html comp-c-htmlman html ./usr/share/man/html3/mbrlen.html comp-c-htmlman html @@ -13412,7 +13414,7 @@ ./usr/share/man/html3/md2.html comp-c-htmlman html ./usr/share/man/html3/md4.html comp-c-htmlman html ./usr/share/man/html3/md5.html comp-c-htmlman html -./usr/share/man/html3/mdoc.html comp-mdocml-htmlman html +./usr/share/man/html3/mdoc.html comp-obsolete obsolete ./usr/share/man/html3/membar_consumer.html comp-c-htmlman html ./usr/share/man/html3/membar_enter.html comp-c-htmlman html ./usr/share/man/html3/membar_exit.html comp-c-htmlman html @@ -19436,7 +19438,8 @@ ./usr/share/man/man3/makecontext.3 comp-c-man .man ./usr/share/man/man3/makedev.3 comp-c-man .man ./usr/share/man/man3/malloc.3 comp-c-man .man -./usr/share/man/man3/man.3 comp-mdocml-man .man +./usr/share/man/man3/man.3 comp-obsolete obsolete +./usr/share/man/man3/mandoc.3 comp-mdocml-man .man ./usr/share/man/man3/math.3 comp-c-man .man ./usr/share/man/man3/mblen.3 comp-c-man .man ./usr/share/man/man3/mbrlen.3 comp-c-man .man @@ -19449,7 +19452,7 @@ ./usr/share/man/man3/md4.3 comp-c-man .man ./usr/share/man/man3/md5.3 comp-c-man .man ./usr/share/man/man3/mdc2.3 comp-obsolete obsolete -./usr/share/man/man3/mdoc.3 comp-mdocml-man .man +./usr/share/man/man3/mdoc.3 comp-obsolete obsolete ./usr/share/man/man3/membar_consumer.3 comp-c-man .man ./usr/share/man/man3/membar_enter.3 comp-c-man .man ./usr/share/man/man3/membar_exit.3 comp-c-man .man Index: src/external/bsd/mdocml/Makefile.inc diff -u src/external/bsd/mdocml/Makefile.inc:1.12 src/external/bsd/mdocml/Makefile.inc:1.13 --- src/external/bsd/mdocml/Makefile.inc:1.12 Sun Jul 25 19:16:18 2010 +++ src/external/bsd/mdocml/Makefile.inc Fri Apr 15 14:36:30 2011 @@ -1,4 +1,4 @@ -# $NetBSD:
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: elric
Date: Fri Apr 15 14:39:33 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.rules.inc
src/crypto/external/bsd/heimdal/lib/libkadm5clnt: Makefile
Log Message:
Need a variable to disable using an existent version-script.map as
dist/lib/kadm5 contains one but builds two libs only one of which
uses it.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/Makefile.rules.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/Makefile.rules.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.2 src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.3
--- src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.2 Fri Apr 15 12:16:31 2011
+++ src/crypto/external/bsd/heimdal/Makefile.rules.inc Fri Apr 15 14:39:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rules.inc,v 1.2 2011/04/15 12:16:31 elric Exp $
+# $NetBSD: Makefile.rules.inc,v 1.3 2011/04/15 14:39:32 elric Exp $
SRCS+= ${HEIMSRCS:N*.et:N*.in:N*.asn1}
@@ -91,7 +91,7 @@
OBJS.${PROG} += ${OBJS}
.endif
-.if defined(LIB) exists(version-script.map)
+.if defined(LIB) exists(version-script.map) !defined(NO_VERSION_SCRIPT)
version-script.map:
LDFLAGS.lib${LIB} += -Wl,--version-script=${version-script.map:P}
Index: src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.1 Wed Apr 13 19:16:52 2011
+++ src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile Fri Apr 15 14:39:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:52 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/04/15 14:39:32 elric Exp $
USE_FORT?= yes # network protocol library
@@ -37,6 +37,7 @@
rename_c.c \
send_recv.c
+NO_VERSION_SCRIPT=
INCSDIR= /usr/include/kadm5
INCS= admin.h \
CVS commit: src/crypto/external/bsd/heimdal/include
Module Name:src Committed By: elric Date: Fri Apr 15 14:41:11 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/include: krb5-types.h Log Message: Also define GSSAPI_DEPRECATED and KRB5_DEPRECATED as NULL to complete the work of the prior check in. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/include/krb5-types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/include/krb5-types.h diff -u src/crypto/external/bsd/heimdal/include/krb5-types.h:1.3 src/crypto/external/bsd/heimdal/include/krb5-types.h:1.4 --- src/crypto/external/bsd/heimdal/include/krb5-types.h:1.3 Fri Apr 15 12:19:20 2011 +++ src/crypto/external/bsd/heimdal/include/krb5-types.h Fri Apr 15 14:41:11 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: krb5-types.h,v 1.3 2011/04/15 12:19:20 elric Exp $ */ +/* $NetBSD: krb5-types.h,v 1.4 2011/04/15 14:41:11 elric Exp $ */ #ifndef __krb5_types_h__ #define __krb5_types_h__ @@ -15,6 +15,8 @@ typedef int krb5_socket_t; #define HEIMDAL_DEPRECATED +#define GSSAPI_DEPRECATED +#define KRB5_DEPRECATED #ifndef HEIMDAL_DEPRECATED #if defined(__GNUC__) ((__GNUC__ 3) || ((__GNUC__ == 3) (__GNUC_MINOR__ = 1 )))
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: elric Date: Fri Apr 15 14:51:22 UTC 2011 Modified Files: src/crypto/external/bsd/openssh/dist: gss-serv-krb5.c Log Message: On reasonably modern versions of Heimdal, you should not include krb5.h to get the krb5 GSS functions. gssapi/gssapi_krb5.h should be included. [this is necesary for the next Heimdal upgrade as krb5.h inclusion is no longer effective.] To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c diff -u src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c:1.2 src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c:1.3 --- src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c:1.2 Sun Jun 7 22:38:46 2009 +++ src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c Fri Apr 15 14:51:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gss-serv-krb5.c,v 1.2 2009/06/07 22:38:46 christos Exp $ */ +/* $NetBSD: gss-serv-krb5.c,v 1.3 2011/04/15 14:51:22 elric Exp $ */ /* $OpenBSD: gss-serv-krb5.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */ /* @@ -26,7 +26,7 @@ */ #include includes.h -__RCSID($NetBSD: gss-serv-krb5.c,v 1.2 2009/06/07 22:38:46 christos Exp $); +__RCSID($NetBSD: gss-serv-krb5.c,v 1.3 2011/04/15 14:51:22 elric Exp $); #ifdef GSSAPI #ifdef KRB5 @@ -48,7 +48,7 @@ extern ServerOptions options; #ifdef HEIMDAL -# include krb5.h +# include gssapi/gssapi_krb5.h #else # ifdef HAVE_GSSAPI_KRB5_H # include gssapi_krb5.h
CVS commit: src/doc
Module Name:src Committed By: jdc Date: Fri Apr 15 15:30:59 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Clarify ffb EDID entry. To generate a diff of this commit: cvs rdiff -u -r1.1538 -r1.1539 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1538 src/doc/CHANGES:1.1539 --- src/doc/CHANGES:1.1538 Sun Apr 10 15:26:37 2011 +++ src/doc/CHANGES Fri Apr 15 15:30:59 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1538 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1539 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -987,4 +987,5 @@ [phx 20110404] sandpoint: QNAP support. [phx 20110405] dhcpcd(8): Import dhcpcd-5.2.12. [roy 20110406] - sparc64: Add EDID support to ffb(4). [jdc 20110408] + sparc64: Add EDID (Extended Display Identification Data) reading, + and video mode setting support, to ffb(4). [jdc 20110408]
CVS commit: src/external/bsd/mdocml/dist
Module Name:src
Committed By: joerg
Date: Fri Apr 15 15:50:28 UTC 2011
Modified Files:
src/external/bsd/mdocml/dist: mdoc_argv.c tbl_layout.c
Log Message:
Deal with two cases of name shadowing
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.13 -r1.2 src/external/bsd/mdocml/dist/mdoc_argv.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/mdocml/dist/tbl_layout.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/dist/mdoc_argv.c
diff -u src/external/bsd/mdocml/dist/mdoc_argv.c:1.1.1.13 src/external/bsd/mdocml/dist/mdoc_argv.c:1.2
--- src/external/bsd/mdocml/dist/mdoc_argv.c:1.1.1.13 Fri Apr 15 13:45:32 2011
+++ src/external/bsd/mdocml/dist/mdoc_argv.c Fri Apr 15 15:50:28 2011
@@ -652,40 +652,40 @@
static enum mdocargt
argv_a2arg(enum mdoct tok, const char *p)
{
- const enum mdocargt *args;
+ const enum mdocargt *argsp;
- args = NULL;
+ argsp = NULL;
switch (tok) {
case (MDOC_An):
- args = args_An;
+ argsp = args_An;
break;
case (MDOC_Bd):
- args = args_Bd;
+ argsp = args_Bd;
break;
case (MDOC_Bf):
- args = args_Bf;
+ argsp = args_Bf;
break;
case (MDOC_Bk):
- args = args_Bk;
+ argsp = args_Bk;
break;
case (MDOC_Bl):
- args = args_Bl;
+ argsp = args_Bl;
break;
case (MDOC_Rv):
/* FALLTHROUGH */
case (MDOC_Ex):
- args = args_Ex;
+ argsp = args_Ex;
break;
default:
return(MDOC_ARG_MAX);
}
- assert(args);
+ assert(argsp);
- for ( ; MDOC_ARG_MAX != *args ; args++)
- if (0 == strcmp(p, mdoc_argnames[*args]))
- return(*args);
+ for ( ; MDOC_ARG_MAX != *argsp ; argsp++)
+ if (0 == strcmp(p, mdoc_argnames[*argsp]))
+ return(*argsp);
return(MDOC_ARG_MAX);
}
Index: src/external/bsd/mdocml/dist/tbl_layout.c
diff -u src/external/bsd/mdocml/dist/tbl_layout.c:1.3 src/external/bsd/mdocml/dist/tbl_layout.c:1.4
--- src/external/bsd/mdocml/dist/tbl_layout.c:1.3 Fri Apr 15 13:47:18 2011
+++ src/external/bsd/mdocml/dist/tbl_layout.c Fri Apr 15 15:50:28 2011
@@ -427,19 +427,19 @@
}
static void
-head_adjust(const struct tbl_cell *cell, struct tbl_head *head)
+head_adjust(const struct tbl_cell *cellp, struct tbl_head *head)
{
- if (TBL_CELL_VERT != cell-pos
- TBL_CELL_DVERT != cell-pos) {
+ if (TBL_CELL_VERT != cellp-pos
+ TBL_CELL_DVERT != cellp-pos) {
head-pos = TBL_HEAD_DATA;
return;
}
- if (TBL_CELL_VERT == cell-pos)
+ if (TBL_CELL_VERT == cellp-pos)
if (TBL_HEAD_DVERT != head-pos)
head-pos = TBL_HEAD_VERT;
- if (TBL_CELL_DVERT == cell-pos)
+ if (TBL_CELL_DVERT == cellp-pos)
head-pos = TBL_HEAD_DVERT;
}
CVS commit: src/sys/ufs/ffs
Module Name:src
Committed By: hannken
Date: Fri Apr 15 15:54:12 UTC 2011
Modified Files:
src/sys/ufs/ffs: ffs_vnops.c
Log Message:
ffs_fsync: no need for wapbl_vptomp() here -- vnode is always VREG.
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/ufs/ffs/ffs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ffs/ffs_vnops.c
diff -u src/sys/ufs/ffs/ffs_vnops.c:1.116 src/sys/ufs/ffs/ffs_vnops.c:1.117
--- src/sys/ufs/ffs/ffs_vnops.c:1.116 Thu Aug 12 07:41:49 2010
+++ src/sys/ufs/ffs/ffs_vnops.c Fri Apr 15 15:54:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vnops.c,v 1.116 2010/08/12 07:41:49 hannken Exp $ */
+/* $NetBSD: ffs_vnops.c,v 1.117 2011/04/15 15:54:11 hannken Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_vnops.c,v 1.116 2010/08/12 07:41:49 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_vnops.c,v 1.117 2011/04/15 15:54:11 hannken Exp $);
#if defined(_KERNEL_OPT)
#include opt_ffs.h
@@ -282,19 +282,18 @@
int bsize;
daddr_t blk_high;
struct vnode *vp;
-#ifdef WAPBL
struct mount *mp;
-#endif
vp = ap-a_vp;
+ mp = vp-v_mount;
- fstrans_start(vp-v_mount, FSTRANS_LAZY);
+ fstrans_start(mp, FSTRANS_LAZY);
if ((ap-a_offlo == 0 ap-a_offhi == 0) || (vp-v_type != VREG)) {
error = ffs_full_fsync(vp, ap-a_flags);
goto out;
}
- bsize = vp-v_mount-mnt_stat.f_iosize;
+ bsize = mp-mnt_stat.f_iosize;
blk_high = ap-a_offhi / bsize;
if (ap-a_offhi % bsize != 0)
blk_high++;
@@ -312,7 +311,7 @@
}
#ifdef WAPBL
- mp = wapbl_vptomp(vp);
+ KASSERT(vp-v_type == VREG);
if (mp-mnt_wapbl) {
/*
* Don't bother writing out metadata if the syncer is
@@ -321,7 +320,7 @@
* VFS_SYNC().
*/
if ((ap-a_flags (FSYNC_DATAONLY | FSYNC_LAZY)) != 0) {
- fstrans_done(vp-v_mount);
+ fstrans_done(mp);
return 0;
}
error = 0;
@@ -330,7 +329,7 @@
IN_MODIFIED | IN_ACCESSED)) {
error = UFS_WAPBL_BEGIN(mp);
if (error) {
-fstrans_done(vp-v_mount);
+fstrans_done(mp);
return error;
}
error = ffs_update(vp, NULL, NULL, UPDATE_CLOSE |
@@ -338,11 +337,11 @@
UFS_WAPBL_END(mp);
}
if (error || (ap-a_flags FSYNC_NOLOG) != 0) {
- fstrans_done(vp-v_mount);
+ fstrans_done(mp);
return error;
}
error = wapbl_flush(mp-mnt_wapbl, 0);
- fstrans_done(vp-v_mount);
+ fstrans_done(mp);
return error;
}
#endif /* WAPBL */
@@ -389,7 +388,7 @@
}
out:
- fstrans_done(vp-v_mount);
+ fstrans_done(mp);
return error;
}
CVS commit: src/external/gpl3/binutils/lib/libbfd/arch
Module Name:src Committed By: matt Date: Fri Apr 15 17:57:41 UTC 2011 Modified Files: src/external/gpl3/binutils/lib/libbfd/arch/alpha: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/arm: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/armeb: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/hppa: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/i386: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/m68000: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/m68k: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/powerpc: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/powerpc64: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/sh3eb: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/sh3el: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/sparc: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/sparc64: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/vax: bfd.h Log Message: Add bfd_mach_mips_xlr (this is easier than running mknative-binutils and achieves the same result but it is a hack). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd.h cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/lib/libbfd/arch/arm/bfd.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfd.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/hppa/bfd.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/i386/bfd.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/m68000/bfd.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/m68k/bfd.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/powerpc/bfd.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/powerpc64/bfd.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/sh3eb/bfd.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/sh3el/bfd.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/sparc64/bfd.h cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/lib/libbfd/arch/vax/bfd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd.h diff -u src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd.h:1.1 src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd.h:1.2 --- src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd.h:1.1 Tue Aug 18 20:21:59 2009 +++ src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd.h Fri Apr 15 17:57:39 2011 @@ -1799,6 +1799,7 @@ #define bfd_mach_mips_loongson_2f 3002 #define bfd_mach_mips_sb1 12310201 /* octal 'SB', 01 */ #define bfd_mach_mips_octeon 6501 +#define bfd_mach_mips_xlr 887682 /* decimal 'XLR' */ #define bfd_mach_mipsisa32 32 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa64 64 Index: src/external/gpl3/binutils/lib/libbfd/arch/arm/bfd.h diff -u src/external/gpl3/binutils/lib/libbfd/arch/arm/bfd.h:1.1 src/external/gpl3/binutils/lib/libbfd/arch/arm/bfd.h:1.2 --- src/external/gpl3/binutils/lib/libbfd/arch/arm/bfd.h:1.1 Tue Aug 18 20:21:59 2009 +++ src/external/gpl3/binutils/lib/libbfd/arch/arm/bfd.h Fri Apr 15 17:57:40 2011 @@ -1799,6 +1799,7 @@ #define bfd_mach_mips_loongson_2f 3002 #define bfd_mach_mips_sb1 12310201 /* octal 'SB', 01 */ #define bfd_mach_mips_octeon 6501 +#define bfd_mach_mips_xlr 887682 /* decimal 'XLR' */ #define bfd_mach_mipsisa32 32 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa64 64 Index: src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfd.h diff -u src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfd.h:1.1 src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfd.h:1.2 --- src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfd.h:1.1 Tue Aug 18 20:21:59 2009 +++ src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfd.h Fri Apr 15 17:57:40 2011 @@ -1799,6 +1799,7 @@ #define bfd_mach_mips_loongson_2f 3002 #define bfd_mach_mips_sb1 12310201 /* octal 'SB', 01 */ #define bfd_mach_mips_octeon 6501 +#define bfd_mach_mips_xlr 887682 /* decimal 'XLR' */ #define bfd_mach_mipsisa32 32 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa64 64 Index: src/external/gpl3/binutils/lib/libbfd/arch/hppa/bfd.h diff -u src/external/gpl3/binutils/lib/libbfd/arch/hppa/bfd.h:1.1 src/external/gpl3/binutils/lib/libbfd/arch/hppa/bfd.h:1.2 --- src/external/gpl3/binutils/lib/libbfd/arch/hppa/bfd.h:1.1 Tue Aug 18 20:21:59 2009 +++
CVS commit: src
Module Name:src Committed By: joerg Date: Fri Apr 15 19:31:07 UTC 2011 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: ad.powerpc md.amd64 md.i386 src/etc/mtree: NetBSD.dist.base src/external/bsd/llvm/include: Makefile Log Message: Install clang's MD headers into /usr/include/clang-3.0 similar to GCC. To generate a diff of this commit: cvs rdiff -u -r1.930 -r1.931 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/comp/ad.powerpc cvs rdiff -u -r1.107 -r1.108 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.116 -r1.117 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.81 -r1.82 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/include/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.930 src/distrib/sets/lists/base/mi:1.931 --- src/distrib/sets/lists/base/mi:1.930 Fri Apr 15 18:05:42 2011 +++ src/distrib/sets/lists/base/mi Fri Apr 15 19:31:06 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.930 2011/04/15 18:05:42 elric Exp $ +# $NetBSD: mi,v 1.931 2011/04/15 19:31:06 joerg Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -739,6 +739,7 @@ ./usr/include/altqbase-c-usr ./usr/include/arpabase-c-usr ./usr/include/cdkbase-obsolete obsolete +./usr/include/clang-3.0base-c-usr ./usr/include/compatbase-obsolete obsolete ./usr/include/cryptobase-c-usr ./usr/include/devbase-c-usr Index: src/distrib/sets/lists/comp/ad.powerpc diff -u src/distrib/sets/lists/comp/ad.powerpc:1.48 src/distrib/sets/lists/comp/ad.powerpc:1.49 --- src/distrib/sets/lists/comp/ad.powerpc:1.48 Fri Apr 15 13:42:22 2011 +++ src/distrib/sets/lists/comp/ad.powerpc Fri Apr 15 19:31:06 2011 @@ -1,7 +1,8 @@ -# $NetBSD: ad.powerpc,v 1.48 2011/04/15 13:42:22 joerg Exp $ +# $NetBSD: ad.powerpc,v 1.49 2011/04/15 19:31:06 joerg Exp $ ./usr/bin/elf2aoutcomp-sysutil-bin ./usr/bin/psim comp-debug-bin gdb,gdb=6 ./usr/include/altivec.hcomp-obsolete obsolete +./usr/include/clang-3.0/altivec.h comp-c-include llvm ./usr/include/gcc-4.1/altivec.h comp-c-include gcccmds,gcc=4 ./usr/include/powerpccomp-c-include ./usr/include/powerpc/ansi.h comp-c-include Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.107 src/distrib/sets/lists/comp/md.amd64:1.108 --- src/distrib/sets/lists/comp/md.amd64:1.107 Fri Apr 15 18:05:43 2011 +++ src/distrib/sets/lists/comp/md.amd64 Fri Apr 15 19:31:06 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.107 2011/04/15 18:05:43 elric Exp $ +# $NetBSD: md.amd64,v 1.108 2011/04/15 19:31:06 joerg Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -67,6 +67,15 @@ ./usr/include/amd64/varargs.h comp-c-include ./usr/include/amd64/vmparam.h comp-c-include ./usr/include/amd64/wchar_limits.h comp-c-include +./usr/include/clang-3.0/avxintrin.h comp-c-include llvm +./usr/include/clang-3.0/emmintrin.h comp-c-include llvm +./usr/include/clang-3.0/immintrin.h comp-c-include llvm +./usr/include/clang-3.0/mm_malloc.h comp-c-include llvm +./usr/include/clang-3.0/mmintrin.h comp-c-include llvm +./usr/include/clang-3.0/pmmintrin.h comp-c-include llvm +./usr/include/clang-3.0/smmintrin.h comp-c-include llvm +./usr/include/clang-3.0/tmmintrin.h comp-c-include llvm +./usr/include/clang-3.0/xmmintrin.h comp-c-include llvm ./usr/include/emmintrin.h comp-obsolete obsolete ./usr/include/gcc-4.1/emmintrin.h comp-c-include gcccmds,gcc=4 ./usr/include/gcc-4.1/mm_malloc.h comp-c-include gcccmds,gcc=4 Index: src/distrib/sets/lists/comp/md.i386 diff -u src/distrib/sets/lists/comp/md.i386:1.116 src/distrib/sets/lists/comp/md.i386:1.117 --- src/distrib/sets/lists/comp/md.i386:1.116 Fri Apr 15 13:42:22 2011 +++ src/distrib/sets/lists/comp/md.i386 Fri Apr 15 19:31:06 2011 @@ -1,4 +1,13 @@ -# $NetBSD: md.i386,v 1.116 2011/04/15 13:42:22 joerg Exp $ +# $NetBSD: md.i386,v 1.117 2011/04/15 19:31:06 joerg Exp $ +./usr/include/clang-3.0/avxintrin.h comp-c-include llvm +./usr/include/clang-3.0/emmintrin.h comp-c-include llvm +./usr/include/clang-3.0/immintrin.h comp-c-include llvm +./usr/include/clang-3.0/mm_malloc.h comp-c-include llvm +./usr/include/clang-3.0/mmintrin.h comp-c-include llvm +./usr/include/clang-3.0/pmmintrin.h comp-c-include llvm +./usr/include/clang-3.0/smmintrin.h comp-c-include llvm +./usr/include/clang-3.0/tmmintrin.h comp-c-include llvm +./usr/include/clang-3.0/xmmintrin.h comp-c-include llvm ./usr/include/emmintrin.h comp-obsolete obsolete ./usr/include/gcc-4.1/emmintrin.h comp-c-include gcccmds,gcc=4 ./usr/include/gcc-4.1/mmintrin.h
CVS commit: src/crypto/external/bsd/heimdal/lib
Module Name:src
Committed By: elric
Date: Fri Apr 15 19:41:11 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile: Makefile
src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et: Makefile
src/crypto/external/bsd/heimdal/lib/libsl/slc: Makefile
Log Message:
I forgot to fix this. .BEGIN: is not appropriate for the creation of
these symlinks as during the make obj phase it would attempt to create
them in the current directory.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile:1.1 Wed Apr 13 19:16:48 2011
+++ src/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile Fri Apr 15 19:41:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:48 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/04/15 19:41:11 elric Exp $
NOLINT= # defined
NOMAN= # defined
@@ -74,7 +74,7 @@
CLEANFILES+= print_version.h make-print-version make-print-version.lo
-.BEGIN:
+beforedepend:
[ -h krb5 ] || ln -sf . krb5
ln -sf ${HEIMBASE}/include/der-protos.h
ln -sf ${HEIMBASE}/include/roken.h
Index: src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile:1.1 Wed Apr 13 19:16:49 2011
+++ src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile Fri Apr 15 19:41:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:49 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/04/15 19:41:11 elric Exp $
NOMAN= # defined
@@ -47,7 +47,7 @@
CLEANFILES+= print_version.h make-print-version make-print-version.lo
-.BEGIN:
+beforedepend:
[ -h krb5 ] || ln -sf . krb5
ln -sf ${HEIMBASE}/include/roken.h
ln -sf ${HEIMBASE}/dist/lib/roken/roken-common.h
Index: src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile:1.1 Wed Apr 13 19:16:55 2011
+++ src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile Fri Apr 15 19:41:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:55 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/04/15 19:41:11 elric Exp $
NOMAN= # defined
@@ -36,7 +36,7 @@
.NOPATH: print_version.h make-print-version
-.BEGIN:
+beforedepend:
[ -h krb5 ] || ln -sf . krb5
ln -sf ${HEIMBASE}/include/roken.h
ln -sf ${HEIMBASE}/dist/lib/roken/roken-common.h
CVS commit: src/sys/arch/alpha/alpha
Module Name:src
Committed By: martin
Date: Fri Apr 15 20:52:36 UTC 2011
Modified Files:
src/sys/arch/alpha/alpha: machdep.c trap.c
Log Message:
Delay initialization of FPU related event counters to cpu_startup() - we
do not expect any events of this type before spinup of all cpus.
To generate a diff of this commit:
cvs rdiff -u -r1.330 -r1.331 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/alpha/alpha/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.330 src/sys/arch/alpha/alpha/machdep.c:1.331
--- src/sys/arch/alpha/alpha/machdep.c:1.330 Fri Mar 4 22:25:24 2011
+++ src/sys/arch/alpha/alpha/machdep.c Fri Apr 15 20:52:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.330 2011/03/04 22:25:24 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.331 2011/04/15 20:52:36 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.330 2011/03/04 22:25:24 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.331 2011/04/15 20:52:36 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -803,6 +803,7 @@
void
cpu_startup(void)
{
+ extern struct evcnt fpevent_use, fpevent_reuse;
vaddr_t minaddr, maxaddr;
char pbuf[9];
#if defined(DEBUG)
@@ -865,6 +866,14 @@
* CPUs.
*/
hwrpb_primary_init();
+
+ /*
+ * Initialize some trap event counters.
+ */
+ evcnt_attach_dynamic(fpevent_use, EVCNT_TYPE_MISC, NULL,
+ FP, proc use);
+ evcnt_attach_dynamic(fpevent_reuse, EVCNT_TYPE_MISC, NULL,
+ FP, proc re-use);
}
/*
Index: src/sys/arch/alpha/alpha/trap.c
diff -u src/sys/arch/alpha/alpha/trap.c:1.124 src/sys/arch/alpha/alpha/trap.c:1.125
--- src/sys/arch/alpha/alpha/trap.c:1.124 Mon Dec 20 00:25:24 2010
+++ src/sys/arch/alpha/alpha/trap.c Fri Apr 15 20:52:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.124 2010/12/20 00:25:24 matt Exp $ */
+/* $NetBSD: trap.c,v 1.125 2011/04/15 20:52:36 martin Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.124 2010/12/20 00:25:24 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.125 2011/04/15 20:52:36 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -149,17 +149,6 @@
*/
alpha_pal_wrmces(alpha_pal_rdmces()
~(ALPHA_MCES_DSC|ALPHA_MCES_DPC));
-
- /*
- * If this is the primary processor, initialize some trap
- * event counters.
- */
- if (cpu_number() == hwrpb-rpb_primary_cpu_id) {
- evcnt_attach_dynamic(fpevent_use, EVCNT_TYPE_MISC, NULL,
- FP, proc use);
- evcnt_attach_dynamic(fpevent_reuse, EVCNT_TYPE_MISC, NULL,
- FP, proc re-use);
- }
}
static void
CVS commit: src/crypto/external/bsd/heimdal/lib/libipc
Module Name:src
Committed By: elric
Date: Fri Apr 15 20:56:52 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/lib/libipc: Makefile
Log Message:
Define an empty libinstall:: target instead of the prior methodology
which doesn't necessarily work everywhere.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/lib/libipc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libipc/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libipc/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libipc/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libipc/Makefile:1.1 Wed Apr 13 19:16:52 2011
+++ src/crypto/external/bsd/heimdal/lib/libipc/Makefile Fri Apr 15 20:56:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:52 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/04/15 20:56:51 elric Exp $
NOLINT= # defined
@@ -12,11 +12,11 @@
LIBDPLIBS+= util ${NETBSDSRCDIR}/lib/libutil \
crypt ${NETBSDSRCDIR}/lib/libcrypt
-INSTALL=/usr/bin/true
-
SRCS= common.c client.c server.c
HOST_CPPFLAGS+= -I${HEIMBASE}/include -DHAVE_CONFIG_H
+libinstall::
+
.include ${HEIMBASE}/Makefile.rules.inc
.include bsd.lib.mk
CVS commit: src/crypto/external/bsd/heimdal/include
Module Name:src
Committed By: elric
Date: Fri Apr 15 21:01:22 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/include: config.h
Log Message:
We need to include nbtool_config.h when we build tools.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/include/config.h
diff -u src/crypto/external/bsd/heimdal/include/config.h:1.1 src/crypto/external/bsd/heimdal/include/config.h:1.2
--- src/crypto/external/bsd/heimdal/include/config.h:1.1 Wed Apr 13 19:03:58 2011
+++ src/crypto/external/bsd/heimdal/include/config.h Fri Apr 15 21:01:22 2011
@@ -1,11 +1,15 @@
/* include/config.h. Generated from config.h.in by configure. */
/* include/config.h.in. Generated from configure.ac by autoheader. */
+#if HAVE_NBTOOL_CONFIG_H
+#include nbtool_config.h
+#endif
+
#ifndef RCSID
#define RCSID(msg) \
static /**/const char *const rcsid[] = { (const char *)rcsid, @(#) msg }
#endif
-
+
/* Maximum values on all known systems */
#define MaxHostNameLen (64+4)
#define MaxPathLen (1024+4)
CVS commit: src/crypto/external/bsd/heimdal/lib/libsl/slc
Module Name:src
Committed By: elric
Date: Fri Apr 15 21:02:47 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/lib/libsl/slc: Makefile
Log Message:
No need to -lfl -ly.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile:1.3
--- src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile:1.2 Fri Apr 15 19:41:11 2011
+++ src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile Fri Apr 15 21:02:47 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/04/15 19:41:11 elric Exp $
+# $NetBSD: Makefile,v 1.3 2011/04/15 21:02:47 elric Exp $
NOMAN= # defined
@@ -14,8 +14,6 @@
YHEADER= # defined
-LDADD=-lfl -ly
-
HOST_CPPFLAGS+= -I. \
-I${HEIMBASE}/include \
-I${HEIMBASE}/include/krb5 \
CVS commit: src/sys/arch/cobalt/dev
Module Name:src Committed By: dyoung Date: Fri Apr 15 21:03:31 UTC 2011 Modified Files: src/sys/arch/cobalt/dev: gt.c Log Message: Don't set pba.pba_flags twice. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/cobalt/dev/gt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cobalt/dev/gt.c diff -u src/sys/arch/cobalt/dev/gt.c:1.23 src/sys/arch/cobalt/dev/gt.c:1.24 --- src/sys/arch/cobalt/dev/gt.c:1.23 Sun Feb 20 07:54:11 2011 +++ src/sys/arch/cobalt/dev/gt.c Fri Apr 15 21:03:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gt.c,v 1.23 2011/02/20 07:54:11 matt Exp $ */ +/* $NetBSD: gt.c,v 1.24 2011/04/15 21:03:31 dyoung Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang. All rights reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: gt.c,v 1.23 2011/02/20 07:54:11 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: gt.c,v 1.24 2011/04/15 21:03:31 dyoung Exp $); #include opt_pci.h #include pci.h @@ -135,7 +135,6 @@ #endif pba.pba_dmat = pci_bus_dma_tag; pba.pba_dmat64 = NULL; - pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED; pba.pba_bus = 0; pba.pba_bridgetag = NULL; pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED |
CVS commit: src/crypto/external/bsd/heimdal/include
Module Name:src Committed By: elric Date: Fri Apr 15 21:03:51 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/include: roken.h Log Message: Randomness isn't terribly necessary when we are building tools. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/include/roken.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/include/roken.h diff -u src/crypto/external/bsd/heimdal/include/roken.h:1.2 src/crypto/external/bsd/heimdal/include/roken.h:1.3 --- src/crypto/external/bsd/heimdal/include/roken.h:1.2 Thu Apr 14 18:12:08 2011 +++ src/crypto/external/bsd/heimdal/include/roken.h Fri Apr 15 21:03:51 2011 @@ -291,7 +291,11 @@ +#ifdef HAVE_NBTOOL_CONFIG_H +#define rk_random() 0 +#else #define rk_random() arc4random() +#endif
CVS commit: src/sys/arch/alpha/alpha
Module Name:src Committed By: martin Date: Fri Apr 15 21:24:01 UTC 2011 Modified Files: src/sys/arch/alpha/alpha: machdep.c Log Message: Hint from Matt Thomas: use evcnt_attach_dynamic_nozero() To generate a diff of this commit: cvs rdiff -u -r1.331 -r1.332 src/sys/arch/alpha/alpha/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/alpha/machdep.c diff -u src/sys/arch/alpha/alpha/machdep.c:1.331 src/sys/arch/alpha/alpha/machdep.c:1.332 --- src/sys/arch/alpha/alpha/machdep.c:1.331 Fri Apr 15 20:52:36 2011 +++ src/sys/arch/alpha/alpha/machdep.c Fri Apr 15 21:24:00 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.331 2011/04/15 20:52:36 martin Exp $ */ +/* $NetBSD: machdep.c,v 1.332 2011/04/15 21:24:00 martin Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.331 2011/04/15 20:52:36 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.332 2011/04/15 21:24:00 martin Exp $); #include sys/param.h #include sys/systm.h @@ -870,9 +870,9 @@ /* * Initialize some trap event counters. */ - evcnt_attach_dynamic(fpevent_use, EVCNT_TYPE_MISC, NULL, + evcnt_attach_dynamic_nozero(fpevent_use, EVCNT_TYPE_MISC, NULL, FP, proc use); - evcnt_attach_dynamic(fpevent_reuse, EVCNT_TYPE_MISC, NULL, + evcnt_attach_dynamic_nozero(fpevent_reuse, EVCNT_TYPE_MISC, NULL, FP, proc re-use); }
CVS commit: src/external/gpl3/binutils/lib/libbfd/arch
Module Name:src Committed By: mrg Date: Fri Apr 15 21:25:07 UTC 2011 Modified Files: src/external/gpl3/binutils/lib/libbfd/arch/alpha: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/arm: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/armeb: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/hppa: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/i386: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/m68000: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/m68k: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/mips64eb: defs.mk src/external/gpl3/binutils/lib/libbfd/arch/mips64el: bfd.h defs.mk src/external/gpl3/binutils/lib/libbfd/arch/mipseb: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/mipsel: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/powerpc: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/sh3eb: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/sh3el: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/sparc: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/sparc64: bfd.h src/external/gpl3/binutils/lib/libbfd/arch/vax: bfd.h Log Message: regenerate for mipsy mips To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd.h cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/lib/libbfd/arch/arm/bfd.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfd.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/lib/libbfd/arch/hppa/bfd.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/lib/libbfd/arch/i386/bfd.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/lib/libbfd/arch/m68000/bfd.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/lib/libbfd/arch/m68k/bfd.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/lib/libbfd/arch/mips64eb/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/lib/libbfd/arch/mips64el/bfd.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/lib/libbfd/arch/mips64el/defs.mk cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/lib/libbfd/arch/mipseb/bfd.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/lib/libbfd/arch/mipsel/bfd.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/lib/libbfd/arch/powerpc/bfd.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/lib/libbfd/arch/sh3eb/bfd.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/lib/libbfd/arch/sh3el/bfd.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/lib/libbfd/arch/sparc64/bfd.h cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/lib/libbfd/arch/vax/bfd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd.h diff -u src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd.h:1.2 src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd.h:1.3 --- src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd.h:1.2 Fri Apr 15 17:57:39 2011 +++ src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd.h Fri Apr 15 21:25:05 2011 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-binutils,v 1.5 2006/02/02 20:06:04 skrll Exp */ +/* Generated from: NetBSD: mknative-binutils,v 1.7 2009/11/09 13:50:41 skrll Exp */ /* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */ /* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically Index: src/external/gpl3/binutils/lib/libbfd/arch/arm/bfd.h diff -u src/external/gpl3/binutils/lib/libbfd/arch/arm/bfd.h:1.2 src/external/gpl3/binutils/lib/libbfd/arch/arm/bfd.h:1.3 --- src/external/gpl3/binutils/lib/libbfd/arch/arm/bfd.h:1.2 Fri Apr 15 17:57:40 2011 +++ src/external/gpl3/binutils/lib/libbfd/arch/arm/bfd.h Fri Apr 15 21:25:05 2011 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-binutils,v 1.5 2006/02/02 20:06:04 skrll Exp */ +/* Generated from: NetBSD: mknative-binutils,v 1.7 2009/11/09 13:50:41 skrll Exp */ /* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */ /* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically Index: src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfd.h diff -u src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfd.h:1.2 src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfd.h:1.3 --- src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfd.h:1.2 Fri Apr 15 17:57:40 2011 +++ src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfd.h Fri Apr 15 21:25:05 2011 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-binutils,v 1.5 2006/02/02 20:06:04
CVS commit: src/sys/dev/pci
Module Name:src Committed By: dyoung Date: Fri Apr 15 21:47:39 UTC 2011 Modified Files: src/sys/dev/pci: radeonfb.c Log Message: Refer to bits in the PCI CSR with using PCI_COMMAND_* instead of PCI_FLAGS_*: change PCI_FLAGS_IO_ENABLED and PCI_FLAGS_MEM_ENABLED to PCI_COMMAND_IO_ENABLE and PCI_COMMAND_MEM_ENABLE, respectively. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/radeonfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/radeonfb.c diff -u src/sys/dev/pci/radeonfb.c:1.42 src/sys/dev/pci/radeonfb.c:1.43 --- src/sys/dev/pci/radeonfb.c:1.42 Sun Feb 6 23:25:17 2011 +++ src/sys/dev/pci/radeonfb.c Fri Apr 15 21:47:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: radeonfb.c,v 1.42 2011/02/06 23:25:17 jmcneill Exp $ */ +/* $NetBSD: radeonfb.c,v 1.43 2011/04/15 21:47:39 dyoung Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -70,7 +70,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: radeonfb.c,v 1.42 2011/02/06 23:25:17 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: radeonfb.c,v 1.43 2011/04/15 21:47:39 dyoung Exp $); #define RADEONFB_DEFAULT_DEPTH 8 @@ -464,7 +464,7 @@ /* enable memory and IO access */ screg = pci_conf_read(sc-sc_pc, sc-sc_pt, PCI_COMMAND_STATUS_REG); - screg |= PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED; + screg |= PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE; pci_conf_write(sc-sc_pc, sc-sc_pt, PCI_COMMAND_STATUS_REG, screg); /*
CVS commit: src/external/bsd/mdocml/dist
Module Name:src
Committed By: joerg
Date: Fri Apr 15 22:05:52 UTC 2011
Modified Files:
src/external/bsd/mdocml/dist: roff.c
Log Message:
Really apply roff.c 1.134 for the conditional stack fix
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/mdocml/dist/roff.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/dist/roff.c
diff -u src/external/bsd/mdocml/dist/roff.c:1.1.1.7 src/external/bsd/mdocml/dist/roff.c:1.2
--- src/external/bsd/mdocml/dist/roff.c:1.1.1.7 Fri Apr 15 13:45:26 2011
+++ src/external/bsd/mdocml/dist/roff.c Fri Apr 15 22:05:51 2011
@@ -277,10 +277,6 @@
assert(r-last);
p = r-last;
- if (ROFF_el == p-tok)
- if (r-rstackpos -1)
- r-rstackpos--;
-
r-last = r-last-parent;
free(p-name);
free(p-end);
@@ -976,29 +972,20 @@
int sv;
enum roffrule rule;
- /* Stack overflow! */
-
- if (ROFF_ie == tok r-rstackpos == RSTACK_MAX - 1) {
- mandoc_msg(MANDOCERR_MEM, r-parse, ln, ppos, NULL);
- return(ROFF_ERR);
- }
-
- /* First, evaluate the conditional. */
+ /*
+ * An `.el' has no conditional body: it will consume the value
+ * of the current rstack entry set in prior `ie' calls or
+ * defaults to DENY.
+ *
+ * If we're not an `el', however, then evaluate the conditional.
+ */
- if (ROFF_el == tok) {
- /*
- * An `.el' will get the value of the current rstack
- * entry set in prior `ie' calls or defaults to DENY.
- */
- if (r-rstackpos 0)
- rule = ROFFRULE_DENY;
- else
- rule = r-rstack[r-rstackpos];
- } else
- rule = roff_evalcond(*bufp, pos);
+ rule = ROFF_el == tok ?
+ (r-rstackpos 0 ?
+ ROFFRULE_DENY : r-rstack[r-rstackpos--]) :
+ roff_evalcond(*bufp, pos);
sv = pos;
-
while (' ' == (*bufp)[pos])
pos++;
@@ -1018,16 +1005,20 @@
r-last-rule = rule;
+ /*
+ * An if-else will put the NEGATION of the current evaluated
+ * conditional into the stack of rules.
+ */
+
if (ROFF_ie == tok) {
- /*
- * An if-else will put the NEGATION of the current
- * evaluated conditional into the stack.
- */
- r-rstackpos++;
- if (ROFFRULE_DENY == r-last-rule)
- r-rstack[r-rstackpos] = ROFFRULE_ALLOW;
- else
- r-rstack[r-rstackpos] = ROFFRULE_DENY;
+ if (r-rstackpos == RSTACK_MAX - 1) {
+ mandoc_msg(MANDOCERR_MEM,
+r-parse, ln, ppos, NULL);
+ return(ROFF_ERR);
+ }
+ r-rstack[++r-rstackpos] =
+ ROFFRULE_DENY == r-last-rule ?
+ ROFFRULE_ALLOW : ROFFRULE_DENY;
}
/* If the parent has false as its rule, then so do we. */
CVS commit: src/lib/librump
Module Name:src Committed By: jym Date: Fri Apr 15 22:57:06 UTC 2011 Modified Files: src/lib/librump: rump.3 Log Message: Duplicate item detected, destroying duplicate. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/librump/rump.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librump/rump.3 diff -u src/lib/librump/rump.3:1.9 src/lib/librump/rump.3:1.10 --- src/lib/librump/rump.3:1.9 Fri Mar 25 16:07:43 2011 +++ src/lib/librump/rump.3 Fri Apr 15 22:57:05 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: rump.3,v 1.9 2011/03/25 16:07:43 pooka Exp $ +.\ $NetBSD: rump.3,v 1.10 2011/04/15 22:57:05 jym Exp $ .\ .\ Copyright (c) 2008-2011 Antti Kantee. All rights reserved. .\ @@ -63,7 +63,7 @@ running the rump kernel will not show up in the rump kernel and vice versa. A rump kernel may also be significantly more lightweight than the -host, and might not include include for example file system support +host, and might not include for example file system support at all. .Pp Clients using services provided by rump kernels can exist either
CVS commit: src/sbin/sysctl
Module Name:src
Committed By: christos
Date: Sat Apr 16 01:15:55 UTC 2011
Modified Files:
src/sbin/sysctl: sysctl.c
Log Message:
PR/44864: Paul Ripke: Compile regular expressions on demand and only once.
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sbin/sysctl/sysctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/sysctl/sysctl.c
diff -u src/sbin/sysctl/sysctl.c:1.133 src/sbin/sysctl/sysctl.c:1.134
--- src/sbin/sysctl/sysctl.c:1.133 Mon Dec 13 12:47:40 2010
+++ src/sbin/sysctl/sysctl.c Fri Apr 15 21:15:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.c,v 1.133 2010/12/13 17:47:40 pooka Exp $ */
+/* $NetBSD: sysctl.c,v 1.134 2011/04/16 01:15:54 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#if 0
static char sccsid[] = @(#)sysctl.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: sysctl.c,v 1.133 2010/12/13 17:47:40 pooka Exp $);
+__RCSID($NetBSD: sysctl.c,v 1.134 2011/04/16 01:15:54 christos Exp $);
#endif
#endif /* not lint */
@@ -123,10 +123,12 @@
/*
* generic routines
*/
-static const struct handlespec *findhandler(const char *, int);
+static const struct handlespec *findhandler(const char *, int, regex_t *,
+size_t *);
static void canonicalize(const char *, char *);
static void purge_tree(struct sysctlnode *);
-static void print_tree(int *, u_int, struct sysctlnode *, u_int, int);
+static void print_tree(int *, u_int, struct sysctlnode *, u_int, int, regex_t *,
+size_t *);
static void write_number(int *, u_int, struct sysctlnode *, char *);
static void write_string(int *, u_int, struct sysctlnode *, char *);
static void display_number(const struct sysctlnode *, const char *,
@@ -137,7 +139,7 @@
const void *, size_t, int);
static void hex_dump(const unsigned char *, size_t);
static void usage(void);
-static void parse(char *);
+static void parse(char *, regex_t *, size_t *);
static void parse_create(char *);
static void parse_destroy(char *);
static void parse_describe(char *);
@@ -270,7 +272,10 @@
{
int name[CTL_MAXNAME];
int ch;
+ size_t lastcompiled = 0;
+ regex_t *re;
+ setprogname(argv[0]);
while ((ch = getopt(argc, argv, Aabdef:Mnqrwx)) != -1) {
switch (ch) {
case 'A':
@@ -334,8 +339,12 @@
warnfp = stdout;
stale = req = 0;
+ if ((re = malloc(sizeof(*re) * __arraycount(handlers))) == NULL)
+ err(1, malloc regex);
+
if (aflag) {
- print_tree(name[0], 0, NULL, CTLTYPE_NODE, 1);
+ print_tree(name[0], 0, NULL, CTLTYPE_NODE, 1,
+ re, lastcompiled);
/* if (argc == 0) */
return (0);
}
@@ -352,7 +361,7 @@
while ((l = fparseln(fp, NULL, nr, NULL, 0)) != NULL)
{
if (*l) {
- parse(l);
+ parse(l, re, lastcompiled);
free(l);
}
}
@@ -365,7 +374,7 @@
usage();
while (argc-- 0)
- parse(*argv++);
+ parse(*argv++, re, lastcompiled);
return errs ? 1 : 0;
}
@@ -377,38 +386,38 @@
*
*/
static const struct handlespec *
-findhandler(const char *s, int w)
+findhandler(const char *s, int w, regex_t *re, size_t *lastcompiled)
{
const struct handlespec *p;
- regex_t re;
- int i, j, l;
+ size_t i, l;
+ int j;
char eb[64];
- regmatch_t match[1];
+ regmatch_t match;
p = handlers[0];
l = strlen(s);
for (i = 0; p[i].ps_re != NULL; i++) {
- j = regcomp(re, p[i].ps_re, REG_EXTENDED);
- if (j != 0) {
- regerror(j, re, eb, sizeof(eb));
- errx(1, regcomp: %s: %s, p[i].ps_re, eb);
+ if (i = *lastcompiled) {
+ j = regcomp(re[i], p[i].ps_re, REG_EXTENDED);
+ if (j != 0) {
+regerror(j, re[i], eb, sizeof(eb));
+errx(1, regcomp: %s: %s, p[i].ps_re, eb);
+ }
+ *lastcompiled = i + 1;
}
- j = regexec(re, s, 1, match, 0);
+ j = regexec(re[i], s, 1, match, 0);
if (j == 0) {
- if (match[0].rm_so == 0 match[0].rm_eo == l
- (w ? p[i].ps_w : p[i].ps_p) != NULL) {
-regfree(re);
-return (p[i]);
- }
+ if (match.rm_so == 0 match.rm_eo == (int)l
+ (w ? p[i].ps_w : p[i].ps_p) != NULL)
+return p[i];
}
else if (j != REG_NOMATCH) {
- regerror(j, re, eb, sizeof(eb));
+ regerror(j, re[i], eb, sizeof(eb));
errx(1, regexec: %s: %s, p[i].ps_re, eb);
}
- regfree(re);
}
- return (NULL);
+ return NULL;
}
/*
@@ -552,7 +561,7 @@
*/
static void
print_tree(int *name, u_int namelen, struct sysctlnode *pnode, u_int type,
- int add)
+ int add, regex_t *re, size_t *lastcompiled)
{
struct sysctlnode *node;
int rc;
@@ -651,7 +660,7 @@
}
canonicalize(gsname, canonname);
- p = findhandler(canonname, 0);
+ p = findhandler(canonname, 0, re, lastcompiled);
if (type != CTLTYPE_NODE p != NULL) {
(*p-ps_p)(gsname, gdname, NULL, name, namelen, pnode, type,
__UNCONST(p-ps_d));
@@ -704,7 +713,7 @@
continue;
print_tree(name, namelen + 1, node[ni],
CVS commit: src/lib/libm
Module Name:src Committed By: jruoho Date: Sat Apr 16 05:48:50 UTC 2011 Modified Files: src/lib/libm: Makefile src/lib/libm/man: ceil.3 Removed Files: src/lib/libm/man: floor.3 Log Message: Merge floor(3) to ceil(3). To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/lib/libm/Makefile cvs rdiff -u -r1.17 -r1.18 src/lib/libm/man/ceil.3 cvs rdiff -u -r1.14 -r0 src/lib/libm/man/floor.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/Makefile diff -u src/lib/libm/Makefile:1.106 src/lib/libm/Makefile:1.107 --- src/lib/libm/Makefile:1.106 Wed Apr 13 04:57:11 2011 +++ src/lib/libm/Makefile Sat Apr 16 05:48:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.106 2011/04/13 04:57:11 jruoho Exp $ +# $NetBSD: Makefile,v 1.107 2011/04/16 05:48:50 jruoho Exp $ # # @(#)Makefile 5.1beta 93/09/24 # @@ -203,7 +203,7 @@ MAN+= acos.3 acosh.3 asin.3 asinh.3 atan.3 atan2.3 atanh.3 \ ceil.3 copysign.3 cos.3 cosh.3 \ erf.3 exp.3 \ - fabs.3 floor.3 fmod.3 frexp.3 hypot.3 ieee.3 \ + fabs.3 fmod.3 frexp.3 hypot.3 ieee.3 \ ieee_test.3 isinff.3 j0.3 ldexp.3 lgamma.3 lrint.3 \ math.3 modf.3 nextafter.3 \ remainder.3 rint.3 round.3 \ @@ -230,7 +230,9 @@ MLINKS+=atan.3 atanf.3 MLINKS+=atan2.3 atan2f.3 MLINKS+=atanh.3 atanhf.3 -MLINKS+=ceil.3 ceilf.3 +MLINKS+=ceil.3 ceilf.3 \ + ceil.3 floor.3 \ + ceil.3 floorf.3 MLINKS+=copysign.3 copysignf.3 \ copysign.3 copysignl.3 MLINKS+=cos.3 cosf.3 @@ -244,7 +246,6 @@ exp.3 pow.3 exp.3 powf.3 \ exp.3 log2.3 exp.3 log2f.3 MLINKS+=fabs.3 fabsf.3 -MLINKS+=floor.3 floorf.3 MLINKS+=fmod.3 fmodf.3 MLINKS+=hypot.3 hypotf.3 MLINKS+=ieee.3 finite.3 ieee.3 finitef.3 \ Index: src/lib/libm/man/ceil.3 diff -u src/lib/libm/man/ceil.3:1.17 src/lib/libm/man/ceil.3:1.18 --- src/lib/libm/man/ceil.3:1.17 Thu Aug 7 16:44:47 2003 +++ src/lib/libm/man/ceil.3 Sat Apr 16 05:48:50 2011 @@ -26,15 +26,17 @@ .\ SUCH DAMAGE. .\ .\ from: @(#)ceil.3 5.1 (Berkeley) 5/2/91 -.\ $NetBSD: ceil.3,v 1.17 2003/08/07 16:44:47 agc Exp $ +.\ $NetBSD: ceil.3,v 1.18 2011/04/16 05:48:50 jruoho Exp $ .\ -.Dd March 10, 1994 +.Dd April 16, 2011 .Dt CEIL 3 .Os .Sh NAME .Nm ceil , -.Nm ceilf -.Nd round to smallest integral value greater than or equal to x +.Nm ceilf , +.Nm floor , +.Nm floorf +.Nd ceiling and floor .Sh LIBRARY .Lb libm .Sh SYNOPSIS @@ -43,6 +45,10 @@ .Fn ceil double x .Ft float .Fn ceilf float x +.Ft double +.Fn floor double x +.Ft float +.Fn floorf float x .Sh DESCRIPTION The .Fn ceil @@ -51,15 +57,23 @@ functions return the smallest integral value greater than or equal to .Fa x . +Conversely, the +.Fn floor +and +.Fn floorf +functions return the largest integral value +less than or equal to +.Fa x . .Sh SEE ALSO .Xr abs 3 , .Xr fabs 3 , -.Xr floor 3 , -.Xr ieee 3 , .Xr math 3 , +.Xr nextafter 3 , .Xr rint 3 .Sh STANDARDS +The described functions conform to +.St -isoC-99 . +.Sh BUGS The -.Fn ceil -function conforms to -.St -ansiC . +.Vt long double +variants of the functions are not yet supported.
