CVS commit: src
Module Name:src Committed By: jruoho Date: Fri Jul 8 06:38:04 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi src/tests/lib/libc/stdio: Makefile Added Files: src/tests/lib/libc/stdio: t_printf.c t_scanf.c Removed Files: src/tests/lib/libc/stdio: t_format.c Log Message: Split out 't_printf' and 't_scanf' from 't_format' to gain the common functional scope for the test files. To generate a diff of this commit: cvs rdiff -u -r1.372 -r1.373 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/stdio/Makefile cvs rdiff -u -r1.5 -r0 src/tests/lib/libc/stdio/t_format.c cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/stdio/t_printf.c \ src/tests/lib/libc/stdio/t_scanf.c 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.372 src/distrib/sets/lists/tests/mi:1.373 --- src/distrib/sets/lists/tests/mi:1.372 Thu Jul 7 15:53:27 2011 +++ src/distrib/sets/lists/tests/mi Fri Jul 8 06:38:03 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.372 2011/07/07 15:53:27 jruoho Exp $ +# $NetBSD: mi,v 1.373 2011/07/08 06:38:03 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -434,8 +434,10 @@ ./usr/libdata/debug/usr/tests/lib/libc/stdiotests-lib-debug ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_clearerr.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fmemopen.debug tests-lib-debug debug,atf -./usr/libdata/debug/usr/tests/lib/libc/stdio/t_format.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/stdio/t_format.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_popen.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/stdio/t_printf.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/stdio/t_scanf.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stdlibtests-lib-debug ./usr/libdata/debug/usr/tests/lib/libc/stdlib/h_atexit.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stdlib/h_getopt.debug tests-lib-debug debug,atf @@ -2010,8 +2012,10 @@ ./usr/tests/lib/libc/stdio/Atffile tests-lib-tests atf ./usr/tests/lib/libc/stdio/t_clearerr tests-lib-tests atf ./usr/tests/lib/libc/stdio/t_fmemopen tests-lib-tests atf -./usr/tests/lib/libc/stdio/t_format tests-lib-tests atf +./usr/tests/lib/libc/stdio/t_format tests-obsolete obsolete ./usr/tests/lib/libc/stdio/t_popen tests-lib-tests atf +./usr/tests/lib/libc/stdio/t_printf tests-lib-tests atf +./usr/tests/lib/libc/stdio/t_scanf tests-lib-tests atf ./usr/tests/lib/libc/stdlib tests-lib-tests ./usr/tests/lib/libc/stdlib/Atffile tests-lib-tests atf ./usr/tests/lib/libc/stdlib/h_atexit tests-lib-tests atf Index: src/tests/lib/libc/stdio/Makefile diff -u src/tests/lib/libc/stdio/Makefile:1.4 src/tests/lib/libc/stdio/Makefile:1.5 --- src/tests/lib/libc/stdio/Makefile:1.4 Sun May 1 16:36:37 2011 +++ src/tests/lib/libc/stdio/Makefile Fri Jul 8 06:38:04 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2011/05/01 16:36:37 jruoho Exp $ +# $NetBSD: Makefile,v 1.5 2011/07/08 06:38:04 jruoho Exp $ .include bsd.own.mk @@ -6,7 +6,8 @@ TESTS_C+= t_clearerr TESTS_C+= t_fmemopen -TESTS_C+= t_format TESTS_C+= t_popen +TESTS_C+= t_printf +TESTS_C+= t_scanf .include bsd.test.mk Added files: Index: src/tests/lib/libc/stdio/t_printf.c diff -u /dev/null src/tests/lib/libc/stdio/t_printf.c:1.1 --- /dev/null Fri Jul 8 06:38:05 2011 +++ src/tests/lib/libc/stdio/t_printf.c Fri Jul 8 06:38:04 2011 @@ -0,0 +1,81 @@ +/* $NetBSD: t_printf.c,v 1.1 2011/07/08 06:38:04 jruoho Exp $ */ + +/*- + * Copyright (c) 2010 The NetBSD Foundation, Inc. + * All rights reserved. + * + * 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 +
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch/sparc
Module Name:src
Committed By: mrg
Date: Fri Jul 8 09:21:17 UTC 2011
Modified Files:
src/external/lgpl3/gmp/lib/libgmp/arch/sparc: Makefile.inc
Log Message:
XXX: like ppc, build sparc gmp files with -DPIC for now.
now /usr/bin/cc in a gcc 4.5.3 world works on a sparc.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/lgpl3/gmp/lib/libgmp/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/external/lgpl3/gmp/lib/libgmp/arch/sparc/Makefile.inc
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/sparc/Makefile.inc:1.2 src/external/lgpl3/gmp/lib/libgmp/arch/sparc/Makefile.inc:1.3
--- src/external/lgpl3/gmp/lib/libgmp/arch/sparc/Makefile.inc:1.2 Sun Jul 3 06:43:16 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/sparc/Makefile.inc Fri Jul 8 09:21:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/07/03 06:43:16 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2011/07/08 09:21:17 mrg Exp $
SRCS+= \
random.c \
@@ -170,9 +170,14 @@
${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4
cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET}
+BUILD_S_INCS= -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn
+
+M4FLAGS= -DPIC
.for _build _src in ${ASM_SRCS_LIST}
${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4
- ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} ${.TARGET}
+ ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} ${BUILD_S_INCS} \
+ ${M4FLAGS} ${M4FLAGS.${.TARGET:R}} \
+ -DOPERATION_${.TARGET:R} ${DIST}/${_src} ${.TARGET}
SRCS+= ${_build:R}.s
CLEANFILES+= ${_build:R}.s
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Fri Jul 8 09:31:35 UTC 2011 Modified Files: src/distrib/sets/lists/comp: ad.m68k Log Message: add gcc-4.5/tgmath.h To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/comp/ad.m68k 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/ad.m68k diff -u src/distrib/sets/lists/comp/ad.m68k:1.43 src/distrib/sets/lists/comp/ad.m68k:1.44 --- src/distrib/sets/lists/comp/ad.m68k:1.43 Thu Jul 7 08:46:21 2011 +++ src/distrib/sets/lists/comp/ad.m68k Fri Jul 8 09:31:35 2011 @@ -1,5 +1,6 @@ -# $NetBSD: ad.m68k,v 1.43 2011/07/07 08:46:21 mrg Exp $ +# $NetBSD: ad.m68k,v 1.44 2011/07/08 09:31:35 mrg Exp $ ./usr/bin/elf2aoutcomp-sysutil-bin +./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45 ./usr/include/gcc-4.5/math-68881.h comp-c-include gcccmds,gcc=45 ./usr/include/m68kcomp-c-include ./usr/include/m68k/ansi.h comp-c-include
CVS commit: src/sys
Module Name:src
Committed By: mrg
Date: Fri Jul 8 09:32:45 UTC 2011
Modified Files:
src/sys/dev/pud: pud.c
src/sys/kern: sys_module.c
Log Message:
avoid some uninitialised variable warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pud/pud.c
cvs rdiff -u -r1.12 -r1.13 src/sys/kern/sys_module.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/pud/pud.c
diff -u src/sys/dev/pud/pud.c:1.10 src/sys/dev/pud/pud.c:1.11
--- src/sys/dev/pud/pud.c:1.10 Mon Feb 7 03:14:28 2011
+++ src/sys/dev/pud/pud.c Fri Jul 8 09:32:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pud.c,v 1.10 2011/02/07 03:14:28 jakllsch Exp $ */
+/* $NetBSD: pud.c,v 1.11 2011/07/08 09:32:45 mrg Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pud.c,v 1.10 2011/02/07 03:14:28 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: pud.c,v 1.11 2011/07/08 09:32:45 mrg Exp $);
#include sys/param.h
#include sys/conf.h
@@ -81,7 +81,7 @@
uint8_t **data, size_t *dlen, void **cookie)
{
struct pud_dev *pd = this;
- struct pud_touser *putp;
+ struct pud_touser *putp = NULL;
int error = 0;
mutex_enter(pd-pd_mtx);
Index: src/sys/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.12 src/sys/kern/sys_module.c:1.13
--- src/sys/kern/sys_module.c:1.12 Sat Aug 21 13:19:39 2010
+++ src/sys/kern/sys_module.c Fri Jul 8 09:32:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_module.c,v 1.12 2010/08/21 13:19:39 pgoyette Exp $ */
+/* $NetBSD: sys_module.c,v 1.13 2011/07/08 09:32:45 mrg Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_module.c,v 1.12 2010/08/21 13:19:39 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_module.c,v 1.13 2011/07/08 09:32:45 mrg Exp $);
#include sys/param.h
#include sys/systm.h
@@ -50,7 +50,7 @@
char *props;
int error;
prop_dictionary_t dict;
- size_t propslen;
+ size_t propslen = 0;
if ((ml-ml_props != NULL ml-ml_propslen == 0) ||
(ml-ml_props == NULL ml-ml_propslen 0)) {
CVS commit: src/sys/arch/sun3/conf
Module Name:src
Committed By: mrg
Date: Fri Jul 8 09:34:51 UTC 2011
Modified Files:
src/sys/arch/sun3/conf: Makefile.sun3
Log Message:
don't use -msoft-float for GCC 4.5. -msoft-float passes down -mno-float
to the assembler, which barfs, and i can't see any way to disable it just
for sun3/fpu.c.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/sun3/conf/Makefile.sun3
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/sun3/conf/Makefile.sun3
diff -u src/sys/arch/sun3/conf/Makefile.sun3:1.101 src/sys/arch/sun3/conf/Makefile.sun3:1.102
--- src/sys/arch/sun3/conf/Makefile.sun3:1.101 Fri Jan 21 15:59:09 2011
+++ src/sys/arch/sun3/conf/Makefile.sun3 Fri Jul 8 09:34:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sun3,v 1.101 2011/01/21 15:59:09 joerg Exp $
+# $NetBSD: Makefile.sun3,v 1.102 2011/07/08 09:34:51 mrg Exp $
# Makefile for NetBSD
#
@@ -32,7 +32,10 @@
## (2) compile settings
##
CPPFLAGS+= -Dsun3
-CFLAGS+= ${CMACHFLAGS} -msoft-float -fno-defer-pop
+CFLAGS+= ${CMACHFLAGS} -fno-defer-pop
+.if defined(HAVE_GCC) ${HAVE_GCC} == 45
+CFLAGS+= -msoft-float
+.endif
AFLAGS+= -x assembler-with-cpp
##
CVS commit: src/sys/arch/amiga/dev
Module Name:src
Committed By: mrg
Date: Fri Jul 8 09:42:16 UTC 2011
Modified Files:
src/sys/arch/amiga/dev: grfabs_cc.c
Log Message:
avoid uninitialised variable warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amiga/dev/grfabs_cc.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/amiga/dev/grfabs_cc.c
diff -u src/sys/arch/amiga/dev/grfabs_cc.c:1.34 src/sys/arch/amiga/dev/grfabs_cc.c:1.35
--- src/sys/arch/amiga/dev/grfabs_cc.c:1.34 Mon Dec 20 00:25:25 2010
+++ src/sys/arch/amiga/dev/grfabs_cc.c Fri Jul 8 09:42:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_cc.c,v 1.34 2010/12/20 00:25:25 matt Exp $ */
+/* $NetBSD: grfabs_cc.c,v 1.35 2011/07/08 09:42:16 mrg Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -38,7 +38,7 @@
#include opt_amigaccgrf.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: grfabs_cc.c,v 1.34 2010/12/20 00:25:25 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: grfabs_cc.c,v 1.35 2011/07/08 09:42:16 mrg Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1575,7 +1575,7 @@
if (a24_this_data-current_view != v) {
vdata_t *vd = VDATA(v);
cop_t *cp, *tmp;
- u_char *inst_plane[2];
+ u_char *inst_plane[2] = { NULL, NULL };
u_char **plane = inst_plane;
u_long full_line = v-bitmap-bytes_per_row + v-bitmap-row_mod;
u_long half_plane = full_line * v-bitmap-rows / 2;
@@ -3047,7 +3047,7 @@
if (p24_this_data-current_view != v) {
vdata_t *vd = VDATA(v);
cop_t *cp, *tmp;
- u_char *inst_plane[2];
+ u_char *inst_plane[2] = { NULL, NULL };
u_char **plane = inst_plane;
u_long full_line = v-bitmap-bytes_per_row + v-bitmap-row_mod;
u_long half_plane = full_line * v-bitmap-rows / 2;
CVS commit: src/lib/libedit
Module Name:src Committed By: christos Date: Fri Jul 8 15:54:56 UTC 2011 Modified Files: src/lib/libedit: read.c Log Message: Support other non-latin1 single byte character sets. From: Alexander Barkov and Nirbhay Choubey at oracle dot com To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/lib/libedit/read.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/libedit/read.c diff -u src/lib/libedit/read.c:1.58 src/lib/libedit/read.c:1.59 --- src/lib/libedit/read.c:1.58 Fri Feb 18 15:53:05 2011 +++ src/lib/libedit/read.c Fri Jul 8 11:54:56 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: read.c,v 1.58 2011/02/18 20:53:05 christos Exp $ */ +/* $NetBSD: read.c,v 1.59 2011/07/08 15:54:56 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = @(#)read.c 8.1 (Berkeley) 6/4/93; #else -__RCSID($NetBSD: read.c,v 1.58 2011/02/18 20:53:05 christos Exp $); +__RCSID($NetBSD: read.c,v 1.59 2011/07/08 15:54:56 christos Exp $); #endif #endif /* not lint not SCCSID */ @@ -352,7 +352,11 @@ } goto again; } - } else /* we don't support other multibyte charsets */ + } else if (*cbuf = 0 || /* ASCII */ + /* we don't support other multibyte charsets */ + ++cbp != 1 || + /* Try non-ASCII characters in a 8-bit character set */ + (bytes = ct_mbtowc(cp, cbuf, cbp)) != 1) #endif *cp = (unsigned char)cbuf[0];
CVS commit: src/sys/arch/mips/atheros
Module Name:src Committed By: dyoung Date: Fri Jul 8 18:49:27 UTC 2011 Modified Files: src/sys/arch/mips/atheros: ar_intr.c Log Message: Use sys/bus.h not machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/atheros/ar_intr.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/mips/atheros/ar_intr.c diff -u src/sys/arch/mips/atheros/ar_intr.c:1.1 src/sys/arch/mips/atheros/ar_intr.c:1.2 --- src/sys/arch/mips/atheros/ar_intr.c:1.1 Thu Jul 7 05:06:44 2011 +++ src/sys/arch/mips/atheros/ar_intr.c Fri Jul 8 18:49:27 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ar_intr.c,v 1.1 2011/07/07 05:06:44 matt Exp $ */ +/* $NetBSD: ar_intr.c,v 1.2 2011/07/08 18:49:27 dyoung Exp $ */ /* * Copyright (c) 2006 Urbana-Champaign Independent Media Center. * Copyright (c) 2006 Garrett D'Amore. @@ -41,7 +41,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ar_intr.c,v 1.1 2011/07/07 05:06:44 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: ar_intr.c,v 1.2 2011/07/08 18:49:27 dyoung Exp $); #define __INTR_PRIVATE @@ -51,8 +51,8 @@ #include sys/systm.h #include sys/device.h #include sys/kernel.h +#include sys/bus.h -#include machine/bus.h #include machine/intr.h #include mips/locore.h
CVS commit: src/sys/arch/evbmips/isa
Module Name:src
Committed By: matt
Date: Fri Jul 8 18:49:49 UTC 2011
Modified Files:
src/sys/arch/evbmips/isa: mcclock_isa.c
Log Message:
white space cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbmips/isa/mcclock_isa.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/isa/mcclock_isa.c
diff -u src/sys/arch/evbmips/isa/mcclock_isa.c:1.13 src/sys/arch/evbmips/isa/mcclock_isa.c:1.14
--- src/sys/arch/evbmips/isa/mcclock_isa.c:1.13 Fri Jul 1 18:46:35 2011
+++ src/sys/arch/evbmips/isa/mcclock_isa.c Fri Jul 8 18:49:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_isa.c,v 1.13 2011/07/01 18:46:35 dyoung Exp $ */
+/* $NetBSD: mcclock_isa.c,v 1.14 2011/07/08 18:49:48 matt Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: mcclock_isa.c,v 1.13 2011/07/01 18:46:35 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: mcclock_isa.c,v 1.14 2011/07/08 18:49:48 matt Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -51,9 +51,9 @@
#define ALGOR_YEAR_ZERO 1920
static int mcclock_isa_match(device_t, cfdata_t, void *);
-static void mcclock_isa_attach(device_t, device_t, void *);
+static void mcclock_isa_attach(device_t, device_t, void *);
-CFATTACH_DECL_NEW(mcclock_isa, sizeof (struct mc146818_softc),
+CFATTACH_DECL_NEW(mcclock_isa, sizeof(struct mc146818_softc),
mcclock_isa_match, mcclock_isa_attach, NULL, NULL);
static void mcclock_isa_write(struct mc146818_softc *, u_int, u_int);
@@ -125,10 +125,11 @@
MC_REGB_24HR);
mc146818_attach(sc);
+
aprint_normal(\n);
}
-void
+static void
mcclock_isa_write(struct mc146818_softc *sc, u_int reg, u_int datum)
{
bus_space_tag_t iot = sc-sc_bst;
@@ -138,7 +139,7 @@
bus_space_write_1(iot, ioh, 1, datum);
}
-u_int
+static u_int
mcclock_isa_read(struct mc146818_softc *sc, u_int reg)
{
bus_space_tag_t iot = sc-sc_bst;
CVS commit: src/sys/arch/evbmips/isa
Module Name:src
Committed By: matt
Date: Fri Jul 8 18:50:12 UTC 2011
Modified Files:
src/sys/arch/evbmips/isa: isadma_bounce.c
Log Message:
Use mips_bus_dma_cookie.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbmips/isa/isadma_bounce.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/isa/isadma_bounce.c
diff -u src/sys/arch/evbmips/isa/isadma_bounce.c:1.9 src/sys/arch/evbmips/isa/isadma_bounce.c:1.10
--- src/sys/arch/evbmips/isa/isadma_bounce.c:1.9 Fri Jul 1 18:46:35 2011
+++ src/sys/arch/evbmips/isa/isadma_bounce.c Fri Jul 8 18:50:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_bounce.c,v 1.9 2011/07/01 18:46:35 dyoung Exp $ */
+/* $NetBSD: isadma_bounce.c,v 1.10 2011/07/08 18:50:11 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: isadma_bounce.c,v 1.9 2011/07/01 18:46:35 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: isadma_bounce.c,v 1.10 2011/07/08 18:50:11 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -51,44 +51,6 @@
#include uvm/uvm_extern.h
-extern paddr_t avail_end;
-
-/*
- * Cookie used by bouncing ISA DMA. A pointer to one of these is stashed
- * in the DMA map.
- */
-struct isadma_bounce_cookie {
- int id_flags; /* flags; see below */
-
- /*
- * Information about the original buffer used during
- * DMA map syncs. Note that origbuflen is only used
- * for ID_BUFTYPE_LINEAR.
- */
- void *id_origbuf; /* pointer to orig buffer if
- bouncing */
- bus_size_t id_origbuflen; /* ...and size */
- int id_buftype; /* type of buffer */
-
- void *id_bouncebuf; /* pointer to the bounce buffer */
- bus_size_t id_bouncebuflen; /* ...and size */
- int id_nbouncesegs; /* number of valid bounce segs */
- bus_dma_segment_t id_bouncesegs[1]; /* array of bounce buffer
- physical memory segments */
-};
-
-/* id_flags */
-#define ID_MIGHT_NEED_BOUNCE 0x01 /* map could need bounce buffers */
-#define ID_HAS_BOUNCE 0x02 /* map currently has bounce buffers */
-#define ID_IS_BOUNCING 0x04 /* map is bouncing current xfer */
-
-/* id_buftype */
-#define ID_BUFTYPE_INVALID 0
-#define ID_BUFTYPE_LINEAR 1
-#define ID_BUFTYPE_MBUF 2
-#define ID_BUFTYPE_UIO 3
-#define ID_BUFTYPE_RAW 4
-
int isadma_bounce_alloc_bouncebuf(bus_dma_tag_t, bus_dmamap_t,
bus_size_t, int);
void isadma_bounce_free_bouncebuf(bus_dma_tag_t, bus_dmamap_t);
@@ -100,7 +62,7 @@
isadma_bounce_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
{
- struct isadma_bounce_cookie *cookie;
+ struct mips_bus_dma_cookie *cookie;
bus_dmamap_t map;
int error, cookieflags;
void *cookiestore;
@@ -137,9 +99,9 @@
* ISA DMA controller), we may have to bounce it as well.
*/
cookieflags = 0;
- if (avail_end (t-_wbase + t-_wsize) ||
- ((map-_dm_size / PAGE_SIZE) + 1) map-_dm_segcnt) {
- cookieflags |= ID_MIGHT_NEED_BOUNCE;
+ if (_BUS_AVAIL_END (t-_wbase + t-_bounce_alloc_hi - t-_bounce_alloc_lo)
+ || ((map-_dm_size / PAGE_SIZE) + 1) map-_dm_segcnt) {
+ cookieflags |= _BUS_DMA_MIGHT_NEED_BOUNCE;
cookiesize += (sizeof(bus_dma_segment_t) *
(map-_dm_segcnt - 1));
}
@@ -153,11 +115,11 @@
goto out;
}
memset(cookiestore, 0, cookiesize);
- cookie = (struct isadma_bounce_cookie *)cookiestore;
+ cookie = (struct mips_bus_dma_cookie *)cookiestore;
cookie-id_flags = cookieflags;
map-_dm_cookie = cookie;
- if (cookieflags ID_MIGHT_NEED_BOUNCE) {
+ if (cookieflags _BUS_DMA_MIGHT_NEED_BOUNCE) {
/*
* Allocate the bounce pages now if the caller
* wishes us to do so.
@@ -183,12 +145,12 @@
void
isadma_bounce_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t map)
{
- struct isadma_bounce_cookie *cookie = map-_dm_cookie;
+ struct mips_bus_dma_cookie *cookie = map-_dm_cookie;
/*
* Free any bounce pages this map might hold.
*/
- if (cookie-id_flags ID_HAS_BOUNCE)
+ if (cookie-id_flags _BUS_DMA_HAS_BOUNCE)
isadma_bounce_free_bouncebuf(t, map);
free(cookie, M_DMAMAP);
@@ -202,7 +164,7 @@
isadma_bounce_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
bus_size_t buflen, struct proc *p, int flags)
{
- struct isadma_bounce_cookie *cookie = map-_dm_cookie;
+ struct mips_bus_dma_cookie *cookie = map-_dm_cookie;
int error;
/*
@@ -217,7 +179,7 @@
*/
error = _bus_dmamap_load(t, map, buf, buflen, p, flags);
if (error == 0 ||
- (error != 0 (cookie-id_flags ID_MIGHT_NEED_BOUNCE) == 0))
+ (error != 0 (cookie-id_flags _BUS_DMA_MIGHT_NEED_BOUNCE) == 0))
return (error);
/*
@@ -227,7 +189,7 @@
/*
* Allocate bounce pages, if necessary.
*/
- if ((cookie-id_flags ID_HAS_BOUNCE) == 0) {
+ if ((cookie-id_flags _BUS_DMA_HAS_BOUNCE) == 0) {
error =
CVS commit: src
Module Name:src Committed By: dyoung Date: Fri Jul 8 19:09:03 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi src/sys/sys: Makefile Log Message: Per Matt Green's suggestion, stop installing /usr/include/sys/bus.h to poison broken architectures that are including it from userland. To generate a diff of this commit: cvs rdiff -u -r1.1641 -r1.1642 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.134 -r1.135 src/sys/sys/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.1641 src/distrib/sets/lists/comp/mi:1.1642 --- src/distrib/sets/lists/comp/mi:1.1641 Thu Jul 7 15:05:41 2011 +++ src/distrib/sets/lists/comp/mi Fri Jul 8 19:09:02 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1641 2011/07/07 15:05:41 matt Exp $ +# $NetBSD: mi,v 1.1642 2011/07/08 19:09:02 dyoung Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2308,7 +2308,7 @@ ./usr/include/sys/bswap.h comp-c-include ./usr/include/sys/buf.hcomp-c-include ./usr/include/sys/bufq.h comp-obsolete obsolete -./usr/include/sys/bus.hcomp-c-include +./usr/include/sys/bus.hcomp-obsolete obsolete ./usr/include/sys/callback.h comp-c-include ./usr/include/sys/callout.h comp-c-include ./usr/include/sys/cc_microtime.h comp-obsolete obsolete Index: src/sys/sys/Makefile diff -u src/sys/sys/Makefile:1.134 src/sys/sys/Makefile:1.135 --- src/sys/sys/Makefile:1.134 Wed Jul 6 18:18:07 2011 +++ src/sys/sys/Makefile Fri Jul 8 19:09:01 2011 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.134 2011/07/06 18:18:07 dyoung Exp $ +# $NetBSD: Makefile,v 1.135 2011/07/08 19:09:01 dyoung Exp $ .include bsd.sys.mk INCSDIR= /usr/include/sys INCS= acct.h agpio.h aio.h ansi.h aout_mids.h ataio.h atomic.h audioio.h \ - bitops.h bootblock.h bswap.h buf.h bus.h \ + bitops.h bootblock.h bswap.h buf.h \ callback.h callout.h cdefs.h cdefs_aout.h \ cdefs_elf.h cdio.h chio.h clockctl.h condvar.h conf.h core.h \ cpuio.h ctype_bits.h ctype_inline.h \
CVS commit: src/sys/arch/mips/rmi
Module Name:src
Committed By: dyoung
Date: Fri Jul 8 19:10:14 UTC 2011
Modified Files:
src/sys/arch/mips/rmi: rmixl_obiovar.h rmixl_usbivar.h
Log Message:
Just #include sys/bus.h instead of machine/bus_dma.h, which is going
away, soon.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/rmi/rmixl_obiovar.h \
src/sys/arch/mips/rmi/rmixl_usbivar.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/mips/rmi/rmixl_obiovar.h
diff -u src/sys/arch/mips/rmi/rmixl_obiovar.h:1.3 src/sys/arch/mips/rmi/rmixl_obiovar.h:1.4
--- src/sys/arch/mips/rmi/rmixl_obiovar.h:1.3 Sun Feb 20 07:48:37 2011
+++ src/sys/arch/mips/rmi/rmixl_obiovar.h Fri Jul 8 19:10:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obiovar.h,v 1.3 2011/02/20 07:48:37 matt Exp $ */
+/* $NetBSD: rmixl_obiovar.h,v 1.4 2011/07/08 19:10:14 dyoung Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -32,8 +32,8 @@
#ifndef _MIPS_RMI_RMIXL_OBIOVAR_H_
#define _MIPS_RMI_RMIXL_OBIOVAR_H_
+#include sys/bus.h
#include dev/pci/pcivar.h
-#include mips/bus_dma.h
#include mips/pci_machdep.h
struct obio_attach_args {
Index: src/sys/arch/mips/rmi/rmixl_usbivar.h
diff -u src/sys/arch/mips/rmi/rmixl_usbivar.h:1.3 src/sys/arch/mips/rmi/rmixl_usbivar.h:1.4
--- src/sys/arch/mips/rmi/rmixl_usbivar.h:1.3 Fri Apr 29 21:54:14 2011
+++ src/sys/arch/mips/rmi/rmixl_usbivar.h Fri Jul 8 19:10:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_usbivar.h,v 1.3 2011/04/29 21:54:14 matt Exp $ */
+/* $NetBSD: rmixl_usbivar.h,v 1.4 2011/07/08 19:10:14 dyoung Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -33,7 +33,6 @@
#define _MIPS_RMI_RMIXL_USBIVAR_H_
#include sys/bus.h
-#include mips/bus_dma.h
struct rmixl_usbi_attach_args {
bus_space_tag_t usbi_eb_bst;
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Fri Jul 8 19:25:51 UTC 2011 Modified Files: src/lib/libc/sys: mknod.2 Log Message: Sort error descriptions. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/lib/libc/sys/mknod.2 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/sys/mknod.2 diff -u src/lib/libc/sys/mknod.2:1.21 src/lib/libc/sys/mknod.2:1.22 --- src/lib/libc/sys/mknod.2:1.21 Sun Jul 3 14:11:43 2011 +++ src/lib/libc/sys/mknod.2 Fri Jul 8 19:25:51 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: mknod.2,v 1.21 2011/07/03 14:11:43 jruoho Exp $ +.\ $NetBSD: mknod.2,v 1.22 2011/07/08 19:25:51 wiz Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -66,52 +66,50 @@ .Fn mknod will fail and the file will be not created if: .Bl -tag -width Er -.It Bq Er ENOTDIR -A component of the path prefix is not a directory. -.It Bq Er ENAMETOOLONG -A component of a pathname exceeded -.Brq Dv NAME_MAX -characters, or an entire path name exceeded -.Brq Dv PATH_MAX -characters. -.It Bq Er ENOENT -A component of the path prefix does not exist. .It Bq Er EACCES Search permission is denied for a component of the path prefix. +.It Bq Er EDQUOT +The directory in which the entry for the new node +is being placed cannot be extended because the +user's quota of disk blocks on the file system +containing the directory has been exhausted; or +the user's quota of inodes on the file system on +which the node is being created has been exhausted. +.It Bq Er EEXIST +The named file exists. +.It Bq Er EFAULT +.Fa path +points outside the process's allocated address space. .It Bq Er EINVAL The supplied .Fa mode or .Fa dev is invalid. -.It Bq Er ELOOP -Too many symbolic links were encountered in translating the pathname. -.It Bq Er EPERM -The process's effective user ID is not super-user. .It Bq Er EIO An I/O error occurred while making the directory entry or allocating the inode. +.It Bq Er ELOOP +Too many symbolic links were encountered in translating the pathname. +.It Bq Er ENAMETOOLONG +A component of a pathname exceeded +.Brq Dv NAME_MAX +characters, or an entire path name exceeded +.Brq Dv PATH_MAX +characters. +.It Bq Er ENOENT +A component of the path prefix does not exist. .It Bq Er ENOSPC The directory in which the entry for the new node is being placed cannot be extended because there is no space left on the file -system containing the directory. -.It Bq Er ENOSPC -There are no free inodes on the file system on which the +system containing the directory; or +there are no free inodes on the file system on which the node is being created. -.It Bq Er EDQUOT -The directory in which the entry for the new node -is being placed cannot be extended because the -user's quota of disk blocks on the file system -containing the directory has been exhausted. -.It Bq Er EDQUOT -The user's quota of inodes on the file system on -which the node is being created has been exhausted. +.It Bq Er ENOTDIR +A component of the path prefix is not a directory. +.It Bq Er EPERM +The process's effective user ID is not super-user. .It Bq Er EROFS The named file resides on a read-only file system. -.It Bq Er EEXIST -The named file exists. -.It Bq Er EFAULT -.Fa path -points outside the process's allocated address space. .El .Sh SEE ALSO .Xr chmod 2 ,
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Fri Jul 8 19:26:19 UTC 2011 Modified Files: src/lib/libc/sys: revoke.2 Log Message: Sort error descriptions. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/sys/revoke.2 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/sys/revoke.2 diff -u src/lib/libc/sys/revoke.2:1.14 src/lib/libc/sys/revoke.2:1.15 --- src/lib/libc/sys/revoke.2:1.14 Sun Jul 3 20:36:34 2011 +++ src/lib/libc/sys/revoke.2 Fri Jul 8 19:26:19 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: revoke.2,v 1.14 2011/07/03 20:36:34 jruoho Exp $ +.\ $NetBSD: revoke.2,v 1.15 2011/07/08 19:26:19 wiz Exp $ .\ .\ Copyright (c) 1993 .\ The Regents of the University of California. All rights reserved. @@ -76,20 +76,20 @@ .Sh ERRORS Access to the named file is revoked unless one of the following: .Bl -tag -width Er -.It Bq Er ENOTDIR -A component of the path prefix is not a directory. -.It Bq Er ENAMETOOLONG -A component of a pathname exceeded 255 characters, -or an entire path name exceeded 1024 characters. -.It Bq Er ENOENT -The named file or a component of the path name does not exist. .It Bq Er EACCES Search permission is denied for a component of the path prefix. -.It Bq Er ELOOP -Too many symbolic links were encountered in translating the pathname. .It Bq Er EFAULT .Fa path points outside the process's allocated address space. +.It Bq Er ELOOP +Too many symbolic links were encountered in translating the pathname. +.It Bq Er ENAMETOOLONG +A component of a pathname exceeded 255 characters, +or an entire path name exceeded 1024 characters. +.It Bq Er ENOENT +The named file or a component of the path name does not exist. +.It Bq Er ENOTDIR +A component of the path prefix is not a directory. .It Bq Er EPERM The caller is neither the owner of the file nor the super user. .El
CVS commit: src/lib/libc/rpc
Module Name:src Committed By: wiz Date: Fri Jul 8 19:28:22 UTC 2011 Modified Files: src/lib/libc/rpc: xdr.3 Log Message: Bump date for xdr_sizeof. Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/libc/rpc/xdr.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/rpc/xdr.3 diff -u src/lib/libc/rpc/xdr.3:1.13 src/lib/libc/rpc/xdr.3:1.14 --- src/lib/libc/rpc/xdr.3:1.13 Mon Jul 4 08:19:51 2011 +++ src/lib/libc/rpc/xdr.3 Fri Jul 8 19:28:22 2011 @@ -1,7 +1,7 @@ .\ @(#)xdr.3n 2.2 88/08/03 4.0 RPCSRC; from 1.16 88/03/14 SMI -.\ $NetBSD: xdr.3,v 1.13 2011/07/04 08:19:51 manu Exp $ +.\ $NetBSD: xdr.3,v 1.14 2011/07/08 19:28:22 wiz Exp $ .\ -.Dd April 17, 2003 +.Dd July 4, 2011 .Dt XDR 3 .Os .Sh NAME @@ -382,7 +382,7 @@ and their external representations. This routine returns one if it succeeds, zero otherwise. .It Fn xdr_sizeof -This routine returns the amount of memory required to encode +This routine returns the amount of memory required to encode .Fa data using filter .Fa func .
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Fri Jul 8 19:40:24 UTC 2011 Modified Files: src/share/man/man9: bus_space.9 Log Message: Remove trailing whitespace, use Er for errors, break some lines to avoid unintended markup. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/share/man/man9/bus_space.9 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/man9/bus_space.9 diff -u src/share/man/man9/bus_space.9:1.44 src/share/man/man9/bus_space.9:1.45 --- src/share/man/man9/bus_space.9:1.44 Wed Jul 6 21:36:16 2011 +++ src/share/man/man9/bus_space.9 Fri Jul 8 19:40:24 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: bus_space.9,v 1.44 2011/07/06 21:36:16 dyoung Exp $ +.\ $NetBSD: bus_space.9,v 1.45 2011/07/08 19:40:24 wiz Exp $ .\ .\ Copyright (c) 1997 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -733,7 +733,8 @@ The .Fn bus_space_reservation_map function is similar to -.Fn bus_space_map but it maps a region of bus space +.Fn bus_space_map +but it maps a region of bus space that was previously reserved by a call to .Fn bus_space_reserve or @@ -903,8 +904,8 @@ .Pp .It Fn bus_space_handle_is_equal space handle1 handle2 Use -.Fn bus_space_handle_is_equal to -check whether or not +.Fn bus_space_handle_is_equal +to check whether or not .Fa handle1 and .Fa handle2 @@ -1035,23 +1036,23 @@ .Pp On success, .Fn bus_space_reserve -records the reservation at +records the reservation at .Fa bsrp and returns 0. On failure, -.Fa bsrp +.Fa bsrp is undefined, and .Fn bus_space_reserve returns a non-zero error code. Possible error codes include .Bl -tag -width EOPNOTSUPP -offset indent -.It Dv EOPNOTSUPP +.It Er EOPNOTSUPP .Fn bus_space_reserve is not supported on this architecture, or .Fa flags was incompatible with the bus space represented by .Fa t . -.It Dv ENOMEM +.It Er ENOMEM There was not sufficient bus space at .Fa bpa to satisfy the request. @@ -1073,29 +1074,29 @@ .Fa boundary , and .Fa flags -each work alike to the +each work alike to the .Fn bus_space_alloc parameters of the same names. .Pp On success, .Fn bus_space_reserve_subregion -records the reservation at +records the reservation at .Fa bsrp and returns 0. On failure, -.Fa bsrp +.Fa bsrp is undefined, and .Fn bus_space_reserve_subregion returns a non-zero error code. Possible error codes include .Bl -tag -width EOPNOTSUPP -offset indent -.It Dv EOPNOTSUPP +.It Er EOPNOTSUPP .Fn bus_space_reserve is not supported on this architecture, or .Fa flags was incompatible with the bus space represented by .Fa t . -.It Dv ENOMEM +.It Er ENOMEM There was not sufficient bus space at .Fa bpa to satisfy the request. @@ -1870,10 +1871,10 @@ .Pp Return 0 if the call succeeds. Return -.Dv EOPNOTSUPP +.Er EOPNOTSUPP if the architecture does not support overrides. Return -.Dv EINVAL +.Er EINVAL if .Fa present is 0, if
CVS commit: src/share/mk
Module Name:src
Committed By: uwe
Date: Fri Jul 8 20:59:53 UTC 2011
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Augment previous. Use -Wno-uninitialized for sh3 in general, not just
dreamcast. The problem is not sh3 per-se, but the fact that for sh3
we use -Os by default. That causes false positives since gcc doesn't
detect that e.g. a variable is set and used under the same condition
in different if statements.
XXX: This should probably check for optimization level instead,
though, for all I know, phase of moon might be a contributing cause
too.
XXX2: MACHINE_CPU is set in bsd.own.mk and is not available here, so
we have to spell the test in terms of MACHINE_ARCH.
To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.207 src/share/mk/bsd.sys.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.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.206 src/share/mk/bsd.sys.mk:1.207
--- src/share/mk/bsd.sys.mk:1.206 Fri Jul 8 03:29:52 2011
+++ src/share/mk/bsd.sys.mk Fri Jul 8 20:59:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.206 2011/07/08 03:29:52 mrg Exp $
+# $NetBSD: bsd.sys.mk,v 1.207 2011/07/08 20:59:53 uwe Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -63,8 +63,10 @@
CFLAGS+= -Wsign-compare
CFLAGS+= ${${ACTIVE_CC} == clang:? -Wpointer-sign :}
.endif
-.if defined(HAVE_GCC) ${HAVE_GCC} == 45 ${MACHINE} == dreamcast
-# XXX GCC 4.5 for dreamcast is extra noisy for cases it should be better with
+.if (defined(HAVE_GCC) ${HAVE_GCC} == 45 \
+ (${MACHINE_ARCH} == sh3eb || ${MACHINE_ARCH} == sh3el))
+# XXX GCC 4.5 for sh3 (which we compile with -Os) is extra noisy for
+# cases it should be better with
CFLAGS+= -Wno-uninitialized
.endif
.endif
CVS commit: [netbsd-5-1] src
Module Name:src Committed By: sborrill Date: Fri Jul 8 21:04:05 UTC 2011 Modified Files: src/dist/bind [netbsd-5-1]: CHANGES version src/dist/bind/lib/dns [netbsd-5-1]: api masterdump.c message.c ncache.c nsec3.c rbtdb.c rdataset.c resolver.c validator.c src/dist/bind/lib/dns/include/dns [netbsd-5-1]: rdataset.h src/distrib/sets/lists/base [netbsd-5-1]: md.amd64 md.sparc64 shl.mi src/lib/libdns [netbsd-5-1]: shlib_version Log Message: Pull up the following revisions(s) (requested by spz in ticket #1647): dist/bind/CHANGES: patch dist/bind/version: patch dist/bind/lib/dns/api: patch dist/bind/lib/dns/masterdump.c: patch dist/bind/lib/dns/message.c:patch dist/bind/lib/dns/ncache.c: patch dist/bind/lib/dns/nsec3.c: patch dist/bind/lib/dns/rbtdb.c: patch dist/bind/lib/dns/rdataset.c: patch dist/bind/lib/dns/resolver.c: patch dist/bind/lib/dns/validator.c: patch dist/bind/lib/dns/include/dns/rdataset.h: patch distrib/sets/lists/base/md.amd64: patch distrib/sets/lists/base/md.sparc64: patch distrib/sets/lists/base/shl.mi: patch lib/libdns/shlib_version: patch Update bind to 9.7.3-P3 fixing CVE-2011-2464 To generate a diff of this commit: cvs rdiff -u -r1.1.1.11.4.2.2.2 -r1.1.1.11.4.2.2.3 src/dist/bind/CHANGES \ src/dist/bind/version cvs rdiff -u -r1.1.1.9.4.1.2.2 -r1.1.1.9.4.1.2.3 src/dist/bind/lib/dns/api cvs rdiff -u -r1.1.1.6.4.1.2.2 -r1.1.1.6.4.1.2.3 \ src/dist/bind/lib/dns/masterdump.c cvs rdiff -u -r1.5.4.1.2.2 -r1.5.4.1.2.3 src/dist/bind/lib/dns/message.c cvs rdiff -u -r1.1.1.5.12.2 -r1.1.1.5.12.3 src/dist/bind/lib/dns/ncache.c cvs rdiff -u -r1.1.4.3 -r1.1.4.4 src/dist/bind/lib/dns/nsec3.c cvs rdiff -u -r1.1.1.6.4.2.2.2 -r1.1.1.6.4.2.2.3 \ src/dist/bind/lib/dns/rbtdb.c cvs rdiff -u -r1.1.1.5.4.1.2.2 -r1.1.1.5.4.1.2.3 \ src/dist/bind/lib/dns/rdataset.c cvs rdiff -u -r1.8.4.2.2.2 -r1.8.4.2.2.3 src/dist/bind/lib/dns/resolver.c cvs rdiff -u -r1.6.4.2.2.2 -r1.6.4.2.2.3 src/dist/bind/lib/dns/validator.c cvs rdiff -u -r1.1.1.5.4.1.2.2 -r1.1.1.5.4.1.2.3 \ src/dist/bind/lib/dns/include/dns/rdataset.h cvs rdiff -u -r1.25.2.8.2.1 -r1.25.2.8.2.2 \ src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.23.2.8.2.1 -r1.23.2.8.2.2 \ src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.450.2.7.2.1 -r1.450.2.7.2.2 \ src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.3.4.1.2.1 -r1.3.4.1.2.2 src/lib/libdns/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/bind/CHANGES diff -u src/dist/bind/CHANGES:1.1.1.11.4.2.2.2 src/dist/bind/CHANGES:1.1.1.11.4.2.2.3 --- src/dist/bind/CHANGES:1.1.1.11.4.2.2.2 Sat Jun 18 11:26:35 2011 +++ src/dist/bind/CHANGES Fri Jul 8 21:04:03 2011 @@ -1,3 +1,16 @@ + --- 9.7.3-P3 released --- + +3124. [bug] Use an rdataset attribute flag to indicate + negative-cache records rather than using rrtype 0; + this will prevent problems when that rrtype is + used in actual DNS packets. [RT #24777] + + --- 9.7.3-P2 released (withdrawn) --- + +3123. [security] Change #2912 exposed a latent flaw in + dns_rdataset_totext() that could cause named to + crash with an assertion failure. [RT #24777] + --- 9.7.3-P1 released --- 3121. [security] An authoritative name server sending a negative Index: src/dist/bind/version diff -u src/dist/bind/version:1.1.1.11.4.2.2.2 src/dist/bind/version:1.1.1.11.4.2.2.3 --- src/dist/bind/version:1.1.1.11.4.2.2.2 Sat Jun 18 11:26:41 2011 +++ src/dist/bind/version Fri Jul 8 21:04:03 2011 @@ -1,4 +1,4 @@ -# Id: version,v 1.51.2.11.12.1 2011-05-27 00:43:04 each Exp +# Id: version,v 1.51.2.11.12.3 2011-06-21 20:36:58 each Exp # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -7,4 +7,4 @@ MINORVER=7 PATCHVER=3 RELEASETYPE=-P -RELEASEVER=1 +RELEASEVER=3 Index: src/dist/bind/lib/dns/api diff -u src/dist/bind/lib/dns/api:1.1.1.9.4.1.2.2 src/dist/bind/lib/dns/api:1.1.1.9.4.1.2.3 --- src/dist/bind/lib/dns/api:1.1.1.9.4.1.2.2 Sat Jun 18 11:28:22 2011 +++ src/dist/bind/lib/dns/api Fri Jul 8 21:04:03 2011 @@ -1,3 +1,3 @@ LIBINTERFACE = 70 -LIBREVISION = 3 +LIBREVISION = 4 LIBAGE = 1 Index: src/dist/bind/lib/dns/masterdump.c diff -u src/dist/bind/lib/dns/masterdump.c:1.1.1.6.4.1.2.2 src/dist/bind/lib/dns/masterdump.c:1.1.1.6.4.1.2.3 --- src/dist/bind/lib/dns/masterdump.c:1.1.1.6.4.1.2.2 Sat Jun 18 11:28:25 2011 +++ src/dist/bind/lib/dns/masterdump.c Fri Jul 8 21:04:03 2011 @@ -1,7 +1,7 @@
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: sborrill Date: Fri Jul 8 21:06:16 UTC 2011 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.1 Log Message: Ticket #1647 To generate a diff of this commit: cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-5.1.1 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-5.1.1 diff -u src/doc/CHANGES-5.1.1:1.1.2.28 src/doc/CHANGES-5.1.1:1.1.2.29 --- src/doc/CHANGES-5.1.1:1.1.2.28 Sat Jun 18 16:43:44 2011 +++ src/doc/CHANGES-5.1.1 Fri Jul 8 21:06:16 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.1,v 1.1.2.28 2011/06/18 16:43:44 bouyer Exp $ +# $NetBSD: CHANGES-5.1.1,v 1.1.2.29 2011/07/08 21:06:16 sborrill Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.1.1 release: @@ -2468,3 +2468,23 @@ external phy. [jdc, ticket #1632] +dist/bind/CHANGESpatch +dist/bind/versionpatch +dist/bind/lib/dns/apipatch +dist/bind/lib/dns/masterdump.c patch +dist/bind/lib/dns/message.c patch +dist/bind/lib/dns/ncache.c patch +dist/bind/lib/dns/nsec3.c patch +dist/bind/lib/dns/rbtdb.c patch +dist/bind/lib/dns/rdataset.c patch +dist/bind/lib/dns/resolver.c patch +dist/bind/lib/dns/validator.c patch +dist/bind/lib/dns/include/dns/rdataset.h patch +distrib/sets/lists/base/md.amd64 patch +distrib/sets/lists/base/md.sparc64 patch +distrib/sets/lists/base/shl.mi patch +lib/libdns/shlib_version patch + + Update bind to 9.7.3-P3 fixing CVE-2011-2464 + [spz, ticket #1647] +
CVS commit: src/share/man/man9
Module Name:src Committed By: dyoung Date: Fri Jul 8 22:38:08 UTC 2011 Modified Files: src/share/man/man9: bus_dma.9 Log Message: Describe some of the expected return codes from bus_dmamap_load(9). To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/share/man/man9/bus_dma.9 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/man9/bus_dma.9 diff -u src/share/man/man9/bus_dma.9:1.55 src/share/man/man9/bus_dma.9:1.56 --- src/share/man/man9/bus_dma.9:1.55 Fri Jul 1 22:06:19 2011 +++ src/share/man/man9/bus_dma.9 Fri Jul 8 22:38:08 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: bus_dma.9,v 1.55 2011/07/01 22:06:19 dyoung Exp $ +.\ $NetBSD: bus_dma.9,v 1.56 2011/07/08 22:38:08 dyoung Exp $ .\ .\ Copyright (c) 1996, 1997, 1998, 2001, 2005, 2006 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -28,7 +28,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd July 1, 2011 +.Dd July 8, 2011 .Dt BUS_DMA 9 .Os .Sh NAME @@ -327,6 +327,17 @@ .Fn bus_dmamap_load . .Pp Returns 0 on success, or an error code to indicate mode of failure. +Possible error codes include the following: +.Pp +.Bl -tag -width dmam -compact +.It Er EINVAL +.Fa buflen +is too large for the DMA map. +.It Er EFBIG +Too many segments. +.It Er ENOMEM +Could not allocate memory for, e.g., a bounce buffer. +.El .It Fn bus_dmamap_load_mbuf tag dmam chain flags This is a variation of .Fn bus_dmamap_load
CVS commit: src/lib/libc/softfloat/bits64
Module Name:src Committed By: matt Date: Sat Jul 9 02:28:31 UTC 2011 Modified Files: src/lib/libc/softfloat/bits64: softfloat.c Log Message: Add SOFTFLOAT_NEED_FIXUNS condition around the float128 fixuns To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/softfloat/bits64/softfloat.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/libc/softfloat/bits64/softfloat.c diff -u src/lib/libc/softfloat/bits64/softfloat.c:1.6 src/lib/libc/softfloat/bits64/softfloat.c:1.7 --- src/lib/libc/softfloat/bits64/softfloat.c:1.6 Mon Jul 4 08:02:35 2011 +++ src/lib/libc/softfloat/bits64/softfloat.c Sat Jul 9 02:28:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: softfloat.c,v 1.6 2011/07/04 08:02:35 matt Exp $ */ +/* $NetBSD: softfloat.c,v 1.7 2011/07/09 02:28:31 matt Exp $ */ /* * This version hacked for use with gcc -msoft-float by bjh21. @@ -46,7 +46,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: softfloat.c,v 1.6 2011/07/04 08:02:35 matt Exp $); +__RCSID($NetBSD: softfloat.c,v 1.7 2011/07/09 02:28:31 matt Exp $); #endif /* LIBC_SCCS and not lint */ #ifdef SOFTFLOAT_FOR_GCC @@ -4482,6 +4482,7 @@ } +#if defined(SOFTFLOAT_FOR_GCC) defined(SOFTFLOAT_NEED_FIXUNS) /* * just like above - but do not care for overflow of signed results */ @@ -4531,6 +4532,7 @@ return z; } +#endif /* defined(SOFTFLOAT_FOR_GCC) defined(SOFTFLOAT_NEED_FIXUNS) */ /* ---
CVS commit: src/common/lib/libc/quad
Module Name:src Committed By: matt Date: Sat Jul 9 02:36:01 UTC 2011 Modified Files: src/common/lib/libc/quad: quad.h Log Message: Add long double prototypes. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/quad/quad.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/quad/quad.h diff -u src/common/lib/libc/quad/quad.h:1.3 src/common/lib/libc/quad/quad.h:1.4 --- src/common/lib/libc/quad/quad.h:1.3 Mon Jul 4 11:22:39 2011 +++ src/common/lib/libc/quad/quad.h Sat Jul 9 02:36:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: quad.h,v 1.3 2011/07/04 11:22:39 mrg Exp $ */ +/* $NetBSD: quad.h,v 1.4 2011/07/09 02:36:01 matt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -116,12 +116,16 @@ quad_t __ashrdi3 __P((quad_t, qshift_t)); int __cmpdi2 __P((quad_t, quad_t)); quad_t __divdi3 __P((quad_t, quad_t)); +quad_t __fixtfdi __P((long double)); quad_t __fixdfdi __P((double)); quad_t __fixsfdi __P((float)); +u_quad_t __fixunstfdi __P((long double)); u_quad_t __fixunsdfdi __P((double)); u_quad_t __fixunssfdi __P((float)); +long double __floatditf __P((quad_t)); double __floatdidf __P((quad_t)); float __floatdisf __P((quad_t)); +long double __floatunditf __P((u_quad_t)); double __floatundidf __P((u_quad_t)); float __floatundisf __P((u_quad_t)); quad_t __iordi3 __P((quad_t, quad_t));
CVS commit: src/lib/libc/quad
Module Name:src
Committed By: matt
Date: Sat Jul 9 03:16:40 UTC 2011
Modified Files:
src/lib/libc/quad: floatunditf_ieee754.c
Log Message:
Appease lint and don't use C99 features.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/quad/floatunditf_ieee754.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/libc/quad/floatunditf_ieee754.c
diff -u src/lib/libc/quad/floatunditf_ieee754.c:1.1 src/lib/libc/quad/floatunditf_ieee754.c:1.2
--- src/lib/libc/quad/floatunditf_ieee754.c:1.1 Sat Jul 9 02:30:27 2011
+++ src/lib/libc/quad/floatunditf_ieee754.c Sat Jul 9 03:16:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: floatunditf_ieee754.c,v 1.1 2011/07/09 02:30:27 matt Exp $ */
+/* $NetBSD: floatunditf_ieee754.c,v 1.2 2011/07/09 03:16:40 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = @(#)floatunsdidf.c 8.1 (Berkeley) 6/4/93;
#else
-__RCSID($NetBSD: floatunditf_ieee754.c,v 1.1 2011/07/09 02:30:27 matt Exp $);
+__RCSID($NetBSD: floatunditf_ieee754.c,v 1.2 2011/07/09 03:16:40 matt Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -65,16 +65,16 @@
return (ld);
#else
union ieee_ext_u extu;
+ quad_t tmp = x; /* must be signed */
+ size_t width = 64;
+ size_t bit = 0;
+ quad_t mask = ~(quad_t)0;
if (x == 0)
return 0.0L;
if (x == 1)
return 1.0L;
- quad_t tmp = x; /* must be signed */
- size_t width = 64;
- size_t bit = 0;
- quad_t mask = ~(quad_t)0;
while (mask != 0 (tmp = 0)) {
width = 1;
mask = width;
CVS commit: src/lib/libc/arch/mips
Module Name:src
Committed By: matt
Date: Sat Jul 9 04:12:01 UTC 2011
Modified Files:
src/lib/libc/arch/mips: Makefile.inc
Log Message:
Don't build tf (long double) if building for O32.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/arch/mips/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/mips/Makefile.inc
diff -u src/lib/libc/arch/mips/Makefile.inc:1.11 src/lib/libc/arch/mips/Makefile.inc:1.12
--- src/lib/libc/arch/mips/Makefile.inc:1.11 Sat Jul 9 02:30:27 2011
+++ src/lib/libc/arch/mips/Makefile.inc Sat Jul 9 04:12:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2011/07/09 02:30:27 matt Exp $
+# $NetBSD: Makefile.inc,v 1.12 2011/07/09 04:12:01 matt Exp $
.include bsd.own.mk
@@ -13,11 +13,13 @@
SRCS+= fixunsgen_ieee754.c fixunssfsi_ieee754.c fixunsdfsi_ieee754.c
SRCS+= fixunsgen64_ieee754.c #fixunssfdi.c fixunsdfdi.c
-.if ${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el
+.if (${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el) \
+ (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
SRCS+= fixunstfsi_ieee754.c fixunstfdi_ieee754.c
.endif
.endif
-.if ${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el
+.if (${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el) \
+ (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
SRCS+= floatunditf_ieee754.c
.endif
