CVS commit: src/usr.bin/make
Module Name:src Committed By: wiz Date: Mon Apr 11 06:56:51 UTC 2011 Modified Files: src/usr.bin/make: make.1 Log Message: Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/make.1 diff -u src/usr.bin/make/make.1:1.187 src/usr.bin/make/make.1:1.188 --- src/usr.bin/make/make.1:1.187 Mon Apr 11 01:44:15 2011 +++ src/usr.bin/make/make.1 Mon Apr 11 06:56:50 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: make.1,v 1.187 2011/04/11 01:44:15 sjg Exp $ +.\ $NetBSD: make.1,v 1.188 2011/04/11 06:56:50 wiz Exp $ .\ .\ Copyright (c) 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -786,7 +786,7 @@ will not create .meta files in .Ql Va .CURDIR . This can be overridden by setting -.Va bf +.Va bf to a value which represents True. .It Pa verbose If in meta mode, print a clue about the target being built. @@ -1043,16 +1043,16 @@ .It Cm \:R Replaces each word in the variable with everything but its suffix. .It Cm \:gmtime -The value is a format string for +The value is a format string for .Xr strftime 3 , -using the current +using the current .Xr gmtime 3 . .It Cm \:hash Compute a 32bit hash of the value and encode it as hex digits. .It Cm \:localtime -The value is a format string for +The value is a format string for .Xr strftime 3 , -using the current +using the current .Xr localtime 3 . .It Cm \:tA Attempt to convert variable to an absolute path using
CVS commit: src/sys/arch/xen/conf
Module Name:src Committed By: cegger Date: Mon Apr 11 08:56:17 UTC 2011 Modified Files: src/sys/arch/xen/conf: files.xen Log Message: build xen kernels again after db_trace merge To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/sys/arch/xen/conf/files.xen 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/xen/conf/files.xen diff -u src/sys/arch/xen/conf/files.xen:1.114 src/sys/arch/xen/conf/files.xen:1.115 --- src/sys/arch/xen/conf/files.xen:1.114 Sun Apr 3 22:29:27 2011 +++ src/sys/arch/xen/conf/files.xen Mon Apr 11 08:56:17 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.xen,v 1.114 2011/04/03 22:29:27 dyoung Exp $ +# $NetBSD: files.xen,v 1.115 2011/04/11 08:56:17 cegger Exp $ # NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp # NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp @@ -42,8 +42,8 @@ file arch/i386/i386/db_dbgreg.S ddb | kstack_check_dr0 file arch/i386/i386/db_disasm.c ddb file arch/i386/i386/db_interface.c ddb +file arch/i386/i386/db_machdep.c ddb file arch/i386/i386/db_memrw.c ddb | kgdb -file arch/i386/i386/db_trace.c ddb file arch/i386/i386/dumpsys.c file arch/i386/i386/gdt.c file arch/i386/i386/ipkdb_glue.c ipkdb @@ -72,9 +72,9 @@ file arch/amd64/amd64/cpufunc.S file arch/amd64/amd64/cpu_in_cksum.S (inet | inet6) cpu_in_cksum file arch/amd64/amd64/db_disasm.c ddb -file arch/amd64/amd64/db_interface.c ddb +file arch/amd64/amd64/db_interface.c ddb +file arch/amd64/amd64/db_machdep.c ddb file arch/amd64/amd64/db_memrw.c ddb | kgdb -file arch/amd64/amd64/db_trace.c ddb file arch/amd64/amd64/kgdb_machdep.c kgdb file arch/amd64/amd64/kobj_machdep.c modular file arch/amd64/amd64/gdt.c @@ -88,6 +88,7 @@ endif file kern/subr_disk_mbr.c disk +file arch/x86/x86/db_trace.c ddb file arch/xen/x86/hypervisor_machdep.c # file arch/x86/x86/mtrr_i686.c mtrr file arch/x86/x86/syscall.c
CVS commit: src/tests/lib/libcurses/slave
Module Name:src Committed By: blymn Date: Mon Apr 11 09:02:03 UTC 2011 Modified Files: src/tests/lib/libcurses/slave: command_table.h curses_commands.h Log Message: Incorrect licence was applied - fix this. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/slave/command_table.h \ src/tests/lib/libcurses/slave/curses_commands.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libcurses/slave/command_table.h diff -u src/tests/lib/libcurses/slave/command_table.h:1.1 src/tests/lib/libcurses/slave/command_table.h:1.2 --- src/tests/lib/libcurses/slave/command_table.h:1.1 Sun Apr 10 09:55:10 2011 +++ src/tests/lib/libcurses/slave/command_table.h Mon Apr 11 09:02:02 2011 @@ -1,34 +1,31 @@ -/* $NetBSD: command_table.h,v 1.1 2011/04/10 09:55:10 blymn Exp $ */ +/* $NetBSD: command_table.h,v 1.2 2011/04/11 09:02:02 blymn Exp $ */ -/* - * Copyright (c) 1981, 1993, 1994 - * The Regents of the University of California. All rights reserved. +/*- + * Copyright 2009 Brett Lymn bl...@netbsd.org + * + * All rights reserved. + * + * This code has been donated to The NetBSD Foundation by the Author. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in the - *documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written permission. + * 2. The name of the author may not be used to endorse or promote products + *derived from this software withough specific prior written permission * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * @(#)curses.h 8.5 (Berkeley) 4/29/95 * */ Index: src/tests/lib/libcurses/slave/curses_commands.h diff -u src/tests/lib/libcurses/slave/curses_commands.h:1.1 src/tests/lib/libcurses/slave/curses_commands.h:1.2 --- src/tests/lib/libcurses/slave/curses_commands.h:1.1 Sun Apr 10 09:55:10 2011 +++ src/tests/lib/libcurses/slave/curses_commands.h Mon Apr 11 09:02:02 2011 @@ -1,34 +1,31 @@ -/* $NetBSD: curses_commands.h,v 1.1 2011/04/10 09:55:10 blymn Exp $ */ +/* $NetBSD: curses_commands.h,v 1.2 2011/04/11 09:02:02 blymn Exp $ */ -/* - * Copyright (c) 1981, 1993, 1994 - * The Regents of the University of California. All rights reserved. +/*- + * Copyright 2009 Brett Lymn bl...@netbsd.org + * + * All rights reserved. + * + * This code has been donated to The NetBSD Foundation by the Author. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in the - *documentation and/or other materials provided with the
CVS commit: src/tests/lib/libcurses
Module Name:src Committed By: blymn Date: Mon Apr 11 09:02:40 UTC 2011 Modified Files: src/tests/lib/libcurses: testframe.txt Log Message: Fix incorrect call example. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/testframe.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libcurses/testframe.txt diff -u src/tests/lib/libcurses/testframe.txt:1.1 src/tests/lib/libcurses/testframe.txt:1.2 --- src/tests/lib/libcurses/testframe.txt:1.1 Sun Apr 10 09:55:08 2011 +++ src/tests/lib/libcurses/testframe.txt Mon Apr 11 09:02:40 2011 @@ -71,7 +71,7 @@ parameters, the window, a pointer to storage for y and a pointer to storage for x would be called like this: - call OK 4 5 getyx $win1 + call3 OK 4 5 getyx $win1 Which calls getyx, the first (and possibly only) return is the return status of the function call, in this case we expect OK
CVS commit: src/tests/lib/libcurses/director
Module Name:src
Committed By: blymn
Date: Mon Apr 11 09:03:25 UTC 2011
Modified Files:
src/tests/lib/libcurses/director: testlang_conf.l
Log Message:
Fix NetBSD tag field.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/director/testlang_conf.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libcurses/director/testlang_conf.l
diff -u src/tests/lib/libcurses/director/testlang_conf.l:1.1 src/tests/lib/libcurses/director/testlang_conf.l:1.2
--- src/tests/lib/libcurses/director/testlang_conf.l:1.1 Sun Apr 10 09:55:09 2011
+++ src/tests/lib/libcurses/director/testlang_conf.l Mon Apr 11 09:03:24 2011
@@ -1,5 +1,5 @@
%{
-/* $NetBSD */
+/* $NetBSD: testlang_conf.l,v 1.2 2011/04/11 09:03:24 blymn Exp $ */
/*-
* Copyright 2009 Brett Lymn bl...@netbsd.org
CVS commit: src/tests/lib/libcurses/slave
Module Name:src
Committed By: blymn
Date: Mon Apr 11 09:06:24 UTC 2011
Modified Files:
src/tests/lib/libcurses/slave: curses_commands.c
Log Message:
Apply patch provided by mrg to fix bad calls to vw_printw and vw_scanw
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/slave/curses_commands.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libcurses/slave/curses_commands.c
diff -u src/tests/lib/libcurses/slave/curses_commands.c:1.2 src/tests/lib/libcurses/slave/curses_commands.c:1.3
--- src/tests/lib/libcurses/slave/curses_commands.c:1.2 Sun Apr 10 23:31:30 2011
+++ src/tests/lib/libcurses/slave/curses_commands.c Mon Apr 11 09:06:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: curses_commands.c,v 1.2 2011/04/10 23:31:30 dholland Exp $ */
+/* $NetBSD: curses_commands.c,v 1.3 2011/04/11 09:06:24 blymn Exp $ */
/*-
* Copyright 2009 Brett Lymn bl...@netbsd.org
@@ -34,6 +34,8 @@
#include stdlib.h
#include string.h
#include termios.h
+#include stdarg.h
+
#include slave.h
#include curses_commands.h
@@ -4398,6 +4400,19 @@
}
+static int
+internal_vw_printw(WINDOW *win, char *arg1, ...)
+{
+ va_list va;
+ int rv;
+
+ va_start(va, arg1);
+ rv = vw_printw(win, arg1, va);
+ va_end(va);
+
+ return rv;
+}
+
void
cmd_vw_printw(int nargs, char **args)
{
@@ -4413,10 +4428,23 @@
}
report_count(1);
- report_return(vw_printw(win, args[1], args[2]));
+ report_return(internal_vw_printw(win, args[1], args[2]));
}
+static int
+internal_vw_scanw(WINDOW *win, char *arg1, ...)
+{
+ va_list va;
+ int rv;
+
+ va_start(va, arg1);
+ rv = vw_scanw(win, arg1, va);
+ va_end(va);
+
+ return rv;
+}
+
void
cmd_vw_scanw(int nargs, char **args)
{
@@ -4434,7 +4462,7 @@
/* XXX - call2 */
report_count(2);
- report_int(vw_scanw(win, args[1], string));
+ report_int(internal_vw_scanw(win, args[1], string));
report_status(string);
}
CVS commit: src/sys/arch/sparc64/include
Module Name:src Committed By: mrg Date: Mon Apr 11 10:41:17 UTC 2011 Modified Files: src/sys/arch/sparc64/include: db_machdep.h Log Message: remove DB_AOUT_SYMBOLS. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sparc64/include/db_machdep.h 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/include/db_machdep.h diff -u src/sys/arch/sparc64/include/db_machdep.h:1.27 src/sys/arch/sparc64/include/db_machdep.h:1.28 --- src/sys/arch/sparc64/include/db_machdep.h:1.27 Fri Jan 14 02:06:32 2011 +++ src/sys/arch/sparc64/include/db_machdep.h Mon Apr 11 10:41:17 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: db_machdep.h,v 1.27 2011/01/14 02:06:32 rmind Exp $ */ +/* $NetBSD: db_machdep.h,v 1.28 2011/04/11 10:41:17 mrg Exp $ */ /* * Mach Operating System @@ -124,18 +124,15 @@ int kdb_trap(int, struct trapframe64 *); /* - * We will use elf symbols in DDB when they work. + * We use elf symbols in DDB. */ -#if 1 #define DB_ELF_SYMBOLS #ifdef __arch64__ #define DB_ELFSIZE 64 #else #define DB_ELFSIZE 32 #endif -#else -#define DB_AOUT_SYMBOLS -#endif + /* * KGDB definitions */
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: martin
Date: Mon Apr 11 10:51:37 UTC 2011
Modified Files:
src/tests/lib/libm: Makefile
Added Files:
src/tests/lib/libm: t_infinity.c
Log Message:
Try to generate infinite values in all available floating point formats
on the FPU and check isinf() and fpclassify() results. This is
different from the libc internal consistency checks testing PR
lib/33262.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libm/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libm/t_infinity.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libm/Makefile
diff -u src/tests/lib/libm/Makefile:1.5 src/tests/lib/libm/Makefile:1.6
--- src/tests/lib/libm/Makefile:1.5 Sun Apr 10 06:11:47 2011
+++ src/tests/lib/libm/Makefile Mon Apr 11 10:51:36 2011
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2011/04/10 06:11:47 jruoho Exp $
+# $NetBSD: Makefile,v 1.6 2011/04/11 10:51:36 martin Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/lib/libm
-TESTS_C+= t_ceil t_floor t_log t_round t_tanh
+TESTS_C+= t_ceil t_floor t_log t_round t_tanh t_infinity
LDADD+= -lm
COPTS+= -Wfloat-equal
Added files:
Index: src/tests/lib/libm/t_infinity.c
diff -u /dev/null src/tests/lib/libm/t_infinity.c:1.1
--- /dev/null Mon Apr 11 10:51:37 2011
+++ src/tests/lib/libm/t_infinity.c Mon Apr 11 10:51:36 2011
@@ -0,0 +1,117 @@
+/* $NetBSD: t_infinity.c,v 1.1 2011/04/11 10:51:36 martin Exp $ */
+
+/*-
+ * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Martin Husemann mar...@netbsd.org.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include sys/cdefs.h
+__RCSID($NetBSD: t_infinity.c,v 1.1 2011/04/11 10:51:36 martin Exp $);
+
+#include atf-c.h
+#include math.h
+#include float.h
+
+ATF_TC(infinity_float);
+ATF_TC_HEAD(infinity_float, tc)
+{
+ atf_tc_set_md_var(tc, descr,
+ check FPU generated infinite float values);
+}
+
+ATF_TC_BODY(infinity_float, tc)
+{
+ float v;
+
+ v = FLT_MAX;
+ v *= v;
+ ATF_REQUIRE(isinf(v));
+ ATF_REQUIRE(fpclassify(v) == FP_INFINITE);
+
+ v = -FLT_MAX;
+ v *= v;
+ ATF_REQUIRE(isinf(v));
+ ATF_REQUIRE(fpclassify(v) == FP_INFINITE);
+}
+
+ATF_TC(infinity_double);
+ATF_TC_HEAD(infinity_double, tc)
+{
+ atf_tc_set_md_var(tc, descr,
+ check FPU generated infinite double values);
+}
+
+ATF_TC_BODY(infinity_double, tc)
+{
+ double v;
+
+ v = DBL_MAX;
+ v *= v;
+ ATF_REQUIRE(isinf(v));
+ ATF_REQUIRE(fpclassify(v) == FP_INFINITE);
+
+ v = -DBL_MAX;
+ v *= v;
+ ATF_REQUIRE(isinf(v));
+ ATF_REQUIRE(fpclassify(v) == FP_INFINITE);
+}
+
+ATF_TC(infinity_long_double);
+ATF_TC_HEAD(infinity_long_double, tc)
+{
+ atf_tc_set_md_var(tc, descr,
+ check FPU generated infinite long double values);
+}
+
+ATF_TC_BODY(infinity_long_double, tc)
+{
+#ifndef LDBL_MAX
+ atf_tc_skip(no long double support on this architecture);
+ return;
+#else
+ long double v;
+
+ v = LDBL_MAX;
+ v *= v;
+ ATF_REQUIRE(isinf(v));
+ ATF_REQUIRE(fpclassify(v) == FP_INFINITE);
+
+ v = -LDBL_MAX;
+ v *= v;
+ ATF_REQUIRE(isinf(v));
+ ATF_REQUIRE(fpclassify(v) == FP_INFINITE);
+#endif
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, infinity_float);
+ ATF_TP_ADD_TC(tp, infinity_double);
+ ATF_TP_ADD_TC(tp, infinity_long_double);
+
+ return atf_no_error();
+}
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: martin Date: Mon Apr 11 10:55:27 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add libm/t_infinity To generate a diff of this commit: cvs rdiff -u -r1.307 -r1.308 src/distrib/sets/lists/tests/mi 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.307 src/distrib/sets/lists/tests/mi:1.308 --- src/distrib/sets/lists/tests/mi:1.307 Sun Apr 10 10:49:43 2011 +++ src/distrib/sets/lists/tests/mi Mon Apr 11 10:55:26 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.307 2011/04/10 10:49:43 jruoho Exp $ +# $NetBSD: mi,v 1.308 2011/04/11 10:55:26 martin Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -469,6 +469,7 @@ ./usr/libdata/debug/usr/tests/lib/libm tests-lib-debug ./usr/libdata/debug/usr/tests/lib/libm/t_ceil.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libm/t_floor.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libm/t_infinity.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libm/t_log.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libm/t_libm.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/lib/libm/t_round.debug tests-lib-debug debug,atf @@ -2064,6 +2065,7 @@ ./usr/tests/lib/libm/Atffile tests-lib-tests atf ./usr/tests/lib/libm/t_ceil tests-lib-tests atf ./usr/tests/lib/libm/t_floor tests-lib-tests atf +./usr/tests/lib/libm/t_infinity tests-lib-tests atf ./usr/tests/lib/libm/t_log tests-lib-tests atf ./usr/tests/lib/libm/t_libm tests-obsolete obsolete ./usr/tests/lib/libm/t_round tests-lib-tests atf
CVS commit: src/sys/arch/x68k/stand/libsa
Module Name:src Committed By: tsutsui Date: Mon Apr 11 13:47:16 UTC 2011 Modified Files: src/sys/arch/x68k/stand/libsa: consio.h Log Message: Fix pasto. Now serial console output on bootloader works properly after ~decade. ok from minoura@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x68k/stand/libsa/consio.h 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/x68k/stand/libsa/consio.h diff -u src/sys/arch/x68k/stand/libsa/consio.h:1.1 src/sys/arch/x68k/stand/libsa/consio.h:1.2 --- src/sys/arch/x68k/stand/libsa/consio.h:1.1 Thu Sep 27 10:03:27 2001 +++ src/sys/arch/x68k/stand/libsa/consio.h Mon Apr 11 13:47:16 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: consio.h,v 1.1 2001/09/27 10:03:27 minoura Exp $ */ +/* $NetBSD: consio.h,v 1.2 2011/04/11 13:47:16 tsutsui Exp $ */ /* * Copyright (c) 2001 MINOURA Makoto. @@ -35,4 +35,4 @@ #define SRAM_PHYS 0x00ed #define SERPARAM_PHYS (SRAM_PHYS + 26) -#define SERPARAM (*((unsigned short *)KEYCTRL_PHYS)) +#define SERPARAM (*((unsigned short *)SERPARAM_PHYS))
CVS commit: src/sys/arch/x68k/stand/libsa
Module Name:src
Committed By: tsutsui
Date: Mon Apr 11 13:48:32 UTC 2011
Modified Files:
src/sys/arch/x68k/stand/libsa: consio.c
Log Message:
Add missing breaks. No need to output to SERIAL on ITE console.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x68k/stand/libsa/consio.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/x68k/stand/libsa/consio.c
diff -u src/sys/arch/x68k/stand/libsa/consio.c:1.5 src/sys/arch/x68k/stand/libsa/consio.c:1.6
--- src/sys/arch/x68k/stand/libsa/consio.c:1.5 Sun Nov 11 05:20:26 2007
+++ src/sys/arch/x68k/stand/libsa/consio.c Mon Apr 11 13:48:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: consio.c,v 1.5 2007/11/11 05:20:26 isaki Exp $ */
+/* $NetBSD: consio.c,v 1.6 2011/04/11 13:48:32 tsutsui Exp $ */
/*
* Copyright (c) 2001 MINOURA Makoto.
@@ -92,8 +92,10 @@
switch (x68k_console_device) {
case ITE:
IOCS_B_PUTC (c);
+ break;
case SERIAL:
IOCS_OUT232C (c);
+ break;
}
}
CVS commit: src/sys/arch/x68k/stand/boot
Module Name:src Committed By: tsutsui Date: Mon Apr 11 13:49:41 UTC 2011 Modified Files: src/sys/arch/x68k/stand/boot: version Log Message: Bump version to denote serial console fix. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/stand/boot/version 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/x68k/stand/boot/version diff -u src/sys/arch/x68k/stand/boot/version:1.2 src/sys/arch/x68k/stand/boot/version:1.3 --- src/sys/arch/x68k/stand/boot/version:1.2 Fri Nov 9 19:53:16 2001 +++ src/sys/arch/x68k/stand/boot/version Mon Apr 11 13:49:41 2011 @@ -1,4 +1,4 @@ -$NetBSD: version,v 1.2 2001/11/09 19:53:16 scw Exp $ +$NetBSD: version,v 1.3 2011/04/11 13:49:41 tsutsui Exp $ NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important - make sure the entries are appended on end, last item @@ -7,3 +7,4 @@ 0.3: xxboot, ancient monolithic bootstrap program. 1.0: Initial version of the libsa-based bootstrap loader. 1.1: loadfile() update to avoid backwards seeks for ELF Program Headers. +1.2: Fix serial console output.
CVS commit: src/sys/arch/x68k/stand/libsa
Module Name:src
Committed By: tsutsui
Date: Mon Apr 11 14:00:02 UTC 2011
Modified Files:
src/sys/arch/x68k/stand/libsa: chdsk.c consio.c consio.h devopen.c fd.c
sdcd.c sdcdvar.h
Log Message:
Some KNF. No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x68k/stand/libsa/chdsk.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x68k/stand/libsa/consio.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/stand/libsa/consio.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/stand/libsa/devopen.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x68k/stand/libsa/fd.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x68k/stand/libsa/sdcd.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x68k/stand/libsa/sdcdvar.h
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/x68k/stand/libsa/chdsk.c
diff -u src/sys/arch/x68k/stand/libsa/chdsk.c:1.3 src/sys/arch/x68k/stand/libsa/chdsk.c:1.4
--- src/sys/arch/x68k/stand/libsa/chdsk.c:1.3 Thu Apr 7 13:38:21 2011
+++ src/sys/arch/x68k/stand/libsa/chdsk.c Mon Apr 11 14:00:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: chdsk.c,v 1.3 2011/04/07 13:38:21 isaki Exp $ */
+/* $NetBSD: chdsk.c,v 1.4 2011/04/11 14:00:02 tsutsui Exp $ */
/*
* Copyright (c) 2001 MINOURA Makoto.
@@ -36,6 +36,7 @@
int
changedisk_hook(struct open_file *f)
{
+
if (strcmp(f-f_dev-dv_name, fd) == 0) {
struct fd_softc *sc = f-f_devdata;
int drive[2];
Index: src/sys/arch/x68k/stand/libsa/consio.c
diff -u src/sys/arch/x68k/stand/libsa/consio.c:1.6 src/sys/arch/x68k/stand/libsa/consio.c:1.7
--- src/sys/arch/x68k/stand/libsa/consio.c:1.6 Mon Apr 11 13:48:32 2011
+++ src/sys/arch/x68k/stand/libsa/consio.c Mon Apr 11 14:00:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: consio.c,v 1.6 2011/04/11 13:48:32 tsutsui Exp $ */
+/* $NetBSD: consio.c,v 1.7 2011/04/11 14:00:02 tsutsui Exp $ */
/*
* Copyright (c) 2001 MINOURA Makoto.
@@ -42,12 +42,13 @@
int
consio_init(int device)
{
+
if (device 0) { /* undetemined yet */
if (KEYCTRL 8)
device = ITE;
else {
- IOCS_B_PRINT (No keyboard;
- switching to serial console...);
+ IOCS_B_PRINT(No keyboard;
+ switching to serial console...);
device = SERIAL;
}
}
@@ -56,12 +57,12 @@
case ITE:
x68k_console_device = ITE;
/* set palette here */
- IOCS_OS_CURON ();
+ IOCS_OS_CURON();
break;
case SERIAL:
x68k_console_device = SERIAL;
- IOCS_OS_CUROF ();
- IOCS_SET232C (SERPARAM);
+ IOCS_OS_CUROF();
+ IOCS_SET232C(SERPARAM);
}
return x68k_console_device;
@@ -74,10 +75,10 @@
switch (x68k_console_device) {
case ITE:
- while ((r = IOCS_B_KEYINP () 0xff) == 0);
+ while ((r = IOCS_B_KEYINP() 0xff) == 0);
return r;
case SERIAL:
- while ((r = IOCS_INP232C () 0xff) == 0);
+ while ((r = IOCS_INP232C() 0xff) == 0);
return r;
}
@@ -87,14 +88,15 @@
void
putchar(int c)
{
+
if (c == '\n')
putchar('\r');
switch (x68k_console_device) {
case ITE:
- IOCS_B_PUTC (c);
+ IOCS_B_PUTC(c);
break;
case SERIAL:
- IOCS_OUT232C (c);
+ IOCS_OUT232C(c);
break;
}
}
@@ -102,11 +104,12 @@
int
check_getchar(void)
{
+
switch (x68k_console_device) {
case ITE:
- return IOCS_B_KEYSNS () 0xff;
+ return IOCS_B_KEYSNS() 0xff;
case SERIAL:
- return IOCS_ISNS232C () 0xff;
+ return IOCS_ISNS232C() 0xff;
}
return -1;
Index: src/sys/arch/x68k/stand/libsa/consio.h
diff -u src/sys/arch/x68k/stand/libsa/consio.h:1.2 src/sys/arch/x68k/stand/libsa/consio.h:1.3
--- src/sys/arch/x68k/stand/libsa/consio.h:1.2 Mon Apr 11 13:47:16 2011
+++ src/sys/arch/x68k/stand/libsa/consio.h Mon Apr 11 14:00:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: consio.h,v 1.2 2011/04/11 13:47:16 tsutsui Exp $ */
+/* $NetBSD: consio.h,v 1.3 2011/04/11 14:00:02 tsutsui Exp $ */
/*
* Copyright (c) 2001 MINOURA Makoto.
@@ -26,13 +26,13 @@
*/
#define KEYCTRL_PHYS (0x00e8e000+7)
-#define KEYCTRL (*((volatile unsigned char *)KEYCTRL_PHYS))
+#define KEYCTRL (*((volatile uint8_t *)KEYCTRL_PHYS))
#define MFP_TIMERC_PHYS (0x00e88000+0x23)
-#define MFP_TIMERC (*((volatile unsigned char *)MFP_TIMERC_PHYS))
+#define MFP_TIMERC (*((volatile uint8_t *)MFP_TIMERC_PHYS))
#define JOYA_PHYS (0x00e9a000+1)
-#define JOYA (*((volatile unsigned char *)JOYA_PHYS))
+#define JOYA (*((volatile uint8_t *)JOYA_PHYS))
#define SRAM_PHYS 0x00ed
#define SERPARAM_PHYS (SRAM_PHYS + 26)
-#define SERPARAM (*((unsigned short *)SERPARAM_PHYS))
+#define SERPARAM (*((uint16_t *)SERPARAM_PHYS))
Index: src/sys/arch/x68k/stand/libsa/devopen.c
diff -u src/sys/arch/x68k/stand/libsa/devopen.c:1.4 src/sys/arch/x68k/stand/libsa/devopen.c:1.5
--- src/sys/arch/x68k/stand/libsa/devopen.c:1.4 Sun Nov 11 05:20:27 2007
+++ src/sys/arch/x68k/stand/libsa/devopen.c Mon Apr 11 14:00:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.4 2007/11/11 05:20:27 isaki Exp $ */
+/* $NetBSD: devopen.c,v 1.5 2011/04/11 14:00:02 tsutsui Exp $ */
/*
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Mon Apr 11 14:49:09 UTC 2011
Modified Files:
src/usr.bin/make: var.c
Log Message:
If a long modifier name does not match, goto default case
so SysV modifier can be tried.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.164 src/usr.bin/make/var.c:1.165
--- src/usr.bin/make/var.c:1.164 Mon Apr 11 01:44:15 2011
+++ src/usr.bin/make/var.c Mon Apr 11 14:49:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.164 2011/04/11 01:44:15 sjg Exp $ */
+/* $NetBSD: var.c,v 1.165 2011/04/11 14:49:09 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: var.c,v 1.164 2011/04/11 01:44:15 sjg Exp $;
+static char rcsid[] = $NetBSD: var.c,v 1.165 2011/04/11 14:49:09 sjg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)var.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: var.c,v 1.164 2011/04/11 01:44:15 sjg Exp $);
+__RCSID($NetBSD: var.c,v 1.165 2011/04/11 14:49:09 sjg Exp $);
#endif
#endif /* not lint */
#endif
@@ -2922,7 +2922,7 @@
cp = tstr + 6;
termc = *cp;
} else {
- goto bad_modifier;
+ goto default_case;
}
break;
case 'h':
@@ -2932,7 +2932,7 @@
cp = tstr + 4;
termc = *cp;
} else {
- goto bad_modifier;
+ goto default_case;
}
break;
case 'l':
@@ -2942,7 +2942,7 @@
cp = tstr + 9;
termc = *cp;
} else {
- goto bad_modifier;
+ goto default_case;
}
break;
case 't':
CVS commit: src/sys/arch/xen/xenbus
Module Name:src
Committed By: cegger
Date: Mon Apr 11 15:00:49 UTC 2011
Modified Files:
src/sys/arch/xen/xenbus: xenbus_probe.c
Log Message:
Continue scanning for other frontends when initialization
of one frontend failed. Bug reported by Konrad Wilk on port-xen@.
Fix this for all error pathes within the loop.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/xen/xenbus/xenbus_probe.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/xen/xenbus/xenbus_probe.c
diff -u src/sys/arch/xen/xenbus/xenbus_probe.c:1.29 src/sys/arch/xen/xenbus/xenbus_probe.c:1.30
--- src/sys/arch/xen/xenbus/xenbus_probe.c:1.29 Wed Mar 30 22:34:03 2011
+++ src/sys/arch/xen/xenbus/xenbus_probe.c Mon Apr 11 15:00:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_probe.c,v 1.29 2011/03/30 22:34:03 jym Exp $ */
+/* $NetBSD: xenbus_probe.c,v 1.30 2011/04/11 15:00:49 cegger Exp $ */
/**
* Talks to Xen Store to figure out what devices we have.
*
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xenbus_probe.c,v 1.29 2011/03/30 22:34:03 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: xenbus_probe.c,v 1.30 2011/04/11 15:00:49 cegger Exp $);
#if 0
#define DPRINTK(fmt, args...) \
@@ -294,6 +294,7 @@
return err;
for (i = 0; i dir_n; i++) {
+ err = 0;
/*
* add size of path to size of xenbus_device. xenbus_device
* already has room for one char in xbusd_path.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: sjg
Date: Mon Apr 11 15:10:15 UTC 2011
Modified Files:
src/usr.bin/make/unit-tests: modmisc test.exp
Log Message:
Add a test case for sysV modifier subst
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/modmisc
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/make/unit-tests/test.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/modmisc
diff -u src/usr.bin/make/unit-tests/modmisc:1.6 src/usr.bin/make/unit-tests/modmisc:1.7
--- src/usr.bin/make/unit-tests/modmisc:1.6 Fri Apr 23 15:43:28 2010
+++ src/usr.bin/make/unit-tests/modmisc Mon Apr 11 15:10:15 2011
@@ -1,4 +1,4 @@
-# $Id: modmisc,v 1.6 2010/04/23 15:43:28 sjg Exp $
+# $Id: modmisc,v 1.7 2011/04/11 15:10:15 sjg Exp $
#
# miscellaneous modifier tests
@@ -15,7 +15,10 @@
MOD_OPT=@d@$${exists($$d):?$$d:$${d:S,/usr,/opt,}}@
MOD_SEP=S,:, ,g
-all: modvar modvarloop
+all: modvar modvarloop modsysv
+
+modsysv:
+ @echo The answer is ${libfoo.a:L:libfoo.a=42}
modvar:
@echo path='${path}'
Index: src/usr.bin/make/unit-tests/test.exp
diff -u src/usr.bin/make/unit-tests/test.exp:1.36 src/usr.bin/make/unit-tests/test.exp:1.37
--- src/usr.bin/make/unit-tests/test.exp:1.36 Thu Apr 7 01:40:02 2011
+++ src/usr.bin/make/unit-tests/test.exp Mon Apr 11 15:10:15 2011
@@ -128,6 +128,7 @@
path_/usr/xbin=/opt/xbin/
paths=/bin /tmp / /no/such/dir /opt/xbin
PATHS=/BIN /TMP / /NO/SUCH/DIR /OPT/XBIN
+The answer is 42
LIST = one two three four five six seven eight nine ten
LIST:O= eight five four nine one seven six ten three two
LIST:Ox = Ok
CVS commit: src/lib/libm/src
Module Name:src
Committed By: drochner
Date: Mon Apr 11 15:17:34 UTC 2011
Modified Files:
src/lib/libm/src: k_standard.c
Log Message:
let log(0) return NaN rather than -inf in POSIX/XOPEN modes, as
requested in PR lib/41931 by Havard Eidnes (the PR refers to POSIX,
the OSF/1 manpage suggests that XOPEN should behave that way too)
being here, do the same to log10 and log2
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libm/src/k_standard.c
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/src/k_standard.c
diff -u src/lib/libm/src/k_standard.c:1.16 src/lib/libm/src/k_standard.c:1.17
--- src/lib/libm/src/k_standard.c:1.16 Wed Sep 1 10:44:28 2010
+++ src/lib/libm/src/k_standard.c Mon Apr 11 15:17:33 2011
@@ -12,7 +12,7 @@
#include sys/cdefs.h
#if defined(LIBM_SCCS) !defined(lint)
-__RCSID($NetBSD: k_standard.c,v 1.16 2010/09/01 10:44:28 drochner Exp $);
+__RCSID($NetBSD: k_standard.c,v 1.17 2011/04/11 15:17:33 drochner Exp $);
#endif
#include math.h
@@ -370,7 +370,7 @@
if (_LIB_VERSION == _SVID_)
exc.retval = -HUGE;
else
- exc.retval = -HUGE_VAL;
+ exc.retval = zero/zero;
if (_LIB_VERSION == _POSIX_)
errno = EDOM;
else if (!matherr(exc)) {
@@ -406,7 +406,7 @@
if (_LIB_VERSION == _SVID_)
exc.retval = -HUGE;
else
- exc.retval = -HUGE_VAL;
+ exc.retval = zero/zero;
if (_LIB_VERSION == _POSIX_)
errno = EDOM;
else if (!matherr(exc)) {
@@ -800,7 +800,7 @@
if (_LIB_VERSION == _SVID_)
exc.retval = -HUGE;
else
- exc.retval = -HUGE_VAL;
+ exc.retval = zero/zero;
if (_LIB_VERSION == _POSIX_)
errno = EDOM;
else if (!matherr(exc)) {
CVS commit: src/sys/arch/x68k/stand
Module Name:src
Committed By: tsutsui
Date: Mon Apr 11 15:20:30 UTC 2011
Modified Files:
src/sys/arch/x68k/stand: Makefile.booters
Log Message:
Use bsd.klinks.mk to create machine and ${MACHINE_ARCH} symlinks.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x68k/stand/Makefile.booters
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/x68k/stand/Makefile.booters
diff -u src/sys/arch/x68k/stand/Makefile.booters:1.5 src/sys/arch/x68k/stand/Makefile.booters:1.6
--- src/sys/arch/x68k/stand/Makefile.booters:1.5 Mon Jan 12 07:56:31 2009
+++ src/sys/arch/x68k/stand/Makefile.booters Mon Apr 11 15:20:30 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.5 2009/01/12 07:56:31 tsutsui Exp $
+# $NetBSD: Makefile.booters,v 1.6 2011/04/11 15:20:30 tsutsui Exp $
S?= ${.CURDIR}/../../../..
@@ -7,21 +7,7 @@
CFLAGS+= -Wno-pointer-sign
CFLAGS+= -Werror
-.if !make(obj) !make(clean) !make(cleandir)
-.NOPATH: machine ${MACHINE_ARCH}
-.BEGIN: machine ${MACHINE_ARCH}
-
-machine::
- -rm -f machine \
- ln -s $S/arch/${MACHINE}/include machine
-
-m68k::
- -rm -f ${MACHINE_ARCH} \
- ln -s $S/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
-.endif
-
-CLEANFILES+= machine ${MACHINE_ARCH}
-
+.include bsd.klinks.mk
# XXX SHOULD NOT NEED TO DEFINE THESE!
LIBCRT0=
CVS commit: src/tests/lib/libc/locale
Module Name:src Committed By: tron Date: Mon Apr 11 17:16:43 UTC 2011 Modified Files: src/tests/lib/libc/locale: Makefile Log Message: Fix build with stack smash protection enabled. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/locale/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/locale/Makefile diff -u src/tests/lib/libc/locale/Makefile:1.1 src/tests/lib/libc/locale/Makefile:1.2 --- src/tests/lib/libc/locale/Makefile:1.1 Sat Apr 9 17:45:25 2011 +++ src/tests/lib/libc/locale/Makefile Mon Apr 11 17:16:43 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2011/04/09 17:45:25 pgoyette Exp $ +# $NetBSD: Makefile,v 1.2 2011/04/11 17:16:43 tron Exp $ .include bsd.own.mk @@ -10,4 +10,6 @@ TESTS_C+= t_wcstod TESTS_C+= t_wctomb +COPTS.t_wctomb.c += -Wno-stack-protector + .include bsd.test.mk
CVS commit: src/sys/arch/sandpoint/conf
Module Name:src Committed By: phx Date: Mon Apr 11 18:02:11 UTC 2011 Modified Files: src/sys/arch/sandpoint/conf: GENERIC Log Message: Enable strtc(4). Should theoretically work. It works indeed for my DSM-G600 after I removed the battery. But there must be something which confuses the chip later on... To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/sandpoint/conf/GENERIC 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/sandpoint/conf/GENERIC diff -u src/sys/arch/sandpoint/conf/GENERIC:1.58 src/sys/arch/sandpoint/conf/GENERIC:1.59 --- src/sys/arch/sandpoint/conf/GENERIC:1.58 Wed Apr 6 18:12:15 2011 +++ src/sys/arch/sandpoint/conf/GENERIC Mon Apr 11 18:02:11 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.58 2011/04/06 18:12:15 phx Exp $ +# $NetBSD: GENERIC,v 1.59 2011/04/11 18:02:11 phx Exp $ # # machine description file for GENERIC NAS # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.58 $ +#ident GENERIC-$Revision: 1.59 $ maxusers 32 @@ -188,9 +188,9 @@ dsrtc* at iic? addr 0x68 rs5c372rtc* at iic? addr 0x32 s390rtc* at iic? addr 0x30 -#strtc* at iic? addr 0x68 -#options STRTC_NO_WATCHDOG -#options STRTC_NO_USERRAM +strtc* at iic? addr 0x68 +options STRTC_NO_WATCHDOG +options STRTC_NO_USERRAM # PCI IDE controllers - see pciide(4) for supported hardware. acardide* at pci? dev ? function ? # Acard IDE controllers
CVS commit: src/sys/kern
Module Name:src Committed By: jakllsch Date: Mon Apr 11 18:24:49 UTC 2011 Modified Files: src/sys/kern: vfs_lookup.c Log Message: Partially revert part of -r1.167; it was wrong. From dholland. To generate a diff of this commit: cvs rdiff -u -r1.173 -r1.174 src/sys/kern/vfs_lookup.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/kern/vfs_lookup.c diff -u src/sys/kern/vfs_lookup.c:1.173 src/sys/kern/vfs_lookup.c:1.174 --- src/sys/kern/vfs_lookup.c:1.173 Mon Apr 11 02:21:17 2011 +++ src/sys/kern/vfs_lookup.c Mon Apr 11 18:24:49 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_lookup.c,v 1.173 2011/04/11 02:21:17 dholland Exp $ */ +/* $NetBSD: vfs_lookup.c,v 1.174 2011/04/11 18:24:49 jakllsch Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.173 2011/04/11 02:21:17 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.174 2011/04/11 18:24:49 jakllsch Exp $); #include opt_magiclinks.h @@ -673,6 +673,8 @@ * * Updates searchdir. inhibitmagic causes magic symlinks to not be * interpreted; this is used by nfsd. + * + * Unlocks foundobj on success (ugh) */ static inline int namei_follow(struct namei_state *state, int inhibitmagic, @@ -745,6 +747,9 @@ /* we're now starting from the beginning of the buffer again */ cnp-cn_nameptr = ndp-ni_pnbuf; + /* must unlock this before relocking searchdir */ + VOP_UNLOCK(foundobj); + /* * Check if root directory should replace current directory. */ @@ -1204,7 +1209,8 @@ ndp-ni_vp = NULL; return error; } - vput(foundobj); + /* namei_follow unlocks it (ugh) so rele, not put */ + vrele(foundobj); foundobj = NULL; continue; }
CVS commit: src/sys
Module Name:src
Committed By: rmind
Date: Mon Apr 11 19:11:08 UTC 2011
Modified Files:
src/sys/arch/vax/vax: genassym.cf
src/sys/kern: kern_mutex.c
Log Message:
G/C unused MUTEX_COUNT_BIAS (it was for VAX)
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/vax/vax/genassym.cf
cvs rdiff -u -r1.50 -r1.51 src/sys/kern/kern_mutex.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/vax/vax/genassym.cf
diff -u src/sys/arch/vax/vax/genassym.cf:1.48 src/sys/arch/vax/vax/genassym.cf:1.49
--- src/sys/arch/vax/vax/genassym.cf:1.48 Mon Dec 20 00:25:45 2010
+++ src/sys/arch/vax/vax/genassym.cf Mon Apr 11 19:11:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.48 2010/12/20 00:25:45 matt Exp $
+# $NetBSD: genassym.cf,v 1.49 2011/04/11 19:11:08 rmind Exp $
#
# Copyright (c) 1997 Ludd, University of Lule}, Sweden.
# All rights reserved.
@@ -170,9 +170,6 @@
define MTX_OWNER offsetof(struct kmutex, mtx_owner)
define MTX_LOCK offsetof(struct kmutex, mtx_lock)
define MTX_IPL offsetof(struct kmutex, mtx_ipl)
-ifdef MUTEX_COUNT_BIAS
-define MTX_COUNT_BIAS MUTEX_COUNT_BIAS
-endif
define RW_OWNER offsetof(struct krwlock, rw_owner)
define RW_HAS_WAITERS RW_HAS_WAITERS
Index: src/sys/kern/kern_mutex.c
diff -u src/sys/kern/kern_mutex.c:1.50 src/sys/kern/kern_mutex.c:1.51
--- src/sys/kern/kern_mutex.c:1.50 Sun Mar 20 23:19:16 2011
+++ src/sys/kern/kern_mutex.c Mon Apr 11 19:11:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_mutex.c,v 1.50 2011/03/20 23:19:16 rmind Exp $ */
+/* $NetBSD: kern_mutex.c,v 1.51 2011/04/11 19:11:08 rmind Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#define __MUTEX_PRIVATE
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_mutex.c,v 1.50 2011/03/20 23:19:16 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_mutex.c,v 1.51 2011/04/11 19:11:08 rmind Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -117,9 +117,6 @@
/*
* Spin mutex SPL save / restore.
*/
-#ifndef MUTEX_COUNT_BIAS
-#define MUTEX_COUNT_BIAS 0
-#endif
#define MUTEX_SPIN_SPLRAISE(mtx) \
do { \
@@ -129,7 +126,7 @@
x__ci = curcpu(); \
x__cnt = x__ci-ci_mtx_count--; \
__insn_barrier(); \
- if (x__cnt == MUTEX_COUNT_BIAS) \
+ if (x__cnt == 0) \
x__ci-ci_mtx_oldspl = (s);\
} while (/* CONSTCOND */ 0)
@@ -138,7 +135,7 @@
struct cpu_info *x__ci = curcpu();\
int s = x__ci-ci_mtx_oldspl; \
__insn_barrier(); \
- if (++(x__ci-ci_mtx_count) == MUTEX_COUNT_BIAS) \
+ if (++(x__ci-ci_mtx_count) == 0) \
splx(s); \
} while (/* CONSTCOND */ 0)
CVS commit: src/sys/kern
Module Name:src Committed By: rmind Date: Mon Apr 11 19:13:54 UTC 2011 Modified Files: src/sys/kern: kern_softint.c Log Message: softint_execute: add assert which could catch locking bugs in softint handlers. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/kern/kern_softint.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/kern/kern_softint.c diff -u src/sys/kern/kern_softint.c:1.33 src/sys/kern/kern_softint.c:1.34 --- src/sys/kern/kern_softint.c:1.33 Mon Dec 20 00:25:46 2010 +++ src/sys/kern/kern_softint.c Mon Apr 11 19:13:54 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_softint.c,v 1.33 2010/12/20 00:25:46 matt Exp $ */ +/* $NetBSD: kern_softint.c,v 1.34 2011/04/11 19:13:54 rmind Exp $ */ /*- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. @@ -176,7 +176,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_softint.c,v 1.33 2010/12/20 00:25:46 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_softint.c,v 1.34 2011/04/11 19:13:54 rmind Exp $); #include sys/param.h #include sys/malloc.h @@ -539,6 +539,11 @@ havelock = true; } (*sh-sh_func)(sh-sh_arg); + + /* Diagnostic: check that spin-locks have not leaked. */ + KASSERTMSG(curcpu()-ci_mtx_count == 0, + (%s: ci_mtx_count (%d) != 0, sh_func %p\n, + __func__, curcpu()-ci_mtx_count, sh-sh_func)); (void)splhigh(); KASSERT((sh-sh_flags SOFTINT_ACTIVE) != 0);
CVS commit: src
Module Name:src
Committed By: martin
Date: Mon Apr 11 20:03:45 UTC 2011
Modified Files:
src/distrib/sets/lists/etc: mi
src/etc: Makefile
src/etc/mtree: NetBSD.dist.base special
Log Message:
When run as root, tcpdump will chroot to /var/run/tcpdump - but it can
not look up /etc/protcols in there. So install a copy of /etc/protocols
into the chroot area.
Fixes PR bin/44721.
To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.387 -r1.388 src/etc/Makefile
cvs rdiff -u -r1.79 -r1.80 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.135 -r1.136 src/etc/mtree/special
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/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.221 src/distrib/sets/lists/etc/mi:1.222
--- src/distrib/sets/lists/etc/mi:1.221 Sun Feb 20 19:24:53 2011
+++ src/distrib/sets/lists/etc/mi Mon Apr 11 20:03:45 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.221 2011/02/20 19:24:53 christos Exp $
+# $NetBSD: mi,v 1.222 2011/04/11 20:03:45 martin Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked obsolete; they should just be removed from
@@ -332,6 +332,7 @@
./root/.profile etc-root-root
./root/.shrc etc-root-root
./var/at/at.denyetc-cron-root
+./var/chroot/tcpdump/etc/protocols etc-sys-etc
./var/crash/minfreeetc-sys-root
./var/cron/tabs/rootetc-cron-root
./var/db/locate.database etc-sys-root
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.387 src/etc/Makefile:1.388
--- src/etc/Makefile:1.387 Wed Feb 16 16:22:13 2011
+++ src/etc/Makefile Mon Apr 11 20:03:45 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.387 2011/02/16 16:22:13 uebayasi Exp $
+# $NetBSD: Makefile,v 1.388 2011/04/11 20:03:45 martin Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -301,6 +301,9 @@
${ETC_INSTALL_OBJ_FILE} -o ${BINOWN} -g ${BINGRP} -m 644 \
${.CURDIR}/etc.${MACHINE}/boot.cfg ${DESTDIR}/
.endif
+ ${_MKMSG_INSTALL} ${DESTDIR}/var/chroot/tcpdump/etc/protocols
+ ${ETC_INSTALL_OBJ_FILE} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ protocols ${DESTDIR}/var/chroot/tcpdump/etc
${_MKMSG_INSTALL} ${DESTDIR}/dev/MAKEDEV
${ETC_INSTALL_OBJ_FILE} -o ${BINOWN} -g ${BINGRP} -m 555 \
MAKEDEV ${DESTDIR}/dev
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.79 src/etc/mtree/NetBSD.dist.base:1.80
--- src/etc/mtree/NetBSD.dist.base:1.79 Thu Mar 24 17:05:42 2011
+++ src/etc/mtree/NetBSD.dist.base Mon Apr 11 20:03:45 2011
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.79 2011/03/24 17:05:42 bouyer Exp $
+# $NetBSD: NetBSD.dist.base,v 1.80 2011/04/11 20:03:45 martin Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -1102,6 +1102,7 @@
./var/chroot/pflogd mode=0755
./var/chroot/sshd mode=0755
./var/chroot/tcpdump mode=0755
+./var/chroot/tcpdump/etc mode=0755
./var/chroot/tftp-proxy mode=0755
./var/crash mode=0770
./var/cron
Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.135 src/etc/mtree/special:1.136
--- src/etc/mtree/special:1.135 Wed Feb 2 02:20:28 2011
+++ src/etc/mtree/special Mon Apr 11 20:03:45 2011
@@ -1,4 +1,4 @@
-# $NetBSD: special,v 1.135 2011/02/02 02:20:28 rmind Exp $
+# $NetBSD: special,v 1.136 2011/04/11 20:03:45 martin Exp $
# @(#)special 8.2 (Berkeley) 1/23/94
#
# This file may be overwritten on upgrades.
@@ -395,6 +395,7 @@
./var/chroot/pflogd type=dir mode=0755
./var/chroot/sshd type=dir mode=0755
./var/chroot/tcpdump type=dir mode=0755
+./var/chroot/tcpdump/etc type=dir mode=0755
./var/chroot/tftp-proxy type=dir mode=0755
./var/cron type=dir mode=0755
./var/cron/tabs type=dir mode=0700
CVS commit: src/tests/usr.bin/shmif_dumpbus
Module Name:src Committed By: martin Date: Mon Apr 11 20:08:10 UTC 2011 Modified Files: src/tests/usr.bin/shmif_dumpbus: t_basic.sh Log Message: Should no longer fail - if it still does, be sure to have a proper /var/chroot/tcpdump/etc/protocols file installed (i.e. by running postinstall) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/shmif_dumpbus/t_basic.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/shmif_dumpbus/t_basic.sh diff -u src/tests/usr.bin/shmif_dumpbus/t_basic.sh:1.5 src/tests/usr.bin/shmif_dumpbus/t_basic.sh:1.6 --- src/tests/usr.bin/shmif_dumpbus/t_basic.sh:1.5 Mon Mar 14 09:25:01 2011 +++ src/tests/usr.bin/shmif_dumpbus/t_basic.sh Mon Apr 11 20:08:10 2011 @@ -1,4 +1,4 @@ -# $NetBSD: t_basic.sh,v 1.5 2011/03/14 09:25:01 pooka Exp $ +# $NetBSD: t_basic.sh,v 1.6 2011/04/11 20:08:10 martin Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -69,7 +69,10 @@ unpack_file d_pcap.out atf_check -s exit:0 -o ignore shmif_dumpbus -p pcap shmbus - atf_expect_fail PR bin/44721 +# +# should not fail anymore... +# +# atf_expect_fail PR bin/44721 atf_check -s exit:0 -o file:d_pcap.out -e ignore \ tcpdump -tt -n -r pcap }
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: martin
Date: Mon Apr 11 20:29:50 UTC 2011
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Add a new check to populate /var/chroot/tcpdump/etc
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.115 src/usr.sbin/postinstall/postinstall:1.116
--- src/usr.sbin/postinstall/postinstall:1.115 Sat Mar 12 23:04:16 2011
+++ src/usr.sbin/postinstall/postinstall Mon Apr 11 20:29:50 2011
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.115 2011/03/12 23:04:16 erh Exp $
+# $NetBSD: postinstall,v 1.116 2011/04/11 20:29:50 martin Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1465,6 +1465,29 @@
#
+# tcpdumpchroot
+#
+additem tcpdumpchroot make sure /var/chroot/tcpdump/etc is populated
+do_tcpdumpchroot()
+{
+ [ -n $1 ] || err 3 USAGE: do_tcpdumpchroot fix|check
+
+ failed=0;
+ if [ ! -r ${DEST_DIR}/var/chroot/tcpdump/etc/protocols ]; then
+ if [ $1 = fix ]; then
+ mkdir -p ${DEST_DIR}/var/chroot/tcpdump/etc
+ cp ${SRC_DIR}/etc/protocols \
+${DEST_DIR}/var/chroot/tcpdump/etc
+ failed=$(( ${failed} + $? ))
+ else
+ failed=1
+ fi
+ fi
+ return ${failed}
+}
+
+
+#
# obsolete
# (this item is last to allow other items to move obsolete files)
#
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Mon Apr 11 21:04:11 UTC 2011
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
GCC 4.1 doesn't have the support code for -I =... yet, so don't use it
for now.
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.95 src/share/mk/bsd.x11.mk:1.96
--- src/share/mk/bsd.x11.mk:1.95 Sun Apr 10 16:52:36 2011
+++ src/share/mk/bsd.x11.mk Mon Apr 11 21:04:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.95 2011/04/10 16:52:36 joerg Exp $
+# $NetBSD: bsd.x11.mk,v 1.96 2011/04/11 21:04:11 joerg Exp $
.include bsd.init.mk
@@ -166,7 +166,7 @@
CPPFLAGS+= -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO
-CPPFLAGS+= -I=${X11INCDIR}
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
.if ${MACHINE_ARCH} == x86_64
CPPFLAGS+= -D__AMD64__
CVS commit: src/lib/libterminfo
Module Name:src Committed By: roy Date: Mon Apr 11 21:13:09 UTC 2011 Modified Files: src/lib/libterminfo: term.h termcap.h Log Message: POSIX says that term.h should define tgetstr and friends Fixes PR lib/43941 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libterminfo/term.h cvs rdiff -u -r1.1 -r1.2 src/lib/libterminfo/termcap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libterminfo/term.h diff -u src/lib/libterminfo/term.h:1.6 src/lib/libterminfo/term.h:1.7 --- src/lib/libterminfo/term.h:1.6 Wed Sep 22 06:10:51 2010 +++ src/lib/libterminfo/term.h Mon Apr 11 21:13:09 2011 @@ -1,7 +1,7 @@ -/* $NetBSD: term.h,v 1.6 2010/09/22 06:10:51 roy Exp $ */ +/* $NetBSD: term.h,v 1.7 2011/04/11 21:13:09 roy Exp $ */ /* - * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc. + * Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc. * * This code is derived from software contributed to The NetBSD Foundation * by Roy Marples. @@ -1463,10 +1463,6 @@ __BEGIN_DECLS extern TERMINAL *cur_term; -#ifndef _TERMCAP_H -extern short ospeed; -extern char PC; -#endif /* setup functions */ int setupterm(const char *, int, int *); @@ -1482,12 +1478,6 @@ char * tparm(const char *, long, long, long, long, long, long, long, long, long); -#ifndef _TERMCAP_H -/* Output functions. */ -int putp(const char *); -int tputs(const char *, int, int (*)(int)); -#endif - /* Non standard functions, but provide a level of thread safety */ int ti_setupterm(TERMINAL **, const char *, int, int *); int ti_getflag(const TERMINAL *, const char *); @@ -1516,5 +1506,8 @@ * The passed string is destroyed and the return string needs to be freed. */ char * captoinfo(char *); +/* POSIX says that term.h should also pull in our termcap definitions. */ +#include termcap.h + __END_DECLS #endif Index: src/lib/libterminfo/termcap.h diff -u src/lib/libterminfo/termcap.h:1.1 src/lib/libterminfo/termcap.h:1.2 --- src/lib/libterminfo/termcap.h:1.1 Wed Feb 3 15:16:32 2010 +++ src/lib/libterminfo/termcap.h Mon Apr 11 21:13:09 2011 @@ -1,7 +1,7 @@ -/* $NetBSD: termcap.h,v 1.1 2010/02/03 15:16:32 roy Exp $ */ +/* $NetBSD: termcap.h,v 1.2 2011/04/11 21:13:09 roy Exp $ */ /* - * Copyright (c) 2009 The NetBSD Foundation, Inc. + * Copyright (c) 2009, 2011 The NetBSD Foundation, Inc. * * This code is derived from software contributed to The NetBSD Foundation * by Roy Marples. @@ -34,7 +34,6 @@ __BEGIN_DECLS -#ifndef _TERM_H /* Output functions. * These are still valid for terminfo. */ int putp(const char *); @@ -42,8 +41,6 @@ extern short ospeed; extern char PC; -#endif - extern char *BC; extern char *UP;
CVS commit: src/lib/libterminfo
Module Name:src
Committed By: roy
Date: Mon Apr 11 21:37:19 UTC 2011
Modified Files:
src/lib/libterminfo: compile.c term.c
Log Message:
Clean up some compile warnings
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libterminfo/compile.c
cvs rdiff -u -r1.11 -r1.12 src/lib/libterminfo/term.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/compile.c
diff -u src/lib/libterminfo/compile.c:1.4 src/lib/libterminfo/compile.c:1.5
--- src/lib/libterminfo/compile.c:1.4 Tue Mar 2 14:11:11 2010
+++ src/lib/libterminfo/compile.c Mon Apr 11 21:37:19 2011
@@ -1,7 +1,7 @@
-/* $NetBSD: compile.c,v 1.4 2010/03/02 14:11:11 roy Exp $ */
+/* $NetBSD: compile.c,v 1.5 2011/04/11 21:37:19 roy Exp $ */
/*
- * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
+ * Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Roy Marples.
@@ -32,7 +32,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: compile.c,v 1.4 2010/03/02 14:11:11 roy Exp $);
+__RCSID($NetBSD: compile.c,v 1.5 2011/04/11 21:37:19 roy Exp $);
#if !HAVE_NBTOOL_CONFIG_H || HAVE_SYS_ENDIAN_H
#include sys/endian.h
@@ -344,7 +344,7 @@
if (ch == '?')
ch = '\177';
else if ((ch = 037) == 0)
- ch = 128;
+ ch = (char)128;
}
*p++ = ch;
last = ch;
@@ -452,7 +452,8 @@
{
char *token, *p, *e, *name, *desc, *alias;
signed char flag;
- long num;
+ long cnum;
+ short num;
ssize_t ind;
size_t len;
TBUF buf;
@@ -564,17 +565,18 @@
_ti_find_cap(tic-nums, 'n', ind) != NULL)
continue;
- num = strtol(p, e, 0);
+ cnum = strtol(p, e, 0);
if (*e != '\0') {
dowarn(flags, %s: %s: not a number,
tic-name, token);
continue;
}
- if (!VALID_NUMERIC(num)) {
+ if (!VALID_NUMERIC(cnum)) {
dowarn(flags, %s: %s: number out of range,
tic-name, token);
continue;
}
+ num = (short)cnum;
if (ind == -1)
_ti_store_extra(tic, 1, token, 'n', -1,
num, NULL, 0, flags);
@@ -608,7 +610,7 @@
le16enc(tic-nums.buf + tic-nums.bufpos, ind);
tic-nums.bufpos += sizeof(uint16_t);
le16enc(tic-nums.buf + tic-nums.bufpos,
- CANCELLED_NUMERIC);
+ (uint16_t)CANCELLED_NUMERIC);
tic-nums.bufpos += sizeof(uint16_t);
tic-nums.entries++;
continue;
Index: src/lib/libterminfo/term.c
diff -u src/lib/libterminfo/term.c:1.11 src/lib/libterminfo/term.c:1.12
--- src/lib/libterminfo/term.c:1.11 Fri Feb 26 00:09:00 2010
+++ src/lib/libterminfo/term.c Mon Apr 11 21:37:19 2011
@@ -1,7 +1,7 @@
-/* $NetBSD: term.c,v 1.11 2010/02/26 00:09:00 roy Exp $ */
+/* $NetBSD: term.c,v 1.12 2011/04/11 21:37:19 roy Exp $ */
/*
- * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
+ * Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Roy Marples.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: term.c,v 1.11 2010/02/26 00:09:00 roy Exp $);
+__RCSID($NetBSD: term.c,v 1.12 2011/04/11 21:37:19 roy Exp $);
#include sys/stat.h
@@ -354,7 +354,8 @@
if (tic != NULL ticcmp(tic, name) == 0) {
len = _ti_flatten(f, tic);
if (len != -1) {
-r = _ti_readterm(term, (char *)f, len, flags);
+r = _ti_readterm(term, (char *)f, (size_t)len,
+flags);
free(f);
}
}
CVS commit: src/etc
Module Name:src
Committed By: martin
Date: Mon Apr 11 21:49:13 UTC 2011
Modified Files:
src/etc: Makefile
Log Message:
Ooops, fix source path for the protocols file
To generate a diff of this commit:
cvs rdiff -u -r1.388 -r1.389 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.388 src/etc/Makefile:1.389
--- src/etc/Makefile:1.388 Mon Apr 11 20:03:45 2011
+++ src/etc/Makefile Mon Apr 11 21:49:13 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.388 2011/04/11 20:03:45 martin Exp $
+# $NetBSD: Makefile,v 1.389 2011/04/11 21:49:13 martin Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -303,7 +303,7 @@
.endif
${_MKMSG_INSTALL} ${DESTDIR}/var/chroot/tcpdump/etc/protocols
${ETC_INSTALL_OBJ_FILE} -o ${BINOWN} -g ${BINGRP} -m 644 \
- protocols ${DESTDIR}/var/chroot/tcpdump/etc
+ ${NETBSDSRCDIR}/etc/protocols ${DESTDIR}/var/chroot/tcpdump/etc
${_MKMSG_INSTALL} ${DESTDIR}/dev/MAKEDEV
${ETC_INSTALL_OBJ_FILE} -o ${BINOWN} -g ${BINGRP} -m 555 \
MAKEDEV ${DESTDIR}/dev
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: martin Date: Mon Apr 11 22:09:56 UTC 2011 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/etc: mi Log Message: Collect all of var/chroot/tcpdump in one set - so we have a chance to win the checkflist game. To generate a diff of this commit: cvs rdiff -u -r1.927 -r1.928 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.222 -r1.223 src/distrib/sets/lists/etc/mi 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.927 src/distrib/sets/lists/base/mi:1.928 --- src/distrib/sets/lists/base/mi:1.927 Thu Mar 24 17:05:40 2011 +++ src/distrib/sets/lists/base/mi Mon Apr 11 22:09:56 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.927 2011/03/24 17:05:40 bouyer Exp $ +# $NetBSD: mi,v 1.928 2011/04/11 22:09:56 martin Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -4835,6 +4835,8 @@ ./var/chroot/spamdbase-obsolete obsolete ./var/chroot/sshdbase-sys-root ./var/chroot/tcpdumpbase-sys-root +./var/chroot/tcpdump/etc base-sys-root +./var/chroot/tcpdump/etc/protocols base-sys-root ./var/chroot/tftp-proxybase-sys-root ./var/crash base-sys-root ./var/cron base-cron-root Index: src/distrib/sets/lists/etc/mi diff -u src/distrib/sets/lists/etc/mi:1.222 src/distrib/sets/lists/etc/mi:1.223 --- src/distrib/sets/lists/etc/mi:1.222 Mon Apr 11 20:03:45 2011 +++ src/distrib/sets/lists/etc/mi Mon Apr 11 22:09:56 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.222 2011/04/11 20:03:45 martin Exp $ +# $NetBSD: mi,v 1.223 2011/04/11 22:09:56 martin Exp $ # # Note: end-user configuration files that are moved to another location # should not be marked obsolete; they should just be removed from @@ -332,7 +332,6 @@ ./root/.profile etc-root-root ./root/.shrc etc-root-root ./var/at/at.denyetc-cron-root -./var/chroot/tcpdump/etc/protocols etc-sys-etc ./var/crash/minfreeetc-sys-root ./var/cron/tabs/rootetc-cron-root ./var/db/locate.database etc-sys-root
CVS commit: src/sys
Module Name:src
Committed By: rmind
Date: Mon Apr 11 22:31:43 UTC 2011
Modified Files:
src/sys/kern: uipc_sem.c
src/sys/sys: file.h
Log Message:
Highly rewrite POSIX semaphore. Use file descriptor subsystem, greatly
simplify reference counting, and fix various bugs which existed before,
e.g. some incorrect locking or mq_unlink() not checking for permissions.
Also, fixes PR/43452.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/kern/uipc_sem.c
cvs rdiff -u -r1.71 -r1.72 src/sys/sys/file.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_sem.c
diff -u src/sys/kern/uipc_sem.c:1.29 src/sys/kern/uipc_sem.c:1.30
--- src/sys/kern/uipc_sem.c:1.29 Fri Nov 14 15:49:21 2008
+++ src/sys/kern/uipc_sem.c Mon Apr 11 22:31:43 2011
@@ -1,11 +1,11 @@
-/* $NetBSD: uipc_sem.c,v 1.29 2008/11/14 15:49:21 ad Exp $ */
+/* $NetBSD: uipc_sem.c,v 1.30 2011/04/11 22:31:43 rmind Exp $ */
/*-
- * Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of Wasabi Systems, Inc, and by Andrew Doran.
+ * by Mindaugas Rasiukevicius.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -55,8 +55,12 @@
* SUCH DAMAGE.
*/
+/*
+ * Implementation of POSIX semaphore.
+ */
+
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_sem.c,v 1.29 2008/11/14 15:49:21 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_sem.c,v 1.30 2011/04/11 22:31:43 rmind Exp $);
#include sys/param.h
#include sys/systm.h
@@ -67,6 +71,8 @@
#include sys/stat.h
#include sys/kmem.h
#include sys/fcntl.h
+#include sys/file.h
+#include sys/filedesc.h
#include sys/kauth.h
#include sys/module.h
#include sys/mount.h
@@ -74,14 +80,48 @@
#include sys/syscallargs.h
#include sys/syscallvar.h
-#define SEM_MAX_NAMELEN 14
-#define SEM_VALUE_MAX (~0U)
-#define SEM_HASHTBL_SIZE 13
+MODULE(MODULE_CLASS_MISC, ksem, NULL);
-#define SEM_TO_ID(x) (((x)-ks_id))
-#define SEM_HASH(id) ((id) % SEM_HASHTBL_SIZE)
+#define SEM_MAX_NAMELEN 14
+#define SEM_VALUE_MAX (~0U)
-MODULE(MODULE_CLASS_MISC, ksem, NULL);
+#define KS_UNLINKED 0x01
+
+typedef struct ksem {
+ LIST_ENTRY(ksem) ks_entry; /* global list entry */
+ kmutex_t ks_lock; /* lock on this ksem */
+ kcondvar_t ks_cv; /* condition variable */
+ u_int ks_ref; /* number of references */
+ u_int ks_value; /* current value */
+ u_int ks_waiters; /* number of waiters */
+ char * ks_name; /* name, if named */
+ size_t ks_namelen; /* length of name */
+ int ks_flags; /* for KS_UNLINKED */
+ mode_t ks_mode; /* protection bits */
+ uid_t ks_uid; /* creator uid */
+ gid_t ks_gid; /* creator gid */
+} ksem_t;
+
+static kmutex_t ksem_lock __cacheline_aligned;
+static LIST_HEAD(,ksem) ksem_head __cacheline_aligned;
+static u_int nsems __cacheline_aligned;
+
+static int ksem_sysinit(void);
+static int ksem_sysfini(bool);
+static int ksem_modcmd(modcmd_t, void *);
+static int ksem_close_fop(file_t *);
+
+static const struct fileops semops = {
+ .fo_read = fbadop_read,
+ .fo_write = fbadop_write,
+ .fo_ioctl = fbadop_ioctl,
+ .fo_fcntl = fnullop_fcntl,
+ .fo_poll = fnullop_poll,
+ .fo_stat = fbadop_stat,
+ .fo_close = ksem_close_fop,
+ .fo_kqfilter = fnullop_kqfilter,
+ .fo_restart = fnullop_restart,
+};
static const struct syscall_package ksem_syscalls[] = {
{ SYS__ksem_init, 0, (sy_call_t *)sys__ksem_init },
@@ -96,283 +136,186 @@
{ 0, 0, NULL },
};
-/*
- * Note: to read the ks_name member, you need either the ks_interlock
- * or the ksem_mutex. To write the ks_name member, you need both. Make
- * sure the order is ksem_mutex - ks_interlock.
- */
-struct ksem {
- LIST_ENTRY(ksem) ks_entry; /* global list entry */
- LIST_ENTRY(ksem) ks_hash; /* hash list entry */
- kmutex_t ks_interlock; /* lock on this ksem */
- kcondvar_t ks_cv; /* condition variable */
- unsigned int ks_ref; /* number of references */
- char *ks_name; /* if named, this is the name */
- size_t ks_namelen; /* length of name */
- mode_t ks_mode; /* protection bits */
- uid_t ks_uid; /* creator uid */
- gid_t ks_gid; /* creator gid */
- unsigned int ks_value; /* current value */
- unsigned int ks_waiters; /* number of waiters */
- intptr_t ks_id; /* unique identifier */
-};
-
-struct ksem_ref {
- LIST_ENTRY(ksem_ref) ksr_list;
- struct ksem *ksr_ksem;
-};
-
-struct ksem_proc {
- krwlock_t kp_lock;
- LIST_HEAD(, ksem_ref) kp_ksems;
-};
-
-LIST_HEAD(ksem_list, ksem);
-
-/*
- * ksem_mutex protects ksem_head and nsems. Only named semaphores go
- * onto ksem_head.
- */
-static kmutex_t ksem_mutex;
-static struct ksem_list ksem_head = LIST_HEAD_INITIALIZER(ksem_head);
-static struct
CVS commit: src/tests/lib/libcurses/director
Module Name:src
Committed By: joerg
Date: Mon Apr 11 22:37:10 UTC 2011
Modified Files:
src/tests/lib/libcurses/director: director.c
Log Message:
Don't fail on platforms with char == unsigned char
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/director/director.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libcurses/director/director.c
diff -u src/tests/lib/libcurses/director/director.c:1.1 src/tests/lib/libcurses/director/director.c:1.2
--- src/tests/lib/libcurses/director/director.c:1.1 Sun Apr 10 09:55:09 2011
+++ src/tests/lib/libcurses/director/director.c Mon Apr 11 22:37:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: director.c,v 1.1 2011/04/10 09:55:09 blymn Exp $ */
+/* $NetBSD: director.c,v 1.2 2011/04/11 22:37:10 joerg Exp $ */
/*-
* Copyright 2009 Brett Lymn bl...@netbsd.org
@@ -110,7 +110,8 @@
{
extern char *optarg;
extern int optind;
- char *termpath, *term, *slave, ch;
+ char *termpath, *term, *slave;
+ int ch;
pid_t slave_pid;
extern FILE *yyin;
char *arg1, *arg2, *arg3, *arg4;
CVS commit: src/external/mit/xorg/bin/sessreg
Module Name:src
Committed By: joerg
Date: Mon Apr 11 22:47:50 UTC 2011
Modified Files:
src/external/mit/xorg/bin/sessreg: Makefile
Log Message:
Extend, not reassign CPPFLAGS.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/sessreg/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/sessreg/Makefile
diff -u src/external/mit/xorg/bin/sessreg/Makefile:1.3 src/external/mit/xorg/bin/sessreg/Makefile:1.4
--- src/external/mit/xorg/bin/sessreg/Makefile:1.3 Sun May 23 21:31:57 2010
+++ src/external/mit/xorg/bin/sessreg/Makefile Mon Apr 11 22:47:50 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/05/23 21:31:57 veego Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/11 22:47:50 joerg Exp $
.include bsd.own.mk
@@ -6,7 +6,7 @@
.include ../xdm/Makefile.xdm
-CPPFLAGS= -I${X11SRCDIR.${PROG}}/../include
+CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include
X11EXTRAMANDEFS+= -e 's,__ttys_file__,/etc/ttys,g; \
s,__utmp_file__,${XDMPIDDIR}/utmp,g; \
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Mon Apr 11 23:03:38 UTC 2011
Modified Files:
src/share/mk: bsd.lib.mk bsd.prog.mk bsd.x11.mk
Log Message:
Adjust --sysroot related usage:
-Wl,-rpath does not expand =, so just drop it.
Drop -Wl,-rpath-link entries that duplicate the -Wl,-rpath entries, this
is done implicitly now that ld is built with sysroot support.
Use ${DESTDIR} explicitly for the remaining -Wl,-rpath-link entries.
To generate a diff of this commit:
cvs rdiff -u -r1.313 -r1.314 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.263 -r1.264 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.96 -r1.97 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.313 src/share/mk/bsd.lib.mk:1.314
--- src/share/mk/bsd.lib.mk:1.313 Sun Apr 10 16:52:36 2011
+++ src/share/mk/bsd.lib.mk Mon Apr 11 23:03:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.313 2011/04/10 16:52:36 joerg Exp $
+# $NetBSD: bsd.lib.mk,v 1.314 2011/04/11 23:03:38 joerg Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include bsd.init.mk
@@ -511,11 +511,10 @@
_LIBLDOPTS=
.if ${SHLIBDIR} != /usr/lib
-_LIBLDOPTS+= -Wl,-rpath-link,=${SHLIBDIR} \
- -Wl,-rpath,=${SHLIBDIR} \
+_LIBLDOPTS+= -Wl,-rpath,${SHLIBDIR} \
-L=${SHLIBDIR}
.elif ${SHLIBINSTALLDIR} != /usr/lib
-_LIBLDOPTS+= -Wl,-rpath-link,=${SHLIBINSTALLDIR} \
+_LIBLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \
-L=${SHLIBINSTALLDIR}
.endif
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.263 src/share/mk/bsd.prog.mk:1.264
--- src/share/mk/bsd.prog.mk:1.263 Sun Apr 10 16:52:36 2011
+++ src/share/mk/bsd.prog.mk Mon Apr 11 23:03:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.263 2011/04/10 16:52:36 joerg Exp $
+# $NetBSD: bsd.prog.mk,v 1.264 2011/04/11 23:03:38 joerg Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -162,11 +162,10 @@
_PROGLDOPTS+= -Wl,-dynamic-linker=${_SHLINKER}
.endif
.if ${SHLIBDIR} != /usr/lib
-_PROGLDOPTS+= -Wl,-rpath-link,=${SHLIBDIR} \
- -Wl,-rpath,=${SHLIBDIR} \
+_PROGLDOPTS+= -Wl,-rpath,${SHLIBDIR} \
-L=${SHLIBDIR}
.elif ${SHLIBINSTALLDIR} != /usr/lib
-_PROGLDOPTS+= -Wl,-rpath-link,=${SHLIBINSTALLDIR} \
+_PROGLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \
-L=${SHLIBINSTALLDIR}
.endif
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.96 src/share/mk/bsd.x11.mk:1.97
--- src/share/mk/bsd.x11.mk:1.96 Mon Apr 11 21:04:11 2011
+++ src/share/mk/bsd.x11.mk Mon Apr 11 23:03:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.96 2011/04/11 21:04:11 joerg Exp $
+# $NetBSD: bsd.x11.mk,v 1.97 2011/04/11 23:03:38 joerg Exp $
.include bsd.init.mk
@@ -172,7 +172,7 @@
CPPFLAGS+= -D__AMD64__
.endif
-LDFLAGS+= -Wl,-rpath,=${X11USRLIBDIR} -L=${X11USRLIBDIR}
+LDFLAGS+= -Wl,-rpath,${X11USRLIBDIR} -L=${X11USRLIBDIR}
#
CVS commit: src/sys/arch/evbmips/rmixl
Module Name:src
Committed By: matt
Date: Mon Apr 11 23:12:41 UTC 2011
Modified Files:
src/sys/arch/evbmips/rmixl: machdep.c
Log Message:
Add code to fixup the text segment to replace loads
from L_CPU(MIPS_CURLWP) or curlwp-l_cpu with
loads from COP0 register OSSCRATCH.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/rmixl/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/evbmips/rmixl/machdep.c
diff -u src/sys/arch/evbmips/rmixl/machdep.c:1.7 src/sys/arch/evbmips/rmixl/machdep.c:1.8
--- src/sys/arch/evbmips/rmixl/machdep.c:1.7 Sun Feb 20 07:48:35 2011
+++ src/sys/arch/evbmips/rmixl/machdep.c Mon Apr 11 23:12:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.7 2011/02/20 07:48:35 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.8 2011/04/11 23:12:41 matt Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -74,7 +74,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.7 2011/02/20 07:48:35 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.8 2011/04/11 23:12:41 matt Exp $);
#define __INTR_PRIVATE
@@ -108,12 +108,14 @@
#include ksyms.h
#if NKSYMS || defined(DDB) || defined(LKM)
-#include machine/db_machdep.h
+#include mips/db_machdep.h
#include ddb/db_extern.h
#endif
-#include machine/cpu.h
-#include machine/psl.h
+#include mips/cpu.h
+#include mips/psl.h
+#include mips/cache.h
+#include mips/mips_opcode.h
#include com.h
#if NCOM == 0
@@ -228,6 +230,7 @@
static void rmixl_wakeup_info_print(volatile rmixlfw_cpu_wakeup_info_t *);
#endif /* MACHDEP_DEBUG */
#endif /* MULTIPROCESSOR */
+static void rmixl_fixup_curcpu(void);
/*
* Do all the stuff that locore normally does before calling main().
@@ -414,6 +417,7 @@
:: r(cpu_info_store), n(MIPS_COP_0_OSSCRATCH));
mips_fixup_exceptions(rmixl_fixup_cop0_oscratch);
#endif
+ rmixl_fixup_curcpu();
}
/*
@@ -483,6 +487,43 @@
#endif /* MULTIPROCESSOR */
/*
+ * The following changes all lX rN, L_CPU(MIPS_CURLWP) [curlwp-l_cpu]
+ * to [d]mfc0 rN, $22 [MIPS_COP_0_OSSCRATCH]
+ *
+ * the mfc0 is 3 cycles shorter than the load.
+ */
+#define LOAD_CURCPU_0 ((MIPS_CURLWP_REG 21) | offsetof(lwp_t, l_cpu))
+#define MFC0_CURCPU_0 ((OP_COP0 26) | (MIPS_COP_0_OSSCRATCH 11))
+#ifdef _LP64
+#define LOAD_CURCPU ((uint32_t)(OP_LD 26) | LOAD_CURCPU_0)
+#define MFC0_CURCPU ((uint32_t)(OP_DMF 21) | MFC0_CURCPU_0)
+#else
+#define LOAD_CURCPU ((uint32_t)(OP_LW 26) | LOAD_CURCPU_0)
+#define MFC0_CURCPU ((uint32_t)(OP_MF 21) | MFC0_CURCPU_0)
+#endif
+#define LOAD_CURCPU_MASK 0xffe0
+
+static void
+rmixl_fixup_curcpu(void)
+{
+ extern uint32_t _ftext[];
+ extern uint32_t _etext[];
+
+ for (uint32_t *insnp = _ftext; insnp _etext; insnp++) {
+ const uint32_t insn = *insnp;
+ if (__predict_false((insn LOAD_CURCPU_MASK) == LOAD_CURCPU)) {
+ /*
+ * Since the register to loaded is located in bits
+ * 16-20 for the mfc0 and the load instruction we can
+ * just change the instruction bits around it.
+ */
+ *insnp = insn ^ LOAD_CURCPU ^ MFC0_CURCPU;
+ mips_icache_sync_range((vaddr_t)insnp, 4);
+ }
+ }
+}
+
+/*
* ram_seg_resv - cut reserved regions out of segs, fragmenting as needed
*
* we simply build a new table of segs, then copy it back over the given one
CVS commit: src/sys/arch/evbmips/rmixl
Module Name:src Committed By: matt Date: Tue Apr 12 00:21:11 UTC 2011 Modified Files: src/sys/arch/evbmips/rmixl: machdep.c Log Message: Make sure we init MIPS COP0 OSSCRATCH for UP as well as for MP. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbmips/rmixl/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/evbmips/rmixl/machdep.c diff -u src/sys/arch/evbmips/rmixl/machdep.c:1.8 src/sys/arch/evbmips/rmixl/machdep.c:1.9 --- src/sys/arch/evbmips/rmixl/machdep.c:1.8 Mon Apr 11 23:12:41 2011 +++ src/sys/arch/evbmips/rmixl/machdep.c Tue Apr 12 00:21:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.8 2011/04/11 23:12:41 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.9 2011/04/12 00:21:10 matt Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -74,7 +74,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.8 2011/04/11 23:12:41 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.9 2011/04/12 00:21:10 matt Exp $); #define __INTR_PRIVATE @@ -408,13 +408,13 @@ if (boothowto RB_KDB) Debugger(); #endif -#ifdef MULTIPROCESSOR /* * store (cpu#0) curcpu in COP0 OSSCRATCH0 * used in exception vector */ __asm __volatile(dmtc0 %0,$%1 :: r(cpu_info_store), n(MIPS_COP_0_OSSCRATCH)); +#ifdef MULTIPROCESSOR mips_fixup_exceptions(rmixl_fixup_cop0_oscratch); #endif rmixl_fixup_curcpu();
CVS commit: src/usr.sbin/crash
Module Name:src
Committed By: mrg
Date: Tue Apr 12 01:47:20 UTC 2011
Modified Files:
src/usr.sbin/crash: Makefile
Log Message:
replace a non-working make construct with a working one.
now crash only builds unsupported.c on non-x86 systems again.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/crash/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/crash/Makefile
diff -u src/usr.sbin/crash/Makefile:1.8 src/usr.sbin/crash/Makefile:1.9
--- src/usr.sbin/crash/Makefile:1.8 Mon Apr 11 04:22:32 2011
+++ src/usr.sbin/crash/Makefile Tue Apr 12 01:47:20 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/04/11 04:22:32 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2011/04/12 01:47:20 mrg Exp $
PROG= crash
MAN= crash.8
@@ -9,7 +9,8 @@
# some ddb kernel components need limited modifications. for now,
# punt if not noted as implemented here.
-.if !empty(${MACHINE:C/(amd64|i386)//})
+.if${MACHINE} != amd64 \
+ ${MACHINE} != i386
SRCS+= unsupported.c
.else
CVS commit: src/tests/lib/libc/stdlib
Module Name:src
Committed By: jruoho
Date: Tue Apr 12 02:52:20 UTC 2011
Modified Files:
src/tests/lib/libc/stdlib: t_strtod.c
Log Message:
PR lib/33262 should be fixed; remove expected failure.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/stdlib/t_strtod.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/stdlib/t_strtod.c
diff -u src/tests/lib/libc/stdlib/t_strtod.c:1.5 src/tests/lib/libc/stdlib/t_strtod.c:1.6
--- src/tests/lib/libc/stdlib/t_strtod.c:1.5 Sun Apr 10 10:23:45 2011
+++ src/tests/lib/libc/stdlib/t_strtod.c Tue Apr 12 02:52:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strtod.c,v 1.5 2011/04/10 10:23:45 jruoho Exp $ */
+/* $NetBSD: t_strtod.c,v 1.6 2011/04/12 02:52:20 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
/* Public domain, Otto Moerbeek o...@drijf.net, 2006. */
#include sys/cdefs.h
-__RCSID($NetBSD: t_strtod.c,v 1.5 2011/04/10 10:23:45 jruoho Exp $);
+__RCSID($NetBSD: t_strtod.c,v 1.6 2011/04/12 02:52:20 jruoho Exp $);
#include errno.h
#include math.h
@@ -106,19 +106,10 @@
{
#ifndef __vax__
- const char *m_arch;
long double ld;
double d;
float f;
- m_arch = atf_config_get(atf_arch);
-
- if (strcmp(m_arch, x86_64) == 0)
- atf_tc_expect_fail(PR lib/33262);
-
- if (system(cpuctl identify 0 | grep -q QEMU) == 0)
- atf_tc_expect_fail(PR lib/33262);
-
d = strtod(INF, NULL);
ATF_REQUIRE(isinf(d) != 0);
CVS commit: src/tests/lib/libc/stdlib
Module Name:src Committed By: jruoho Date: Tue Apr 12 02:56:20 UTC 2011 Modified Files: src/tests/lib/libc/stdlib: t_strtod.c Log Message: Better to still leave the old PR number as a comment. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libc/stdlib/t_strtod.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/stdlib/t_strtod.c diff -u src/tests/lib/libc/stdlib/t_strtod.c:1.6 src/tests/lib/libc/stdlib/t_strtod.c:1.7 --- src/tests/lib/libc/stdlib/t_strtod.c:1.6 Tue Apr 12 02:52:20 2011 +++ src/tests/lib/libc/stdlib/t_strtod.c Tue Apr 12 02:56:20 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: t_strtod.c,v 1.6 2011/04/12 02:52:20 jruoho Exp $ */ +/* $NetBSD: t_strtod.c,v 1.7 2011/04/12 02:56:20 jruoho Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ /* Public domain, Otto Moerbeek o...@drijf.net, 2006. */ #include sys/cdefs.h -__RCSID($NetBSD: t_strtod.c,v 1.6 2011/04/12 02:52:20 jruoho Exp $); +__RCSID($NetBSD: t_strtod.c,v 1.7 2011/04/12 02:56:20 jruoho Exp $); #include errno.h #include math.h @@ -110,6 +110,9 @@ double d; float f; + /* + * See old PR lib/33262. + */ d = strtod(INF, NULL); ATF_REQUIRE(isinf(d) != 0);
CVS commit: src/tests/lib/libm
Module Name:src Committed By: jruoho Date: Tue Apr 12 03:06:21 UTC 2011 Modified Files: src/tests/lib/libm: t_log.c Log Message: PR lib/41931 should be fixed; remove expected failure. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libm/t_log.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libm/t_log.c diff -u src/tests/lib/libm/t_log.c:1.1 src/tests/lib/libm/t_log.c:1.2 --- src/tests/lib/libm/t_log.c:1.1 Sun Apr 10 06:11:47 2011 +++ src/tests/lib/libm/t_log.c Tue Apr 12 03:06:21 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: t_log.c,v 1.1 2011/04/10 06:11:47 jruoho Exp $ */ +/* $NetBSD: t_log.c,v 1.2 2011/04/12 03:06:21 jruoho Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__RCSID($NetBSD: t_log.c,v 1.1 2011/04/10 06:11:47 jruoho Exp $); +__RCSID($NetBSD: t_log.c,v 1.2 2011/04/12 03:06:21 jruoho Exp $); #include math.h @@ -51,10 +51,9 @@ /* * If the argument is negative, * the result should be NaN and - * a domain error should follow + * a domain error should follow. + * Refer to the old PR lib/41931. */ - atf_tc_expect_fail(PR lib/41931); - d = log(-1); ATF_REQUIRE(isnan(d) != 0);
CVS commit: src/lib/libc/arch/sparc
Module Name:src
Committed By: mrg
Date: Tue Apr 12 03:35:47 UTC 2011
Modified Files:
src/lib/libc/arch/sparc: Makefile.inc
Log Message:
rm -f ${.TARGET} before trying to write to it; some how mine ended up
being mode 444 and the build failed.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/sparc/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/sparc/Makefile.inc
diff -u src/lib/libc/arch/sparc/Makefile.inc:1.13 src/lib/libc/arch/sparc/Makefile.inc:1.14
--- src/lib/libc/arch/sparc/Makefile.inc:1.13 Sun Oct 26 07:43:07 2008
+++ src/lib/libc/arch/sparc/Makefile.inc Tue Apr 12 03:35:47 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.13 2008/10/26 07:43:07 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.14 2011/04/12 03:35:47 mrg Exp $
SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
@@ -9,24 +9,28 @@
sdiv.S: ${LIBCDIR}/arch/sparc/gen/divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}'
+ @rm -f ${.TARGET}
@(echo define(NAME,\`.div')define(OP,\`div')define(S,\`true'); \
cat ${.ALLSRC}) | ${TOOL_M4} ${.TARGET}
@chmod 444 ${.TARGET}
udiv.S: ${LIBCDIR}/arch/sparc/gen/divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}'
+ @rm -f ${.TARGET}
@(echo define(NAME,\`.udiv')define(OP,\`div')define(S,\`false'); \
cat ${.ALLSRC}) | ${TOOL_M4} ${.TARGET}
@chmod 444 ${.TARGET}
rem.S: ${LIBCDIR}/arch/sparc/gen/divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}'
+ @rm -f ${.TARGET}
@(echo define(NAME,\`.rem')define(OP,\`rem')define(S,\`true'); \
cat ${.ALLSRC}) | ${TOOL_M4} ${.TARGET}
@chmod 444 ${.TARGET}
urem.S: ${LIBCDIR}/arch/sparc/gen/divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}'
+ @rm -f ${.TARGET}
@(echo define(NAME,\`.urem')define(OP,\`rem')define(S,\`false'); \
cat ${.ALLSRC}) | ${TOOL_M4} ${.TARGET}
@chmod 444 ${.TARGET}
CVS commit: src/share/man/man3
Module Name:src Committed By: jruoho Date: Tue Apr 12 04:27:02 UTC 2011 Modified Files: src/share/man/man3: unistd.3 Log Message: Small rewording. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man3/unistd.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man3/unistd.3 diff -u src/share/man/man3/unistd.3:1.2 src/share/man/man3/unistd.3:1.3 --- src/share/man/man3/unistd.3:1.2 Sun Apr 10 10:01:06 2011 +++ src/share/man/man3/unistd.3 Tue Apr 12 04:27:02 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: unistd.3,v 1.2 2011/04/10 10:01:06 wiz Exp $ +.\ $NetBSD: unistd.3,v 1.3 2011/04/12 04:27:02 jruoho Exp $ .\ .\ Copyright (c) 2011 Jukka Ruohonen jruoho...@iki.fi .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 10, 2011 +.Dd April 12, 2011 .Dt UNISTD 3 .Os .Sh NAME @@ -58,12 +58,13 @@ and .Xr sysconf 3 . .It -Prototypes for several important system calls such as -.Xr alarm 3 , +Prototypes for several important system calls and library routines such as +.Xr chown 2 , +.Xr dup 2 , .Xr execl 3 , .Xr fork 2 , -.Xr link 2 , .Xr pipe 2 , +.Xr rmdir 2 , .Xr setuid 2 , and .Xr write 2 .
CVS commit: src/lib/libc/gen
Module Name:src Committed By: jruoho Date: Tue Apr 12 04:55:05 UTC 2011 Modified Files: src/lib/libc/gen: getloadavg.3 Log Message: Use RETURN VALUES rather than DIAGNOSTIC for... return values. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/gen/getloadavg.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/libc/gen/getloadavg.3 diff -u src/lib/libc/gen/getloadavg.3:1.14 src/lib/libc/gen/getloadavg.3:1.15 --- src/lib/libc/gen/getloadavg.3:1.14 Thu Aug 7 16:42:50 2003 +++ src/lib/libc/gen/getloadavg.3 Tue Apr 12 04:55:05 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: getloadavg.3,v 1.14 2003/08/07 16:42:50 agc Exp $ +.\ $NetBSD: getloadavg.3,v 1.15 2011/04/12 04:55:05 jruoho Exp $ .\ .\ Copyright (c) 1989, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)getloadavg.3 8.1 (Berkeley) 6/4/93 .\ -.Dd June 4, 1993 +.Dd April 12, 2011 .Dt GETLOADAVG 3 .Os .Sh NAME @@ -52,7 +52,7 @@ .Fa loadavg Ns Bq . The system imposes a maximum of 3 samples, representing averages over the last 1, 5, and 15 minutes, respectively. -.Sh DIAGNOSTICS +.Sh RETURN VALUES If the load average was unobtainable, \-1 is returned; otherwise, the number of samples actually retrieved is returned. .Sh SEE ALSO
CVS commit: src/sys/arch/xen/xenbus
Module Name:src
Committed By: cegger
Date: Tue Apr 12 05:09:32 UTC 2011
Modified Files:
src/sys/arch/xen/xenbus: xenbus_probe.c
Log Message:
previous fix does not work if there is exactly only one entry where continue
exits the loop.
Apply fix from Konrad Wilke on port-xen@
That makes NetBSD DomU boot on Linux Dom0 with xl.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/xen/xenbus/xenbus_probe.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/xen/xenbus/xenbus_probe.c
diff -u src/sys/arch/xen/xenbus/xenbus_probe.c:1.30 src/sys/arch/xen/xenbus/xenbus_probe.c:1.31
--- src/sys/arch/xen/xenbus/xenbus_probe.c:1.30 Mon Apr 11 15:00:49 2011
+++ src/sys/arch/xen/xenbus/xenbus_probe.c Tue Apr 12 05:09:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_probe.c,v 1.30 2011/04/11 15:00:49 cegger Exp $ */
+/* $NetBSD: xenbus_probe.c,v 1.31 2011/04/12 05:09:32 cegger Exp $ */
/**
* Talks to Xen Store to figure out what devices we have.
*
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xenbus_probe.c,v 1.30 2011/04/11 15:00:49 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: xenbus_probe.c,v 1.31 2011/04/12 05:09:32 cegger Exp $);
#if 0
#define DPRINTK(fmt, args...) \
@@ -317,6 +317,7 @@
printf(xenbus: can't get state
for %s (%d)\n, xbusd-xbusd_path, err);
free(xbusd, M_DEVBUF);
+ err = 0;
continue;
}
if (state != XenbusStateInitialising) {
CVS commit: src/lib/libc/time
Module Name:src Committed By: jruoho Date: Tue Apr 12 05:41:22 UTC 2011 Modified Files: src/lib/libc/time: strptime.3 Log Message: .Dv NULL. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/lib/libc/time/strptime.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/libc/time/strptime.3 diff -u src/lib/libc/time/strptime.3:1.27 src/lib/libc/time/strptime.3:1.28 --- src/lib/libc/time/strptime.3:1.27 Sun May 24 02:30:17 2009 +++ src/lib/libc/time/strptime.3 Tue Apr 12 05:41:22 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: strptime.3,v 1.27 2009/05/24 02:30:17 ginsbach Exp $ +.\ $NetBSD: strptime.3,v 1.28 2011/04/12 05:41:22 jruoho Exp $ .\ .\ Copyright (c) 1997, 1998, 2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -26,7 +26,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 24, 2009 +.Dd April 12, 2011 .Dt STRPTIME 3 .Os .Sh NAME @@ -316,7 +316,9 @@ .Fn strptime function returns a pointer to the character following the last character parsed. -Otherwise, a null pointer is returned. +Otherwise, a +.Dv NULL +pointer is returned. .Sh SEE ALSO .Xr ctime 3 , .Xr isspace 3 ,
