CVS commit: src
Module Name:src
Committed By: aymeric
Date: Fri Dec 24 10:11:40 UTC 2010
Modified Files:
src/distrib/macppc/floppies/ramdisk: Makefile
src/sys/arch/macppc/conf: GENERIC_MD INSTALL MAMBO POWERMAC_G5
Log Message:
Bump ramdisk size by 64K. This allows release builds to finish on macppc.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/macppc/floppies/ramdisk/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/macppc/conf/GENERIC_MD \
src/sys/arch/macppc/conf/MAMBO
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/macppc/conf/INSTALL
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/macppc/conf/POWERMAC_G5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/macppc/floppies/ramdisk/Makefile
diff -u src/distrib/macppc/floppies/ramdisk/Makefile:1.38 src/distrib/macppc/floppies/ramdisk/Makefile:1.39
--- src/distrib/macppc/floppies/ramdisk/Makefile:1.38 Thu Feb 11 09:06:49 2010
+++ src/distrib/macppc/floppies/ramdisk/Makefile Fri Dec 24 10:11:39 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.38 2010/02/11 09:06:49 roy Exp $
+# $NetBSD: Makefile,v 1.39 2010/12/24 10:11:39 aymeric Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 2048k
+IMAGESIZE= 2112k
MAKEFS_FLAGS= -f 15
WARNS= 1
Index: src/sys/arch/macppc/conf/GENERIC_MD
diff -u src/sys/arch/macppc/conf/GENERIC_MD:1.10 src/sys/arch/macppc/conf/GENERIC_MD:1.11
--- src/sys/arch/macppc/conf/GENERIC_MD:1.10 Fri Feb 6 18:50:28 2009
+++ src/sys/arch/macppc/conf/GENERIC_MD Fri Dec 24 10:11:39 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_MD,v 1.10 2009/02/06 18:50:28 jym Exp $
+# $NetBSD: GENERIC_MD,v 1.11 2010/12/24 10:11:39 aymeric Exp $
#
# GENERIC_MD config file
#
@@ -8,5 +8,5 @@
# Enable the hooks used for initializing the ram-disk.
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
-options MEMORY_DISK_ROOT_SIZE=4096 # 2 Megabytes
+options MEMORY_DISK_ROOT_SIZE=4224 # 2112 KiB
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
Index: src/sys/arch/macppc/conf/MAMBO
diff -u src/sys/arch/macppc/conf/MAMBO:1.10 src/sys/arch/macppc/conf/MAMBO:1.11
--- src/sys/arch/macppc/conf/MAMBO:1.10 Tue Nov 23 11:14:02 2010
+++ src/sys/arch/macppc/conf/MAMBO Fri Dec 24 10:11:39 2010
@@ -6,7 +6,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident GENERIC-$Revision: 1.10 $
+#ident GENERIC-$Revision: 1.11 $
maxusers 32
@@ -203,7 +203,7 @@
# Enable the hooks used for initializing the ram-disk.
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
-options MEMORY_DISK_ROOT_SIZE=4096 # 2 Megabytes
+options MEMORY_DISK_ROOT_SIZE=4224 # 2112 KiB
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
options MAMBO
Index: src/sys/arch/macppc/conf/INSTALL
diff -u src/sys/arch/macppc/conf/INSTALL:1.110 src/sys/arch/macppc/conf/INSTALL:1.111
--- src/sys/arch/macppc/conf/INSTALL:1.110 Tue Nov 23 11:14:02 2010
+++ src/sys/arch/macppc/conf/INSTALL Fri Dec 24 10:11:39 2010
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.110 2010/11/23 11:14:02 hannken Exp $
+# $NetBSD: INSTALL,v 1.111 2010/12/24 10:11:39 aymeric Exp $
#
# config file for INSTALL FLOPPY
#
@@ -17,7 +17,7 @@
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=4096 # 2 Megabytes
+options MEMORY_DISK_ROOT_SIZE=4224 # 2112 KiB
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
options USERCONF # userconf(4) support
Index: src/sys/arch/macppc/conf/POWERMAC_G5
diff -u src/sys/arch/macppc/conf/POWERMAC_G5:1.11 src/sys/arch/macppc/conf/POWERMAC_G5:1.12
--- src/sys/arch/macppc/conf/POWERMAC_G5:1.11 Tue Nov 23 11:14:02 2010
+++ src/sys/arch/macppc/conf/POWERMAC_G5 Fri Dec 24 10:11:39 2010
@@ -193,5 +193,5 @@
# Enable the hooks used for initializing the ram-disk.
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
-options MEMORY_DISK_ROOT_SIZE=4096 # 2 Megabytes
+options MEMORY_DISK_ROOT_SIZE=4224 # 2112 KiB
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
CVS commit: src
Module Name:src Committed By: skrll Date: Fri Dec 24 12:41:44 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi src/include: dlfcn.h src/lib/libpthread: Makefile src/libexec/ld.elf_so: headers.c load.c reloc.c rtld.c rtld.h search.c src/share/man/man3: dlfcn.3 src/sys/sys: exec_elf.h src/tests/libexec/ld.elf_so: Makefile Added Files: src/tests/libexec/ld.elf_so: h_df_1_noopen.c t_df_1_noopen.sh Log Message: Add support for DF_1_BIND_NOW, DF_1_NODELETE and DF_1_NOOPEN marked objects, and the RTLD_NODELETE and RTLD_NOLOAD flags to dlopen(3). Mark libpthread as DF_1_NOOPEN and use it to test the functionality. Somewhat taken from FreeBSD. Fixes PR 42029. OK from christos and joerg. To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.21 -r1.22 src/include/dlfcn.h cvs rdiff -u -r1.70 -r1.71 src/lib/libpthread/Makefile cvs rdiff -u -r1.37 -r1.38 src/libexec/ld.elf_so/headers.c cvs rdiff -u -r1.41 -r1.42 src/libexec/ld.elf_so/load.c cvs rdiff -u -r1.102 -r1.103 src/libexec/ld.elf_so/reloc.c cvs rdiff -u -r1.136 -r1.137 src/libexec/ld.elf_so/rtld.c cvs rdiff -u -r1.96 -r1.97 src/libexec/ld.elf_so/rtld.h cvs rdiff -u -r1.22 -r1.23 src/libexec/ld.elf_so/search.c cvs rdiff -u -r1.27 -r1.28 src/share/man/man3/dlfcn.3 cvs rdiff -u -r1.107 -r1.108 src/sys/sys/exec_elf.h cvs rdiff -u -r1.2 -r1.3 src/tests/libexec/ld.elf_so/Makefile cvs rdiff -u -r0 -r1.1 src/tests/libexec/ld.elf_so/h_df_1_noopen.c \ src/tests/libexec/ld.elf_so/t_df_1_noopen.sh 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.187 src/distrib/sets/lists/tests/mi:1.188 --- src/distrib/sets/lists/tests/mi:1.187 Thu Dec 23 15:27:44 2010 +++ src/distrib/sets/lists/tests/mi Fri Dec 24 12:41:42 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.187 2010/12/23 15:27:44 pgoyette Exp $ +# $NetBSD: mi,v 1.188 2010/12/24 12:41:42 skrll Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -387,6 +387,8 @@ ./usr/libdata/debug/usr/tests/lib/libutil/t_sockaddr_snprintf.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/libexec tests-lib-debug ./usr/libdata/debug/usr/tests/libexec/ld.elf_sotests-libexec-debug +./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_df_1_noopen1.debug tests-libexec-debug debug,atf +./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_df_1_noopen2.debug tests-libexec-debug debug,atf ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_dlerror-cleared.debug tests-libexec-debug debug,atf ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_dlerror-false.debug tests-libexec-debug debug,atf ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_dlinfo.debug tests-libexec-debug debug,atf @@ -1632,6 +1634,9 @@ ./usr/tests/libexec/Atffile tests-lib-tests atf ./usr/tests/libexec/ld.elf_so tests-libexec-tests ./usr/tests/libexec/ld.elf_so/Atffile tests-libexec-tests atf +./usr/tests/libexec/ld.elf_so/h_df_1_noopen1 tests-libexec-tests atf +./usr/tests/libexec/ld.elf_so/h_df_1_noopen2 tests-libexec-tests atf +./usr/tests/libexec/ld.elf_so/t_df_1_noopen tests-libexec-tests atf ./usr/tests/libexec/ld.elf_so/t_dlerror-cleared tests-libexec-tests atf ./usr/tests/libexec/ld.elf_so/t_dlerror-false tests-libexec-tests atf ./usr/tests/libexec/ld.elf_so/t_dlinfo tests-libexec-tests atf Index: src/include/dlfcn.h diff -u src/include/dlfcn.h:1.21 src/include/dlfcn.h:1.22 --- src/include/dlfcn.h:1.21 Thu Jan 7 07:35:35 2010 +++ src/include/dlfcn.h Fri Dec 24 12:41:42 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: dlfcn.h,v 1.21 2010/01/07 07:35:35 skrll Exp $ */ +/* $NetBSD: dlfcn.h,v 1.22 2010/12/24 12:41:42 skrll Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -64,6 +64,8 @@ #define RTLD_NOW 2 #define RTLD_GLOBAL 0x100 /* Allow global searches in object */ #define RTLD_LOCAL 0x200 +#define RTLD_NODELETE 0x01000 /* Do not remove members. */ +#define RTLD_NOLOAD 0x02000 /* Do not load if not already loaded. */ #if defined(_NETBSD_SOURCE) #define DL_LAZY RTLD_LAZY /* Compat */ #endif Index: src/lib/libpthread/Makefile diff -u src/lib/libpthread/Makefile:1.70 src/lib/libpthread/Makefile:1.71 --- src/lib/libpthread/Makefile:1.70 Fri Aug 6 05:35:42 2010 +++ src/lib/libpthread/Makefile Fri Dec 24 12:41:42 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2010/08/06 05:35:42 christos Exp $ +# $NetBSD: Makefile,v 1.71 2010/12/24 12:41:42 skrll Exp $ # WARNS= 4 @@ -33,6 +33,8 @@ LIB= pthread +LDFLAGS+= -Wl,-znodlopen + # # NOTE: When you create a new file for libpthread, make sure that pthread.c # gets a reference to a symbol in that file. Otherwise, Unix's stupid static Index: src/libexec/ld.elf_so/headers.c diff -u src/libexec/ld.elf_so/headers.c:1.37
CVS commit: src/share/man/man3
Module Name:src Committed By: skrll Date: Fri Dec 24 12:42:56 UTC 2010 Modified Files: src/share/man/man3: dlfcn.3 Log Message: Bump date. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/share/man/man3/dlfcn.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/dlfcn.3 diff -u src/share/man/man3/dlfcn.3:1.28 src/share/man/man3/dlfcn.3:1.29 --- src/share/man/man3/dlfcn.3:1.28 Fri Dec 24 12:41:43 2010 +++ src/share/man/man3/dlfcn.3 Fri Dec 24 12:42:56 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: dlfcn.3,v 1.28 2010/12/24 12:41:43 skrll Exp $ +.\ $NetBSD: dlfcn.3,v 1.29 2010/12/24 12:42:56 skrll Exp $ .\ .\ Copyright (c) 1998 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd January 18, 2010 +.Dd December 24, 2010 .Dt DLFCN 3 .Os .Sh NAME
CVS commit: src/share/man/man3
Module Name:src Committed By: wiz Date: Fri Dec 24 13:00:24 UTC 2010 Modified Files: src/share/man/man3: dlfcn.3 Log Message: Fix xref and pasto. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/share/man/man3/dlfcn.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/dlfcn.3 diff -u src/share/man/man3/dlfcn.3:1.29 src/share/man/man3/dlfcn.3:1.30 --- src/share/man/man3/dlfcn.3:1.29 Fri Dec 24 12:42:56 2010 +++ src/share/man/man3/dlfcn.3 Fri Dec 24 13:00:24 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: dlfcn.3,v 1.29 2010/12/24 12:42:56 skrll Exp $ +.\ $NetBSD: dlfcn.3,v 1.30 2010/12/24 13:00:24 wiz Exp $ .\ .\ Copyright (c) 1998 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -77,7 +77,7 @@ shared object searches. .Po see -.Xr ld.elf_so 5 +.Xr ld.elf_so 1 .Pc .Pp Shared libraries take the following form: @@ -87,7 +87,6 @@ its external references are resolved in the same way as is done with the implicitly loaded shared libraries at program startup. .Pp -The If the first argument is .Dv NULL , .Fn dlopen
CVS commit: src
Module Name:src
Committed By: njoly
Date: Fri Dec 24 13:12:10 UTC 2010
Modified Files:
src/gnu/dist/gdb6: Makefile.in
src/tools/gdb: Makefile
Log Message:
Adjust LDFLAGS handling to fix curses detection for mknative-gdb.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/gnu/dist/gdb6/Makefile.in
cvs rdiff -u -r1.17 -r1.18 src/tools/gdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gdb6/Makefile.in
diff -u src/gnu/dist/gdb6/Makefile.in:1.1.1.2 src/gnu/dist/gdb6/Makefile.in:1.2
--- src/gnu/dist/gdb6/Makefile.in:1.1.1.2 Sun Jul 2 20:11:53 2006
+++ src/gnu/dist/gdb6/Makefile.in Fri Dec 24 13:12:09 2010
@@ -286,7 +286,7 @@
WINDRES = @WINDRES@
CFLAGS = @CFLAGS@
-LDFLAGS =
+LDFLAGS = @LDFLAGS@
LIBCFLAGS = $(CFLAGS)
CXXFLAGS = @CXXFLAGS@
LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.17 src/tools/gdb/Makefile:1.18
--- src/tools/gdb/Makefile:1.17 Sat May 8 23:18:44 2010
+++ src/tools/gdb/Makefile Fri Dec 24 13:12:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2010/05/08 23:18:44 hans Exp $
+# $NetBSD: Makefile,v 1.18 2010/12/24 13:12:09 njoly Exp $
.include bsd.own.mk
@@ -16,7 +16,8 @@
.include ${.CURDIR}/../Makefile.gnuhost
-CCADDFLAGS= ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
+CCADDFLAGS= ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include -B${DESTDIR}/usr/lib/
+LDADDFLAGS= -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -Wl,-rpath-link,${DESTDIR}/usr/lib
NEWCONFIGDIR?= ${.CURDIR}/../..
MKNATIVE?= ${.CURDIR}/mknative-gdb
@@ -65,7 +66,7 @@
CC=${CC:Q}' '${CCADDFLAGS:Q} \
CXX=${CXX:Q}' '${CCADDFLAGS:Q} \
CPP=${CPP:Q}' '-isystem' '${DESTDIR}/usr/include \
- CFLAGS= CPPFLAGS= CXXFLAGS= LDFLAGS= \
+ CFLAGS= CPPFLAGS= CXXFLAGS= LDFLAGS=${LDADDFLAGS:Q} \
MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \
XGETTEXT=${TOOLDIR}/bin/${_TOOL_PREFIX}xgettext \
LIBS=-lintl \
CVS commit: src/sys/ufs/ffs
Module Name:src
Committed By: mlelstv
Date: Fri Dec 24 13:38:58 UTC 2010
Modified Files:
src/sys/ufs/ffs: ffs_wapbl.c
Log Message:
For update mounts the root vnode is already in use and we must not
free it. Since the mount persists even when the update fails,
this is not a problem either.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/ufs/ffs/ffs_wapbl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ffs/ffs_wapbl.c
diff -u src/sys/ufs/ffs/ffs_wapbl.c:1.16 src/sys/ufs/ffs/ffs_wapbl.c:1.17
--- src/sys/ufs/ffs/ffs_wapbl.c:1.16 Thu Dec 23 14:43:37 2010
+++ src/sys/ufs/ffs/ffs_wapbl.c Fri Dec 24 13:38:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_wapbl.c,v 1.16 2010/12/23 14:43:37 mlelstv Exp $ */
+/* $NetBSD: ffs_wapbl.c,v 1.17 2010/12/24 13:38:57 mlelstv Exp $ */
/*-
* Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_wapbl.c,v 1.16 2010/12/23 14:43:37 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_wapbl.c,v 1.17 2010/12/24 13:38:57 mlelstv Exp $);
#define WAPBL_INTERNAL
@@ -608,13 +608,15 @@
if ((error = VFS_ROOT(mp, rvp)) != 0)
return error;
- if ((error = UFS_VALLOC(rvp, 0 | S_IFREG, NOCRED, vp)) != 0) {
+ error = UFS_VALLOC(rvp, 0 | S_IFREG, NOCRED, vp);
+ if (mp-mnt_flag MNT_UPDATE) {
+ vput(rvp);
+ } else {
VOP_UNLOCK(rvp);
vgone(rvp);
- return error;
}
- VOP_UNLOCK(rvp);
- vgone(rvp);
+ if (error != 0)
+ return error;
vp-v_type = VREG;
ip = VTOI(vp);
CVS commit: src/gnu/dist/gdb6/gdb/config/i386
Module Name:src Committed By: njoly Date: Fri Dec 24 14:46:03 UTC 2010 Modified Files: src/gnu/dist/gdb6/gdb/config/i386: nbsd64.mt Log Message: Add support for 32bit (i386) binaries on amd64. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/gnu/dist/gdb6/gdb/config/i386/nbsd64.mt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/gdb6/gdb/config/i386/nbsd64.mt diff -u src/gnu/dist/gdb6/gdb/config/i386/nbsd64.mt:1.1.1.1 src/gnu/dist/gdb6/gdb/config/i386/nbsd64.mt:1.2 --- src/gnu/dist/gdb6/gdb/config/i386/nbsd64.mt:1.1.1.1 Mon May 15 14:12:03 2006 +++ src/gnu/dist/gdb6/gdb/config/i386/nbsd64.mt Fri Dec 24 14:46:02 2010 @@ -1,3 +1,4 @@ # Target: NetBSD/amd64 -TDEPFILES= amd64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o nbsd-tdep.o \ +TDEPFILES= amd64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o \ + i386bsd-tdep.o i386nbsd-tdep.o nbsd-tdep.o \ corelow.o solib.o solib-svr4.o
CVS commit: src/gnu/usr.bin/gdb6
Module Name:src
Committed By: njoly
Date: Fri Dec 24 14:49:19 UTC 2010
Modified Files:
src/gnu/usr.bin/gdb6/arch/x86_64: config.h defs.mk init.c
src/gnu/usr.bin/gdb6/bfd/arch/x86_64: config.h
src/gnu/usr.bin/gdb6/libiberty/arch/x86_64: config.h defs.mk
src/gnu/usr.bin/gdb6/opcodes/arch/x86_64: config.h
Log Message:
Regen amd64 files for 32bit binaries support.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/gdb6/arch/x86_64/config.h
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/gdb6/arch/x86_64/defs.mk
cvs rdiff -u -r1.1 -r1.2 src/gnu/usr.bin/gdb6/arch/x86_64/init.c
cvs rdiff -u -r1.2 -r1.3 src/gnu/usr.bin/gdb6/bfd/arch/x86_64/config.h
cvs rdiff -u -r1.2 -r1.3 src/gnu/usr.bin/gdb6/libiberty/arch/x86_64/config.h \
src/gnu/usr.bin/gdb6/libiberty/arch/x86_64/defs.mk
cvs rdiff -u -r1.2 -r1.3 src/gnu/usr.bin/gdb6/opcodes/arch/x86_64/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/gdb6/arch/x86_64/config.h
diff -u src/gnu/usr.bin/gdb6/arch/x86_64/config.h:1.5 src/gnu/usr.bin/gdb6/arch/x86_64/config.h:1.6
--- src/gnu/usr.bin/gdb6/arch/x86_64/config.h:1.5 Sat Jan 5 15:43:18 2008
+++ src/gnu/usr.bin/gdb6/arch/x86_64/config.h Fri Dec 24 14:49:18 2010
@@ -340,7 +340,7 @@
#define HAVE_STDLIB_H 1
/* Define if you have the stpcpy function */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
/* Define to 1 if you have the `strcasecmp' function. */
#define HAVE_STRCASECMP 1
@@ -459,7 +459,7 @@
/* #undef HAVE_TERMIO_H */
/* Define to 1 if you have the term.h header file. */
-/* #undef HAVE_TERM_H */
+#define HAVE_TERM_H 1
/* Define to 1 if you have the thread_db.h header file. */
/* #undef HAVE_THREAD_DB_H */
Index: src/gnu/usr.bin/gdb6/arch/x86_64/defs.mk
diff -u src/gnu/usr.bin/gdb6/arch/x86_64/defs.mk:1.4 src/gnu/usr.bin/gdb6/arch/x86_64/defs.mk:1.5
--- src/gnu/usr.bin/gdb6/arch/x86_64/defs.mk:1.4 Tue May 15 15:44:40 2007
+++ src/gnu/usr.bin/gdb6/arch/x86_64/defs.mk Fri Dec 24 14:49:18 2010
@@ -3,5 +3,5 @@
# Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp
#
G_INTERNAL_CFLAGS= -I. -I${GNUHOSTDIST}/gdb -I${GNUHOSTDIST}/gdb/config -DLOCALEDIR=\/usr/share/locale\ -DHAVE_CONFIG_H -I${GNUHOSTDIST}/gdb/../include/opcode -I${GNUHOSTDIST}/gdb/../readline/.. -I../bfd -I${GNUHOSTDIST}/gdb/../bfd -I${GNUHOSTDIST}/gdb/../include -I../intl -I${GNUHOSTDIST}/gdb/../intl -DMI_OUT=1 -DTUI=1 -Wimplicit -Wreturn-type -Wcomment -Wtrigraphs -Wformat -Wparentheses -Wpointer-arith -Wformat-nonliteral -Wunused-label -Wunused-function -Wno-pointer-sign
-G_LIBGDB_OBS=amd64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o nbsd-tdep.o corelow.o solib.o solib-svr4.o ser-base.o ser-unix.o ser-pipe.o ser-tcp.o fork-child.o inf-ptrace.o amd64-nat.o amd64bsd-nat.o nbsd-nat.o amd64nbsd-nat.o bsd-kvm.o remote.o dcache.o remote-utils.o tracepoint.o ax-general.o ax-gdb.o remote-fileio.o cli-dump.o cli-decode.o cli-script.o cli-cmds.o cli-setshow.o cli-utils.o cli-logging.o cli-interp.o mi-out.o mi-console.o mi-cmds.o mi-cmd-env.o mi-cmd-var.o mi-cmd-break.o mi-cmd-stack.o mi-cmd-file.o mi-cmd-disas.o mi-symbol-cmds.o mi-interp.o mi-main.o mi-parse.o mi-getopt.o mi-common.o posix-hdep.o tui-command.o tui-data.o tui-disasm.o tui-file.o tui.o tui-hooks.o tui-interp.o tui-io.o tui-layout.o tui-out.o tui-regs.o tui-source.o tui-stack.o tui-win.o tui-windata.o tui-wingeneral.o tui-winsource.o c-exp.o cp-name-parser.o objc-exp.o ada-exp.o jv-exp.o f-exp.o m2-exp.o p-exp.o version.o annotate.o auxv.o bfd-targe
t.o blockframe.o breakpoint.o findvar.o regcache.o charset.o disasm.o dummy-frame.o source.o value.o eval.o valops.o valarith.o valprint.o printcmd.o block.o symtab.o symfile.o symmisc.o linespec.o dictionary.o infcall.o infcmd.o infrun.o expprint.o environ.o stack.o thread.o exceptions.o inf-child.o interps.o main.o macrotab.o macrocmd.o macroexp.o macroscope.o event-loop.o event-top.o inf-loop.o completer.o gdbarch.o arch-utils.o gdbtypes.o osabi.o copying.o memattr.o mem-break.o target.o parse.o language.o buildsym.o std-regs.o signals.o kod.o kod-cisco.o gdb-events.o exec.o bcache.o objfiles.o observer.o minsyms.o maint.o demangle.o dbxread.o coffread.o coff-pe-read.o elfread.o dwarfread.o dwarf2read.o mipsread.o stabsread.o corefile.o dwarf2expr.o dwarf2loc.o dwarf2-frame.o ada-lang.o c-lang.o f-lang.o objc-lang.o ui-out.o cli-out.o varobj.o wrapper.o jv-lang.o jv-valprint.o jv-typeprint.o m2-lang.o p-lang.o p-typeprint.o p-valprint.o scm-exp
.o scm-lang.o scm-valprint.o sentinel-frame.o complaints.o typeprint.o ada-typeprint.o c-typeprint.o f-typeprint.o m2-typeprint.o ada-valprint.o c-valprint.o cp-valprint.o f-valprint.o m2-valprint.o nlmread.o serial.o mdebugread.o top.o utils.o ui-file.o user-regs.o frame.o frame-unwind.o doublest.o
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Fri Dec 24 16:00:13 UTC 2010 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: LOCKDEBUG is not referenced in this file anymore. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/hp700/include/cpu.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/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.53 src/sys/arch/hp700/include/cpu.h:1.54 --- src/sys/arch/hp700/include/cpu.h:1.53 Sun Dec 12 08:23:15 2010 +++ src/sys/arch/hp700/include/cpu.h Fri Dec 24 16:00:13 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.53 2010/12/12 08:23:15 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.54 2010/12/24 16:00:13 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -190,10 +190,6 @@ #ifndef _LOCORE #ifdef _KERNEL -#if defined(_KERNEL_OPT) -#include opt_lockdebug.h -#endif - /* * External definitions unique to PA-RISC cpu support. * These are the public declarations - those needed in
CVS commit: src/sys/arch/hp700/hp700
Module Name:src Committed By: skrll Date: Fri Dec 24 16:03:54 UTC 2010 Modified Files: src/sys/arch/hp700/hp700: intr.c Log Message: #include opt_lockdebug.h To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/hp700/hp700/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/hp700/hp700/intr.c diff -u src/sys/arch/hp700/hp700/intr.c:1.31 src/sys/arch/hp700/hp700/intr.c:1.32 --- src/sys/arch/hp700/hp700/intr.c:1.31 Mon Dec 20 00:25:33 2010 +++ src/sys/arch/hp700/hp700/intr.c Fri Dec 24 16:03:54 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.c,v 1.31 2010/12/20 00:25:33 matt Exp $ */ +/* $NetBSD: intr.c,v 1.32 2010/12/24 16:03:54 skrll Exp $ */ /* $OpenBSD: intr.c,v 1.27 2009/12/31 12:52:35 jsing Exp $ */ /* @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.31 2010/12/20 00:25:33 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.32 2010/12/24 16:03:54 skrll Exp $); #define __MUTEX_PRIVATE @@ -55,6 +55,10 @@ #include machine/mutex.h +#if defined(_KERNEL_OPT) +#include opt_lockdebug.h +#endif + /* The priority level masks. */ int imask[NIPL];
CVS commit: src/external/cddl/osnet/dist/lib/libzfs/common
Module Name:src Committed By: haad Date: Fri Dec 24 16:13:58 UTC 2010 Modified Files: src/external/cddl/osnet/dist/lib/libzfs/common: libzfs_util.c Log Message: libzfs_fru_clear was not ported to NetBSD disable it foor now. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c diff -u src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c:1.3 src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c:1.4 --- src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c:1.3 Sat Feb 27 23:43:53 2010 +++ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c Fri Dec 24 16:13:58 2010 @@ -615,7 +615,9 @@ if (hdl-libzfs_log_str) (void) free(hdl-libzfs_log_str); zpool_free_handles(hdl); +#ifdef PORT_SOLARIS libzfs_fru_clear(hdl, B_TRUE); +#endif namespace_clear(hdl); libzfs_mnttab_fini(hdl); free(hdl);
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: phx Date: Fri Dec 24 17:05:34 UTC 2010 Modified Files: src/sys/arch/macppc/conf: GENERIC Log Message: Establishing an UMTS connection with ubsa(4) works fine with my Pismo, so add it to our config. To generate a diff of this commit: cvs rdiff -u -r1.286 -r1.287 src/sys/arch/macppc/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/macppc/conf/GENERIC diff -u src/sys/arch/macppc/conf/GENERIC:1.286 src/sys/arch/macppc/conf/GENERIC:1.287 --- src/sys/arch/macppc/conf/GENERIC:1.286 Fri Dec 10 17:54:34 2010 +++ src/sys/arch/macppc/conf/GENERIC Fri Dec 24 17:05:34 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.286 2010/12/10 17:54:34 phx Exp $ +# $NetBSD: GENERIC,v 1.287 2010/12/24 17:05:34 phx Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.286 $ +#ident GENERIC-$Revision: 1.287 $ maxusers 32 @@ -488,6 +488,9 @@ umodem* at uhub? port ? configuration ? # USB Modem ucom* at umodem? +ubsa* at uhub? port ? # Belkin serial adapter +ucom* at ubsa? portno ? + uhso* at uhub? port ? configuration ? # Option N.V. Wireless WAN modems umass* at uhub? port ? configuration ? interface ? # USB Mass Storage
CVS commit: src/doc
Module Name:src Committed By: mlelstv Date: Fri Dec 24 18:58:18 UTC 2010 Modified Files: src/doc: CHANGES Log Message: dm(4): Make LVM use non 512-byte sector devices. To generate a diff of this commit: cvs rdiff -u -r1.1480 -r1.1481 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1480 src/doc/CHANGES:1.1481 --- src/doc/CHANGES:1.1480 Fri Dec 24 02:56:56 2010 +++ src/doc/CHANGES Fri Dec 24 18:58:17 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1480 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1481 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -812,3 +812,4 @@ to change a timezone. [christos 20101216] amigappc: Made onboard serial interface work. [phx 20101219] yacc(1): Import byacc-20101127 [christos 20091223] + dm(4): Make LVM use non 512-byte sector devices. [mlelstv 20101223]
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Fri Dec 24 19:22:17 UTC 2010 Modified Files: src/sys/dev/usb: usbdevs Log Message: add Hauppauge WinTV USB2 FM To generate a diff of this commit: cvs rdiff -u -r1.571 -r1.572 src/sys/dev/usb/usbdevs 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/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.571 src/sys/dev/usb/usbdevs:1.572 --- src/sys/dev/usb/usbdevs:1.571 Tue Dec 21 07:03:08 2010 +++ src/sys/dev/usb/usbdevs Fri Dec 24 19:22:17 2010 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.571 2010/12/21 07:03:08 jnemeth Exp $ +$NetBSD: usbdevs,v 1.572 2010/12/24 19:22:17 jmcneill Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -514,6 +514,7 @@ vendor DLINK 0x2001 D-Link vendor PLANEX2 0x2019 Planex Communications vendor ENCORE 0x203d Encore +vendor HAUPPAUGE2 0x2040 Hauppauge Computer Works vendor DLINK3 0x2101 D-Link vendor ERICSSON 0x2282 Ericsson vendor MOTOROLA2 0x22b8 Motorola @@ -1403,6 +1404,7 @@ /* Hauppauge Computer Works */ product HAUPPAUGE WINTV_USB_FM 0x4d12 WinTV USB FM +product HAUPPAUGE2 WINTV_USB2_FM 0xb110 WinTV USB2 FM /* Hawking Technologies products */ product HAWKING RT2870_1 0x0001 RT2870
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jmcneill
Date: Fri Dec 24 19:22:37 UTC 2010
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.564 -r1.565 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.565 -r1.566 src/sys/dev/usb/usbdevs_data.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/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.564 src/sys/dev/usb/usbdevs.h:1.565
--- src/sys/dev/usb/usbdevs.h:1.564 Tue Dec 21 07:03:54 2010
+++ src/sys/dev/usb/usbdevs.h Fri Dec 24 19:22:37 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.564 2010/12/21 07:03:54 jnemeth Exp $ */
+/* $NetBSD: usbdevs.h,v 1.565 2010/12/24 19:22:37 jmcneill Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.571 2010/12/21 07:03:08 jnemeth Exp
+ * NetBSD: usbdevs,v 1.572 2010/12/24 19:22:17 jmcneill Exp
*/
/*
@@ -521,6 +521,7 @@
#define USB_VENDOR_DLINK 0x2001 /* D-Link */
#define USB_VENDOR_PLANEX2 0x2019 /* Planex Communications */
#define USB_VENDOR_ENCORE 0x203d /* Encore */
+#define USB_VENDOR_HAUPPAUGE2 0x2040 /* Hauppauge Computer Works */
#define USB_VENDOR_DLINK3 0x2101 /* D-Link */
#define USB_VENDOR_ERICSSON 0x2282 /* Ericsson */
#define USB_VENDOR_MOTOROLA2 0x22b8 /* Motorola */
@@ -1410,6 +1411,7 @@
/* Hauppauge Computer Works */
#define USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM 0x4d12 /* WinTV USB FM */
+#define USB_PRODUCT_HAUPPAUGE2_WINTV_USB2_FM 0xb110 /* WinTV USB2 FM */
/* Hawking Technologies products */
#define USB_PRODUCT_HAWKING_RT2870_1 0x0001 /* RT2870 */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.565 src/sys/dev/usb/usbdevs_data.h:1.566
--- src/sys/dev/usb/usbdevs_data.h:1.565 Tue Dec 21 07:03:54 2010
+++ src/sys/dev/usb/usbdevs_data.h Fri Dec 24 19:22:37 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.565 2010/12/21 07:03:54 jnemeth Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.566 2010/12/24 19:22:37 jmcneill Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.571 2010/12/21 07:03:08 jnemeth Exp
+ * NetBSD: usbdevs,v 1.572 2010/12/24 19:22:17 jmcneill Exp
*/
/*
@@ -1863,6 +1863,10 @@
Encore,
},
{
+ USB_VENDOR_HAUPPAUGE2,
+ Hauppauge Computer Works,
+ },
+ {
USB_VENDOR_DLINK3,
D-Link,
},
@@ -1995,7 +1999,7 @@
GNU Radio USRP,
},
};
-const int usb_nvendors = 489;
+const int usb_nvendors = 490;
const struct usb_product usb_products[] = {
{
@@ -4283,6 +4287,10 @@
WinTV USB FM,
},
{
+ USB_VENDOR_HAUPPAUGE2, USB_PRODUCT_HAUPPAUGE2_WINTV_USB2_FM,
+ WinTV USB2 FM,
+ },
+ {
USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_RT2870_1,
RT2870,
},
@@ -8375,4 +8383,4 @@
Prestige,
},
};
-const int usb_nproducts = 1594;
+const int usb_nproducts = 1595;
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src
Committed By: jakllsch
Date: Fri Dec 24 20:36:51 UTC 2010
Modified Files:
src/sys/arch/i386/stand/lib: biosdisk.c biosdisk.h biosdisk_ll.c
Log Message:
Sprinkle daddr_t.
Adjust DISK_DEBUG printf formats to match.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/i386/stand/lib/biosdisk.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/stand/lib/biosdisk.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/i386/stand/lib/biosdisk_ll.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/i386/stand/lib/biosdisk.c
diff -u src/sys/arch/i386/stand/lib/biosdisk.c:1.31 src/sys/arch/i386/stand/lib/biosdisk.c:1.32
--- src/sys/arch/i386/stand/lib/biosdisk.c:1.31 Fri Jun 25 15:35:08 2010
+++ src/sys/arch/i386/stand/lib/biosdisk.c Fri Dec 24 20:36:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk.c,v 1.31 2010/06/25 15:35:08 tsutsui Exp $ */
+/* $NetBSD: biosdisk.c,v 1.32 2010/12/24 20:36:51 jakllsch Exp $ */
/*
* Copyright (c) 1996, 1998
@@ -90,7 +90,7 @@
struct biosdisk {
struct biosdisk_ll ll;
- int boff;
+ daddr_t boff;
charbuf[BUFSIZE];
};
@@ -164,7 +164,7 @@
#ifndef NO_DISKLABEL
static int
-check_label(struct biosdisk *d, int sector)
+check_label(struct biosdisk *d, daddr_t sector)
{
struct disklabel *lp;
@@ -178,7 +178,7 @@
lp = (struct disklabel *) (d-buf + LABELOFFSET);
if (lp-d_magic != DISKMAGIC || dkcksum(lp)) {
#ifdef DISK_DEBUG
- printf(warning: no disklabel in sector %u\n, sector);
+ printf(warning: no disklabel in sector %lld\n, sector);
#endif
return -1;
}
@@ -234,7 +234,7 @@
continue;
sector = this_ext + mbr[i].mbrp_start;
#ifdef DISK_DEBUG
- printf(ptn type %d in sector %u\n, typ, sector);
+ printf(ptn type %d in sector %lld\n, typ, sector);
#endif
if (typ == MBR_PTYPE_NETBSD) {
error = check_label(d, sector);
@@ -377,7 +377,7 @@
*/
int
-biosdisk_findpartition(int biosdev, u_int sector)
+biosdisk_findpartition(int biosdev, daddr_t sector)
{
#ifdef NO_DISKLABEL
return 0;
@@ -386,7 +386,7 @@
int partition = 0;
struct disklabel *lp;
#ifdef DISK_DEBUG
- printf(looking for partition device %x, sector %u\n, biosdev, sector);
+ printf(looking for partition device %x, sector %lld\n, biosdev, sector);
#endif
/* Look for netbsd partition that is the dos boot one */
Index: src/sys/arch/i386/stand/lib/biosdisk.h
diff -u src/sys/arch/i386/stand/lib/biosdisk.h:1.7 src/sys/arch/i386/stand/lib/biosdisk.h:1.8
--- src/sys/arch/i386/stand/lib/biosdisk.h:1.7 Sun Dec 14 17:03:43 2008
+++ src/sys/arch/i386/stand/lib/biosdisk.h Fri Dec 24 20:36:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk.h,v 1.7 2008/12/14 17:03:43 christos Exp $ */
+/* $NetBSD: biosdisk.h,v 1.8 2010/12/24 20:36:51 jakllsch Exp $ */
/*
* Copyright (c) 1996
@@ -29,4 +29,4 @@
int biosdisk_open(struct open_file *, ...);
int biosdisk_close(struct open_file *);
int biosdisk_ioctl(struct open_file *, u_long, void *);
-int biosdisk_findpartition(int, u_int);
+int biosdisk_findpartition(int, daddr_t);
Index: src/sys/arch/i386/stand/lib/biosdisk_ll.c
diff -u src/sys/arch/i386/stand/lib/biosdisk_ll.c:1.26 src/sys/arch/i386/stand/lib/biosdisk_ll.c:1.27
--- src/sys/arch/i386/stand/lib/biosdisk_ll.c:1.26 Mon Apr 28 20:23:25 2008
+++ src/sys/arch/i386/stand/lib/biosdisk_ll.c Fri Dec 24 20:36:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk_ll.c,v 1.26 2008/04/28 20:23:25 martin Exp $ */
+/* $NetBSD: biosdisk_ll.c,v 1.27 2010/12/24 20:36:51 jakllsch Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -153,8 +153,8 @@
* this buffer doesn't cross a 64K DMA boundary.
*/
static int ra_dev;
-static int ra_end;
-static int ra_first;
+static daddr_t ra_end;
+static daddr_t ra_first;
/*
* Because some older BIOSes have bugs in their int13 extensions, we
@@ -264,8 +264,8 @@
while ((nsec = do_read(d, dblk, maxsecs, trbuf)) 0) {
#ifdef DISK_DEBUG
if (!cold)
- printf(read error dblk %d-%d\n, (int)dblk,
- (int)(dblk + maxsecs - 1));
+ printf(read error dblk %lld-%lld\n,
+ dblk, (dblk + maxsecs - 1));
#endif
if (--retries = 0)
continue;
CVS commit: src/sys/arch/i386/stand/boot
Module Name:src
Committed By: jakllsch
Date: Fri Dec 24 20:40:42 UTC 2010
Modified Files:
src/sys/arch/i386/stand/boot: devopen.c devopen.h
Log Message:
Sprinkle daddr_t.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/stand/boot/devopen.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/stand/boot/devopen.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/i386/stand/boot/devopen.c
diff -u src/sys/arch/i386/stand/boot/devopen.c:1.7 src/sys/arch/i386/stand/boot/devopen.c:1.8
--- src/sys/arch/i386/stand/boot/devopen.c:1.7 Fri May 2 15:26:38 2008
+++ src/sys/arch/i386/stand/boot/devopen.c Fri Dec 24 20:40:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.7 2008/05/02 15:26:38 ad Exp $ */
+/* $NetBSD: devopen.c,v 1.8 2010/12/24 20:40:42 jakllsch Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
}
void
-bios2dev(int biosdev, u_int sector, char **devname, int *unit, int *partition)
+bios2dev(int biosdev, daddr_t sector, char **devname, int *unit, int *partition)
{
/* set default */
Index: src/sys/arch/i386/stand/boot/devopen.h
diff -u src/sys/arch/i386/stand/boot/devopen.h:1.3 src/sys/arch/i386/stand/boot/devopen.h:1.4
--- src/sys/arch/i386/stand/boot/devopen.h:1.3 Sun Dec 11 12:17:47 2005
+++ src/sys/arch/i386/stand/boot/devopen.h Fri Dec 24 20:40:42 2010
@@ -1,5 +1,5 @@
-/* $NetBSD: devopen.h,v 1.3 2005/12/11 12:17:47 christos Exp $ */
+/* $NetBSD: devopen.h,v 1.4 2010/12/24 20:40:42 jakllsch Exp $ */
extern int boot_biosdev;
-void bios2dev(int, u_int, char **, int *, int *);
+void bios2dev(int, daddr_t, char **, int *, int *);
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jmcneill
Date: Fri Dec 24 20:49:55 UTC 2010
Modified Files:
src/sys/dev/usb: uaudio.c
Log Message:
fill audio_info.config with the string usb:cookie instead of uaudio,
where cookie comes from the usbd device handle:
$ audioctl -d /dev/sound1 config
config=usb:0009
this can be used by software to find the audio device(s) associated with a
USB video capture device
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/usb/uaudio.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/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.118 src/sys/dev/usb/uaudio.c:1.119
--- src/sys/dev/usb/uaudio.c:1.118 Wed Nov 3 22:34:23 2010
+++ src/sys/dev/usb/uaudio.c Fri Dec 24 20:49:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.118 2010/11/03 22:34:23 dyoung Exp $ */
+/* $NetBSD: uaudio.c,v 1.119 2010/12/24 20:49:55 jmcneill Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uaudio.c,v 1.118 2010/11/03 22:34:23 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: uaudio.c,v 1.119 2010/12/24 20:49:55 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -52,6 +52,7 @@
#include sys/vnode.h
#include sys/poll.h
#include sys/module.h
+#include sys/bus.h
#include sys/audioio.h
#include dev/audio_if.h
@@ -61,6 +62,7 @@
#include dev/usb/usb.h
#include dev/usb/usbdi.h
+#include dev/usb/usbdivar.h
#include dev/usb/usbdi_util.h
#include dev/usb/usb_quirks.h
@@ -179,6 +181,7 @@
struct audio_encoding_set *sc_encodings;
u_int sc_channel_config;
char sc_dying;
+ struct audio_device sc_adev;
};
struct terminal_list {
@@ -349,12 +352,6 @@
NULL,
};
-Static struct audio_device uaudio_device = {
- USB audio,
- ,
- uaudio
-};
-
int uaudio_match(device_t, cfdata_t, void *);
void uaudio_attach(device_t, device_t, void *);
int uaudio_detach(device_t, int);
@@ -395,6 +392,11 @@
sc-sc_dev = self;
sc-sc_udev = uaa-device;
+ strlcpy(sc-sc_adev.name, USB audio, sizeof(sc-sc_adev.name));
+ strlcpy(sc-sc_adev.version, , sizeof(sc-sc_adev.version));
+ snprintf(sc-sc_adev.config, sizeof(sc-sc_adev.config), usb:%08x,
+ sc-sc_udev-cookie.cookie);
+
aprint_naive(\n);
aprint_normal(\n);
@@ -2226,7 +2228,7 @@
if (sc-sc_dying)
return EIO;
- *retp = uaudio_device;
+ *retp = sc-sc_adev;
return 0;
}
CVS commit: src/sys/dev
Module Name:src Committed By: jmcneill Date: Fri Dec 24 20:54:29 UTC 2010 Modified Files: src/sys/dev: video.c video_if.h src/sys/dev/usb: pseye.c uvideo.c Log Message: VIDIOC_QUERYCAP changes: - use driver name instead of device instance name in 'driver' field - add 'get_businfo' callback to fill in 'bus_info' field instead of hard-coding USB - use the kernel version for the 'version' field instead of 1 - adapt pseye and uvideo drivers to changes in struct video_hw_if To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/video.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/video_if.h cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/pseye.c cvs rdiff -u -r1.32 -r1.33 src/sys/dev/usb/uvideo.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/video.c diff -u src/sys/dev/video.c:1.24 src/sys/dev/video.c:1.25 --- src/sys/dev/video.c:1.24 Tue Dec 14 03:25:16 2010 +++ src/sys/dev/video.c Fri Dec 24 20:54:28 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: video.c,v 1.24 2010/12/14 03:25:16 jmcneill Exp $ */ +/* $NetBSD: video.c,v 1.25 2010/12/24 20:54:28 jmcneill Exp $ */ /* * Copyright (c) 2008 Patrick Mahoney p...@polycrystal.org @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: video.c,v 1.24 2010/12/14 03:25:16 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: video.c,v 1.25 2010/12/24 20:54:28 jmcneill Exp $); #include video.h #if NVIDEO 0 @@ -71,7 +71,10 @@ #define PAGE_ALIGN(a) (((a) + PAGE_SIZE - 1) ~(PAGE_SIZE - 1)) -#define VIDEO_DRIVER_VERSION 1 +#define VIDEO_DRIVER_VERSION\ + (((__NetBSD_Version__ / 1) 16) | \ + ((__NetBSD_Version__ / 100 % 100) 8) | \ + (__NetBSD_Version__ / 100 % 100)) /* TODO: move to sys/intr.h */ #define IPL_VIDEO IPL_VM @@ -1844,12 +1847,13 @@ case VIDIOC_QUERYCAP: cap = data; memset(cap, 0, sizeof(*cap)); - strlcpy(cap-driver, device_xname(sc-hw_dev), + strlcpy(cap-driver, + device_cfdriver(sc-hw_dev)-cd_name, sizeof(cap-driver)); strlcpy(cap-card, hw-get_devname(sc-hw_softc), sizeof(cap-card)); - /* FIXME: bus_info is wrongly hardcoded to USB */ - strlcpy(cap-bus_info, USB, sizeof(cap-bus_info)); + strlcpy(cap-bus_info, hw-get_businfo(sc-hw_softc), + sizeof(cap-bus_info)); cap-version = VIDEO_DRIVER_VERSION; cap-capabilities = 0; if (hw-start_transfer != NULL hw-stop_transfer != NULL) Index: src/sys/dev/video_if.h diff -u src/sys/dev/video_if.h:1.6 src/sys/dev/video_if.h:1.7 --- src/sys/dev/video_if.h:1.6 Tue Dec 14 03:25:16 2010 +++ src/sys/dev/video_if.h Fri Dec 24 20:54:28 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: video_if.h,v 1.6 2010/12/14 03:25:16 jmcneill Exp $ */ +/* $NetBSD: video_if.h,v 1.7 2010/12/24 20:54:28 jmcneill Exp $ */ /* * Copyright (c) 2008 Patrick Mahoney p...@polycrystal.org @@ -454,6 +454,7 @@ void (*close)(void *); /* close hardware */ const char * (*get_devname)(void *); + const char * (*get_businfo)(void *); int (*enum_format)(void *, uint32_t, struct video_format *); int (*get_format)(void *, struct video_format *); Index: src/sys/dev/usb/pseye.c diff -u src/sys/dev/usb/pseye.c:1.18 src/sys/dev/usb/pseye.c:1.19 --- src/sys/dev/usb/pseye.c:1.18 Sat Nov 13 13:52:12 2010 +++ src/sys/dev/usb/pseye.c Fri Dec 24 20:54:28 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pseye.c,v 1.18 2010/11/13 13:52:12 uebayasi Exp $ */ +/* $NetBSD: pseye.c,v 1.19 2010/12/24 20:54:28 jmcneill Exp $ */ /*- * Copyright (c) 2008 Jared D. McNeill jmcne...@invisible.ca @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pseye.c,v 1.18 2010/11/13 13:52:12 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: pseye.c,v 1.19 2010/12/24 20:54:28 jmcneill Exp $); #include sys/param.h #include sys/systm.h @@ -54,6 +54,7 @@ #include dev/usb/usb.h #include dev/usb/usbdi.h +#include dev/usb/usbdivar.h #include dev/usb/usbdi_util.h #include dev/usb/usbdevs.h #include dev/usb/uvideoreg.h @@ -97,6 +98,8 @@ int sc_bulkin_bufferlen; char sc_dying; + + char sc_businfo[32]; }; static int pseye_match(device_t, cfdata_t, void *); @@ -126,6 +129,7 @@ static int pseye_open(void *, int); static void pseye_close(void *); static const char * pseye_get_devname(void *); +static const char * pseye_get_businfo(void *); static int pseye_enum_format(void *, uint32_t, struct video_format *); static int pseye_get_format(void *, struct video_format *); @@ -142,6 +146,7 @@ .open = pseye_open, .close = pseye_close, .get_devname = pseye_get_devname, + .get_businfo = pseye_get_businfo, .enum_format = pseye_enum_format, .get_format = pseye_get_format, .set_format = pseye_set_format, @@ -196,6 +201,8 @@ sc-sc_dev = self; sc-sc_udev = dev; sc-sc_iface = uaa-iface; + snprintf(sc-sc_businfo, sizeof(sc-sc_businfo), usb:%08x, + sc-sc_udev-cookie.cookie); sc-sc_bulkin_bufferlen = PSEYE_BULKIN_BUFLEN;
CVS commit: src/sys/lib/libsa
Module Name:src Committed By: christos Date: Fri Dec 24 23:12:29 UTC 2010 Modified Files: src/sys/lib/libsa: stand.h Log Message: panic takes a printf format too. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/lib/libsa/stand.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/lib/libsa/stand.h diff -u src/sys/lib/libsa/stand.h:1.69 src/sys/lib/libsa/stand.h:1.70 --- src/sys/lib/libsa/stand.h:1.69 Thu Mar 19 06:20:54 2009 +++ src/sys/lib/libsa/stand.h Fri Dec 24 18:12:28 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: stand.h,v 1.69 2009/03/19 10:20:54 tsutsui Exp $ */ +/* $NetBSD: stand.h,v 1.70 2010/12/24 23:12:28 christos Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -238,7 +238,8 @@ int getfile(char *prompt, int mode); char *strerror(int); __dead void exit(int); -__dead void panic(const char *, ...); +__dead void panic(const char *, ...) +__attribute__((__format__(__printf__, 1, 2))); __dead void _rtt(void); void *memcpy(void *, const void *, size_t); void *memmove(void *, const void *, size_t);
CVS commit: src/external/bsd/byacc/bin
Module Name:src
Committed By: christos
Date: Fri Dec 24 23:27:14 UTC 2010
Modified Files:
src/external/bsd/byacc/bin: yacc.1
Log Message:
update for new yacc.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/byacc/bin/yacc.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/byacc/bin/yacc.1
diff -u src/external/bsd/byacc/bin/yacc.1:1.1 src/external/bsd/byacc/bin/yacc.1:1.2
--- src/external/bsd/byacc/bin/yacc.1:1.1 Wed Oct 28 20:56:35 2009
+++ src/external/bsd/byacc/bin/yacc.1 Fri Dec 24 18:27:14 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: yacc.1,v 1.1 2009/10/29 00:56:35 christos Exp $
+.\ $NetBSD: yacc.1,v 1.2 2010/12/24 23:27:14 christos Exp $
.\
.\ Copyright (c) 1989, 1990 The Regents of the University of California.
.\ All rights reserved.
@@ -31,9 +31,9 @@
.\ SUCH DAMAGE.
.\
.\ from: @(#)yacc.1 5.7 (Berkeley) 7/30/91
-.\ $NetBSD: yacc.1,v 1.1 2009/10/29 00:56:35 christos Exp $
+.\ $NetBSD: yacc.1,v 1.2 2010/12/24 23:27:14 christos Exp $
.\
-.Dd October 29, 2009
+.Dd December 23, 2010
.Dt YACC 1
.Os
.Sh NAME
@@ -43,7 +43,7 @@
parser generator
.Sh SYNOPSIS
.Nm
-.Op Fl dglrtv
+.Op Fl dglPrtVv
.Op Fl b Ar prefix
.Op Fl o Ar outputfile
.Op Fl p Ar symbol_prefix
@@ -53,7 +53,7 @@
reads the grammar specification in the file
.Ar filename
and generates an
-.Tn LR(1)
+.Tn LALR(1)
parser for it.
The parsers consist of a set of
.Tn LALR(1)
@@ -82,8 +82,9 @@
.It Fl g
The
.Fl g
-option causes a graphical description of the generated LALR(1) parser to
-be written to the file
+option causes a graphical description of the generated
+.Tn LALR(1)
+parser to be written to the file
.Pa y.dot
in graphviz format, ready to be processed by
.Xr dot 1 .
@@ -106,6 +107,14 @@
.Fl o
option specifies an explicit output file name should be used instead
of the default.
+.It Fl P
+The
+.Fl P
+options instructs
+.Nm
+to create a reentrant parser, like
+.Dq %pure-parser
+does.
.It Fl p Ar symbol_prefix
The
.Fl p
@@ -130,6 +139,10 @@
option changes the preprocessor directives generated by
.Nm
so that debugging statements will be incorporated in the compiled code.
+.It Fl V
+The
+.Fl V
+option prints the version number to the standard output.
.It Fl v
The
.Fl v
@@ -137,6 +150,47 @@
be written to the file
.Pa y.output .
.El
+.Sh EXTENSIONS
+.Nm
+provides some extensions for compatibility with
+.Xr bison 1
+and other implementations
+of
+.Nm :
+.Pp
+.Bl -tag -width %expect-rr number -compact
+.It Dv %expect Ar number
+Tell
+.Nm
+the expected number of shift/reduce conflicts.
+That makes it only report the number if it differs.
+.It Dv %expect-rr Ar number
+Tell
+.Nm
+the expected number of reduce/reduce conflicts.
+That makes it only report the number if it differs.
+This is (unlike
+.Xr bison 1 )
+allowable in
+.Tn LALR(1)
+parsers.
+.It Dv %lex-param Ar { Ar argument-declaration Ar }
+By default, the lexer accepts no parameters, e.g.,
+.Fn yylex .
+Use this directive to add parameter declarations for your customized lexer.
+.It Dv %parse-param Ar { Ar Iargument-declaration Ar }
+By default, the parser accepts no parameters, e.g.,
+.Fn yyparse .
+Use this directive to add parameter declarations for your customized parser.
+.It Dv %pure-parser
+Most variables (other than
+.Fa yydebug
+and
+.Fa yynerrs )
+are allocated on the stack within
+.Fn yyparse ,
+making the parser reasonably reentrant.
+.El
.Sh ENVIRONMENT
The following environment variable is referenced by
.Nm :
CVS commit: src/external/bsd/byacc/bin
Module Name:src
Committed By: christos
Date: Fri Dec 24 23:28:14 UTC 2010
Modified Files:
src/external/bsd/byacc/bin: yacc.1
Log Message:
remove typo.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/bin/yacc.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/byacc/bin/yacc.1
diff -u src/external/bsd/byacc/bin/yacc.1:1.2 src/external/bsd/byacc/bin/yacc.1:1.3
--- src/external/bsd/byacc/bin/yacc.1:1.2 Fri Dec 24 18:27:14 2010
+++ src/external/bsd/byacc/bin/yacc.1 Fri Dec 24 18:28:14 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: yacc.1,v 1.2 2010/12/24 23:27:14 christos Exp $
+.\ $NetBSD: yacc.1,v 1.3 2010/12/24 23:28:14 christos Exp $
.\
.\ Copyright (c) 1989, 1990 The Regents of the University of California.
.\ All rights reserved.
@@ -31,7 +31,7 @@
.\ SUCH DAMAGE.
.\
.\ from: @(#)yacc.1 5.7 (Berkeley) 7/30/91
-.\ $NetBSD: yacc.1,v 1.2 2010/12/24 23:27:14 christos Exp $
+.\ $NetBSD: yacc.1,v 1.3 2010/12/24 23:28:14 christos Exp $
.\
.Dd December 23, 2010
.Dt YACC 1
@@ -178,7 +178,7 @@
By default, the lexer accepts no parameters, e.g.,
.Fn yylex .
Use this directive to add parameter declarations for your customized lexer.
-.It Dv %parse-param Ar { Ar Iargument-declaration Ar }
+.It Dv %parse-param Ar { Ar argument-declaration Ar }
By default, the parser accepts no parameters, e.g.,
.Fn yyparse .
Use this directive to add parameter declarations for your customized parser.
CVS commit: src/usr.bin/vmstat
Module Name:src Committed By: enami Date: Fri Dec 24 23:39:19 UTC 2010 Modified Files: src/usr.bin/vmstat: vmstat.c Log Message: We still need to update ouvmexp to output the differene from previous iteration. To generate a diff of this commit: cvs rdiff -u -r1.171 -r1.172 src/usr.bin/vmstat/vmstat.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/vmstat/vmstat.c diff -u src/usr.bin/vmstat/vmstat.c:1.171 src/usr.bin/vmstat/vmstat.c:1.172 --- src/usr.bin/vmstat/vmstat.c:1.171 Mon Dec 20 04:25:03 2010 +++ src/usr.bin/vmstat/vmstat.c Fri Dec 24 23:39:19 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: vmstat.c,v 1.171 2010/12/20 04:25:03 christos Exp $ */ +/* $NetBSD: vmstat.c,v 1.172 2010/12/24 23:39:19 enami Exp $ */ /*- * Copyright (c) 1998, 2000, 2001, 2007 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ #if 0 static char sccsid[] = @(#)vmstat.c 8.2 (Berkeley) 3/1/95; #else -__RCSID($NetBSD: vmstat.c,v 1.171 2010/12/20 04:25:03 christos Exp $); +__RCSID($NetBSD: vmstat.c,v 1.172 2010/12/24 23:39:19 enami Exp $); #endif #endif /* not lint */ @@ -736,6 +736,7 @@ (void)fflush(stdout); if (reps = 0 --reps = 0) break; + ouvmexp = uvmexp; ocpucounter = cpucounter; uptime = interval-tv_sec; /*
CVS commit: src
Module Name:src Committed By: pgoyette Date: Sat Dec 25 01:04:27 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi src/tests/lib/libc/gen: Makefile Added Files: src/tests/lib/libc/gen: t_siginfo.c Log Message: Move the siginfo tests from regress to atf. While here, add a new test for PR/43655. XXX The sigchild_dump test currently fails when execute under atf-run. XXX It does not fail when executed directly from the shell, so there's XXX something in atf that prevents the child process from dumping. To generate a diff of this commit: cvs rdiff -u -r1.188 -r1.189 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/gen/Makefile cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/gen/t_siginfo.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.188 src/distrib/sets/lists/tests/mi:1.189 --- src/distrib/sets/lists/tests/mi:1.188 Fri Dec 24 12:41:42 2010 +++ src/distrib/sets/lists/tests/mi Sat Dec 25 01:04:27 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.188 2010/12/24 12:41:42 skrll Exp $ +# $NetBSD: mi,v 1.189 2010/12/25 01:04:27 pgoyette Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -321,6 +321,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/gen/t_basedirname.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_glob_star.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_syslog_pthread.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/gen/t_siginfo.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/hashtests-lib-debug ./usr/libdata/debug/usr/tests/lib/libc/hash/t_sha2.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stdiotests-lib-debug @@ -1541,6 +1542,7 @@ ./usr/tests/lib/libc/gen/t_basedirname tests-lib-tests atf ./usr/tests/lib/libc/gen/t_glob_star tests-lib-tests atf ./usr/tests/lib/libc/gen/t_syslog_pthread tests-lib-tests atf +./usr/tests/lib/libc/gen/t_siginfo tests-lib-tests atf ./usr/tests/lib/libc/hash tests-lib-tests ./usr/tests/lib/libc/hash/Atffile tests-lib-tests atf ./usr/tests/lib/libc/hash/t_sha2 tests-lib-tests atf Index: src/tests/lib/libc/gen/Makefile diff -u src/tests/lib/libc/gen/Makefile:1.3 src/tests/lib/libc/gen/Makefile:1.4 --- src/tests/lib/libc/gen/Makefile:1.3 Wed Dec 22 23:45:44 2010 +++ src/tests/lib/libc/gen/Makefile Sat Dec 25 01:04:26 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2010/12/22 23:45:44 pgoyette Exp $ +# $NetBSD: Makefile,v 1.4 2010/12/25 01:04:26 pgoyette Exp $ .include bsd.own.mk @@ -7,6 +7,7 @@ TESTS_C+= t_glob_star TESTS_C+= t_syslog_pthread TESTS_C+= t_basedirname +TESTS_C+= t_siginfo LDADD.t_syslog_pthread+=-lpthread Added files: Index: src/tests/lib/libc/gen/t_siginfo.c diff -u /dev/null src/tests/lib/libc/gen/t_siginfo.c:1.1 --- /dev/null Sat Dec 25 01:04:27 2010 +++ src/tests/lib/libc/gen/t_siginfo.c Sat Dec 25 01:04:26 2010 @@ -0,0 +1,398 @@ +/* $NetBSD */ + +/*- + * 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 + * 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 atf-c.h + +#include sys/resource.h +#include sys/time.h +#include sys/ucontext.h +#include sys/wait.h + +#include assert.h +#include signal.h +#include stdio.h +#include stdlib.h +#include unistd.h + +#ifndef __vax__ +#include ieeefp.h +#endif + +/* for sigchild */ +pid_t child; +int code; +int status; + +/* for sigfpe */ +sig_atomic_t fltdiv_signalled = 0; +sig_atomic_t
CVS commit: src/regress/lib/libc/siginfo
Module Name:src Committed By: pgoyette Date: Sat Dec 25 01:08:38 UTC 2010 Removed Files: src/regress/lib/libc/siginfo: Makefile src/regress/lib/libc/siginfo/sigalrm: Makefile sigalrm.c src/regress/lib/libc/siginfo/sigchld: Makefile sigchld.c src/regress/lib/libc/siginfo/sigfpe: Makefile sigfpe.c src/regress/lib/libc/siginfo/sigsegv: Makefile sigsegv.c Log Message: The siginfo tests have migrated to atf in src/tests/lib/libc/gen/ To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/regress/lib/libc/siginfo/Makefile cvs rdiff -u -r1.1 -r0 src/regress/lib/libc/siginfo/sigalrm/Makefile cvs rdiff -u -r1.6 -r0 src/regress/lib/libc/siginfo/sigalrm/sigalrm.c cvs rdiff -u -r1.1 -r0 src/regress/lib/libc/siginfo/sigchld/Makefile cvs rdiff -u -r1.7 -r0 src/regress/lib/libc/siginfo/sigchld/sigchld.c cvs rdiff -u -r1.1 -r0 src/regress/lib/libc/siginfo/sigfpe/Makefile cvs rdiff -u -r1.2 -r0 src/regress/lib/libc/siginfo/sigfpe/sigfpe.c cvs rdiff -u -r1.1 -r0 src/regress/lib/libc/siginfo/sigsegv/Makefile cvs rdiff -u -r1.5 -r0 src/regress/lib/libc/siginfo/sigsegv/sigsegv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/lib/libsa
Module Name:src Committed By: jakllsch Date: Sat Dec 25 01:08:44 UTC 2010 Modified Files: src/sys/lib/libsa: alloc.c Log Message: Correct recently exposed printf format problem. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/lib/libsa/alloc.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/lib/libsa/alloc.c diff -u src/sys/lib/libsa/alloc.c:1.23 src/sys/lib/libsa/alloc.c:1.24 --- src/sys/lib/libsa/alloc.c:1.23 Sun Dec 2 04:59:24 2007 +++ src/sys/lib/libsa/alloc.c Sat Dec 25 01:08:44 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: alloc.c,v 1.23 2007/12/02 04:59:24 tsutsui Exp $ */ +/* $NetBSD: alloc.c,v 1.24 2010/12/25 01:08:44 jakllsch Exp $ */ /* * Copyright (c) 1993 @@ -214,7 +214,7 @@ top += ALIGN(sizeof(unsigned int)) + ALIGN(size); #ifdef HEAP_LIMIT if (top (char *)HEAP_LIMIT) - panic(heap full (0x%lx+%zu), help, size); + panic(heap full (%p+%zu), help, size); #endif *(unsigned int *)(void *)help = (unsigned int)ALIGN(size); #ifdef ALLOC_TRACE
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src
Committed By: jakllsch
Date: Sat Dec 25 01:19:34 UTC 2010
Modified Files:
src/sys/arch/i386/stand/lib: biosdisk.c biosdisk_ll.c
bootinfo_biosgeom.c
Log Message:
Use printf format macros for long longs.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/i386/stand/lib/biosdisk.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/i386/stand/lib/biosdisk_ll.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/i386/stand/lib/bootinfo_biosgeom.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/i386/stand/lib/biosdisk.c
diff -u src/sys/arch/i386/stand/lib/biosdisk.c:1.32 src/sys/arch/i386/stand/lib/biosdisk.c:1.33
--- src/sys/arch/i386/stand/lib/biosdisk.c:1.32 Fri Dec 24 20:36:51 2010
+++ src/sys/arch/i386/stand/lib/biosdisk.c Sat Dec 25 01:19:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk.c,v 1.32 2010/12/24 20:36:51 jakllsch Exp $ */
+/* $NetBSD: biosdisk.c,v 1.33 2010/12/25 01:19:33 jakllsch Exp $ */
/*
* Copyright (c) 1996, 1998
@@ -178,7 +178,7 @@
lp = (struct disklabel *) (d-buf + LABELOFFSET);
if (lp-d_magic != DISKMAGIC || dkcksum(lp)) {
#ifdef DISK_DEBUG
- printf(warning: no disklabel in sector %lld\n, sector);
+ printf(warning: no disklabel in sector %PRId64\n, sector);
#endif
return -1;
}
@@ -234,7 +234,7 @@
continue;
sector = this_ext + mbr[i].mbrp_start;
#ifdef DISK_DEBUG
- printf(ptn type %d in sector %lld\n, typ, sector);
+ printf(ptn type %d in sector %PRId64\n, typ, sector);
#endif
if (typ == MBR_PTYPE_NETBSD) {
error = check_label(d, sector);
@@ -334,10 +334,10 @@
printf( size );
size = ed.totsec * ed.sbytes;
if (size = (10ULL * 1024 * 1024 * 1024))
- printf(%llu GB,
+ printf(%PRIu64 GB,
size / (1024 * 1024 * 1024));
else
- printf(%llu MB,
+ printf(%PRIu64 MB,
size / (1024 * 1024));
}
printf(\n);
@@ -386,7 +386,7 @@
int partition = 0;
struct disklabel *lp;
#ifdef DISK_DEBUG
- printf(looking for partition device %x, sector %lld\n, biosdev, sector);
+ printf(looking for partition device %x, sector %PRId64\n, biosdev, sector);
#endif
/* Look for netbsd partition that is the dos boot one */
Index: src/sys/arch/i386/stand/lib/biosdisk_ll.c
diff -u src/sys/arch/i386/stand/lib/biosdisk_ll.c:1.27 src/sys/arch/i386/stand/lib/biosdisk_ll.c:1.28
--- src/sys/arch/i386/stand/lib/biosdisk_ll.c:1.27 Fri Dec 24 20:36:51 2010
+++ src/sys/arch/i386/stand/lib/biosdisk_ll.c Sat Dec 25 01:19:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk_ll.c,v 1.27 2010/12/24 20:36:51 jakllsch Exp $ */
+/* $NetBSD: biosdisk_ll.c,v 1.28 2010/12/25 01:19:33 jakllsch Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -264,7 +264,7 @@
while ((nsec = do_read(d, dblk, maxsecs, trbuf)) 0) {
#ifdef DISK_DEBUG
if (!cold)
- printf(read error dblk %lld-%lld\n,
+ printf(read error dblk %PRId64-%PRId64\n,
dblk, (dblk + maxsecs - 1));
#endif
if (--retries = 0)
Index: src/sys/arch/i386/stand/lib/bootinfo_biosgeom.c
diff -u src/sys/arch/i386/stand/lib/bootinfo_biosgeom.c:1.20 src/sys/arch/i386/stand/lib/bootinfo_biosgeom.c:1.21
--- src/sys/arch/i386/stand/lib/bootinfo_biosgeom.c:1.20 Fri Nov 20 19:25:37 2009
+++ src/sys/arch/i386/stand/lib/bootinfo_biosgeom.c Sat Dec 25 01:19:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo_biosgeom.c,v 1.20 2009/11/20 19:25:37 dsl Exp $ */
+/* $NetBSD: bootinfo_biosgeom.c,v 1.21 2010/12/25 01:19:33 jakllsch Exp $ */
/*
* Copyright (c) 1997
@@ -99,7 +99,7 @@
#ifdef GEOM_DEBUG
printf(#%d: %x: C %d H %d S %d\n, nvalid,
d.dev, d.cyl, d.head, d.sec);
- printf( sz %d fl %x cyl %d head %d sec %d totsec %lld sbytes %d\n,
+ printf( sz %d fl %x cyl %d head %d sec %d totsec %PRId64 sbytes %d\n,
ed.size, ed.flags, ed.cyl, ed.head, ed.sec,
ed.totsec, ed.sbytes);
#endif
CVS commit: src/regress/lib/libc
Module Name:src
Committed By: pgoyette
Date: Sat Dec 25 01:20:11 UTC 2010
Modified Files:
src/regress/lib/libc: Makefile
Log Message:
Don't descend into siginfo - it's not there any more
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/regress/lib/libc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/regress/lib/libc/Makefile
diff -u src/regress/lib/libc/Makefile:1.61 src/regress/lib/libc/Makefile:1.62
--- src/regress/lib/libc/Makefile:1.61 Thu Dec 23 15:32:03 2010
+++ src/regress/lib/libc/Makefile Sat Dec 25 01:20:11 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2010/12/23 15:32:03 pgoyette Exp $
+# $NetBSD: Makefile,v 1.62 2010/12/25 01:20:11 pgoyette Exp $
SUBDIR+= _setjmp atexit citrus clone context convfp db \
divrem gen gdtoa getaddrinfo hsearch inet int_fmtio locale md5sha \
@@ -18,14 +18,6 @@
SUBDIR+= ldexp
.endif
-.if !make(obj) !make(cleandir)
-HAVE_SIGINFO != if (echo \#include signal.h echo SA_SIGINFO) | ${CC} -E -I${DESTDIR}/usr/include - | grep -sq 0x0040; then echo yes; else echo no; fi
-.endif
-
-.if make(obj) || make(cleandir) || (${HAVE_SIGINFO} == yes)
-SUBDIR+= siginfo
-.endif
-
.if exists(arch/${MACHINE_ARCH})
SUBDIR+= arch/${MACHINE_ARCH}
.endif
CVS commit: src/tests/lib/libc/gen
Module Name:src
Committed By: pgoyette
Date: Sat Dec 25 01:22:02 UTC 2010
Modified Files:
src/tests/lib/libc/gen: Makefile
Log Message:
Don't include the siginfo tests unless we actually have siginfo ability!
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/gen/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/gen/Makefile
diff -u src/tests/lib/libc/gen/Makefile:1.4 src/tests/lib/libc/gen/Makefile:1.5
--- src/tests/lib/libc/gen/Makefile:1.4 Sat Dec 25 01:04:26 2010
+++ src/tests/lib/libc/gen/Makefile Sat Dec 25 01:22:02 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/12/25 01:04:26 pgoyette Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/25 01:22:02 pgoyette Exp $
.include bsd.own.mk
@@ -9,6 +9,14 @@
TESTS_C+= t_basedirname
TESTS_C+= t_siginfo
+.if !make(obj) !make(cleandir)
+HAVE_SIGINFO != if (echo \#include signal.h echo SA_SIGINFO) | ${CC} -E -I${DESTDIR}/usr/include - | grep -sq 0x0040; then echo yes; else echo no; fi
+.endif
+
+.if make(obj) || make(cleandir) || (${HAVE_SIGINFO} == yes)
+TESTS_C+= t_siginfo
+.endif
+
LDADD.t_syslog_pthread+=-lpthread
.include bsd.test.mk
CVS commit: src/tests/lib/libc/gen
Module Name:src
Committed By: pgoyette
Date: Sat Dec 25 01:25:37 UTC 2010
Modified Files:
src/tests/lib/libc/gen: Makefile
Log Message:
Correctly added the conditional part, but now need to remove the original
unconditional part.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/gen/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/gen/Makefile
diff -u src/tests/lib/libc/gen/Makefile:1.5 src/tests/lib/libc/gen/Makefile:1.6
--- src/tests/lib/libc/gen/Makefile:1.5 Sat Dec 25 01:22:02 2010
+++ src/tests/lib/libc/gen/Makefile Sat Dec 25 01:25:37 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/12/25 01:22:02 pgoyette Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/25 01:25:37 pgoyette Exp $
.include bsd.own.mk
@@ -7,7 +7,6 @@
TESTS_C+= t_glob_star
TESTS_C+= t_syslog_pthread
TESTS_C+= t_basedirname
-TESTS_C+= t_siginfo
.if !make(obj) !make(cleandir)
HAVE_SIGINFO != if (echo \#include signal.h echo SA_SIGINFO) | ${CC} -E -I${DESTDIR}/usr/include - | grep -sq 0x0040; then echo yes; else echo no; fi
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Sat Dec 25 03:29:08 UTC 2010 Modified Files: src/sys/dev/pci: r128fb.c Log Message: there is no R128_LITTLE_ENDIAN_EN flag, just lack of R128_HOST_BIG_ENDIAN_EN Someone(tm) needs to test this on little endian hw To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/r128fb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/r128fb.c diff -u src/sys/dev/pci/r128fb.c:1.17 src/sys/dev/pci/r128fb.c:1.18 --- src/sys/dev/pci/r128fb.c:1.17 Thu Dec 16 06:45:50 2010 +++ src/sys/dev/pci/r128fb.c Sat Dec 25 03:29:08 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: r128fb.c,v 1.17 2010/12/16 06:45:50 cegger Exp $ */ +/* $NetBSD: r128fb.c,v 1.18 2010/12/25 03:29:08 macallan Exp $ */ /* * Copyright (c) 2007 Michael Lorenz @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: r128fb.c,v 1.17 2010/12/16 06:45:50 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: r128fb.c,v 1.18 2010/12/25 03:29:08 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -623,8 +623,7 @@ bus_space_write_4(sc-sc_memt, sc-sc_regh, R128_DP_DATATYPE, R128_HOST_BIG_ENDIAN_EN); #else - bus_space_write_4(sc-sc_memt, sc-sc_regh, R128_DP_DATATYPE, - R128_HOST_LITTLE_ENDIAN_EN); + bus_space_write_4(sc-sc_memt, sc-sc_regh, R128_DP_DATATYPE, 0); #endif r128fb_wait(sc, 5);
CVS commit: src/usr.bin/make
Module Name:src
Committed By: dholland
Date: Sat Dec 25 04:57:07 UTC 2010
Modified Files:
src/usr.bin/make: for.c main.c nonints.h parse.c
Log Message:
Begin cleanup of the make parser: separate out the logic for reading files
from the parsing goo. This will now use mmap for reading if it works and
fall back to read only for pipes and such. Step 1 of a cleanup program
proposed without objection on tech-toolchain.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/usr.bin/make/for.c
cvs rdiff -u -r1.192 -r1.193 src/usr.bin/make/main.c
cvs rdiff -u -r1.61 -r1.62 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.169 -r1.170 src/usr.bin/make/parse.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/for.c
diff -u src/usr.bin/make/for.c:1.47 src/usr.bin/make/for.c:1.48
--- src/usr.bin/make/for.c:1.47 Sat Feb 6 20:37:13 2010
+++ src/usr.bin/make/for.c Sat Dec 25 04:57:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: for.c,v 1.47 2010/02/06 20:37:13 dholland Exp $ */
+/* $NetBSD: for.c,v 1.48 2010/12/25 04:57:07 dholland Exp $ */
/*
* Copyright (c) 1992, The Regents of the University of California.
@@ -30,14 +30,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: for.c,v 1.47 2010/02/06 20:37:13 dholland Exp $;
+static char rcsid[] = $NetBSD: for.c,v 1.48 2010/12/25 04:57:07 dholland Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)for.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: for.c,v 1.47 2010/02/06 20:37:13 dholland Exp $);
+__RCSID($NetBSD: for.c,v 1.48 2010/12/25 04:57:07 dholland Exp $);
#endif
#endif /* not lint */
#endif
@@ -366,7 +366,7 @@
}
static char *
-For_Iterate(void *v_arg)
+For_Iterate(void *v_arg, size_t *ret_len)
{
For *arg = v_arg;
int i, len;
@@ -451,6 +451,7 @@
arg-sub_next += strlist_num(arg-vars);
arg-parse_buf = cp;
+*ret_len = strlen(cp);
return cp;
}
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.192 src/usr.bin/make/main.c:1.193
--- src/usr.bin/make/main.c:1.192 Mon Dec 13 01:48:50 2010
+++ src/usr.bin/make/main.c Sat Dec 25 04:57:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.192 2010/12/13 01:48:50 dholland Exp $ */
+/* $NetBSD: main.c,v 1.193 2010/12/25 04:57:07 dholland Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: main.c,v 1.192 2010/12/13 01:48:50 dholland Exp $;
+static char rcsid[] = $NetBSD: main.c,v 1.193 2010/12/25 04:57:07 dholland Exp $;
#else
#include sys/cdefs.h
#ifndef lint
@@ -81,7 +81,7 @@
#if 0
static char sccsid[] = @(#)main.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: main.c,v 1.192 2010/12/13 01:48:50 dholland Exp $);
+__RCSID($NetBSD: main.c,v 1.193 2010/12/25 04:57:07 dholland Exp $);
#endif
#endif /* not lint */
#endif
@@ -1307,7 +1307,7 @@
char *name, *path = bmake_malloc(len);
if (!strcmp(fname, -)) {
- Parse_File((stdin), dup(fileno(stdin)));
+ Parse_File(NULL /*stdin*/, -1);
Var_Set(MAKEFILE, , VAR_GLOBAL, 0);
} else {
/* if we've chdir'd, rebuild the path name */
Index: src/usr.bin/make/nonints.h
diff -u src/usr.bin/make/nonints.h:1.61 src/usr.bin/make/nonints.h:1.62
--- src/usr.bin/make/nonints.h:1.61 Thu Dec 9 22:30:17 2010
+++ src/usr.bin/make/nonints.h Sat Dec 25 04:57:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.61 2010/12/09 22:30:17 sjg Exp $ */
+/* $NetBSD: nonints.h,v 1.62 2010/12/25 04:57:07 dholland Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@@ -136,7 +136,7 @@
void Parse_File(const char *, int);
void Parse_Init(void);
void Parse_End(void);
-void Parse_SetInput(const char *, int, int, char *(*)(void *), void *);
+void Parse_SetInput(const char *, int, int, char *(*)(void *, size_t *), void *);
Lst Parse_MainName(void);
/* str.c */
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.169 src/usr.bin/make/parse.c:1.170
--- src/usr.bin/make/parse.c:1.169 Mon Dec 13 05:01:56 2010
+++ src/usr.bin/make/parse.c Sat Dec 25 04:57:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.169 2010/12/13 05:01:56 dholland Exp $ */
+/* $NetBSD: parse.c,v 1.170 2010/12/25 04:57:07 dholland Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: parse.c,v 1.169 2010/12/13 05:01:56 dholland Exp $;
+static char rcsid[] = $NetBSD: parse.c,v 1.170 2010/12/25 04:57:07 dholland Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)parse.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: parse.c,v 1.169 2010/12/13 05:01:56 dholland Exp $);
+__RCSID($NetBSD: parse.c,v 1.170 2010/12/25 04:57:07 dholland Exp $);
#endif
#endif /* not lint */
#endif
@@ -123,12 +123,19 @@
* Parse_MainName Returns a Lst of the main target to create.
*/
+#include
