CVS commit: src/usr.bin/make
Module Name:src Committed By: apb Date: Sun Jan 19 10:23:29 UTC 2014 Modified Files: src/usr.bin/make: make.1 Log Message: Emphasise the fact that the regexp and replacement in :C/// are subjected to variable expansion before regexp parsing. This was already documented if you read carefully enough, but more emphasis would have helped me to figure out why I needed three or four backslashes where I expected to need only two. To generate a diff of this commit: cvs rdiff -u -r1.228 -r1.229 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.228 src/usr.bin/make/make.1:1.229 --- src/usr.bin/make/make.1:1.228 Fri Jan 10 16:28:34 2014 +++ src/usr.bin/make/make.1 Sun Jan 19 10:23:29 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: make.1,v 1.228 2014/01/10 16:28:34 wiz Exp $ +.\ $NetBSD: make.1,v 1.229 2014/01/19 10:23:29 apb 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 January 10, 2014 +.Dd January 19, 2014 .Dt MAKE 1 .Os .Sh NAME @@ -1250,6 +1250,15 @@ and are orthogonal; the former specifies whether multiple words are potentially affected, the latter whether multiple substitutions can potentially occur within each affected word. +.Pp +As for the +.Cm \:S +modifier, the +.Ar pattern +and +.Ar replacement +are subjected to variable expansion before being parsed as +regular expressions. .It Cm \:T Replaces each word in the variable with its last component. .It Cm \:u
CVS commit: src/sys/arch
Module Name:src
Committed By: dsl
Date: Sun Jan 19 10:30:19 UTC 2014
Modified Files:
src/sys/arch/amd64/include: pcb.h
src/sys/arch/i386/include: pcb.h
Log Message:
Remove the unused 'struct md_coredump'.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amd64/include/pcb.h
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/i386/include/pcb.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/amd64/include/pcb.h
diff -u src/sys/arch/amd64/include/pcb.h:1.21 src/sys/arch/amd64/include/pcb.h:1.22
--- src/sys/arch/amd64/include/pcb.h:1.21 Wed Dec 11 22:06:51 2013
+++ src/sys/arch/amd64/include/pcb.h Sun Jan 19 10:30:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pcb.h,v 1.21 2013/12/11 22:06:51 dsl Exp $ */
+/* $NetBSD: pcb.h,v 1.22 2014/01/19 10:30:19 dsl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -102,14 +102,6 @@ struct pcb {
int pcb_iopl;
};
-/*
- * The pcb is augmented with machine-dependent additional data for
- * core dumps. For the i386, there is nothing to add.
- */
-struct md_coredump {
- long md_pad[8];
-};
-
#else /* __x86_64__ */
#include i386/pcb.h
Index: src/sys/arch/i386/include/pcb.h
diff -u src/sys/arch/i386/include/pcb.h:1.50 src/sys/arch/i386/include/pcb.h:1.51
--- src/sys/arch/i386/include/pcb.h:1.50 Sun Dec 1 01:05:16 2013
+++ src/sys/arch/i386/include/pcb.h Sun Jan 19 10:30:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pcb.h,v 1.50 2013/12/01 01:05:16 christos Exp $ */
+/* $NetBSD: pcb.h,v 1.51 2014/01/19 10:30:19 dsl Exp $ */
/*-
* Copyright (c) 1998, 2009 The NetBSD Foundation, Inc.
@@ -104,12 +104,4 @@ struct pcb {
char *pcb_iomap; /* I/O permission bitmap */
};
-/*
- * The pcb is augmented with machine-dependent additional data for
- * core dumps. For the i386, there is nothing to add.
- */
-struct md_coredump {
- long md_pad[8];
-};
-
#endif /* _I386_PCB_H_ */
CVS commit: src/lib/libc
Module Name:src
Committed By: apb
Date: Sun Jan 19 11:36:45 UTC 2014
Modified Files:
src/lib/libc: Makefile
Log Message:
If MKREPRO=yes, make the tags file refer to /usr/src
instead of referring to the actual source directory ${NETBSDSRC}.
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/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/lib/libc/Makefile
diff -u src/lib/libc/Makefile:1.162 src/lib/libc/Makefile:1.163
--- src/lib/libc/Makefile:1.162 Sat Jan 18 01:08:56 2014
+++ src/lib/libc/Makefile Sun Jan 19 11:36:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.162 2014/01/18 01:08:56 joerg Exp $
+# $NetBSD: Makefile,v 1.163 2014/01/19 11:36:45 apb Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -130,13 +130,24 @@ LSRCS := ${LSRCS} ${unwanted_file}
NLS= C.msg Pig.msg ca.msg cs.msg de.msg es.msg fi.msg fr.msg nl.msg \
no.msg pl.msg sk.msg sv.msg
+.if ${MKREPRO:Uno} == yes
+REGEX_SPECIALS=[][)(^$$.?*\\;]
+MKREPRO_SED= -e 's;${NETBSDSRCDIR:C/${REGEX_SPECIALS}//g};/usr/src;'
+.endif
+
realall: tags
tags: ${SRCS}
${_MKTARGET_CREATE}
- -${TOOL_CTAGS} -w ${.ALLSRC:M*.c}
+ -${TOOL_CTAGS} -f ${.TARGET}.tmp -w ${.ALLSRC:M*.c}
-egrep ^ENTRY(.*)|^FUNC(.*)|^SYSCALL(.*) /dev/null ${.ALLSRC:M*.S} | \
sed s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/; \
- ${.TARGET}; sort -o ${.TARGET} ${.TARGET}
+${.TARGET}.tmp
+.if ${MKREPRO:Uno} == yes
+ sed ${MKREPRO_SED} ${.TARGET}.tmp | sort -o ${.TARGET}
+.else
+ sort -o ${.TARGET} ${.TARGET}.tmp
+.endif
+ rm -f ${.TARGET}.tmp
FILES= tags
FILESNAME= libc.tags
CVS commit: src/sys
Module Name:src
Committed By: dsl
Date: Sun Jan 19 13:35:58 UTC 2014
Modified Files:
src/sys/arch/i386/i386: freebsd_machdep.c
src/sys/arch/i386/include: freebsd_machdep.h
src/sys/compat/freebsd: freebsd_ptrace.c
Log Message:
Rip out the code that might once have supported the freebsd ptrace
system calls.
Removes some very dodgy conversions of FP register layouts.
Most of it has been disabled since 2007 when I removed the stackgap.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/i386/i386/freebsd_machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/include/freebsd_machdep.h
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/freebsd/freebsd_ptrace.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/i386/freebsd_machdep.c
diff -u src/sys/arch/i386/i386/freebsd_machdep.c:1.56 src/sys/arch/i386/i386/freebsd_machdep.c:1.57
--- src/sys/arch/i386/i386/freebsd_machdep.c:1.56 Sun Dec 8 20:45:30 2013
+++ src/sys/arch/i386/i386/freebsd_machdep.c Sun Jan 19 13:35:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_machdep.c,v 1.56 2013/12/08 20:45:30 dsl Exp $ */
+/* $NetBSD: freebsd_machdep.c,v 1.57 2014/01/19 13:35:58 dsl Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: freebsd_machdep.c,v 1.56 2013/12/08 20:45:30 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: freebsd_machdep.c,v 1.57 2014/01/19 13:35:58 dsl Exp $);
#if defined(_KERNEL_OPT)
#include opt_vm86.h
@@ -56,7 +56,6 @@ __KERNEL_RCSID(0, $NetBSD: freebsd_mach
#include compat/freebsd/freebsd_syscallargs.h
#include compat/freebsd/freebsd_exec.h
#include compat/freebsd/freebsd_signal.h
-#include compat/freebsd/freebsd_ptrace.h
void
freebsd_setregs(struct lwp *l, struct exec_package *epp, vaddr_t stack)
@@ -255,152 +254,3 @@ freebsd_sys_sigreturn(struct lwp *l, con
return (EJUSTRETURN);
}
-
-/*
- * freebsd_ptrace(2) support
- */
-
-void
-netbsd_to_freebsd_ptrace_regs(struct reg *nregs, struct fpreg *nfpregs, struct freebsd_ptrace_reg *fregs)
-{
- struct save87 *nframe = (struct save87 *)nfpregs;
-
- fregs-freebsd_ptrace_regs.tf_es = nregs-r_es;
- fregs-freebsd_ptrace_regs.tf_ds = nregs-r_ds;
- fregs-freebsd_ptrace_regs.tf_edi = nregs-r_edi;
- fregs-freebsd_ptrace_regs.tf_esi = nregs-r_esi;
- fregs-freebsd_ptrace_regs.tf_ebp = nregs-r_ebp;
- fregs-freebsd_ptrace_regs.tf_isp = 0;
- fregs-freebsd_ptrace_regs.tf_ebx = nregs-r_ebx;
- fregs-freebsd_ptrace_regs.tf_edx = nregs-r_edx;
- fregs-freebsd_ptrace_regs.tf_ecx = nregs-r_ecx;
- fregs-freebsd_ptrace_regs.tf_eax = nregs-r_eax;
- fregs-freebsd_ptrace_regs.tf_trapno = 0;
-
- fregs-freebsd_ptrace_regs.tf_err = 0;
- fregs-freebsd_ptrace_regs.tf_eip = nregs-r_eip;
- fregs-freebsd_ptrace_regs.tf_cs = nregs-r_cs;
- fregs-freebsd_ptrace_regs.tf_eflags = nregs-r_eflags;
-
- fregs-freebsd_ptrace_regs.tf_esp = nregs-r_esp;
- fregs-freebsd_ptrace_regs.tf_ss = nregs-r_ss;
-
- fregs-freebsd_ptrace_fpregs.sv_env = nframe-sv_env;
- memcpy(fregs-freebsd_ptrace_fpregs.sv_ac, nframe-sv_ac,
- sizeof(fregs-freebsd_ptrace_fpregs.sv_ac));
- fregs-freebsd_ptrace_fpregs.sv_ex_sw =
- nframe-sv_ex_sw;
- /*
- * fortunately, sizeof(freebsd_save87) = sizeof(save87)
- */
-#ifdef DIAGNOSTIC
- if (sizeof(fregs-freebsd_ptrace_fpregs.sv_pad)
- sizeof(nframe-sv_ex_tw) + sizeof(nframe-sv_pad)) {
- panic(netbsd_to_freebsd_ptrace_regs: %s,
- sizeof(freebsd_save87) = sizeof(save87));
- }
-#endif
- memcpy(fregs-freebsd_ptrace_fpregs.sv_pad, nframe-sv_ex_tw,
- sizeof(nframe-sv_ex_tw));
- memcpy((char *)fregs-freebsd_ptrace_fpregs.sv_pad +
- sizeof(nframe-sv_ex_tw),
- nframe-sv_pad,
- sizeof(nframe-sv_pad));
- memset((char *)fregs-freebsd_ptrace_fpregs.sv_pad +
- sizeof(nframe-sv_ex_tw) + sizeof(nframe-sv_pad),
- 0,
- sizeof(fregs-freebsd_ptrace_fpregs.sv_pad) -
- sizeof(nframe-sv_ex_tw) - sizeof(nframe-sv_pad));
-}
-
-void
-freebsd_to_netbsd_ptrace_regs(struct freebsd_ptrace_reg *fregs, struct reg *nregs, struct fpreg *nfpregs)
-{
- struct save87 *nframe = (struct save87 *)nfpregs;
-
- nregs-r_es = fregs-freebsd_ptrace_regs.tf_es;
- nregs-r_ds = fregs-freebsd_ptrace_regs.tf_ds;
- nregs-r_edi = fregs-freebsd_ptrace_regs.tf_edi;
- nregs-r_esi = fregs-freebsd_ptrace_regs.tf_esi;
- nregs-r_ebp = fregs-freebsd_ptrace_regs.tf_ebp;
- nregs-r_ebx = fregs-freebsd_ptrace_regs.tf_ebx;
- nregs-r_edx = fregs-freebsd_ptrace_regs.tf_edx;
- nregs-r_ecx = fregs-freebsd_ptrace_regs.tf_ecx;
- nregs-r_eax = fregs-freebsd_ptrace_regs.tf_eax;
-
- nregs-r_eip = fregs-freebsd_ptrace_regs.tf_eip;
- nregs-r_cs = fregs-freebsd_ptrace_regs.tf_cs;
- nregs-r_eflags = fregs-freebsd_ptrace_regs.tf_eflags;
-
- nregs-r_esp = fregs-freebsd_ptrace_regs.tf_esp;
- nregs-r_ss = fregs-freebsd_ptrace_regs.tf_ss;
-
- nframe-sv_env =
CVS commit: src/sys/compat/freebsd
Module Name:src Committed By: dsl Date: Sun Jan 19 13:36:40 UTC 2014 Removed Files: src/sys/compat/freebsd: freebsd_ptrace.h Log Message: No longer used. To generate a diff of this commit: cvs rdiff -u -r1.6 -r0 src/sys/compat/freebsd/freebsd_ptrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/crypto/opencrypto
Module Name:src Committed By: pgoyette Date: Sun Jan 19 13:41:00 UTC 2014 Modified Files: src/tests/crypto/opencrypto: h_aesctr1.c Log Message: Sprinkle in some UNCONST() To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/crypto/opencrypto/h_aesctr1.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/crypto/opencrypto/h_aesctr1.c diff -u src/tests/crypto/opencrypto/h_aesctr1.c:1.3 src/tests/crypto/opencrypto/h_aesctr1.c:1.4 --- src/tests/crypto/opencrypto/h_aesctr1.c:1.3 Sat Jan 18 20:40:27 2014 +++ src/tests/crypto/opencrypto/h_aesctr1.c Sun Jan 19 13:40:59 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: h_aesctr1.c,v 1.3 2014/01/18 20:40:27 pgoyette Exp $ */ +/* $NetBSD: h_aesctr1.c,v 1.4 2014/01/19 13:40:59 pgoyette Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -219,7 +219,7 @@ main(void) memset(cs, 0, sizeof(cs)); cs.cipher = CRYPTO_AES_CTR; cs.keylen = tests[i].key_len; - cs.key = tests[i].key; + cs.key = __UNCONST(tests[i].key); res = ioctl(fd, CIOCGSESSION, cs); if (res 0) err(1, CIOCGSESSION %zu, i); @@ -228,10 +228,10 @@ main(void) co.ses = cs.ses; co.op = COP_ENCRYPT; co.len = tests[i].len; - co.src = tests[i].plaintx; + co.src = __UNCONST(tests[i].plaintx); co.dst = buf; co.dst_len = sizeof(buf); - co.iv = tests[i].iv; + co.iv = __UNCONST(tests[i].iv); res = ioctl(fd, CIOCCRYPT, co); if (res 0) err(1, CIOCCRYPT %zu, i);
CVS commit: src/sys
Module Name:src
Committed By: dsl
Date: Sun Jan 19 14:30:38 UTC 2014
Modified Files:
src/sys/arch/i386/i386: freebsd_machdep.c ibcs2_machdep.c machdep.c
process_machdep.c svr4_machdep.c trap.c
src/sys/arch/i386/include: npx.h
src/sys/arch/i386/isa: npx.c
src/sys/compat/linux/arch/i386: linux_machdep.c
Log Message:
Flatten the floating point register structures bu moving the
'environment' registers into the main strcuture.
There are x87 instructions that only affect the environment, but that
is no real excuse for all the sub-structures.
Rename fields so that there are far fewer collisions between the two
sets of field names.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/i386/i386/freebsd_machdep.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/i386/i386/ibcs2_machdep.c
cvs rdiff -u -r1.741 -r1.742 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/i386/i386/process_machdep.c
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/i386/i386/svr4_machdep.c
cvs rdiff -u -r1.267 -r1.268 src/sys/arch/i386/i386/trap.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/i386/include/npx.h
cvs rdiff -u -r1.147 -r1.148 src/sys/arch/i386/isa/npx.c
cvs rdiff -u -r1.154 -r1.155 src/sys/compat/linux/arch/i386/linux_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/i386/i386/freebsd_machdep.c
diff -u src/sys/arch/i386/i386/freebsd_machdep.c:1.57 src/sys/arch/i386/i386/freebsd_machdep.c:1.58
--- src/sys/arch/i386/i386/freebsd_machdep.c:1.57 Sun Jan 19 13:35:58 2014
+++ src/sys/arch/i386/i386/freebsd_machdep.c Sun Jan 19 14:30:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_machdep.c,v 1.57 2014/01/19 13:35:58 dsl Exp $ */
+/* $NetBSD: freebsd_machdep.c,v 1.58 2014/01/19 14:30:37 dsl Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: freebsd_machdep.c,v 1.57 2014/01/19 13:35:58 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: freebsd_machdep.c,v 1.58 2014/01/19 14:30:37 dsl Exp $);
#if defined(_KERNEL_OPT)
#include opt_vm86.h
@@ -64,9 +64,9 @@ freebsd_setregs(struct lwp *l, struct ex
setregs(l, epp, stack);
if (i386_use_fxsave)
- pcb-pcb_savefpu.sv_xmm.sv_env.fx_cw = __FreeBSD_NPXCW__;
+ pcb-pcb_savefpu.sv_xmm.fx_cw = __FreeBSD_NPXCW__;
else
- pcb-pcb_savefpu.sv_87.sv_env.en_cw = __FreeBSD_NPXCW__;
+ pcb-pcb_savefpu.sv_87.s87_cw = __FreeBSD_NPXCW__;
}
/*
Index: src/sys/arch/i386/i386/ibcs2_machdep.c
diff -u src/sys/arch/i386/i386/ibcs2_machdep.c:1.41 src/sys/arch/i386/i386/ibcs2_machdep.c:1.42
--- src/sys/arch/i386/i386/ibcs2_machdep.c:1.41 Sun Dec 8 20:45:30 2013
+++ src/sys/arch/i386/i386/ibcs2_machdep.c Sun Jan 19 14:30:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ibcs2_machdep.c,v 1.41 2013/12/08 20:45:30 dsl Exp $ */
+/* $NetBSD: ibcs2_machdep.c,v 1.42 2014/01/19 14:30:37 dsl Exp $ */
/*-
* Copyright (c) 1997, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ibcs2_machdep.c,v 1.41 2013/12/08 20:45:30 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: ibcs2_machdep.c,v 1.42 2014/01/19 14:30:37 dsl Exp $);
#if defined(_KERNEL_OPT)
#include opt_vm86.h
@@ -69,9 +69,9 @@ ibcs2_setregs(struct lwp *l, struct exec
setregs(l, epp, stack);
if (i386_use_fxsave)
- pcb-pcb_savefpu.sv_xmm.sv_env.fx_cw = __iBCS2_NPXCW__;
+ pcb-pcb_savefpu.sv_xmm.fx_cw = __iBCS2_NPXCW__;
else
- pcb-pcb_savefpu.sv_87.sv_env.en_cw = __iBCS2_NPXCW__;
+ pcb-pcb_savefpu.sv_87.s87_cw = __iBCS2_NPXCW__;
tf = l-l_md.md_regs;
tf-tf_eax = 0x200; /* XXX base of heap */
tf-tf_cs = GSEL(GUCODEBIG_SEL, SEL_UPL);
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.741 src/sys/arch/i386/i386/machdep.c:1.742
--- src/sys/arch/i386/i386/machdep.c:1.741 Thu Jan 9 00:57:25 2014
+++ src/sys/arch/i386/i386/machdep.c Sun Jan 19 14:30:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.741 2014/01/09 00:57:25 dholland Exp $ */
+/* $NetBSD: machdep.c,v 1.742 2014/01/19 14:30:37 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.741 2014/01/09 00:57:25 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.742 2014/01/19 14:30:37 dsl Exp $);
#include opt_beep.h
#include opt_compat_ibcs2.h
@@ -887,10 +887,10 @@ setregs(struct lwp *l, struct exec_packa
l-l_md.md_flags = ~MDL_USEDFPU;
if (i386_use_fxsave) {
- pcb-pcb_savefpu.sv_xmm.sv_env.fx_cw = control;
- pcb-pcb_savefpu.sv_xmm.sv_env.fx_mxcsr = __INITIAL_MXCSR__;
+ pcb-pcb_savefpu.sv_xmm.fx_cw = control;
+ pcb-pcb_savefpu.sv_xmm.fx_mxcsr = __INITIAL_MXCSR__;
} else
- pcb-pcb_savefpu.sv_87.sv_env.en_cw = control;
+ pcb-pcb_savefpu.sv_87.s87_cw = control;
memcpy(pcb-pcb_fsd,
CVS commit: src/sys/opencrypto
Module Name:src
Committed By: christos
Date: Sun Jan 19 18:16:13 UTC 2014
Modified Files:
src/sys/opencrypto: cryptodev.c
Log Message:
bail out unloading for now
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/opencrypto/cryptodev.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/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.71 src/sys/opencrypto/cryptodev.c:1.72
--- src/sys/opencrypto/cryptodev.c:1.71 Sat Jan 4 16:42:42 2014
+++ src/sys/opencrypto/cryptodev.c Sun Jan 19 13:16:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.71 2014/01/04 21:42:42 pgoyette Exp $ */
+/* $NetBSD: cryptodev.c,v 1.72 2014/01/19 18:16:13 christos Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.71 2014/01/04 21:42:42 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.72 2014/01/19 18:16:13 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2205,6 +2205,8 @@ crypto_modcmd(modcmd_t cmd, void *arg)
return error;
case MODULE_CMD_FINI:
#ifdef _MODULE
+#ifdef notyet
+ /* We need to keep track of open instances before we do this */
error = config_cfdata_detach(crypto_cfdata);
if (error) {
return error;
@@ -2213,6 +2215,9 @@ crypto_modcmd(modcmd_t cmd, void *arg)
config_cfattach_detach(crypto_cd.cd_name, crypto_ca);
config_cfdriver_detach(crypto_cd);
devsw_detach(NULL, crypto_cdevsw);
+#else
+ return EOPNOTSUPP;
+#endif
#endif
return error;
CVS commit: src/tests/lib/libcurses
Module Name:src
Committed By: apb
Date: Sun Jan 19 21:50:17 UTC 2014
Modified Files:
src/tests/lib/libcurses/director: Makefile
src/tests/lib/libcurses/slave: Makefile
Log Message:
Remove -g from CPPFLAGS and LDFLAGS in curses tests.
The debug information contains embedded references to the src directory,
which is bad for reproducible builds.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libcurses/director/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libcurses/slave/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/libcurses/director/Makefile
diff -u src/tests/lib/libcurses/director/Makefile:1.6 src/tests/lib/libcurses/director/Makefile:1.7
--- src/tests/lib/libcurses/director/Makefile:1.6 Sun Jun 3 02:10:46 2012
+++ src/tests/lib/libcurses/director/Makefile Sun Jan 19 21:50:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/06/03 02:10:46 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2014/01/19 21:50:17 apb Exp $
#
.include bsd.own.mk
@@ -12,8 +12,7 @@ NOMAN= true
SRCS= testlang_parse.y testlang_conf.l director.c
YHEADER= 1
-CPPFLAGS+= -O0 -g -I${.CURDIR} -I.
-LDFLAGS+= -g
+CPPFLAGS+= -O0 -I${.CURDIR} -I.
DPADD+= ${LIBL}
LDADD+= -ll -lutil -lc
Index: src/tests/lib/libcurses/slave/Makefile
diff -u src/tests/lib/libcurses/slave/Makefile:1.6 src/tests/lib/libcurses/slave/Makefile:1.7
--- src/tests/lib/libcurses/slave/Makefile:1.6 Thu Sep 8 18:44:38 2011
+++ src/tests/lib/libcurses/slave/Makefile Sun Jan 19 21:50:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/09/08 18:44:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2014/01/19 21:50:17 apb Exp $
#
.include bsd.own.mk
@@ -11,7 +11,7 @@ NOMAN= true
#MAN= slave.7
SRCS= slave.c commands.c curses_commands.c
-CPPFLAGS+= -g -I${.CURDIR} -I. -I${.CURDIR}/../director
+CPPFLAGS+= -I${.CURDIR} -I. -I${.CURDIR}/../director
LDADD+= -lcurses -lterminfo -Wl,--no-fatal-warnings
COPTS.curses_commands.c += -Wno-format-nonliteral
CVS commit: src/tests/lib/libcurses/director
Module Name:src
Committed By: apb
Date: Sun Jan 19 22:09:34 UTC 2014
Modified Files:
src/tests/lib/libcurses/director: Makefile
Log Message:
Remove -O0 from CPPFLAGS, and instead set
COPTS.testlang_parse.c += -Wno-uninitialized.
Without the old -O0, and without the new -Wno-uninitialized,
gcc issues this bogus error:
testlang_parse.y:1400:8: error: 'cmd' may be used uninitialized in this function
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libcurses/director/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/libcurses/director/Makefile
diff -u src/tests/lib/libcurses/director/Makefile:1.7 src/tests/lib/libcurses/director/Makefile:1.8
--- src/tests/lib/libcurses/director/Makefile:1.7 Sun Jan 19 21:50:17 2014
+++ src/tests/lib/libcurses/director/Makefile Sun Jan 19 22:09:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/01/19 21:50:17 apb Exp $
+# $NetBSD: Makefile,v 1.8 2014/01/19 22:09:34 apb Exp $
#
.include bsd.own.mk
@@ -12,10 +12,11 @@ NOMAN= true
SRCS= testlang_parse.y testlang_conf.l director.c
YHEADER= 1
-CPPFLAGS+= -O0 -I${.CURDIR} -I.
+CPPFLAGS+= -I${.CURDIR} -I.
DPADD+= ${LIBL}
LDADD+= -ll -lutil -lc
+COPTS.testlang_parse.c += -Wno-uninitialized
CWARNFLAGS.clang+= -Wno-format -Wno-conversion
.include bsd.test.mk
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: matt
Date: Sun Jan 19 22:31:13 UTC 2014
Modified Files:
src/sbin/ifconfig: af_link.c
Log Message:
Rename link to link_pkw to avoid shadowing the link syscall.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sbin/ifconfig/af_link.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/ifconfig/af_link.c
diff -u src/sbin/ifconfig/af_link.c:1.6 src/sbin/ifconfig/af_link.c:1.7
--- src/sbin/ifconfig/af_link.c:1.6 Tue Apr 21 22:46:39 2009
+++ src/sbin/ifconfig/af_link.c Sun Jan 19 22:31:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: af_link.c,v 1.6 2009/04/21 22:46:39 dyoung Exp $ */
+/* $NetBSD: af_link.c,v 1.7 2014/01/19 22:31:13 matt Exp $ */
/*-
* Copyright (c) 2008 David Young. All rights reserved.
@@ -27,7 +27,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: af_link.c,v 1.6 2009/04/21 22:46:39 dyoung Exp $);
+__RCSID($NetBSD: af_link.c,v 1.7 2014/01/19 22:31:13 matt Exp $);
#endif /* not lint */
#include sys/param.h
@@ -59,7 +59,7 @@ static const struct kwinst linkkw[] = {
.k_bool = true, .k_nextparser = command_root.pb_parser}
};
-struct pkw link = PKW_INITIALIZER(link, link, NULL, NULL,
+struct pkw link_pkw = PKW_INITIALIZER(link_pkw, link, NULL, NULL,
linkkw, __arraycount(linkkw), NULL);
static struct afswtch af = {
@@ -127,6 +127,6 @@ static void
link_constructor(void)
{
register_family(af);
- cmdloop_branch_init(branch, link.pk_parser);
+ cmdloop_branch_init(branch, link_pkw.pk_parser);
register_cmdloop_branch(branch);
}
CVS commit: src/sys/arch/i386/include
Module Name:src
Committed By: dsl
Date: Sun Jan 19 23:27:30 UTC 2014
Modified Files:
src/sys/arch/i386/include: npx.h
Log Message:
Add a couple of __CTASSERT() for the sizes of the fp save structures.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/i386/include/npx.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/include/npx.h
diff -u src/sys/arch/i386/include/npx.h:1.28 src/sys/arch/i386/include/npx.h:1.29
--- src/sys/arch/i386/include/npx.h:1.28 Sun Jan 19 14:30:37 2014
+++ src/sys/arch/i386/include/npx.h Sun Jan 19 23:27:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npx.h,v 1.28 2014/01/19 14:30:37 dsl Exp $ */
+/* $NetBSD: npx.h,v 1.29 2014/01/19 23:27:30 dsl Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -91,6 +91,7 @@ struct save87 {
uint8_t s87_pad[8 * 2 - 2 * 4]; /* bogus historical padding */
#endif
};
+__CTASSERT(sizeof (struct save87) == 108 + 16);
/* FPU regsters in the extended save format. */
struct fpaccxmm {
@@ -121,6 +122,8 @@ struct fxsave {
uint32_t sv_ex_sw; /* saved SW from last exception */
uint32_t sv_ex_tw; /* saved TW from last exception */
} __aligned(16);
+__CTASSERT(sizeof (struct fxsave) == 512 + 16);
+
union savefpu {
struct save87 sv_87;
CVS commit: src/gnu/dist/gcc4/libobjc
Module Name:src
Committed By: christos
Date: Mon Jan 20 00:05:57 UTC 2014
Modified Files:
src/gnu/dist/gcc4/libobjc: archive.c sendmsg.c
Log Message:
fix some inlines to make compilable with later versions of gcc
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/gnu/dist/gcc4/libobjc/archive.c
cvs rdiff -u -r1.2 -r1.3 src/gnu/dist/gcc4/libobjc/sendmsg.c
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/gcc4/libobjc/archive.c
diff -u src/gnu/dist/gcc4/libobjc/archive.c:1.1.1.1 src/gnu/dist/gcc4/libobjc/archive.c:1.2
--- src/gnu/dist/gcc4/libobjc/archive.c:1.1.1.1 Thu Apr 20 05:55:17 2006
+++ src/gnu/dist/gcc4/libobjc/archive.c Sun Jan 19 19:05:57 2014
@@ -351,7 +351,7 @@ objc_write_use_common (struct objc_typed
}
}
-static inline int
+inline int
__objc_write_extension (struct objc_typed_stream *stream, unsigned char code)
{
if (code = _B_VALUE)
@@ -367,7 +367,7 @@ __objc_write_extension (struct objc_type
}
}
-inline int
+static inline int
__objc_write_object (struct objc_typed_stream *stream, id object)
{
unsigned char buf = '\0';
@@ -433,7 +433,7 @@ objc_write_object (struct objc_typed_str
}
}
-inline int
+static inline int
__objc_write_class (struct objc_typed_stream *stream, struct objc_class *class)
{
__objc_write_extension (stream, _BX_CLASS);
Index: src/gnu/dist/gcc4/libobjc/sendmsg.c
diff -u src/gnu/dist/gcc4/libobjc/sendmsg.c:1.2 src/gnu/dist/gcc4/libobjc/sendmsg.c:1.3
--- src/gnu/dist/gcc4/libobjc/sendmsg.c:1.2 Thu May 11 20:25:04 2006
+++ src/gnu/dist/gcc4/libobjc/sendmsg.c Sun Jan 19 19:05:57 2014
@@ -86,7 +86,7 @@ Method_t search_for_method_in_list (Meth
id nil_method (id, SEL);
/* Given a selector, return the proper forwarding implementation. */
-inline
+static inline
IMP
__objc_get_forward_imp (SEL sel)
{
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Mon Jan 20 01:10:38 UTC 2014
Modified Files:
src/sys/dev/pci: pucdata.c
Log Message:
Fix a bug that EG20T's UARTs from #1 to #3 never match.
Tested with my MinnowBoard.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/dev/pci/pucdata.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/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.89 src/sys/dev/pci/pucdata.c:1.90
--- src/sys/dev/pci/pucdata.c:1.89 Wed Dec 25 16:05:59 2013
+++ src/sys/dev/pci/pucdata.c Mon Jan 20 01:10:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.89 2013/12/25 16:05:59 msaitoh Exp $ */
+/* $NetBSD: pucdata.c,v 1.90 2014/01/20 01:10:38 msaitoh Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pucdata.c,v 1.89 2013/12/25 16:05:59 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: pucdata.c,v 1.90 2014/01/20 01:10:38 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1852,7 +1852,7 @@ const struct puc_device_description puc_
/* Intel EG20T UART */
{ Intel EG20T UART #1,
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EG20T_UART_1, 0, 1 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EG20T_UART_1, 0, 0 },
{ 0x, 0x, 0, 0 },
{
{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
@@ -1861,7 +1861,7 @@ const struct puc_device_description puc_
/* Intel EG20T UART */
{ Intel EG20T UART #2,
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EG20T_UART_2, 0, 2 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EG20T_UART_2, 0, 0 },
{ 0x, 0x, 0, 0 },
{
{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
@@ -1870,7 +1870,7 @@ const struct puc_device_description puc_
/* Intel EG20T UART */
{ Intel EG20T UART #3,
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EG20T_UART_3, 0, 3 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EG20T_UART_3, 0, 0 },
{ 0x, 0x, 0, 0 },
{
{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
CVS commit: src/external/bsd/openpam/dist/lib
Module Name:src
Committed By: christos
Date: Mon Jan 20 01:15:03 UTC 2014
Modified Files:
src/external/bsd/openpam/dist/lib: openpam_log.c
Log Message:
gcc 4.1 does not support pragma diagnostic ignored
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openpam/dist/lib/openpam_log.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openpam/dist/lib/openpam_log.c
diff -u src/external/bsd/openpam/dist/lib/openpam_log.c:1.6 src/external/bsd/openpam/dist/lib/openpam_log.c:1.7
--- src/external/bsd/openpam/dist/lib/openpam_log.c:1.6 Mon Jan 6 21:15:02 2014
+++ src/external/bsd/openpam/dist/lib/openpam_log.c Sun Jan 19 20:15:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: openpam_log.c,v 1.6 2014/01/07 02:15:02 joerg Exp $ */
+/* $NetBSD: openpam_log.c,v 1.7 2014/01/20 01:15:03 christos Exp $ */
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
@@ -96,7 +96,9 @@ openpam_log(int level, const char *fmt,
#else
+#if __GNUC_PREREQ__(4, 5)
#pragma GCC diagnostic ignored -Wformat-nonliteral
+#endif
void
_openpam_log(int level, const char *func, const char *fmt, ...)
{
CVS commit: src/external/bsd/ntp/lib/libntp
Module Name:src
Committed By: christos
Date: Mon Jan 20 01:32:12 UTC 2014
Modified Files:
src/external/bsd/ntp/lib/libntp: Makefile
Log Message:
Gcc-4.1 does not have -Wno-error
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/lib/libntp/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/bsd/ntp/lib/libntp/Makefile
diff -u src/external/bsd/ntp/lib/libntp/Makefile:1.8 src/external/bsd/ntp/lib/libntp/Makefile:1.9
--- src/external/bsd/ntp/lib/libntp/Makefile:1.8 Wed Jan 15 09:40:30 2014
+++ src/external/bsd/ntp/lib/libntp/Makefile Sun Jan 19 20:32:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/01/15 14:40:30 apb Exp $
+# $NetBSD: Makefile,v 1.9 2014/01/20 01:32:12 christos Exp $
LIBISPRIVATE=yes
@@ -77,7 +77,9 @@ ymd2yd.c
CPPFLAGS+= -I${IDIST}/sntp/libopts
+.if defined(HAVE_GCC) ${HAVE_GCC} = 45
COPTS.msyslog.c+= -Wno-error=format-nonliteral
+.endif
# For MKREPRO, avoid using __DATE__ and __TIME__.
# Instead, use the date and time from ${IMPORTDATE_FILE}.
CVS commit: src/external/bsd/ntp/lib/libiscntp
Module Name:src
Committed By: christos
Date: Mon Jan 20 01:37:53 UTC 2014
Modified Files:
src/external/bsd/ntp/lib/libiscntp: Makefile
Log Message:
gcc 4.1 does not have -Wno-error
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/lib/libiscntp/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/bsd/ntp/lib/libiscntp/Makefile
diff -u src/external/bsd/ntp/lib/libiscntp/Makefile:1.6 src/external/bsd/ntp/lib/libiscntp/Makefile:1.7
--- src/external/bsd/ntp/lib/libiscntp/Makefile:1.6 Thu Jan 2 16:38:38 2014
+++ src/external/bsd/ntp/lib/libiscntp/Makefile Sun Jan 19 20:37:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/01/02 21:38:38 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2014/01/20 01:37:53 christos Exp $
LIBISPRIVATE=yes
@@ -43,6 +43,8 @@ SRCS= assertions.c \
time.c \
sockaddr.c
+.if defined(HAVE_GCC) ${HAVE_GCC} 45
COPTS.log.c+= -Wno-error=format-nonliteral
+.endif
.include bsd.lib.mk
CVS commit: src/external/bsd/ntp/lib/libopts
Module Name:src
Committed By: christos
Date: Mon Jan 20 01:43:34 UTC 2014
Modified Files:
src/external/bsd/ntp/lib/libopts: Makefile
Log Message:
ignore format errors for old gcc
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/lib/libopts/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/bsd/ntp/lib/libopts/Makefile
diff -u src/external/bsd/ntp/lib/libopts/Makefile:1.8 src/external/bsd/ntp/lib/libopts/Makefile:1.9
--- src/external/bsd/ntp/lib/libopts/Makefile:1.8 Thu Jan 2 16:38:38 2014
+++ src/external/bsd/ntp/lib/libopts/Makefile Sun Jan 19 20:43:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/01/02 21:38:38 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2014/01/20 01:43:34 christos Exp $
LIBISPRIVATE=yes
@@ -19,6 +19,8 @@ SRCS=libopts.c
COPTS.libopts.c += -DPOSIX_SHELL=\/bin/sh\ -Wno-format-nonliteral
.if ${HAVE_GCC:U} = 45
COPTS.libopts.c+= ${${ACTIVE_CC} == gcc:? -Wno-format-contains-nul :}
+.else
+COPTS.libopts.c+= -Wno-format
.endif
.include bsd.lib.mk
CVS commit: src/external/bsd/ntp/bin/ntpd
Module Name:src
Committed By: christos
Date: Mon Jan 20 01:52:54 UTC 2014
Modified Files:
src/external/bsd/ntp/bin/ntpd: Makefile
Log Message:
use the old style no-error for gcc-4.1
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/bin/ntpd/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/bsd/ntp/bin/ntpd/Makefile
diff -u src/external/bsd/ntp/bin/ntpd/Makefile:1.15 src/external/bsd/ntp/bin/ntpd/Makefile:1.16
--- src/external/bsd/ntp/bin/ntpd/Makefile:1.15 Thu Jan 2 16:38:38 2014
+++ src/external/bsd/ntp/bin/ntpd/Makefile Sun Jan 19 20:52:54 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/01/02 21:38:38 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2014/01/20 01:52:54 christos Exp $
.include bsd.own.mk
@@ -73,7 +73,7 @@ SRCS= cmd_args.c\
LDADD+= -L${LIBPARSE} -lparse -L${LIBISC} -liscntp -lm -lutil
DPADD+= ${LIBPARSE}/libparse.a ${LIBISC}/libiscntp.a ${LIBOPTS}/libopts.a ${LIBNTP}/libntp.a ${LIBM} ${LIBUTIL}
-COPTS.ntp_control.c+= ${${ACTIVE_CC} == gcc:? -Wno-error=format-nonliteral :}
+COPTS.ntp_control.c+= ${${ACTIVE_CC} == gcc:? -Wno-format-nonliteral :}
.include ${.CURDIR}/../Makefile.inc
CVS commit: src/external/bsd/tmux/dist
Module Name:src
Committed By: christos
Date: Mon Jan 20 02:08:27 UTC 2014
Modified Files:
src/external/bsd/tmux/dist: log.c
Log Message:
gcc-4.1 does not have the pragma diagnostic ignored
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tmux/dist/log.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/dist/log.c
diff -u src/external/bsd/tmux/dist/log.c:1.4 src/external/bsd/tmux/dist/log.c:1.5
--- src/external/bsd/tmux/dist/log.c:1.4 Tue Jan 7 04:28:57 2014
+++ src/external/bsd/tmux/dist/log.c Sun Jan 19 21:08:27 2014
@@ -1,4 +1,4 @@
-/* $Id: log.c,v 1.4 2014/01/07 09:28:57 joerg Exp $ */
+/* $Id: log.c,v 1.5 2014/01/20 02:08:27 christos Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott n...@users.sourceforge.net
@@ -108,7 +108,9 @@ log_vwrite(int pri, const char *msg, va_
#if __GNUC_PREREQ__(4, 6) || defined(__clang__)
#pragma GCC diagnostic push
#endif
+#if __GNUC_PREREQ__(4, 5)
#pragma GCC diagnostic ignored -Wformat-nonliteral
+#endif
void printflike1
log_warn(const char *msg, ...)
{
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: christos Date: Mon Jan 20 02:32:57 UTC 2014 Modified Files: src/distrib/sets/lists/xdebug: md.vax Log Message: add missing. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xdebug/md.vax 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/xdebug/md.vax diff -u src/distrib/sets/lists/xdebug/md.vax:1.3 src/distrib/sets/lists/xdebug/md.vax:1.4 --- src/distrib/sets/lists/xdebug/md.vax:1.3 Fri Feb 8 10:13:04 2013 +++ src/distrib/sets/lists/xdebug/md.vax Sun Jan 19 21:32:57 2014 @@ -1,10 +1,12 @@ -# $NetBSD: md.vax,v 1.3 2013/02/08 15:13:04 christos Exp $ +# $NetBSD: md.vax,v 1.4 2014/01/20 02:32:57 christos Exp $ ./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libglx_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/librecord_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libshadow_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/libexa_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/libfb_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/libi2c_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/libshadowfb_g.a -unknown- debuglib,xorg
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Mon Jan 20 02:34:20 UTC 2014 Modified Files: src/distrib/sets/lists/debug: mi Log Message: fix typo To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/debug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.49 src/distrib/sets/lists/debug/mi:1.50 --- src/distrib/sets/lists/debug/mi:1.49 Fri Jan 17 17:34:36 2014 +++ src/distrib/sets/lists/debug/mi Sun Jan 19 21:34:20 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.49 2014/01/17 22:34:36 pgoyette Exp $ +# $NetBSD: mi,v 1.50 2014/01/20 02:34:20 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -145,7 +145,7 @@ ./usr/lib/librumpdev_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpdev_md_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpdev_netsmb_g.a comp-c-debuglib debuglib,rump -./usr/lib/librumpdev_opencrypto.a comp-c-debuglib debuglib,rump +./usr/lib/librumpdev_opencrypto_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpdev_pad_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpdev_pud_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpdev_putter_g.a comp-c-debuglib debuglib,rump
CVS commit: src/sys/kern
Module Name:src
Committed By: hannken
Date: Mon Jan 20 07:47:22 UTC 2014
Modified Files:
src/sys/kern: vfs_cache.c
Log Message:
Change cache_prune() to test for end-of-list before testing for an
invalid entry. Prevents a lifelock when the end-of-list marker
gets invalid while scanning the list and all entries are recent.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/kern/vfs_cache.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_cache.c
diff -u src/sys/kern/vfs_cache.c:1.92 src/sys/kern/vfs_cache.c:1.93
--- src/sys/kern/vfs_cache.c:1.92 Tue Oct 29 09:53:51 2013
+++ src/sys/kern/vfs_cache.c Mon Jan 20 07:47:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_cache.c,v 1.92 2013/10/29 09:53:51 hannken Exp $ */
+/* $NetBSD: vfs_cache.c,v 1.93 2014/01/20 07:47:22 hannken Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_cache.c,v 1.92 2013/10/29 09:53:51 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_cache.c,v 1.93 2014/01/20 07:47:22 hannken Exp $);
#include opt_ddb.h
#include opt_revcache.h
@@ -968,8 +968,6 @@ cache_prune(int incache, int target)
break;
items++;
nxtcp = TAILQ_NEXT(ncp, nc_lru);
- if (ncp-nc_dvp == NULL)
- continue;
if (ncp == sentinel) {
/*
* If we looped back on ourself, then ignore
@@ -977,6 +975,8 @@ cache_prune(int incache, int target)
*/
tryharder = 1;
}
+ if (ncp-nc_dvp == NULL)
+ continue;
if (!tryharder (ncp-nc_hittime - recent) 0) {
if (sentinel == NULL)
sentinel = ncp;
