CVS commit: src/usr.bin/systat
Module Name:src
Committed By: bad
Date: Mon Oct 14 22:23:22 UTC 2013
Modified Files:
src/usr.bin/systat: keyboard.c
Log Message:
No David, '\?' is not the del character. Broken in rev 1.21.
XXX pullup-5, pullup-6.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/systat/keyboard.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/systat/keyboard.c
diff -u src/usr.bin/systat/keyboard.c:1.24 src/usr.bin/systat/keyboard.c:1.25
--- src/usr.bin/systat/keyboard.c:1.24 Mon Dec 31 00:22:14 2007
+++ src/usr.bin/systat/keyboard.c Mon Oct 14 22:23:22 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: keyboard.c,v 1.24 2007/12/31 00:22:14 christos Exp $ */
+/* $NetBSD: keyboard.c,v 1.25 2013/10/14 22:23:22 bad Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)keyboard.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: keyboard.c,v 1.24 2007/12/31 00:22:14 christos Exp $");
+__RCSID("$NetBSD: keyboard.c,v 1.25 2013/10/14 22:23:22 bad Exp $");
#endif /* not lint */
#include
@@ -121,7 +121,7 @@ keyboard(void)
}
continue;
}
- if (ch == '\b' || ch == '\?' || ch == erasechar()) {
+ if (ch == '\b' || ch == '\177' || ch == erasechar()) {
if (col > 0)
col--;
goto doerase;
CVS commit: src/external/bsd/llvm
Module Name:src
Committed By: joerg
Date: Mon Oct 14 21:19:17 UTC 2013
Modified Files:
src/external/bsd/llvm: Makefile.inc
src/external/bsd/llvm/lib/libLLVMCodeGen: Makefile
src/external/bsd/llvm/lib/libLLVMInstrumentation: Makefile
Log Message:
Update LLVM/Clang snapshot to r192615, which defaults to libc++ and the
unwinder in libc on x86.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/bsd/llvm/lib/libLLVMInstrumentation/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/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.57 src/external/bsd/llvm/Makefile.inc:1.58
--- src/external/bsd/llvm/Makefile.inc:1.57 Mon Oct 14 01:37:39 2013
+++ src/external/bsd/llvm/Makefile.inc Mon Oct 14 21:19:16 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.57 2013/10/14 01:37:39 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.58 2013/10/14 21:19:16 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
@@ -7,7 +7,7 @@ LLVM_TOPLEVEL_MK=
SVN_ROOT= http://llvm.org/svn/llvm-project
-COMMON_REVISION= 192551
+COMMON_REVISION= 192615
CLANG_REVISION= ${COMMON_REVISION}
COMPILER_RT_REVISION= ${COMMON_REVISION}
LLD_REVISION= ${COMMON_REVISION}
Index: src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.22 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.23
--- src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.22 Thu Apr 25 13:59:57 2013
+++ src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile Mon Oct 14 21:19:16 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2013/04/25 13:59:57 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2013/10/14 21:19:16 joerg Exp $
LIB= LLVMCodeGen
@@ -104,7 +104,6 @@ SRCS+= AggressiveAntiDepBreaker.cpp \
StackColoring.cpp \
StackProtector.cpp \
StackSlotColoring.cpp \
- StrongPHIElimination.cpp \
TailDuplication.cpp \
TargetFrameLoweringImpl.cpp \
TargetInstrInfo.cpp \
Index: src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile:1.11 src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile:1.12
--- src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile:1.11 Mon Oct 14 01:37:39 2013
+++ src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile Mon Oct 14 21:19:16 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/10/14 01:37:39 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2013/10/14 21:19:16 joerg Exp $
LIB= LLVMInstrumentation
@@ -13,7 +13,6 @@ SRCS+= AddressSanitizer.cpp \
GCOVProfiling.cpp \
Instrumentation.cpp \
MemorySanitizer.cpp \
- ProfilingUtils.cpp \
ThreadSanitizer.cpp
.if defined(HOSTLIB)
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Mon Oct 14 18:15:12 UTC 2013
Modified Files:
src/sys/dev/usb: ucycom.c
Log Message:
Handle an error from uhidev_get_report in ucycom_get_cfg
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/usb/ucycom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ucycom.c
diff -u src/sys/dev/usb/ucycom.c:1.36 src/sys/dev/usb/ucycom.c:1.37
--- src/sys/dev/usb/ucycom.c:1.36 Sun Sep 15 15:06:04 2013
+++ src/sys/dev/usb/ucycom.c Mon Oct 14 18:15:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ucycom.c,v 1.36 2013/09/15 15:06:04 martin Exp $ */
+/* $NetBSD: ucycom.c,v 1.37 2013/10/14 18:15:12 skrll Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.36 2013/09/15 15:06:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.37 2013/10/14 18:15:12 skrll Exp $");
#include
#include
@@ -1096,6 +1096,10 @@ ucycom_get_cfg(struct ucycom_softc *sc)
err = uhidev_get_report(&sc->sc_hdev, UHID_FEATURE_REPORT,
report, sc->sc_flen);
+ if (err) {
+ DPRINTF(("%s: failed\n", __func__));
+ return;
+ }
cfg = report[4];
baud = (report[3] << 24) + (report[2] << 16) + (report[1] << 8) +
report[0];
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: skrll
Date: Mon Oct 14 18:14:08 UTC 2013
Modified Files:
src/sys/arch/arm/arm: process_machdep.c
Log Message:
Fix size parameter to memset. Found by gcc 4.8.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/arm/process_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/process_machdep.c
diff -u src/sys/arch/arm/arm/process_machdep.c:1.27 src/sys/arch/arm/arm/process_machdep.c:1.28
--- src/sys/arch/arm/arm/process_machdep.c:1.27 Fri Aug 23 05:22:01 2013
+++ src/sys/arch/arm/arm/process_machdep.c Mon Oct 14 18:14:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.27 2013/08/23 05:22:01 matt Exp $ */
+/* $NetBSD: process_machdep.c,v 1.28 2013/10/14 18:14:08 skrll Exp $ */
/*
* Copyright (c) 1993 The Regents of the University of California.
@@ -133,7 +133,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.27 2013/08/23 05:22:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.28 2013/10/14 18:14:08 skrll Exp $");
#include
#include
@@ -176,7 +176,7 @@ process_read_fpregs(struct lwp *l, struc
{
#ifdef FPU_VFP
if (curcpu()->ci_vfp_id == 0) {
- memset(regs, 0, sizeof(regs));
+ memset(regs, 0, sizeof(*regs));
return 0;
}
const struct pcb * const pcb = lwp_getpcb(l);
CVS commit: src
Module Name:src
Committed By: joerg
Date: Mon Oct 14 16:00:17 UTC 2013
Modified Files:
src/distrib/sets: mkvars.mk sets.subr
src/distrib/sets/lists/comp: mi
src/lib/libc: Makefile
src/share/mk: bsd.lib.mk bsd.own.mk
Log Message:
Rename USE_LIBGCC to HAVE_LIBGCC and retry using it as flag on unwind.h.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.155 -r1.156 src/distrib/sets/sets.subr
cvs rdiff -u -r1.1843 -r1.1844 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.159 -r1.160 src/lib/libc/Makefile
cvs rdiff -u -r1.340 -r1.341 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.752 -r1.753 src/share/mk/bsd.own.mk
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/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.12 src/distrib/sets/mkvars.mk:1.13
--- src/distrib/sets/mkvars.mk:1.12 Wed Jun 12 21:35:29 2013
+++ src/distrib/sets/mkvars.mk Mon Oct 14 16:00:16 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.12 2013/06/12 21:35:29 mrg Exp $
+# $NetBSD: mkvars.mk,v 1.13 2013/10/14 16:00:16 joerg Exp $
MKEXTRAVARS= \
MACHINE \
@@ -6,6 +6,7 @@ MKEXTRAVARS= \
MACHINE_CPU \
HAVE_GCC \
HAVE_GDB \
+ HAVE_LIBGCC \
HAVE_SSP \
OBJECT_FMT \
TOOLCHAIN_MISSING \
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.155 src/distrib/sets/sets.subr:1.156
--- src/distrib/sets/sets.subr:1.155 Mon Oct 14 11:11:13 2013
+++ src/distrib/sets/sets.subr Mon Oct 14 16:00:16 2013
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.155 2013/10/14 11:11:13 joerg Exp $
+# $NetBSD: sets.subr,v 1.156 2013/10/14 16:00:16 joerg Exp $
#
#
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.155 2013/10/14 11:11:13 joerg Exp $
+# # $NetBSD: sets.subr,v 1.156 2013/10/14 16:00:16 joerg Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -229,7 +229,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# ldap ${MKLDAP} != no
# lint ${MKLINT} != no
# libcxx ${MKLIBCXX} != no
-# nolibgcc ${USE_LIBGCC} == no
+# libgcc ${HAVE_LIBGCC} != no
# libstdcxx ${MKLIBSTDCXX} != no
# lld ${MKLLD} != no
# lldb ${MKLLDB} != no
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1843 src/distrib/sets/lists/comp/mi:1.1844
--- src/distrib/sets/lists/comp/mi:1.1843 Mon Oct 14 11:11:13 2013
+++ src/distrib/sets/lists/comp/mi Mon Oct 14 16:00:16 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1843 2013/10/14 11:11:13 joerg Exp $
+# $NetBSD: mi,v 1.1844 2013/10/14 16:00:16 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2779,7 +2779,7 @@
./usr/include/ulimit.hcomp-c-include
./usr/include/unctrl.hcomp-c-include
./usr/include/unistd.hcomp-c-include
-./usr/include/unwind.hcomp-c-include nolibgcc
+./usr/include/unwind.hcomp-c-include !libgcc
./usr/include/usb.hcomp-obsolete obsolete
./usr/include/usbhid.hcomp-c-include
./usr/include/util.hcomp-c-include
Index: src/lib/libc/Makefile
diff -u src/lib/libc/Makefile:1.159 src/lib/libc/Makefile:1.160
--- src/lib/libc/Makefile:1.159 Mon Oct 14 01:30:21 2013
+++ src/lib/libc/Makefile Mon Oct 14 16:00:17 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.159 2013/10/14 01:30:21 joerg Exp $
+# $NetBSD: Makefile,v 1.160 2013/10/14 16:00:17 joerg Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -63,7 +63,7 @@ CPPFLAGS+= -D__BUILD_LEGACY
.include "${.CURDIR}/db/Makefile.inc"
.include "${.CURDIR}/citrus/Makefile.inc"
.include "${.CURDIR}/compat-43/Makefile.inc"
-.if ${USE_LIBGCC} == "no"
+.if ${HAVE_LIBGCC} == "no"
.include "${.CURDIR}/compiler_rt/Makefile.inc"
.endif
.include "${.CURDIR}/dlfcn/Makefile.inc"
@@ -99,7 +99,7 @@ CPPFLAGS+= -D__BUILD_LEGACY
.include "${.CURDIR}/time/Makefile.inc"
.include "${.CURDIR}/tls/Makefile.inc"
.include "${.CURDIR}/sys/Makefile.inc"
-.if ${USE_LIBGCC} == "no"
+.if ${HAVE_LIBGCC} == "no"
.include "${NETBSDSRCDIR}/sys/lib/libunwind/Makefile.inc"
.endif
.include "${.CURDIR}/uuid/Makefile.inc"
@@ -152,6 +152,6 @@ CSHLIBFLAGS+= -D_I18N_DYNAMIC
# force the dynamic linker to initialize libc first
SHLIB_SHFLAGS+= -Wl,-z,initfirst
-.if ${USE_LIBGCC} == "no"
+.if ${HAVE_LIBGCC} == "no"
SHLIB_SHFLAGS+= -Wl,-z,defs
.endif
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.340 src/share/mk/bsd.lib.mk:1.341
--- src/share/mk/bsd.lib.mk:1.340 Mon Oct 14 01:30:21 2013
+++ src/share/mk/bsd.lib.mk Mon Oct 14 16:00:16 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.340 2013/10/14 01:30:21 joerg Exp $
+# $NetBSD: bsd.lib.mk,v 1.341 2013/10/14 16:00:16 joerg Exp $
# @(#)bsd.lib.mk 8.3 (Berke
CVS commit: src/sys/arch/m68k/m68k
Module Name:src Committed By: isaki Date: Mon Oct 14 12:20:05 UTC 2013 Modified Files: src/sys/arch/m68k/m68k: switch_subr.s Log Message: Check whether we have an FPU regardless of FPU_EMULATE option. It prevents a kernel panic when we don't have an FPU and FPU_EMULATE option is not set. Thanks tsutsui@ for advice. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/m68k/m68k/switch_subr.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/m68k/m68k/switch_subr.s diff -u src/sys/arch/m68k/m68k/switch_subr.s:1.31 src/sys/arch/m68k/m68k/switch_subr.s:1.32 --- src/sys/arch/m68k/m68k/switch_subr.s:1.31 Sat Sep 7 19:06:29 2013 +++ src/sys/arch/m68k/m68k/switch_subr.s Mon Oct 14 12:20:05 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: switch_subr.s,v 1.31 2013/09/07 19:06:29 chs Exp $ */ +/* $NetBSD: switch_subr.s,v 1.32 2013/10/14 12:20:05 isaki Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation. @@ -109,10 +109,9 @@ ENTRY(cpu_switchto) jbsr _ASM_LABEL(m68k_fpuctx_save) #else #ifdef FPCOPROC -#ifdef FPU_EMULATE tstl _C_LABEL(fputype) | Do we have an FPU? jeq .Lcpu_switch_nofpsave | No Then don't attempt save. -#endif + lea PCB_FPCTX(%a1),%a2 | pointer to FP save area fsave (%a2) | save FP state #if defined(M68020) || defined(M68030) || defined(M68040) @@ -222,10 +221,9 @@ ENTRY(cpu_switchto) moveml (%sp)+,%d0/%d1 #else #ifdef FPCOPROC -#ifdef FPU_EMULATE tstl _C_LABEL(fputype) | Do we have an FPU? jeq .Lcpu_switch_nofprest | No Then don't attempt restore. -#endif + lea PCB_FPCTX(%a1),%a0 | pointer to FP save area #if defined(M68020) || defined(M68030) || defined(M68040) #if defined(M68060) @@ -279,10 +277,9 @@ ENTRY(savectx) jbsr _ASM_LABEL(m68k_fpuctx_save) #else #ifdef FPCOPROC -#ifdef FPU_EMULATE tstl _C_LABEL(fputype) | Do we have FPU? jeq .Lsavectx_nofpsave | No? Then don't save state. -#endif + lea PCB_FPCTX(%a1),%a0 | pointer to FP save area fsave (%a0) | save FP state #if defined(M68020) || defined(M68030) || defined(M68040)
CVS commit: src/distrib/sets
Module Name:src
Committed By: joerg
Date: Mon Oct 14 11:11:14 UTC 2013
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/comp: mi
Log Message:
Invert logic to try to fix the !clang case.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/distrib/sets/sets.subr
cvs rdiff -u -r1.1842 -r1.1843 src/distrib/sets/lists/comp/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/sets.subr
diff -u src/distrib/sets/sets.subr:1.154 src/distrib/sets/sets.subr:1.155
--- src/distrib/sets/sets.subr:1.154 Mon Oct 14 01:30:21 2013
+++ src/distrib/sets/sets.subr Mon Oct 14 11:11:13 2013
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.154 2013/10/14 01:30:21 joerg Exp $
+# $NetBSD: sets.subr,v 1.155 2013/10/14 11:11:13 joerg Exp $
#
#
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.154 2013/10/14 01:30:21 joerg Exp $
+# # $NetBSD: sets.subr,v 1.155 2013/10/14 11:11:13 joerg Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -229,7 +229,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# ldap ${MKLDAP} != no
# lint ${MKLINT} != no
# libcxx ${MKLIBCXX} != no
-# libgcc ${USE_LIBGCC} != no
+# nolibgcc ${USE_LIBGCC} == no
# libstdcxx ${MKLIBSTDCXX} != no
# lld ${MKLLD} != no
# lldb ${MKLLDB} != no
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1842 src/distrib/sets/lists/comp/mi:1.1843
--- src/distrib/sets/lists/comp/mi:1.1842 Mon Oct 14 01:30:21 2013
+++ src/distrib/sets/lists/comp/mi Mon Oct 14 11:11:13 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1842 2013/10/14 01:30:21 joerg Exp $
+# $NetBSD: mi,v 1.1843 2013/10/14 11:11:13 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2779,7 +2779,7 @@
./usr/include/ulimit.hcomp-c-include
./usr/include/unctrl.hcomp-c-include
./usr/include/unistd.hcomp-c-include
-./usr/include/unwind.hcomp-c-include !libgcc
+./usr/include/unwind.hcomp-c-include nolibgcc
./usr/include/usb.hcomp-obsolete obsolete
./usr/include/usbhid.hcomp-c-include
./usr/include/util.hcomp-c-include
