CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc
Module Name:src
Committed By: matt
Date: Sat Jan 11 02:45:52 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
Log Message:
Don't pass -Wl,-x to ${CC} since that strips symbols needed by ARM BE.
Let the OBJCOPY strip them.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.17 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.18
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.17 Sat Jan 11 00:30:23 2014
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Sat Jan 11 02:45:52 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/01/11 00:30:23 matt Exp $
+# $NetBSD: Makefile,v 1.18 2014/01/11 02:45:52 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -59,7 +59,7 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.t
${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
${NM} -pg ${.TARGET}.tmp1 | \
${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
- ${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+ ${CC} ${COPTS} -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
.else
@@ -73,7 +73,7 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.t
${COMPILE.S} ${PICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1
${NM} -pg ${.TARGET}.tmp1 | \
${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
- ${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+ ${CC} ${COPTS} -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
.else
CVS commit: src/sys/arch/luna68k/luna68k
Module Name:src
Committed By: tsutsui
Date: Sat Jan 11 01:43:22 UTC 2014
Modified Files:
src/sys/arch/luna68k/luna68k: mainbus.c
Log Message:
Use the same address as LUNA to probe LANCE on LUNA-II.
It looks the device is mapped at both regions.
4.4BSD/luna68k probes it at 0xf100, but UniOS-Mach for LUNA-II
attaches the lance at 0xf000. It is probably because
the UniOS needs to map DS1220 NVRAM (mapped at 0xf104 and
used to store the MAC address) to the different kernel page,
but there is no reason for us to use different addresses.
(Note our bootloader already use the same address for both machines.)
This change will make (forthcoming) booted device check easier.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/luna68k/luna68k/mainbus.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/luna68k/luna68k/mainbus.c
diff -u src/sys/arch/luna68k/luna68k/mainbus.c:1.12 src/sys/arch/luna68k/luna68k/mainbus.c:1.13
--- src/sys/arch/luna68k/luna68k/mainbus.c:1.12 Mon Sep 23 17:11:22 2013
+++ src/sys/arch/luna68k/luna68k/mainbus.c Sat Jan 11 01:43:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.12 2013/09/23 17:11:22 tsutsui Exp $ */
+/* $NetBSD: mainbus.c,v 1.13 2014/01/11 01:43:22 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12 2013/09/23 17:11:22 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.13 2014/01/11 01:43:22 tsutsui Exp $");
#include
#include
@@ -50,7 +50,7 @@ static const struct mainbus_attach_args
static const struct mainbus_attach_args luna2_devs[] = {
{ "clock", 0x4500, -1 }, /* Dallas TimeKeeper */
- { "le", 0xf000, 3 }, /* Am7990 */
+ { "le", 0xf100, 3 }, /* Am7990 */
{ "sio",0x5100, 6 }, /* uPD7201A */
{ "fb", 0xc110, -1 }, /* BrookTree RAMDAC */
{ "spc",0xe100, 2 }, /* internal MB89352 */
CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc
Module Name:src
Committed By: matt
Date: Sat Jan 11 00:30:23 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
Log Message:
Don't use ${LD} -x because it screws up ARM BE.
Use ${OBJCOPY} ${OBJCOPYLIBFLAGS} instead so that $a/$d/$t are preserved.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.16 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.17
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.16 Wed Oct 2 18:25:43 2013
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Sat Jan 11 00:30:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/10/02 18:25:43 christos Exp $
+# $NetBSD: Makefile,v 1.17 2014/01/11 00:30:23 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -63,7 +63,7 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.t
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
.else
- ${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET}
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.tmp2 ${.TARGET}
rm -f ${.TARGET}.tmp2
.endif
rm -f ${.TARGET}.tmp1
@@ -77,7 +77,7 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.t
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
.else
- ${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET}
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.tmp2 ${.TARGET}
rm -f ${.TARGET}.tmp2
.endif
rm -f ${.TARGET}.tmp1
CVS commit: [matt-nb5-mips64] src/lib/csu/common_elf
Module Name:src
Committed By: matt
Date: Sat Jan 11 00:23:41 UTC 2014
Modified Files:
src/lib/csu/common_elf [matt-nb5-mips64]: Makefile.inc
Log Message:
Make sure $a/$t/$d are preserved for ARM BE.
To generate a diff of this commit:
cvs rdiff -u -r1.30.10.1 -r1.30.10.2 src/lib/csu/common_elf/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/csu/common_elf/Makefile.inc
diff -u src/lib/csu/common_elf/Makefile.inc:1.30.10.1 src/lib/csu/common_elf/Makefile.inc:1.30.10.2
--- src/lib/csu/common_elf/Makefile.inc:1.30.10.1 Tue Sep 1 23:09:14 2009
+++ src/lib/csu/common_elf/Makefile.inc Sat Jan 11 00:23:41 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.30.10.1 2009/09/01 23:09:14 matt Exp $
+# $NetBSD: Makefile.inc,v 1.30.10.2 2014/01/11 00:23:41 matt Exp $
.include
@@ -33,23 +33,23 @@ realall: ${OBJS}
crt0.o: crt0.c
${_MKTARGET_COMPILE}
${COMPILE.c} -DCRT0 ${.IMPSRC} -o ${.TARGET}
- ${OBJCOPY} -x ${.TARGET}
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
# dependant on crt0.o to pick up header dependencies
gcrt0.o: ${.CURDIR}/crt0.c crt0.o
${_MKTARGET_COMPILE}
${COMPILE.c} -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
- ${OBJCOPY} -x ${.TARGET}
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
crti.o: crti.c
${_MKTARGET_COMPILE}
${COMPILE.c} ${.IMPSRC} -o ${.TARGET}
- ${OBJCOPY} -X ${.TARGET}
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} -X ${.TARGET}
crtn.o: crtn.c
${_MKTARGET_COMPILE}
${COMPILE.c} ${.IMPSRC} -o ${.TARGET}
- ${OBJCOPY} -X ${.TARGET}
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} -X ${.TARGET}
FILES=${OBJS}
FILESDIR=${LIBDIR}
CVS commit: src/lib/csu/common
Module Name:src
Committed By: matt
Date: Sat Jan 11 00:18:15 UTC 2014
Modified Files:
src/lib/csu/common: Makefile.inc
Log Message:
Using ${LD} -x screws up BE arm. Use ${OBJCOPY} ${OBJCOPYLIBFLAGS} instead
so the $a/$t/$d symbols are preserved.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/lib/csu/common/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/csu/common/Makefile.inc
diff -u src/lib/csu/common/Makefile.inc:1.23 src/lib/csu/common/Makefile.inc:1.24
--- src/lib/csu/common/Makefile.inc:1.23 Sun Nov 17 11:16:09 2013
+++ src/lib/csu/common/Makefile.inc Sat Jan 11 00:18:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.23 2013/11/17 11:16:09 martin Exp $
+# $NetBSD: Makefile.inc,v 1.24 2014/01/11 00:18:15 matt Exp $
.include
@@ -42,7 +42,7 @@ crtbegin.o: crtbegin.c crtbegin.h
${_MKTARGET_COMPILE}
${COMPILE.c} ${CFLAGS.crtbegin.c} ${COMMON_DIR}/crtbegin.c -o ${.TARGET}.o
.endif
- ${LD} -x -r -o ${.TARGET} ${.TARGET}.o
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET}
rm -f ${.TARGET}.o
.if ${MKSTRIPIDENT} != "no"
${OBJCOPY} -R .ident ${.TARGET}
@@ -57,7 +57,7 @@ crtbeginS.o: crtbegin.c crtbegin.h
${_MKTARGET_COMPILE}
${COMPILE.c} ${PICFLAGS} -DSHARED ${COMMON_DIR}/crtbegin.c -o ${.TARGET}.o
.endif
- ${LD} -x -r -o ${.TARGET} ${.TARGET}.o
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET}
rm -f ${.TARGET}.o
.if ${MKSTRIPIDENT} != "no"
${OBJCOPY} -R .ident ${.TARGET}
@@ -66,7 +66,7 @@ crtbeginS.o: crtbegin.c crtbegin.h
crtend.o: crtend.S
${_MKTARGET_COMPILE}
${COMPILE.S} ${ARCHDIR}/crtend.S -o ${.TARGET}.o
- ${LD} -x -r -o ${.TARGET} ${.TARGET}.o
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET}
rm -f ${.TARGET}.o
.if ${MKSTRIPIDENT} != "no"
${OBJCOPY} -R .ident ${.TARGET}
@@ -82,8 +82,9 @@ crt0.o: crt0.S crt0-common.c
${_MKTARGET_COMPILE}
${COMPILE.S} ${ARCHDIR}/crt0.S -o ${.TARGET}.S.o
${COMPILE.c} ${MY_PICFLAGS} ${COMMON_DIR}/crt0-common.c -o ${.TARGET}.c.o
- ${LD} -x -r -o ${.TARGET} ${.TARGET}.S.o ${.TARGET}.c.o
- rm -f ${.TARGET}.S.o ${.TARGET}.c.o
+ ${LD} -r -o ${.TARGET}.o ${.TARGET}.S.o ${.TARGET}.c.o
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET}
+ rm -f ${.TARGET}.S.o ${.TARGET}.c.o ${.TARGET}.o
.if ${MKSTRIPIDENT} != "no"
${OBJCOPY} -R .ident ${.TARGET}
.endif
@@ -92,8 +93,9 @@ gcrt0.o: crt0.S crt0-common.c
${_MKTARGET_COMPILE}
${COMPILE.S} ${ARCHDIR}/crt0.S -o ${.TARGET}.S.o
${COMPILE.c} ${MY_PICFLAGS} -DMCRT0 ${COMMON_DIR}/crt0-common.c -o ${.TARGET}.c.o
- ${LD} -x -r -o ${.TARGET} ${.TARGET}.S.o ${.TARGET}.c.o
- rm -f ${.TARGET}.S.o ${.TARGET}.c.o
+ ${LD} -r -o ${.TARGET}.o ${.TARGET}.S.o ${.TARGET}.c.o
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET}
+ rm -f ${.TARGET}.S.o ${.TARGET}.c.o ${.TARGET}.o
.if ${MKSTRIPIDENT} != "no"
${OBJCOPY} -R .ident ${.TARGET}
.endif
@@ -103,7 +105,7 @@ gcrt0.o: crt0.S crt0-common.c
crtfm.o: crtfm.c
${_MKTARGET_COMPILE}
${COMPILE.c} ${.ALLSRC} -o ${.TARGET}.o
- ${LD} -x -r -o ${.TARGET} ${.TARGET}.o
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET}
rm -f ${.TARGET}.o
.endif
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: matt Date: Fri Jan 10 23:52:53 UTC 2014 Modified Files: src/sys/arch/arm/arm: disassem.c Log Message: byte swap the insn on BE8 it's LE in memory but needs to be BE to decode. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/arm/disassem.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/arm/arm/disassem.c diff -u src/sys/arch/arm/arm/disassem.c:1.22 src/sys/arch/arm/arm/disassem.c:1.23 --- src/sys/arch/arm/arm/disassem.c:1.22 Sun Aug 18 16:08:02 2013 +++ src/sys/arch/arm/arm/disassem.c Fri Jan 10 23:52:53 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: disassem.c,v 1.22 2013/08/18 16:08:02 matt Exp $ */ +/* $NetBSD: disassem.c,v 1.23 2014/01/10 23:52:53 matt Exp $ */ /* * Copyright (c) 1996 Mark Brinicombe. @@ -49,7 +49,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.22 2013/08/18 16:08:02 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.23 2014/01/10 23:52:53 matt Exp $"); #include @@ -324,6 +324,9 @@ disasm(const disasm_interface_t *di, vad fmt = 0; matchp = 0; insn = di->di_readword(loc); +#if defined(__ARMEB__) && defined(CPU_ARMV7) + insn = bswap32(insn); +#endif char neonfmt = 'd'; char neonsign = 'u';
CVS commit: src/tests/lib/libc/net
Module Name:src
Committed By: gson
Date: Fri Jan 10 20:38:11 UTC 2014
Modified Files:
src/tests/lib/libc/net: t_hostent.sh
Log Message:
Remove comment that no longer applies.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libc/net/t_hostent.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/net/t_hostent.sh
diff -u src/tests/lib/libc/net/t_hostent.sh:1.7 src/tests/lib/libc/net/t_hostent.sh:1.8
--- src/tests/lib/libc/net/t_hostent.sh:1.7 Fri Jan 10 01:43:55 2014
+++ src/tests/lib/libc/net/t_hostent.sh Fri Jan 10 20:38:11 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_hostent.sh,v 1.7 2014/01/10 01:43:55 christos Exp $
+# $NetBSD: t_hostent.sh,v 1.8 2014/01/10 20:38:11 gson Exp $
#
# Copyright (c) 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -45,9 +45,7 @@ dir="$(atf_get_srcdir)"
res="-r ${dir}/resolv.conf"
# Hijack DNS traffic using a single rump server instance and a DNS
-# server listening on its loopback address. Also hijack file system
-# call to /etc, mapping them to the root file system of the rump
-# server, so that we can control the contents of /etc/resolv.conf.
+# server listening on its loopback address.
start_dns_server() {
export RUMP_SERVER=unix:///tmp/rumpserver
CVS commit: src/sys/rump/kern/lib/libsys_linux
Module Name:src Committed By: njoly Date: Fri Jan 10 20:10:43 UTC 2014 Modified Files: src/sys/rump/kern/lib/libsys_linux: rump_linux_syscall.h rump_linux_syscallargs.h rump_linux_syscalls.c rump_linux_sysent.c Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/sys/rump/kern/lib/libsys_linux/rump_linux_syscall.h cvs rdiff -u -r1.12 -r1.13 \ src/sys/rump/kern/lib/libsys_linux/rump_linux_syscallargs.h \ src/sys/rump/kern/lib/libsys_linux/rump_linux_syscalls.c \ src/sys/rump/kern/lib/libsys_linux/rump_linux_sysent.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/rump/kern/lib/libsys_linux/rump_linux_syscall.h diff -u src/sys/rump/kern/lib/libsys_linux/rump_linux_syscall.h:1.9 src/sys/rump/kern/lib/libsys_linux/rump_linux_syscall.h:1.10 --- src/sys/rump/kern/lib/libsys_linux/rump_linux_syscall.h:1.9 Fri Jan 10 19:45:43 2014 +++ src/sys/rump/kern/lib/libsys_linux/rump_linux_syscall.h Fri Jan 10 20:10:43 2014 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_linux_syscall.h,v 1.9 2014/01/10 19:45:43 njoly Exp $ */ +/* $NetBSD: rump_linux_syscall.h,v 1.10 2014/01/10 20:10:43 njoly Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.11 2014/01/10 19:44:47 njoly Exp + * created from NetBSD: syscalls.master,v 1.12 2014/01/10 20:10:23 njoly Exp */ #ifndef _RUMP_LINUX_SYS_SYSCALL_H_ @@ -243,6 +243,12 @@ /* syscall: "utimes" ret: "int" args: "const char *" "struct linux_timeval *" */ #define RUMP_LINUX_SYS_utimes 420 +/* syscall: "__futimes50" ret: "int" args: "int" "const struct timeval *" */ +#define RUMP_LINUX_SYS___futimes50 423 + +/* syscall: "__lutimes50" ret: "int" args: "const char *" "const struct timeval *" */ +#define RUMP_LINUX_SYS___lutimes50 424 + /* syscall: "ppoll" ret: "int" args: "struct pollfd *" "u_int" "const struct linux_timespec *" "const linux_sigset_t *" */ #define RUMP_LINUX_SYS_ppoll 437 Index: src/sys/rump/kern/lib/libsys_linux/rump_linux_syscallargs.h diff -u src/sys/rump/kern/lib/libsys_linux/rump_linux_syscallargs.h:1.12 src/sys/rump/kern/lib/libsys_linux/rump_linux_syscallargs.h:1.13 --- src/sys/rump/kern/lib/libsys_linux/rump_linux_syscallargs.h:1.12 Fri Jan 10 19:45:43 2014 +++ src/sys/rump/kern/lib/libsys_linux/rump_linux_syscallargs.h Fri Jan 10 20:10:43 2014 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_linux_syscallargs.h,v 1.12 2014/01/10 19:45:43 njoly Exp $ */ +/* $NetBSD: rump_linux_syscallargs.h,v 1.13 2014/01/10 20:10:43 njoly Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.11 2014/01/10 19:44:47 njoly Exp + * created from NetBSD: syscalls.master,v 1.12 2014/01/10 20:10:23 njoly Exp */ #ifndef _RUMP_LINUX_SYS_SYSCALLARGS_H_ @@ -167,6 +167,10 @@ struct linux_sys_select_args; struct linux_sys_utimes_args; +struct sys___futimes50_args; + +struct sys___lutimes50_args; + struct linux_sys_ppoll_args; struct linux_sys_stat64_args; @@ -370,6 +374,10 @@ int linux_sys_select(struct lwp *, const int linux_sys_utimes(struct lwp *, const struct linux_sys_utimes_args *, register_t *); +int sys___futimes50(struct lwp *, const struct sys___futimes50_args *, register_t *); + +int sys___lutimes50(struct lwp *, const struct sys___lutimes50_args *, register_t *); + int linux_sys_ppoll(struct lwp *, const struct linux_sys_ppoll_args *, register_t *); int linux_sys_stat64(struct lwp *, const struct linux_sys_stat64_args *, register_t *); Index: src/sys/rump/kern/lib/libsys_linux/rump_linux_syscalls.c diff -u src/sys/rump/kern/lib/libsys_linux/rump_linux_syscalls.c:1.12 src/sys/rump/kern/lib/libsys_linux/rump_linux_syscalls.c:1.13 --- src/sys/rump/kern/lib/libsys_linux/rump_linux_syscalls.c:1.12 Fri Jan 10 19:45:43 2014 +++ src/sys/rump/kern/lib/libsys_linux/rump_linux_syscalls.c Fri Jan 10 20:10:43 2014 @@ -1,14 +1,14 @@ -/* $NetBSD: rump_linux_syscalls.c,v 1.12 2014/01/10 19:45:43 njoly Exp $ */ +/* $NetBSD: rump_linux_syscalls.c,v 1.13 2014/01/10 20:10:43 njoly Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.11 2014/01/10 19:44:47 njoly Exp + * created from NetBSD: syscalls.master,v 1.12 2014/01/10 20:10:23 njoly Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: rump_linux_syscalls.c,v 1.12 2014/01/10 19:45:43 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump_linux_syscalls.c,v 1.13 2014/01/10 20:10:43 njoly Exp $"); #if defined(_KERNEL_OPT) #include @@ -452,8 +452,8 @@ const char *const rump_linux_syscallname /* 420 */ "utimes", /* 421 */ "#421 (unimplemented adjtime)", /* 422 */ "#422 (unimplemented lfs_segwait)", - /* 423 */ "#423 (unimplemented futimes)", - /* 424 */ "#424 (unimplemented lutimes
CVS commit: src/sys/rump/kern/lib/libsys_linux
Module Name:src
Committed By: njoly
Date: Fri Jan 10 20:10:24 UTC 2014
Modified Files:
src/sys/rump/kern/lib/libsys_linux: syscalls.master
Log Message:
Add NetBSD futimes/lutimes syscalls which does not exists on Linux.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/kern/lib/libsys_linux/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/kern/lib/libsys_linux/syscalls.master
diff -u src/sys/rump/kern/lib/libsys_linux/syscalls.master:1.11 src/sys/rump/kern/lib/libsys_linux/syscalls.master:1.12
--- src/sys/rump/kern/lib/libsys_linux/syscalls.master:1.11 Fri Jan 10 19:44:47 2014
+++ src/sys/rump/kern/lib/libsys_linux/syscalls.master Fri Jan 10 20:10:23 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.11 2014/01/10 19:44:47 njoly Exp $
+ $NetBSD: syscalls.master,v 1.12 2014/01/10 20:10:23 njoly Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -548,8 +548,10 @@
struct linux_timeval *tv); }
421 UNIMPL adjtime
422 UNIMPL lfs_segwait
-423 UNIMPL futimes
-424 UNIMPL lutimes
+423 NOARGS { int|sys|50|futimes(int fd, \
+ const struct timeval *tptr); }
+424 NOARGS { int|sys|50|lutimes(const char *path, \
+ const struct timeval *tptr); }
425 UNIMPL setitimer
426 UNIMPL getitimer
427 UNIMPL clock_gettime
CVS commit: src/sys/rump/kern/lib/libsys_linux
Module Name:src Committed By: njoly Date: Fri Jan 10 19:45:43 UTC 2014 Modified Files: src/sys/rump/kern/lib/libsys_linux: rump_linux_syscall.h rump_linux_syscallargs.h rump_linux_syscalls.c rump_linux_sysent.c Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/sys/rump/kern/lib/libsys_linux/rump_linux_syscall.h cvs rdiff -u -r1.11 -r1.12 \ src/sys/rump/kern/lib/libsys_linux/rump_linux_syscallargs.h \ src/sys/rump/kern/lib/libsys_linux/rump_linux_syscalls.c \ src/sys/rump/kern/lib/libsys_linux/rump_linux_sysent.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/rump/kern/lib/libsys_linux/rump_linux_syscall.h diff -u src/sys/rump/kern/lib/libsys_linux/rump_linux_syscall.h:1.8 src/sys/rump/kern/lib/libsys_linux/rump_linux_syscall.h:1.9 --- src/sys/rump/kern/lib/libsys_linux/rump_linux_syscall.h:1.8 Sat Dec 14 17:35:11 2013 +++ src/sys/rump/kern/lib/libsys_linux/rump_linux_syscall.h Fri Jan 10 19:45:43 2014 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_linux_syscall.h,v 1.8 2013/12/14 17:35:11 njoly Exp $ */ +/* $NetBSD: rump_linux_syscall.h,v 1.9 2014/01/10 19:45:43 njoly Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.10 2013/12/14 17:34:47 njoly Exp + * created from NetBSD: syscalls.master,v 1.11 2014/01/10 19:44:47 njoly Exp */ #ifndef _RUMP_LINUX_SYS_SYSCALL_H_ @@ -21,12 +21,18 @@ /* syscall: "write" ret: "ssize_t" args: "int" "const void *" "size_t" */ #define RUMP_LINUX_SYS_write 4 +/* syscall: "open" ret: "int" args: "const char *" "int" "int" */ +#define RUMP_LINUX_SYS_open 5 + /* syscall: "close" ret: "int" args: "int" */ #define RUMP_LINUX_SYS_close 6 /* syscall: "link" ret: "int" args: "const char *" "const char *" */ #define RUMP_LINUX_SYS_link 9 +/* syscall: "unlink" ret: "int" args: "const char *" */ +#define RUMP_LINUX_SYS_unlink 10 + /* syscall: "chdir" ret: "int" args: "const char *" */ #define RUMP_LINUX_SYS_chdir 12 @@ -51,6 +57,24 @@ /* syscall: "geteuid" ret: "uid_t" args: */ #define RUMP_LINUX_SYS_geteuid 25 +/* syscall: "recvmsg" ret: "ssize_t" args: "int" "struct linux_msghdr *" "int" */ +#define RUMP_LINUX_SYS_recvmsg 27 + +/* syscall: "sendmsg" ret: "ssize_t" args: "int" "const struct linux_msghdr *" "int" */ +#define RUMP_LINUX_SYS_sendmsg 28 + +/* syscall: "recvfrom" ret: "ssize_t" args: "int" "void *" "int" "int" "struct osockaddr *" "int *" */ +#define RUMP_LINUX_SYS_recvfrom 29 + +/* syscall: "accept" ret: "int" args: "int" "struct osockaddr *" "int *" */ +#define RUMP_LINUX_SYS_accept 30 + +/* syscall: "getpeername" ret: "int" args: "int" "struct osockaddr *" "int *" */ +#define RUMP_LINUX_SYS_getpeername 31 + +/* syscall: "getsockname" ret: "int" args: "int" "struct osockaddr *" "int *" */ +#define RUMP_LINUX_SYS_getsockname 32 + /* syscall: "access" ret: "int" args: "const char *" "int" */ #define RUMP_LINUX_SYS_access 33 @@ -66,6 +90,9 @@ /* syscall: "getgid" ret: "gid_t" args: */ #define RUMP_LINUX_SYS_getgid 47 +/* syscall: "ioctl" ret: "int" args: "int" "u_long" "void *" */ +#define RUMP_LINUX_SYS_ioctl 54 + /* syscall: "symlink" ret: "int" args: "const char *" "const char *" */ #define RUMP_LINUX_SYS_symlink 57 @@ -93,12 +120,27 @@ /* syscall: "dup2" ret: "int" args: "int" "int" */ #define RUMP_LINUX_SYS_dup2 90 +/* syscall: "fcntl" ret: "int" args: "int" "int" "void *" */ +#define RUMP_LINUX_SYS_fcntl 92 + /* syscall: "fsync" ret: "int" args: "int" */ #define RUMP_LINUX_SYS_fsync 95 +/* syscall: "connect" ret: "int" args: "int" "const struct osockaddr *" "unsigned int" */ +#define RUMP_LINUX_SYS_connect 98 + +/* syscall: "bind" ret: "int" args: "int" "const struct osockaddr *" "unsigned" */ +#define RUMP_LINUX_SYS_bind 104 + +/* syscall: "setsockopt" ret: "int" args: "int" "int" "int" "const void *" "int" */ +#define RUMP_LINUX_SYS_setsockopt 105 + /* syscall: "listen" ret: "int" args: "int" "int" */ #define RUMP_LINUX_SYS_listen 106 +/* syscall: "getsockopt" ret: "int" args: "int" "int" "int" "void *" "int *" */ +#define RUMP_LINUX_SYS_getsockopt 118 + /* syscall: "readv" ret: "ssize_t" args: "int" "const struct iovec *" "int" */ #define RUMP_LINUX_SYS_readv 120 @@ -123,9 +165,15 @@ /* syscall: "flock" ret: "int" args: "int" "int" */ #define RUMP_LINUX_SYS_flock 131 +/* syscall: "sendto" ret: "int" args: "int" "void *" "int" "int" "const struct osockaddr *" "int" */ +#define RUMP_LINUX_SYS_sendto 133 + /* syscall: "shutdown" ret: "int" args: "int" "int" */ #define RUMP_LINUX_SYS_shutdown 134 +/* syscall: "socketpair" ret: "int" args: "int" "int" "int" "int *" */ +#define RUMP_LINUX_SYS_socketpair 135 + /* syscall: "mkdir" ret: "int" args: "const char *" "mode_t" */ #define RUMP_LINUX_SYS_mkdir 136 @@ -150,6 +198,12 @@ /* syscall: "set
CVS commit: src/sys/rump/kern/lib/libsys_linux
Module Name:src
Committed By: njoly
Date: Fri Jan 10 19:44:47 UTC 2014
Modified Files:
src/sys/rump/kern/lib/libsys_linux: linux_rump.c syscalls.master
Log Message:
Do not redefine linux syscalls arguments, just use compat ones
instead.
Include linux_socketcall.h to bring missing socket syscall
arguments/prototypes on arches that have socketcall(2).
Finally, cleanup rump linux syscall wrapper, to remove linux syscall
argument/prototype local copy.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/kern/lib/libsys_linux/linux_rump.c
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/kern/lib/libsys_linux/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/kern/lib/libsys_linux/linux_rump.c
diff -u src/sys/rump/kern/lib/libsys_linux/linux_rump.c:1.1 src/sys/rump/kern/lib/libsys_linux/linux_rump.c:1.2
--- src/sys/rump/kern/lib/libsys_linux/linux_rump.c:1.1 Sat Dec 14 10:29:45 2013
+++ src/sys/rump/kern/lib/libsys_linux/linux_rump.c Fri Jan 10 19:44:47 2014
@@ -1,28 +1,13 @@
-/* $NetBSD: linux_rump.c,v 1.1 2013/12/14 10:29:45 njoly Exp $ */
+/* $NetBSD: linux_rump.c,v 1.2 2014/01/10 19:44:47 njoly Exp $ */
#include
#include
#include
+#include
#include "rump_linux_syscallargs.h"
-/*
-compat/linux/arch/.../syscallargs.h and rump_linux_syscallargs.h
-define the same syscall arguments and prototypes, thus cannot be
-both used. Just copy needed linux stuff for now to avoid conflicts.
-*/
-
-struct linux_sys_mknodat_args {
-syscallarg(int) fd;
-syscallarg(const char *) path;
-syscallarg(mode_t) mode;
-syscallarg(unsigned) dev;
-};
-check_syscall_args(linux_sys_mknodat)
-
-int linux_sys_mknodat(struct lwp *, const struct linux_sys_mknodat_args *, register_t *);
-
int
rump_linux_sys_mknodat(struct lwp *l,
const struct rump_linux_sys_mknodat_args *uap, register_t *retval)
Index: src/sys/rump/kern/lib/libsys_linux/syscalls.master
diff -u src/sys/rump/kern/lib/libsys_linux/syscalls.master:1.10 src/sys/rump/kern/lib/libsys_linux/syscalls.master:1.11
--- src/sys/rump/kern/lib/libsys_linux/syscalls.master:1.10 Sat Dec 14 17:34:47 2013
+++ src/sys/rump/kern/lib/libsys_linux/syscalls.master Fri Jan 10 19:44:47 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.10 2013/12/14 17:34:47 njoly Exp $
+ $NetBSD: syscalls.master,v 1.11 2014/01/10 19:44:47 njoly Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -34,6 +34,12 @@
#include
#include
+#include
+#include
+
+#ifdef LINUX_SYS_socketcall
+#include
+#endif
#include "rump_linux_syscallargs.h"
@@ -45,13 +51,13 @@
3 NOARGS { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
4 NOARGS { ssize_t|sys||write(int fd, const void *buf, \
size_t nbyte); }
-5 NODEF { int|linux_sys||open(const char *path, \
+5 NOARGS { int|linux_sys||open(const char *path, \
int flags, int mode); }
6 NOARGS { int|sys||close(int fd); }
7 UNIMPL wait4
8 UNIMPL creat
9 NOARGS { int|sys||link(const char *path, const char *link); }
-10 NODEF { int|linux_sys||unlink(const char *path); }
+10 NOARGS { int|linux_sys||unlink(const char *path); }
11 UNIMPL execv
12 NOARGS { int|sys||chdir(const char *path); }
13 NOARGS { int|sys||fchdir(int fd); }
@@ -69,18 +75,18 @@
24 NOARGS { uid_t|sys||getuid_with_euid(void); } getuid
25 NOARGS { uid_t|sys||geteuid(void); }
26 UNIMPL ptrace
-27 NODEF { ssize_t|linux_sys||recvmsg(int s, \
+27 NOARGS { ssize_t|linux_sys||recvmsg(int s, \
struct linux_msghdr *msg, int flags); }
-28 NODEF { ssize_t|linux_sys||sendmsg(int s, \
+28 NOARGS { ssize_t|linux_sys||sendmsg(int s, \
const struct linux_msghdr *msg, int flags); }
-29 NODEF { ssize_t|linux_sys||recvfrom(int s, void *buf, \
+29 NOARGS { ssize_t|linux_sys||recvfrom(int s, void *buf, \
int len, int flags, struct osockaddr *from, \
int *fromlenaddr); }
-30 NODEF { int|linux_sys||accept(int s, struct osockaddr *name, \
+30 NOARGS { int|linux_sys||accept(int s, struct osockaddr *name, \
int *anamelen); }
-31 NODEF { int|linux_sys||getpeername(int fdes, \
+31 NOARGS { int|linux_sys||getpeername(int fdes, \
struct osockaddr *asa, int *alen); }
-32 NODEF { int|linux_sys||getsockname(int fdes, \
+32 NOARGS { int|linux_sys||getsockname(int fdes, \
struct osockaddr *asa, int *alen); }
33 NOARGS { int|sys||access(const char *path, int flags); }
34 UNIMPL chflags
@@ -106,7 +112,7 @@
51 UNIMPL acct
52 UNIMPL sigpending
53 UNIMPL sigaltstack
-54 NODEF { int|linux_sys||ioctl(int fd, \
+54 NOARGS { int|linux_sys||ioctl(int fd, \
u_long com, void *data); }
55 UNIMPL reboot
56 UNIMPL revoke
@@ -149,13 +155,13 @@
89 UNIMPL getdtablesize
90 NOARGS { int|sys||dup2(int from, int to); }
91 UNIMPL getdopt
-92 NODEF { int|linux_sys||fcntl(int fd, i
CVS commit: src/sbin/sysctl
Module Name:src
Committed By: christos
Date: Fri Jan 10 18:37:18 UTC 2014
Modified Files:
src/sbin/sysctl: sysctl.c
Log Message:
use __func__, EXIT_{SUCCESS,FAILURE}
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sbin/sysctl/sysctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/sysctl/sysctl.c
diff -u src/sbin/sysctl/sysctl.c:1.150 src/sbin/sysctl/sysctl.c:1.151
--- src/sbin/sysctl/sysctl.c:1.150 Fri Jan 10 04:38:56 2014
+++ src/sbin/sysctl/sysctl.c Fri Jan 10 13:37:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.c,v 1.150 2014/01/10 09:38:56 pooka Exp $ */
+/* $NetBSD: sysctl.c,v 1.151 2014/01/10 18:37:18 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\
#if 0
static char sccsid[] = "@(#)sysctl.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: sysctl.c,v 1.150 2014/01/10 09:38:56 pooka Exp $");
+__RCSID("$NetBSD: sysctl.c,v 1.151 2014/01/10 18:37:18 christos Exp $");
#endif
#endif /* not lint */
@@ -337,14 +337,14 @@ main(int argc, char *argv[])
aflag = 1;
if (prog_init && prog_init() == -1)
- err(1, "prog init failed");
+ err(EXIT_FAILURE, "prog init failed");
if (Aflag)
warnfp = stdout;
stale = req = 0;
if ((re = malloc(sizeof(*re) * __arraycount(handlers))) == NULL)
- err(1, "malloc regex");
+ err(EXIT_FAILURE, "malloc regex");
if (aflag) {
print_tree(&name[0], 0, NULL, CTLTYPE_NODE, 1,
@@ -359,7 +359,7 @@ main(int argc, char *argv[])
fp = fopen(fn, "r");
if (fp == NULL) {
- err(1, "%s", fn);
+ err(EXIT_FAILURE, "%s", fn);
} else {
nr = 0;
while ((l = fparseln(fp, NULL, &nr, NULL, 0)) != NULL)
@@ -380,7 +380,7 @@ main(int argc, char *argv[])
while (argc-- > 0)
parse(*argv++, re, &lastcompiled);
- return errs ? 1 : 0;
+ return errs ? EXIT_FAILURE : EXIT_SUCCESS;
}
/*
@@ -405,7 +405,7 @@ findhandler(const char *s, regex_t *re,
j = regcomp(&re[i], p[i].ps_re, REG_EXTENDED);
if (j != 0) {
regerror(j, &re[i], eb, sizeof(eb));
-errx(1, "regcomp: %s: %s", p[i].ps_re, eb);
+errx(EXIT_FAILURE, "regcomp: %s: %s", p[i].ps_re, eb);
}
*lastcompiled = i + 1;
}
@@ -416,7 +416,7 @@ findhandler(const char *s, regex_t *re,
}
else if (j != REG_NOMATCH) {
regerror(j, &re[i], eb, sizeof(eb));
- errx(1, "regexec: %s: %s", p[i].ps_re, eb);
+ errx(EXIT_FAILURE, "regexec: %s: %s", p[i].ps_re, eb);
}
}
@@ -679,7 +679,7 @@ print_tree(int *name, u_int namelen, str
if (p->ps_p == NULL) {
sysctlperror("Cannot print `%s': %s\n", gsname,
strerror(EOPNOTSUPP));
- exit(1);
+ exit(EXIT_FAILURE);
}
(*p->ps_p)(gsname, gdname, NULL, name, namelen, pnode, type,
__UNCONST(p->ps_d));
@@ -890,7 +890,7 @@ parse(char *l, regex_t *re, size_t *last
if (optional)
return;
sysctlparseerror(namelen, l);
- EXIT(1);
+ EXIT(EXIT_FAILURE);
}
type = SYSCTL_TYPE(node->sysctl_flags);
@@ -910,7 +910,7 @@ parse(char *l, regex_t *re, size_t *last
if (!wflag) {
sysctlperror("Must specify -w to set variables\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
canonicalize(gsname, canonname);
@@ -919,7 +919,7 @@ parse(char *l, regex_t *re, size_t *last
if (w->ps_w == NULL) {
sysctlperror("Cannot write `%s': %s\n", gsname,
strerror(EOPNOTSUPP));
- exit(1);
+ exit(EXIT_FAILURE);
}
(*w->ps_w)(gsname, gdname, value, name, namelen, node, type,
__UNCONST(w->ps_d));
@@ -987,7 +987,7 @@ parse_create(char *l)
if (!wflag) {
sysctlperror("Must specify -w to create nodes\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
/*
@@ -1068,11 +1068,11 @@ parse_create(char *l)
"%s: already have %s for new node\n",
nname,
method == CTL_CREATE ? "addr" : "symbol");
-EXIT(1);
+EXIT(EXIT_FAILURE);
}
if (value == NULL) {
sysctlperror("%s: missing value\n", nname);
-EXIT(1);
+EXIT(EXIT_FAILURE);
}
errno = 0;
addr = (void*)strtoul(value, &t, 0);
@@ -1080,7 +1080,7 @@ parse_create(char *l)
sysctlperror(
"%s: '%s' is not a valid address\n",
nname, value);
-EXIT(1);
+EXIT(EXIT_FAILURE);
}
method = CTL_CREATE;
}
@@ -1090,7 +1090,7 @@ parse_create(char *l)
"%s: already have %s for new node\n",
nname,
method == CTL_CREATE ? "addr" : "symbol");
-EXIT(1);
+EXIT(EXIT_FAILURE);
}
addr = value;
method = CTL_CREATESYM;
@@ -1098,7 +1098,7 @@ parse_create(char *l)
else if (strcmp(key, "type") == 0) {
if (value == NULL) {
sysctlperror("%s: missing value\n", nname);
-EXIT(1);
+EXIT(EXIT_FAILURE);
}
if (strcmp(value, "node") == 0)
type = CTLTYPE_NODE;
@@ -1122,13 +1122,13 @@ parse_create(char *l)
sysctlperror(
"%s: '%s' is not a valid type\n",
nname, value);
-EX
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: matt Date: Fri Jan 10 18:03:26 UTC 2014 Modified Files: src/sys/arch/arm/arm: arm_machdep.c Log Message: Make sure to start BE-8 programs with the PSR[E] set. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/arm/arm/arm_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm/arm_machdep.c diff -u src/sys/arch/arm/arm/arm_machdep.c:1.39 src/sys/arch/arm/arm/arm_machdep.c:1.40 --- src/sys/arch/arm/arm/arm_machdep.c:1.39 Wed Nov 6 02:34:10 2013 +++ src/sys/arch/arm/arm/arm_machdep.c Fri Jan 10 18:03:26 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: arm_machdep.c,v 1.39 2013/11/06 02:34:10 christos Exp $ */ +/* $NetBSD: arm_machdep.c,v 1.40 2014/01/10 18:03:26 matt Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -78,7 +78,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.39 2013/11/06 02:34:10 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.40 2014/01/10 18:03:26 matt Exp $"); #include #include @@ -174,12 +174,21 @@ setregs(struct lwp *l, struct exec_packa tf->tf_svc_lr = 0x; /* Something we can see */ tf->tf_pc = pack->ep_entry; #ifdef __PROG32 +#if defined(__ARMEB__) + /* + * If we are running on ARMv7, we need to set the E bit to force + * programs to start as big endian. + */ + tf->tf_spsr = PSR_USR32_MODE | (CPU_IS_ARMV7_P() ? PSR_E_BIT : 0); +#else tf->tf_spsr = PSR_USR32_MODE; +#endif /* __ARMEB__ */ + #ifdef THUMB_CODE if (pack->ep_entry & 1) tf->tf_spsr |= PSR_T_bit; #endif -#endif +#endif /* __PROG32 */ l->l_md.md_flags = 0; #ifdef EXEC_AOUT
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Fri Jan 10 17:48:11 UTC 2014 Modified Files: src/sys/arch/arm/include: armreg.h Log Message: Flush out the PSR definitions. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/sys/arch/arm/include/armreg.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/arm/include/armreg.h diff -u src/sys/arch/arm/include/armreg.h:1.84 src/sys/arch/arm/include/armreg.h:1.85 --- src/sys/arch/arm/include/armreg.h:1.84 Fri Dec 27 12:16:01 2013 +++ src/sys/arch/arm/include/armreg.h Fri Jan 10 17:48:11 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: armreg.h,v 1.84 2013/12/27 12:16:01 matt Exp $ */ +/* $NetBSD: armreg.h,v 1.85 2014/01/10 17:48:11 matt Exp $ */ /* * Copyright (c) 1998, 2001 Ben Harris @@ -58,13 +58,24 @@ #define PSR_V_bit (1 << 28) /* overflow */ #define PSR_Q_bit (1 << 27) /* saturation */ +#define PSR_IT1_bit (1 << 26) +#define PSR_IT0_bit (1 << 25) +#define PSR_J_bit (1 << 24) /* Jazelle mode */ +#define PSR_GE_bits (15 << 16) /* SIMD GE bits */ +#define PSR_IT7_bit (1 << 15) +#define PSR_IT6_bit (1 << 14) +#define PSR_IT5_bit (1 << 13) +#define PSR_IT4_bit (1 << 12) +#define PSR_IT3_bit (1 << 11) +#define PSR_IT2_bit (1 << 10) +#define PSR_E_BIT (1 << 9) /* Endian state */ +#define PSR_A_BIT (1 << 8) /* Async abort disable */ #define I32_bit (1 << 7) /* IRQ disable */ #define F32_bit (1 << 6) /* FIQ disable */ -#define IF32_bits (3 << 6) /* IRQ/FIQ disable */ +#define IF32_bits (3 << 6) /* IRQ/FIQ disable */ #define PSR_T_bit (1 << 5) /* Thumb state */ -#define PSR_J_bit (1 << 24) /* Java mode */ #define PSR_MODE 0x001f /* mode mask */ #define PSR_USR26_MODE 0x
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src
Committed By: jakllsch
Date: Fri Jan 10 17:40:51 UTC 2014
Modified Files:
src/sys/arch/i386/stand/lib: exec.c
Log Message:
fix style and whitespace nits
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/i386/stand/lib/exec.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/exec.c
diff -u src/sys/arch/i386/stand/lib/exec.c:1.57 src/sys/arch/i386/stand/lib/exec.c:1.58
--- src/sys/arch/i386/stand/lib/exec.c:1.57 Sun Jan 5 21:36:50 2014
+++ src/sys/arch/i386/stand/lib/exec.c Fri Jan 10 17:40:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.57 2014/01/05 21:36:50 jakllsch Exp $ */
+/* $NetBSD: exec.c,v 1.58 2014/01/10 17:40:51 jakllsch Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -386,7 +386,7 @@ exec_netbsd(const char *file, physaddr_t
userconf_init();
if (btinfo_userconfcommands != NULL)
BI_ADD(btinfo_userconfcommands, BTINFO_USERCONFCOMMANDS,
- btinfo_userconfcommands_size);
+ btinfo_userconfcommands_size);
#ifdef DEBUG
printf("Start @ 0x%lx [%ld=0x%lx-0x%lx]...\n", marks[MARK_ENTRY],
@@ -458,7 +458,7 @@ module_path(boot_module_t *bm, const cha
}
} else {
/* device not specified; load from kernel device if known */
- if (name[0] == '/')
+ if (name[0] == '/')
snprintf(buf, sizeof(buf), "%s%s", kdev, name);
else
snprintf(buf, sizeof(buf), "%s%s/%s/%s.kmod",
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: pedro Date: Fri Jan 10 16:47:07 UTC 2014 Modified Files: src/sys/arch/i386/i386: copy.S Log Message: Fix a comment describing the check performed by copyin(); the value checked against VM_MAXUSER_ADDRESS is derived from the source address, not the destination address. OK rmind@. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/i386/i386/copy.S 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/i386/copy.S diff -u src/sys/arch/i386/i386/copy.S:1.22 src/sys/arch/i386/i386/copy.S:1.23 --- src/sys/arch/i386/i386/copy.S:1.22 Wed Jul 7 01:21:15 2010 +++ src/sys/arch/i386/i386/copy.S Fri Jan 10 16:47:07 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: copy.S,v 1.22 2010/07/07 01:21:15 chs Exp $ */ +/* $NetBSD: copy.S,v 1.23 2014/01/10 16:47:07 pedro Exp $ */ /* NetBSD: locore.S,v 1.34 2005/04/01 11:59:31 yamt Exp $ */ /*- @@ -65,7 +65,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: copy.S,v 1.22 2010/07/07 01:21:15 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: copy.S,v 1.23 2014/01/10 16:47:07 pedro Exp $"); #include "assym.h" @@ -270,9 +270,9 @@ ENTRY(copyin) movl 16(%esp),%edi movl 20(%esp),%eax /* - * We check that the end of the destination buffer is not past the end - * of the user's address space. If it's not, then we only need to - * check that each page is readable, and the CPU will do that for us. + * We check that the end of the source buffer is not past the end of + * the user's address space. If it's not, then we only need to check + * that each page is readable, and the CPU will do that for us. */ .Lcopyin_start: movl %esi,%edx
CVS commit: src/sys/fs/tmpfs
Module Name:src
Committed By: pedro
Date: Fri Jan 10 16:42:38 UTC 2014
Modified Files:
src/sys/fs/tmpfs: tmpfs_vnops.c
Log Message:
Prevent a diagnostic assertion in tmpfs_rmdir() from being triggered
through an rmdir on ".." by moving it so it happens after the check for
empty directories; OK rmind@.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/fs/tmpfs/tmpfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/tmpfs/tmpfs_vnops.c
diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.111 src/sys/fs/tmpfs/tmpfs_vnops.c:1.112
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.111 Fri Jan 3 09:53:12 2014
+++ src/sys/fs/tmpfs/tmpfs_vnops.c Fri Jan 10 16:42:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vnops.c,v 1.111 2014/01/03 09:53:12 hannken Exp $ */
+/* $NetBSD: tmpfs_vnops.c,v 1.112 2014/01/10 16:42:38 pedro Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.111 2014/01/03 09:53:12 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.112 2014/01/10 16:42:38 pedro Exp $");
#include
#include
@@ -837,7 +837,6 @@ tmpfs_rmdir(void *v)
KASSERT(VOP_ISLOCKED(dvp));
KASSERT(VOP_ISLOCKED(vp));
- KASSERT(node->tn_spec.tn_dir.tn_parent == dnode);
/*
* Directories with more than two entries ('.' and '..') cannot be
@@ -861,6 +860,8 @@ tmpfs_rmdir(void *v)
KASSERT(error == 0);
}
+ KASSERT(node->tn_spec.tn_dir.tn_parent == dnode);
+
/* Lookup the directory entry (check the cached hint first). */
de = tmpfs_dir_cached(node);
if (de == NULL) {
CVS commit: src/sys/arch/m68k/060sp
Module Name:src
Committed By: christos
Date: Fri Jan 10 16:41:16 UTC 2014
Modified Files:
src/sys/arch/m68k/060sp: Makefile
Log Message:
make it clean after itself, use standard rules files
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/m68k/060sp/Makefile
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/m68k/060sp/Makefile
diff -u src/sys/arch/m68k/060sp/Makefile:1.10 src/sys/arch/m68k/060sp/Makefile:1.11
--- src/sys/arch/m68k/060sp/Makefile:1.10 Fri Mar 28 18:29:16 2008
+++ src/sys/arch/m68k/060sp/Makefile Fri Jan 10 11:41:16 2014
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2008/03/28 22:29:16 apb Exp $
+# $NetBSD: Makefile,v 1.11 2014/01/10 16:41:16 christos Exp $
-.include # for HOST_SH, TOOL_SED
+.include # for HOST_SH, TOOL_SED
# regenerate isp.S, fpsp.S, pfpsp.S
@@ -14,4 +14,8 @@
SED=${TOOL_SED:Q} \
${HOST_SH} asm2gas ${.IMPSRC} >${.TARGET}
-all: isp.S fpsp.S pfpsp.S
+
+all: isp.S fpsp.S pfpsp.S
+CLEANFILES+=isp.S fpsp.S pfpsp.S
+
+.include
CVS commit: src/regress/lib/libc
Module Name:src
Committed By: christos
Date: Fri Jan 10 16:35:11 UTC 2014
Modified Files:
src/regress/lib/libc: Makefile
Log Message:
don't include bsd.sys.mk
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 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.81 src/regress/lib/libc/Makefile:1.82
--- src/regress/lib/libc/Makefile:1.81 Sun Mar 18 03:54:00 2012
+++ src/regress/lib/libc/Makefile Fri Jan 10 11:35:11 2014
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2012/03/18 07:54:00 jruoho Exp $
+# $NetBSD: Makefile,v 1.82 2014/01/10 16:35:11 christos Exp $
SUBDIR+= citrus divrem
.include
-.include
.if exists(arch/${MACHINE_ARCH})
SUBDIR+= arch/${MACHINE_ARCH}
CVS commit: src/sys/arch/hp700/dev
Module Name:src Committed By: christos Date: Fri Jan 10 16:36:54 UTC 2014 Modified Files: src/sys/arch/hp700/dev: Makefile Log Message: include bsd.own.mk To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hp700/dev/Makefile 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/dev/Makefile diff -u src/sys/arch/hp700/dev/Makefile:1.2 src/sys/arch/hp700/dev/Makefile:1.3 --- src/sys/arch/hp700/dev/Makefile:1.2 Sun Oct 19 18:05:21 2008 +++ src/sys/arch/hp700/dev/Makefile Fri Jan 10 11:36:54 2014 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2008/10/19 22:05:21 apb Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/10 16:36:54 christos Exp $ # $OpenBSD: Makefile,v 1.3 1999/04/20 20:19:37 mickey Exp $ -.include +.include cpudevs.h cpudevs_data.h: cpudevs devlist2h.awk /bin/rm -f cpudevs.h cpudevs_data.h
CVS commit: src/sys/arch/sgimips/gio
Module Name:src Committed By: christos Date: Fri Jan 10 16:36:30 UTC 2014 Modified Files: src/sys/arch/sgimips/gio: Makefile.giodevs Log Message: include bsd.own.mk To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sgimips/gio/Makefile.giodevs 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/sgimips/gio/Makefile.giodevs diff -u src/sys/arch/sgimips/gio/Makefile.giodevs:1.5 src/sys/arch/sgimips/gio/Makefile.giodevs:1.6 --- src/sys/arch/sgimips/gio/Makefile.giodevs:1.5 Sun Oct 19 18:05:21 2008 +++ src/sys/arch/sgimips/gio/Makefile.giodevs Fri Jan 10 11:36:29 2014 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.giodevs,v 1.5 2008/10/19 22:05:21 apb Exp $ +# $NetBSD: Makefile.giodevs,v 1.6 2014/01/10 16:36:29 christos Exp $ -.include +.include giodevs.h: giodevs devlist2h.awk /bin/rm -f giodevs.h giodevs_data.h
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: christos Date: Fri Jan 10 16:35:59 UTC 2014 Modified Files: src/sys/arch/hp300/dev: Makefile Log Message: don't include bsd.sys.mk To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hp300/dev/Makefile 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/hp300/dev/Makefile diff -u src/sys/arch/hp300/dev/Makefile:1.4 src/sys/arch/hp300/dev/Makefile:1.5 --- src/sys/arch/hp300/dev/Makefile:1.4 Tue Dec 28 05:15:49 2010 +++ src/sys/arch/hp300/dev/Makefile Fri Jan 10 11:35:59 2014 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2010/12/28 10:15:49 tsutsui Exp $ +# $NetBSD: Makefile,v 1.5 2014/01/10 16:35:59 christos Exp $ .include -.include diodevs.h diodevs_data.h: diodevs devlist2h.awk /bin/rm -f diodevs.h diodevs_data.h
CVS commit: src/usr.bin/make
Module Name:src Committed By: wiz Date: Fri Jan 10 16:28:34 UTC 2014 Modified Files: src/usr.bin/make: make.1 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.227 -r1.228 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/make.1 diff -u src/usr.bin/make/make.1:1.227 src/usr.bin/make/make.1:1.228 --- src/usr.bin/make/make.1:1.227 Fri Jan 10 16:12:52 2014 +++ src/usr.bin/make/make.1 Fri Jan 10 16:28:34 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.227 2014/01/10 16:12:52 christos Exp $ +.\" $NetBSD: make.1,v 1.228 2014/01/10 16:28:34 wiz Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd October 25, 2013 +.Dd January 10, 2014 .Dt MAKE 1 .Os .Sh NAME
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Fri Jan 10 16:20:14 UTC 2014
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
not so fast, let's fix the tree first.
To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 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.233 src/share/mk/bsd.sys.mk:1.234
--- src/share/mk/bsd.sys.mk:1.233 Fri Jan 10 11:16:57 2014
+++ src/share/mk/bsd.sys.mk Fri Jan 10 11:20:14 2014
@@ -1,14 +1,14 @@
-# $NetBSD: bsd.sys.mk,v 1.233 2014/01/10 16:16:57 christos Exp $
+# $NetBSD: bsd.sys.mk,v 1.234 2014/01/10 16:20:14 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
.if !defined(_BSD_SYS_MK_)
_BSD_SYS_MK_=1
-.if !empty(.INCLUDEDFROMFILE:MMakefile*)
-error:
- @(echo "bsd.sys.mk should not be included from Makefiles" >& 2; exit 1)
-.endif
+#.if !empty(.INCLUDEDFROMFILE:MMakefile*)
+#error:
+# @(echo "bsd.sys.mk should not be included from Makefiles" >& 2; exit 1)
+#.endif
.if ${MKREPRO:Uno} == "yes"
CPPFLAGS+= -Wp,-iremap,${NETBSDSRCDIR}:/usr/src
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Fri Jan 10 16:16:57 UTC 2014
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Add protection against direct inclusion of this file from other Makefiles.
This file is only intended to be included from the other rules files like
bsd.lib.mk or bsd.prog.mk. If you need things to be defined early, use
bsd.own.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 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.232 src/share/mk/bsd.sys.mk:1.233
--- src/share/mk/bsd.sys.mk:1.232 Mon Jan 6 21:16:41 2014
+++ src/share/mk/bsd.sys.mk Fri Jan 10 11:16:57 2014
@@ -1,10 +1,15 @@
-# $NetBSD: bsd.sys.mk,v 1.232 2014/01/07 02:16:41 joerg Exp $
+# $NetBSD: bsd.sys.mk,v 1.233 2014/01/10 16:16:57 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
.if !defined(_BSD_SYS_MK_)
_BSD_SYS_MK_=1
+.if !empty(.INCLUDEDFROMFILE:MMakefile*)
+error:
+ @(echo "bsd.sys.mk should not be included from Makefiles" >& 2; exit 1)
+.endif
+
.if ${MKREPRO:Uno} == "yes"
CPPFLAGS+= -Wp,-iremap,${NETBSDSRCDIR}:/usr/src
CPPFLAGS+= -Wp,-iremap,${DESTDIR}/:/
CVS commit: src/usr.bin/make
Module Name:src
Committed By: christos
Date: Fri Jan 10 16:12:52 UTC 2014
Modified Files:
src/usr.bin/make: make.1 parse.c
Log Message:
add .INCLUDEDFROM{FILE,DIR}
To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/usr.bin/make/make.1
cvs rdiff -u -r1.192 -r1.193 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/make.1
diff -u src/usr.bin/make/make.1:1.226 src/usr.bin/make/make.1:1.227
--- src/usr.bin/make/make.1:1.226 Thu Nov 7 13:50:46 2013
+++ src/usr.bin/make/make.1 Fri Jan 10 11:12:52 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.226 2013/11/07 18:50:46 dholland Exp $
+.\" $NetBSD: make.1,v 1.227 2014/01/10 16:12:52 christos Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -638,6 +638,10 @@ target is to be transformed (the
source); also known as
.Ql Va \&\*[Lt] .
It is not defined in explicit rules.
+.It Va .INCLUDEDFROMDIR
+The directory of the file this Makefile was included from.
+.It Va .INCLUDEDFROMFILE
+The filename of the file this Makefile was included from.
.It Va .MEMBER
The name of the archive member.
.It Va .OODATE
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.192 src/usr.bin/make/parse.c:1.193
--- src/usr.bin/make/parse.c:1.192 Fri Oct 18 16:47:06 2013
+++ src/usr.bin/make/parse.c Fri Jan 10 11:12:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.192 2013/10/18 20:47:06 christos Exp $ */
+/* $NetBSD: parse.c,v 1.193 2014/01/10 16:12:52 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.192 2013/10/18 20:47:06 christos Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.193 2014/01/10 16:12:52 christos Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: parse.c,v 1.192 2013/10/18 20:47:06 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.193 2014/01/10 16:12:52 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -361,6 +361,7 @@ static int ParseAddCmd(void *, void *);
static void ParseHasCommands(void *);
static void ParseDoInclude(char *);
static void ParseSetParseFile(const char *);
+static void ParseSetIncludedFile(void);
#ifdef SYSVINCLUDE
static void ParseTraditionalInclude(char *);
#endif
@@ -845,7 +846,8 @@ ParseLinkSrc(void *pgnp, void *cgnp)
(void)Lst_AtEnd(cgn->parents, pgn);
pgn->unmade += 1;
if (DEBUG(PARSE)) {
- fprintf(debug_file, "# ParseLinkSrc: added child %s - %s\n", pgn->name, cgn->name);
+ fprintf(debug_file, "# %s: added child %s - %s\n", __func__,
+ pgn->name, cgn->name);
Targ_PrintNode(pgn, 0);
Targ_PrintNode(cgn, 0);
}
@@ -1020,8 +1022,8 @@ ParseDoSrc(int tOp, const char *src)
(void)Lst_AtEnd(predecessor->order_succ, gn);
(void)Lst_AtEnd(gn->order_pred, predecessor);
if (DEBUG(PARSE)) {
- fprintf(debug_file, "# ParseDoSrc: added Order dependency %s - %s\n",
- predecessor->name, gn->name);
+ fprintf(debug_file, "# %s: added Order dependency %s - %s\n",
+ __func__, predecessor->name, gn->name);
Targ_PrintNode(predecessor, 0);
Targ_PrintNode(gn, 0);
}
@@ -2164,6 +2166,7 @@ Parse_include_file(char *file, Boolean i
/* load it */
lf = loadfile(fullname, fd);
+ParseSetIncludedFile();
/* Start reading from this file next */
Parse_SetInput(fullname, 0, -1, loadedfile_nextbuf, lf);
curFile->lf = lf;
@@ -2223,6 +2226,41 @@ ParseDoInclude(char *line)
/*-
*-
+ * ParseSetIncludedFile --
+ * Set the .INCLUDEDFROMFILE variable to the contents of .PARSEFILE
+ * and the .INCLUDEDFROMDIR variable to the contents of .PARSEDIR
+ *
+ * Results:
+ * None
+ *
+ * Side Effects:
+ * The .INCLUDEDFROMFILE variable is overwritten by the contents
+ * of .PARSEFILE and the .INCLUDEDFROMDIR variable is overwriten
+ * but the contents of .PARSEDIR
+ *-
+ */
+static void
+ParseSetIncludedFile(void)
+{
+char *pf, *fp = NULL;
+char *pd, *dp = NULL;
+
+pf = Var_Value(".PARSEFILE", VAR_GLOBAL, &fp);
+Var_Set(".INCLUDEDFROMFILE", pf, VAR_GLOBAL, 0);
+pd = Var_Value(".PARSEDIR", VAR_GLOBAL, &dp);
+Var_Set(".INCLUDEDFROMDIR", pd, VAR_GLOBAL, 0);
+
+if (DEBUG(PARSE))
+ fprintf(debug_file, "%s: ${.INCLUDEDFROMDIR} = `%s' "
+ "${.INCLUDEDFROMFILE} = `%s'\n", __func__, pd, pf);
+
+if (fp)
+ free(fp);
+if (dp)
+ free(dp);
+}
+/*-
+ *-
* ParseSetParseFile --
* Set the .PARSEDIR and .PARSEFILE variables to the dirname and
* basename of the given filename
@@ -2256,8 +2294,8 @@ ParseSetParseFile(const
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Fri Jan 10 15:54:59 UTC 2014 Modified Files: src/sys/sys: Makefile Log Message: we never include bsd.sys.mk directly. To generate a diff of this commit: cvs rdiff -u -r1.146 -r1.147 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/sys/sys/Makefile diff -u src/sys/sys/Makefile:1.146 src/sys/sys/Makefile:1.147 --- src/sys/sys/Makefile:1.146 Fri Jan 10 10:00:16 2014 +++ src/sys/sys/Makefile Fri Jan 10 10:54:59 2014 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.146 2014/01/10 15:00:16 martin Exp $ +# $NetBSD: Makefile,v 1.147 2014/01/10 15:54:59 christos Exp $ -.include # prerequisite for bsd.sys.mk -.include +.include INCSDIR= /usr/include/sys
CVS commit: src/regress/sys/kern/ras
Module Name:src
Committed By: christos
Date: Fri Jan 10 15:52:25 UTC 2014
Modified Files:
src/regress/sys/kern/ras/ras1: Makefile
src/regress/sys/kern/ras/ras2: Makefile
src/regress/sys/kern/ras/ras3: Makefile
Log Message:
Fix NOMAN
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/regress/sys/kern/ras/ras1/Makefile
cvs rdiff -u -r1.7 -r1.8 src/regress/sys/kern/ras/ras2/Makefile
cvs rdiff -u -r1.7 -r1.8 src/regress/sys/kern/ras/ras3/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/sys/kern/ras/ras1/Makefile
diff -u src/regress/sys/kern/ras/ras1/Makefile:1.7 src/regress/sys/kern/ras/ras1/Makefile:1.8
--- src/regress/sys/kern/ras/ras1/Makefile:1.7 Fri Jan 10 10:00:16 2014
+++ src/regress/sys/kern/ras/ras1/Makefile Fri Jan 10 10:52:25 2014
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2014/01/10 15:00:16 martin Exp $
-
-.include # ACVTIVE_CC
+# $NetBSD: Makefile,v 1.8 2014/01/10 15:52:25 christos Exp $
NOMAN= #defined
+.include # ACTIVE_CC
+
PROG= ras1
-WARNS= 2
regress:
@if ./${PROG} ; then \
Index: src/regress/sys/kern/ras/ras2/Makefile
diff -u src/regress/sys/kern/ras/ras2/Makefile:1.7 src/regress/sys/kern/ras/ras2/Makefile:1.8
--- src/regress/sys/kern/ras/ras2/Makefile:1.7 Fri Jan 10 10:00:16 2014
+++ src/regress/sys/kern/ras/ras2/Makefile Fri Jan 10 10:52:25 2014
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2014/01/10 15:00:16 martin Exp $
-
-.include # ACVTIVE_CC
+# $NetBSD: Makefile,v 1.8 2014/01/10 15:52:25 christos Exp $
NOMAN= #defined
+.include # ACTIVE_CC
+
PROG= ras2
-WARNS= 2
regress:
@if ./${PROG} ; then \
Index: src/regress/sys/kern/ras/ras3/Makefile
diff -u src/regress/sys/kern/ras/ras3/Makefile:1.7 src/regress/sys/kern/ras/ras3/Makefile:1.8
--- src/regress/sys/kern/ras/ras3/Makefile:1.7 Fri Jan 10 10:00:16 2014
+++ src/regress/sys/kern/ras/ras3/Makefile Fri Jan 10 10:52:25 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2014/01/10 15:00:16 martin Exp $
-
-.include # ACVTIVE_CC
+# $NetBSD: Makefile,v 1.8 2014/01/10 15:52:25 christos Exp $
NOMAN= #defined
+
+.include # ACTIVE_CC
+
PROG= ras3
-WARNS= 2
regress:
@if ./${PROG} ; then \
CVS commit: src/lib/librumphijack
Module Name:src Committed By: christos Date: Fri Jan 10 15:54:29 UTC 2014 Modified Files: src/lib/librumphijack: Makefile Log Message: don't need to include anything before bsd.lib.mk since we don't use any variables To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/librumphijack/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librumphijack/Makefile diff -u src/lib/librumphijack/Makefile:1.14 src/lib/librumphijack/Makefile:1.15 --- src/lib/librumphijack/Makefile:1.14 Fri Jan 10 10:00:16 2014 +++ src/lib/librumphijack/Makefile Fri Jan 10 10:54:29 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2014/01/10 15:00:16 martin Exp $ +# $NetBSD: Makefile,v 1.15 2014/01/10 15:54:29 christos Exp $ # LIB= rumphijack @@ -18,9 +18,6 @@ WARNS?= 5 # a stack frame COPTS.hijackdlsym.c+= -O0 -.include # prerequisite for bsd.sys.mk -.include - CPPFLAGS+= -U_FORTIFY_SOURCE .include
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/common
Module Name:src Committed By: christos Date: Fri Jan 10 15:50:34 UTC 2014 Modified Files: src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile Log Message: don't include bsd.sys.mk To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.19 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.20 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.19 Fri Jan 10 10:00:16 2014 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Fri Jan 10 10:50:34 2014 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.19 2014/01/10 15:00:16 martin Exp $ +# $NetBSD: Makefile,v 1.20 2014/01/10 15:50:34 christos Exp $ .include # prerequisite for bsd.sys.mk -.include # for HOST_SH .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod"
CVS commit: src
Module Name:src Committed By: martin Date: Fri Jan 10 15:00:16 UTC 2014 Modified Files: src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile src/lib/librumphijack: Makefile src/regress/sys/kern/ras/ras1: Makefile src/regress/sys/kern/ras/ras2: Makefile src/regress/sys/kern/ras/ras3: Makefile src/sys/sys: Makefile Log Message: ACTIVE_CC can only be used after include of bsd.own.mk To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile cvs rdiff -u -r1.13 -r1.14 src/lib/librumphijack/Makefile cvs rdiff -u -r1.6 -r1.7 src/regress/sys/kern/ras/ras1/Makefile cvs rdiff -u -r1.6 -r1.7 src/regress/sys/kern/ras/ras2/Makefile cvs rdiff -u -r1.6 -r1.7 src/regress/sys/kern/ras/ras3/Makefile cvs rdiff -u -r1.145 -r1.146 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/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.18 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.19 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.18 Wed Apr 13 16:18:14 2011 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Fri Jan 10 15:00:16 2014 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2011/04/13 16:18:14 macallan Exp $ +# $NetBSD: Makefile,v 1.19 2014/01/10 15:00:16 martin Exp $ +.include # prerequisite for bsd.sys.mk .include # for HOST_SH .include "../../../Makefile.serverlib" Index: src/lib/librumphijack/Makefile diff -u src/lib/librumphijack/Makefile:1.13 src/lib/librumphijack/Makefile:1.14 --- src/lib/librumphijack/Makefile:1.13 Tue Sep 10 16:53:06 2013 +++ src/lib/librumphijack/Makefile Fri Jan 10 15:00:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/09/10 16:53:06 pooka Exp $ +# $NetBSD: Makefile,v 1.14 2014/01/10 15:00:16 martin Exp $ # LIB= rumphijack @@ -18,6 +18,7 @@ WARNS?= 5 # a stack frame COPTS.hijackdlsym.c+= -O0 +.include # prerequisite for bsd.sys.mk .include CPPFLAGS+= -U_FORTIFY_SOURCE Index: src/regress/sys/kern/ras/ras1/Makefile diff -u src/regress/sys/kern/ras/ras1/Makefile:1.6 src/regress/sys/kern/ras/ras1/Makefile:1.7 --- src/regress/sys/kern/ras/ras1/Makefile:1.6 Wed Apr 4 10:59:47 2012 +++ src/regress/sys/kern/ras/ras1/Makefile Fri Jan 10 15:00:16 2014 @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2012/04/04 10:59:47 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2014/01/10 15:00:16 martin Exp $ + +.include # ACVTIVE_CC NOMAN= #defined Index: src/regress/sys/kern/ras/ras2/Makefile diff -u src/regress/sys/kern/ras/ras2/Makefile:1.6 src/regress/sys/kern/ras/ras2/Makefile:1.7 --- src/regress/sys/kern/ras/ras2/Makefile:1.6 Wed Apr 4 10:59:47 2012 +++ src/regress/sys/kern/ras/ras2/Makefile Fri Jan 10 15:00:16 2014 @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2012/04/04 10:59:47 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2014/01/10 15:00:16 martin Exp $ + +.include # ACVTIVE_CC NOMAN= #defined Index: src/regress/sys/kern/ras/ras3/Makefile diff -u src/regress/sys/kern/ras/ras3/Makefile:1.6 src/regress/sys/kern/ras/ras3/Makefile:1.7 --- src/regress/sys/kern/ras/ras3/Makefile:1.6 Wed Apr 4 10:59:47 2012 +++ src/regress/sys/kern/ras/ras3/Makefile Fri Jan 10 15:00:16 2014 @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2012/04/04 10:59:47 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2014/01/10 15:00:16 martin Exp $ + +.include # ACVTIVE_CC NOMAN= #defined PROG= ras3 Index: src/sys/sys/Makefile diff -u src/sys/sys/Makefile:1.145 src/sys/sys/Makefile:1.146 --- src/sys/sys/Makefile:1.145 Wed Dec 11 01:24:08 2013 +++ src/sys/sys/Makefile Fri Jan 10 15:00:16 2014 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.145 2013/12/11 01:24:08 joerg Exp $ +# $NetBSD: Makefile,v 1.146 2014/01/10 15:00:16 martin Exp $ +.include # prerequisite for bsd.sys.mk .include INCSDIR= /usr/include/sys
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: sborrill Date: Fri Jan 10 12:31:33 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.3 Log Message: File is for 6.1.2 -> 6.1.3, not 6.1.1 -> 6.1.2 To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-6.1.3 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-6.1.3 diff -u src/doc/CHANGES-6.1.3:1.1.2.13 src/doc/CHANGES-6.1.3:1.1.2.14 --- src/doc/CHANGES-6.1.3:1.1.2.13 Tue Jan 7 18:03:24 2014 +++ src/doc/CHANGES-6.1.3 Fri Jan 10 12:31:33 2014 @@ -1,6 +1,6 @@ -# $NetBSD: CHANGES-6.1.3,v 1.1.2.13 2014/01/07 18:03:24 bouyer Exp $ +# $NetBSD: CHANGES-6.1.3,v 1.1.2.14 2014/01/10 12:31:33 sborrill Exp $ -A complete list of changes from the NetBSD 6.1.1 release to the NetBSD 6.1.2 +A complete list of changes from the NetBSD 6.1.2 release to the NetBSD 6.1.3 release: doc/README.filespatched by hand
CVS commit: src/gnu/dist/groff/src
Module Name:src Committed By: joerg Date: Fri Jan 10 11:29:24 UTC 2014 Modified Files: src/gnu/dist/groff/src/devices/grohtml: post-html.cpp src/gnu/dist/groff/src/roff/troff: node.cpp Log Message: Use format strings. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 \ src/gnu/dist/groff/src/devices/grohtml/post-html.cpp cvs rdiff -u -r1.2 -r1.3 src/gnu/dist/groff/src/roff/troff/node.cpp 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/groff/src/devices/grohtml/post-html.cpp diff -u src/gnu/dist/groff/src/devices/grohtml/post-html.cpp:1.1.1.3 src/gnu/dist/groff/src/devices/grohtml/post-html.cpp:1.2 --- src/gnu/dist/groff/src/devices/grohtml/post-html.cpp:1.1.1.3 Mon Feb 6 18:14:50 2006 +++ src/gnu/dist/groff/src/devices/grohtml/post-html.cpp Fri Jan 10 11:29:24 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: post-html.cpp,v 1.1.1.3 2006/02/06 18:14:50 wiz Exp $ */ +/* $NetBSD: post-html.cpp,v 1.2 2014/01/10 11:29:24 joerg Exp $ */ // -*- C++ -*- /* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 @@ -1589,7 +1589,7 @@ void header_desc::write_headings (FILE * buffer += as_string(h); buffer += '\0'; - fprintf(f, buffer.contents()); + fprintf(f, "%s", buffer.contents()); } else fputs(g->text_string, f); h++; Index: src/gnu/dist/groff/src/roff/troff/node.cpp diff -u src/gnu/dist/groff/src/roff/troff/node.cpp:1.2 src/gnu/dist/groff/src/roff/troff/node.cpp:1.3 --- src/gnu/dist/groff/src/roff/troff/node.cpp:1.2 Fri Jan 6 15:16:03 2012 +++ src/gnu/dist/groff/src/roff/troff/node.cpp Fri Jan 10 11:29:24 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: node.cpp,v 1.2 2012/01/06 15:16:03 joerg Exp $ */ +/* $NetBSD: node.cpp,v 1.3 2014/01/10 11:29:24 joerg Exp $ */ // -*- C++ -*- /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005 @@ -2159,7 +2159,7 @@ void glyph_node::debug_node() if (c) fprintf(stderr, "%c", c); else -fprintf(stderr, ci->nm.contents()); +fprintf(stderr, "%s", ci->nm.contents()); if (push_state) fprintf(stderr, " "); if (state)
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Fri Jan 10 11:12:03 UTC 2014
Modified Files:
src/sys/arch/luna68k/stand/boot: Makefile autoconf.c boot.c devopen.c
if_le.c init_main.c samachdep.h sc.c scsivar.h sd.c version
Removed Files:
src/sys/arch/luna68k/stand/boot: device.h ioconf.c
Log Message:
Reorgenize boot device configuration. The idea is taken from OpenBSD/luna88k.
- remove kernel-like autoconfiguration to probe bootable devices
- initialize SCSI and Ethernet controllers statically instead
- reorganize device softc structures per autoconf removal
- probe and print all SCSI disks (but don't assign unit numbers)
- make sdopen() to recheck the device and allocate softc dynamically
- use controller number and SCSI target ID (ctlr * 10 + id) to specify
the boot disk on the "boot" command arg
- bump version to denote changes
Now bootloader works as the following:
---
>> NetBSD/luna68k boot, Revision 1.8 (Wed Jan 8 22:13:12 JST 2014)
>> (based on Stinger ver 0.0 [Phase-31])
Machine model = LUNA-II
Physical Memory = 0x400 (64 MB)
sc0 at 0xe100: async, parity, ID 7
ID 3: TEAC FC-1 HGF 10 rev , 512 bytes/sect x 2879 sectors
ID 6: IBM DPES-31080 rev S31Q, 512 bytes/sect x 2118143 sectors
sc1 at 0xe140: async, parity, ID 7
ID 6: MELCO DSC-G rev 1.00, 512 bytes/sect x 62533295 sectors
le0: Am7990 LANCE Ethernet, mem at 0x7101
le0: Ethernet address = 00:00:0a:03:42:77
Press return to boot now, any other key for boot menu
booting sd(16,0)netbsd - starting in 0 seconds.
auto-boot sd(16,0)netbsd
1911696+96040 [280480+159179]=0x255a30
:
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/luna68k/stand/boot/Makefile \
src/sys/arch/luna68k/stand/boot/autoconf.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/boot.c \
src/sys/arch/luna68k/stand/boot/devopen.c \
src/sys/arch/luna68k/stand/boot/if_le.c
cvs rdiff -u -r1.7 -r0 src/sys/arch/luna68k/stand/boot/device.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/luna68k/stand/boot/init_main.c \
src/sys/arch/luna68k/stand/boot/sc.c src/sys/arch/luna68k/stand/boot/sd.c \
src/sys/arch/luna68k/stand/boot/version
cvs rdiff -u -r1.5 -r0 src/sys/arch/luna68k/stand/boot/ioconf.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/luna68k/stand/boot/samachdep.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/stand/boot/scsivar.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/luna68k/stand/boot/Makefile
diff -u src/sys/arch/luna68k/stand/boot/Makefile:1.9 src/sys/arch/luna68k/stand/boot/Makefile:1.10
--- src/sys/arch/luna68k/stand/boot/Makefile:1.9 Tue Jan 22 15:48:40 2013
+++ src/sys/arch/luna68k/stand/boot/Makefile Fri Jan 10 11:12:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/01/22 15:48:40 tsutsui Exp $
+# $NetBSD: Makefile,v 1.10 2014/01/10 11:12:03 tsutsui Exp $
# @(#)Makefile 8.2 (Berkeley) 8/15/93
NOMAN= # defined
@@ -32,7 +32,7 @@ LDSCRIPT= ${.CURDIR}/boot.ldscript
LINKFORMAT= -static -N -Ttext ${TEXTADDR} -T ${LDSCRIPT}
SRCS= locore.S
-SRCS+= init_main.c autoconf.c ioconf.c
+SRCS+= init_main.c autoconf.c
SRCS+= trap.c
SRCS+= devopen.c
SRCS+= conf.c
Index: src/sys/arch/luna68k/stand/boot/autoconf.c
diff -u src/sys/arch/luna68k/stand/boot/autoconf.c:1.9 src/sys/arch/luna68k/stand/boot/autoconf.c:1.10
--- src/sys/arch/luna68k/stand/boot/autoconf.c:1.9 Fri Jan 3 03:25:25 2014
+++ src/sys/arch/luna68k/stand/boot/autoconf.c Fri Jan 10 11:12:03 2014
@@ -1,10 +1,7 @@
-/* $NetBSD: autoconf.c,v 1.9 2014/01/03 03:25:25 tsutsui Exp $ */
+/* $NetBSD: autoconf.c,v 1.10 2014/01/10 11:12:03 tsutsui Exp $ */
-/*
- * Copyright (c) 1992 OMRON Corporation.
- *
- * This code is derived from software contributed to Berkeley by
- * OMRON Corporation.
+/*-
+ * Copyright (c) 2013 Izumi Tsutsui. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -14,437 +11,32 @@
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in the
*documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *may be used to endorse or promote products derived from this software
- *without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO
CVS commit: src/tests/lib/libc/ssp
Module Name:src Committed By: martin Date: Fri Jan 10 10:45:34 UTC 2014 Modified Files: src/tests/lib/libc/ssp: t_ssp.sh Log Message: In the strcat test, smash the stack more severely (this all may depend on alignment and stack frame details). The gcc folks disagree with this test in general: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59750 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/ssp/t_ssp.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/ssp/t_ssp.sh diff -u src/tests/lib/libc/ssp/t_ssp.sh:1.5 src/tests/lib/libc/ssp/t_ssp.sh:1.6 --- src/tests/lib/libc/ssp/t_ssp.sh:1.5 Sun Jun 12 21:12:46 2011 +++ src/tests/lib/libc/ssp/t_ssp.sh Fri Jan 10 10:45:34 2014 @@ -1,4 +1,4 @@ -# $NetBSD: t_ssp.sh,v 1.5 2011/06/12 21:12:46 plunky Exp $ +# $NetBSD: t_ssp.sh,v 1.6 2014/01/10 10:45:34 martin Exp $ # # Copyright (c) 2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -177,7 +177,7 @@ strcat_body() prog="$(atf_get_srcdir)/h_strcat" h_pass "$prog 0123456" - h_fail "$prog 012345678" + h_fail "$prog 0123456789ABCDEF" } atf_test_case strncpy
CVS commit: src/share/man/man7
Module Name:src Committed By: wiz Date: Fri Jan 10 09:44:30 UTC 2014 Modified Files: src/share/man/man7: symlink.7 Log Message: whitespace. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/share/man/man7/symlink.7 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/man7/symlink.7 diff -u src/share/man/man7/symlink.7:1.22 src/share/man/man7/symlink.7:1.23 --- src/share/man/man7/symlink.7:1.22 Thu Jan 9 18:55:41 2014 +++ src/share/man/man7/symlink.7 Fri Jan 10 09:44:30 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: symlink.7,v 1.22 2014/01/09 18:55:41 dholland Exp $ +.\" $NetBSD: symlink.7,v 1.23 2014/01/10 09:44:30 wiz Exp $ .\" .\" Copyright (c) 1992, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -514,7 +514,7 @@ For example Expands to the value of .Li MACHINE for the system. -For native binaries, this is +For native binaries, this is equivalent to the output of .Dq uname -m or
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: wiz Date: Fri Jan 10 09:43:15 UTC 2014 Modified Files: src/lib/libc/stdlib: ptsname.3 Log Message: whitespace. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libc/stdlib/ptsname.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/stdlib/ptsname.3 diff -u src/lib/libc/stdlib/ptsname.3:1.8 src/lib/libc/stdlib/ptsname.3:1.9 --- src/lib/libc/stdlib/ptsname.3:1.8 Wed Jan 8 02:17:30 2014 +++ src/lib/libc/stdlib/ptsname.3 Fri Jan 10 09:43:15 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: ptsname.3,v 1.8 2014/01/08 02:17:30 christos Exp $ +.\" $NetBSD: ptsname.3,v 1.9 2014/01/10 09:43:15 wiz Exp $ .\" .\" Copyright (c) 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -57,7 +57,7 @@ The function places the pathname of the slave pseudo-terminal device that corresponds to the master pseudo-terminal device associated with -.Fa masterfd +.Fa masterfd int the .Fa buf argument copying up to
CVS commit: src/sbin/sysctl
Module Name:src
Committed By: pooka
Date: Fri Jan 10 09:38:56 UTC 2014
Modified Files:
src/sbin/sysctl: sysctl.c
Log Message:
give err() some reason to avoid:
sysctl.c:2713:5: error: zero-length gnu_printf format string
[-Werror=format-zero-length]
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/sbin/sysctl/sysctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/sysctl/sysctl.c
diff -u src/sbin/sysctl/sysctl.c:1.149 src/sbin/sysctl/sysctl.c:1.150
--- src/sbin/sysctl/sysctl.c:1.149 Thu Dec 13 05:27:01 2012
+++ src/sbin/sysctl/sysctl.c Fri Jan 10 09:38:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.c,v 1.149 2012/12/13 05:27:01 msaitoh Exp $ */
+/* $NetBSD: sysctl.c,v 1.150 2014/01/10 09:38:56 pooka Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\
#if 0
static char sccsid[] = "@(#)sysctl.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: sysctl.c,v 1.149 2012/12/13 05:27:01 msaitoh Exp $");
+__RCSID("$NetBSD: sysctl.c,v 1.150 2014/01/10 09:38:56 pooka Exp $");
#endif
#endif /* not lint */
@@ -2710,12 +2710,12 @@ bitmask_print(const bitmap *o)
else
rv = asprintf(&s, "%zu", i);
if (rv == -1)
-err(1, "");
+err(1, "bitmask_print 1");
free(os);
os = s;
}
if (s == NULL && (s = strdup("")) == NULL)
- err(1, "");
+ err(1, "bitmask_print 2");
return s;
}
@@ -2724,7 +2724,7 @@ bitmask_scan(const void *v, bitmap *o)
{
char *s = strdup(v);
if (s == NULL)
- err(1, "");
+ err(1, "bitmask_scan");
__BITMAP_ZERO(o);
for (s = strtok(s, ","); s; s = strtok(NULL, ",")) {
