CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify
Module Name:src
Committed By: agc
Date: Wed Mar 12 06:38:56 UTC 2014
Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
Log Message:
Turn off literal format string warnings for one file
A better fix is coming
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.9 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.10
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.9 Mon Mar 10 17:00:53 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile Wed Mar 12 06:38:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/03/10 17:00:53 agc Exp $
+# $NetBSD: Makefile,v 1.10 2014/03/12 06:38:56 agc Exp $
PROG=netpgpverify
BINDIR= /usr/bin
@@ -12,6 +12,7 @@ SRCS+= bzlib.c zlib.c
SRCS+= md5c.c rmd160.c sha1.c sha2.c tiger.c
CPPFLAGS+=-I${.CURDIR} -I${EXTDIST}/src/netpgpverify
+COPTS.libverify.c+= -Wno-format-literal
.ifndef PRODUCTION
CPPFLAGS+=-g -O0
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Wed Mar 12 01:49:58 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add quotes.
To generate a diff of this commit:
cvs rdiff -u -r1.785 -r1.786 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/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.785 src/share/mk/bsd.own.mk:1.786
--- src/share/mk/bsd.own.mk:1.785 Wed Mar 12 00:07:33 2014
+++ src/share/mk/bsd.own.mk Wed Mar 12 01:49:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.785 2014/03/12 00:07:33 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.786 2014/03/12 01:49:58 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -100,7 +100,7 @@ HAVE_LIBGCC?= yes
_LIBC_UNWIND_SUPPORT.i386= yes
_LIBC_UNWIND_SUPPORT.x86_64= yes
-.if ${MKLLVM:Uno} == "yes" && ${_LIBC_UNWIND_SUPPORT.${MACHINE_ARCH}:Uno} == yes
+.if ${MKLLVM:Uno} == "yes" && ${_LIBC_UNWIND_SUPPORT.${MACHINE_ARCH}:Uno} == "yes"
HAVE_LIBGCC_EH?= no
.else
HAVE_LIBGCC_EH?= yes
CVS commit: src/sys/lib/libunwind
Module Name:src
Committed By: joerg
Date: Tue Mar 11 23:52:17 UTC 2014
Modified Files:
src/sys/lib/libunwind: DwarfParser.hpp
Log Message:
0 is a valid LSDA encoding and can be seen in statically linked
programs. Initialize lsdaEncoding to DW_EH_PE_omit and check for that
value to decide whether a value should be decoded.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/lib/libunwind/DwarfParser.hpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libunwind/DwarfParser.hpp
diff -u src/sys/lib/libunwind/DwarfParser.hpp:1.1 src/sys/lib/libunwind/DwarfParser.hpp:1.2
--- src/sys/lib/libunwind/DwarfParser.hpp:1.1 Mon Oct 14 01:14:57 2013
+++ src/sys/lib/libunwind/DwarfParser.hpp Tue Mar 11 23:52:17 2014
@@ -172,7 +172,7 @@ bool CFI_Parser::decodeFDE(A &addr
if (cieInfo->fdesHaveAugmentationData) {
uintptr_t augLen = addressSpace.getULEB128(p, nextCFI);
pint_t endOfAug = p + augLen;
-if (cieInfo->lsdaEncoding != 0) {
+if (cieInfo->lsdaEncoding != DW_EH_PE_omit) {
// Peek at value (without indirection). Zero means no LSDA.
pint_t lsdaStart = p;
if (addressSpace.getEncodedP(p, nextCFI, cieInfo->lsdaEncoding & 0x0F,
@@ -198,7 +198,7 @@ template
bool CFI_Parser::parseCIE(A &addressSpace, pint_t cie,
CIE_Info *cieInfo) {
cieInfo->pointerEncoding = 0;
- cieInfo->lsdaEncoding = 0;
+ cieInfo->lsdaEncoding = DW_EH_PE_omit;
cieInfo->personalityEncoding = 0;
cieInfo->personalityOffsetInCIE = 0;
cieInfo->personality = 0;
CVS commit: src/sys/lib/libunwind
Module Name:src
Committed By: joerg
Date: Tue Mar 11 23:57:42 UTC 2014
Modified Files:
src/sys/lib/libunwind: DwarfInstructions.hpp Registers.hpp
Log Message:
Rename IP_PSEUDO_REG to RETURN_REG. Fix PPC value. Sort.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/lib/libunwind/DwarfInstructions.hpp \
src/sys/lib/libunwind/Registers.hpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libunwind/DwarfInstructions.hpp
diff -u src/sys/lib/libunwind/DwarfInstructions.hpp:1.2 src/sys/lib/libunwind/DwarfInstructions.hpp:1.3
--- src/sys/lib/libunwind/DwarfInstructions.hpp:1.2 Tue Mar 11 23:55:11 2014
+++ src/sys/lib/libunwind/DwarfInstructions.hpp Tue Mar 11 23:57:42 2014
@@ -49,7 +49,7 @@ private:
static int lastRestoreReg(const R &) { return R::LAST_RESTORE_REG; }
static bool isReturnAddressRegister(int regno, const R &) {
-return regno == R::IP_PSEUDO_REG;
+return regno == R::RETURN_REG;
}
static pint_t getCFA(A &addressSpace,
Index: src/sys/lib/libunwind/Registers.hpp
diff -u src/sys/lib/libunwind/Registers.hpp:1.2 src/sys/lib/libunwind/Registers.hpp:1.3
--- src/sys/lib/libunwind/Registers.hpp:1.2 Wed Jan 29 06:59:53 2014
+++ src/sys/lib/libunwind/Registers.hpp Tue Mar 11 23:57:42 2014
@@ -32,9 +32,9 @@ enum {
class Registers_x86 {
public:
enum {
-LAST_RESTORE_REG = REGNO_X86_EIP,
-IP_PSEUDO_REG = REGNO_X86_EIP,
LAST_REGISTER = REGNO_X86_EIP,
+LAST_RESTORE_REG = REGNO_X86_EIP,
+RETURN_REG = REGNO_X86_EIP,
};
__dso_hidden Registers_x86();
@@ -97,9 +97,9 @@ enum {
class Registers_x86_64 {
public:
enum {
-LAST_RESTORE_REG = REGNO_X86_64_RIP,
-IP_PSEUDO_REG = REGNO_X86_64_RIP,
LAST_REGISTER = REGNO_X86_64_RIP,
+LAST_RESTORE_REG = REGNO_X86_64_RIP,
+RETURN_REG = REGNO_X86_64_RIP,
};
__dso_hidden Registers_x86_64();
@@ -166,9 +166,9 @@ enum {
class Registers_ppc32 {
public:
enum {
-LAST_RESTORE_REG = REGNO_PPC32_V31,
-IP_PSEUDO_REG = REGNO_PPC32_SRR0,
LAST_REGISTER = REGNO_PPC32_V31,
+LAST_RESTORE_REG = REGNO_PPC32_V31,
+RETURN_REG = REGNO_PPC32_LR,
};
__dso_hidden Registers_ppc32();
@@ -246,9 +246,9 @@ enum {
class Registers_arm32 {
public:
enum {
-LAST_RESTORE_REG = REGNO_ARM32_SPSR,
-IP_PSEUDO_REG = REGNO_ARM32_SPSR,
LAST_REGISTER = REGNO_ARM32_D31,
+LAST_RESTORE_REG = REGNO_ARM32_SPSR,
+RETURN_REG = REGNO_ARM32_SPSR,
};
__dso_hidden Registers_arm32();
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Wed Mar 12 00:07:33 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
More readable condition.
To generate a diff of this commit:
cvs rdiff -u -r1.784 -r1.785 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/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.784 src/share/mk/bsd.own.mk:1.785
--- src/share/mk/bsd.own.mk:1.784 Tue Mar 11 23:22:36 2014
+++ src/share/mk/bsd.own.mk Wed Mar 12 00:07:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.784 2014/03/11 23:22:36 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.785 2014/03/12 00:07:33 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -98,7 +98,9 @@ HAVE_LIBGCC?= no
HAVE_LIBGCC?= yes
.endif
-.if ${MKLLVM:Uno} == "yes" && (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
+_LIBC_UNWIND_SUPPORT.i386= yes
+_LIBC_UNWIND_SUPPORT.x86_64= yes
+.if ${MKLLVM:Uno} == "yes" && ${_LIBC_UNWIND_SUPPORT.${MACHINE_ARCH}:Uno} == yes
HAVE_LIBGCC_EH?= no
.else
HAVE_LIBGCC_EH?= yes
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Mar 11 23:23:44 UTC 2014 Modified Files: src/doc: CHANGES Log Message: switch amd64 to gcc-4.8 Regression: ctf stuff does not work properly with some c++ (gcc) To generate a diff of this commit: cvs rdiff -u -r1.1902 -r1.1903 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1902 src/doc/CHANGES:1.1903 --- src/doc/CHANGES:1.1902 Sun Mar 9 13:16:09 2014 +++ src/doc/CHANGES Tue Mar 11 19:23:44 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1902 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1903 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -371,3 +371,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: alpha: Switched to GCC 4.8. [martin 20140307] arm: Switched to GCC 4.8. [skrll 20140307] elftoolchain: import FreeBSD-2014-03-08 [christos 20140309] + amd64: Switched to GCC 4.8. [christos 20140311]
CVS commit: src/sys/lib/libunwind
Module Name:src
Committed By: joerg
Date: Tue Mar 11 23:55:11 UTC 2014
Modified Files:
src/sys/lib/libunwind: DwarfInstructions.hpp
Log Message:
GC unused enum.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/lib/libunwind/DwarfInstructions.hpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libunwind/DwarfInstructions.hpp
diff -u src/sys/lib/libunwind/DwarfInstructions.hpp:1.1 src/sys/lib/libunwind/DwarfInstructions.hpp:1.2
--- src/sys/lib/libunwind/DwarfInstructions.hpp:1.1 Mon Oct 14 01:14:57 2013
+++ src/sys/lib/libunwind/DwarfInstructions.hpp Tue Mar 11 23:55:11 2014
@@ -39,12 +39,6 @@ public:
static step_result stepWithDwarf(A &, pint_t, pint_t, R &, unw_proc_info_t *);
private:
- // Pseudo-register used for return addresses.
- enum {
-DW_X86_RET_ADDR = 8,
-DW_X86_64_RET_ADDR = 16,
- };
-
static pint_t evaluateExpression(pint_t, A &, const R &, pint_t);
static pint_t
getSavedRegister(A &, const R &, pint_t,
CVS commit: src/sys/lib/libunwind
Module Name:src
Committed By: joerg
Date: Wed Mar 12 00:01:12 UTC 2014
Modified Files:
src/sys/lib/libunwind: Registers.hpp unwind_registers.S
Log Message:
Add a dummy element as explicit padding for PPC32. Fix DWARF enumeration
to match the values created by GCC. Fix DWARFish -> index conversion.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/lib/libunwind/Registers.hpp
cvs rdiff -u -r1.2 -r1.3 src/sys/lib/libunwind/unwind_registers.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/lib/libunwind/Registers.hpp
diff -u src/sys/lib/libunwind/Registers.hpp:1.3 src/sys/lib/libunwind/Registers.hpp:1.4
--- src/sys/lib/libunwind/Registers.hpp:1.3 Tue Mar 11 23:57:42 2014
+++ src/sys/lib/libunwind/Registers.hpp Wed Mar 12 00:01:12 2014
@@ -144,19 +144,18 @@ enum {
DWARF_PPC32_R31 = 31,
DWARF_PPC32_F0 = 32,
DWARF_PPC32_F31 = 63,
- DWARF_PPC32_V0 = 1124,
- DWARF_PPC32_V31 = 1155,
DWARF_PPC32_LR = 65,
- DWARF_PPC32_CTR = 66,
- DWARF_PPC32_XER = 76,
+ DWARF_PPC32_CR = 70,
+ DWARF_PPC32_V0 = 77,
+ DWARF_PPC32_V31 = 108,
+
REGNO_PPC32_R0 = 0,
- REGNO_PPC32_R1 = 0,
+ REGNO_PPC32_R1 = 1,
REGNO_PPC32_R31 = 31,
- REGNO_PPC32_CR = 32,
- REGNO_PPC32_LR = 33,
- REGNO_PPC32_CTR = 34,
- REGNO_PPC32_XER = 35,
- REGNO_PPC32_SRR0 = 36,
+ REGNO_PPC32_LR = 32,
+ REGNO_PPC32_CR = 33,
+ REGNO_PPC32_SRR0 = 34,
+
REGNO_PPC32_F0 = REGNO_PPC32_SRR0 + 1,
REGNO_PPC32_F31 = REGNO_PPC32_F0 + 31,
REGNO_PPC32_V0 = REGNO_PPC32_F31 + 1,
@@ -180,7 +179,14 @@ public:
return REGNO_PPC32_F0 + (num - DWARF_PPC32_F0);
if (num >= DWARF_PPC32_V0 && num <= DWARF_PPC32_V31)
return REGNO_PPC32_V0 + (num - DWARF_PPC32_V0);
-return LAST_REGISTER + 1;
+switch (num) {
+case DWARF_PPC32_LR:
+ return REGNO_PPC32_LR;
+case DWARF_PPC32_CR:
+ return REGNO_PPC32_CR;
+default:
+ return LAST_REGISTER + 1;
+}
}
bool validRegister(int num) const {
@@ -225,6 +231,7 @@ private:
uint64_t low, high;
};
uint32_t reg[REGNO_PPC32_SRR0 + 1];
+ uint32_t dummy;
uint64_t fpreg[32];
vecreg_t vecreg[64];
};
Index: src/sys/lib/libunwind/unwind_registers.S
diff -u src/sys/lib/libunwind/unwind_registers.S:1.2 src/sys/lib/libunwind/unwind_registers.S:1.3
--- src/sys/lib/libunwind/unwind_registers.S:1.2 Wed Jan 29 06:59:53 2014
+++ src/sys/lib/libunwind/unwind_registers.S Wed Mar 12 00:01:12 2014
@@ -116,6 +116,7 @@ ENTRY(_ZNK7_Unwind16Registers_x86_646jum
#ifdef __powerpc__
.hidden _ZN7_Unwind15Registers_ppc32C1Ev
ENTRY(_ZN7_Unwind15Registers_ppc32C1Ev)
+ /* TODO: skip non-callee-safe registers */
stw %r0, 0(%r3)
stw %r1, 4(%r3)
stw %r2, 8(%r3)
@@ -148,21 +149,82 @@ ENTRY(_ZN7_Unwind15Registers_ppc32C1Ev)
stw %r29,116(%r3)
stw %r30,120(%r3)
stw %r31,124(%r3)
-
- mfcr %r0
- stw %r0, 128(%r3) /* CR */
mflr %r0
- stw %r0, 132(%r3) /* LR */
- stw %r0, 144(%r3) /* LR */
- mfctr %r0
- stw %r0, 136(%r3) /* CTR */
- mfxer %r0
- stw %r0, 140(%r3) /* XER */
+ stw %r0, 136(%r3) /* SRR0 */
+ mfcr %r0
+ stw %r0, 132(%r3) /* CR */
+
+ stfd %f0, 144(%r3)
+ stfd %f1, 152(%r3)
+ stfd %f2, 160(%r3)
+ stfd %f3, 168(%r3)
+ stfd %f4, 176(%r3)
+ stfd %f5, 184(%r3)
+ stfd %f6, 192(%r3)
+ stfd %f7, 200(%r3)
+ stfd %f8, 208(%r3)
+ stfd %f9, 216(%r3)
+ stfd %f10, 224(%r3)
+ stfd %f11, 232(%r3)
+ stfd %f12, 240(%r3)
+ stfd %f13, 248(%r3)
+ stfd %f14, 256(%r3)
+ stfd %f15, 264(%r3)
+ stfd %f16, 272(%r3)
+ stfd %f17, 280(%r3)
+ stfd %f18, 288(%r3)
+ stfd %f19, 296(%r3)
+ stfd %f20, 304(%r3)
+ stfd %f21, 312(%r3)
+ stfd %f22, 320(%r3)
+ stfd %f23, 328(%r3)
+ stfd %f24, 336(%r3)
+ stfd %f25, 344(%r3)
+ stfd %f26, 352(%r3)
+ stfd %f27, 360(%r3)
+ stfd %f28, 368(%r3)
+ stfd %f29, 376(%r3)
+ stfd %f30, 384(%r3)
+ stfd %f31, 392(%r3)
+ /* LR is undefined */
blr
.hidden _ZNK7_Unwind15Registers_ppc326jumptoEv
ENTRY(_ZNK7_Unwind15Registers_ppc326jumptoEv)
+ lfd %f0, 144(%r3)
+ lfd %f1, 152(%r3)
+ lfd %f2, 160(%r3)
+ lfd %f3, 168(%r3)
+ lfd %f4, 176(%r3)
+ lfd %f5, 184(%r3)
+ lfd %f6, 192(%r3)
+ lfd %f7, 200(%r3)
+ lfd %f8, 208(%r3)
+ lfd %f9, 216(%r3)
+ lfd %f10, 224(%r3)
+ lfd %f11, 232(%r3)
+ lfd %f12, 240(%r3)
+ lfd %f13, 248(%r3)
+ lfd %f14, 256(%r3)
+ lfd %f15, 264(%r3)
+ lfd %f16, 272(%r3)
+ lfd %f17, 280(%r3)
+ lfd %f18, 288(%r3)
+ lfd %f19, 296(%r3)
+ lfd %f20, 304(%r3)
+ lfd %f21, 312(%r3)
+ lfd %f22, 320(%r3)
+ lfd %f23, 328(%r3)
+ lfd %f24, 336(%r3)
+ lfd %f25, 344(%r3)
+ lfd %f26, 352(%r3)
+ lfd %f27, 360(%r3)
+ lfd %f28, 368(%r3)
+ lfd %f29, 376(%r3)
+ lfd %f30, 384(%r3)
+ lfd %f31, 392(%r3)
+
lwz %r2, 8(%r3)
/* skip r3 for now */
lwz %r4, 16(%r3)
@@ -194,20 +256,16 @@ ENTRY(_ZNK7_Unwind15Registers_ppc326jump
lwz %r30,120(%r3)
lwz %r31,124(%r3)
- lwz %r0, 128(%r3) /* CR */
- mtcr %r0
- lwz
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Mar 11 23:22:36 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch amd64 to gcc-4.8
To generate a diff of this commit:
cvs rdiff -u -r1.783 -r1.784 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/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.783 src/share/mk/bsd.own.mk:1.784
--- src/share/mk/bsd.own.mk:1.783 Mon Mar 10 18:38:53 2014
+++ src/share/mk/bsd.own.mk Tue Mar 11 19:22:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.783 2014/03/10 22:38:53 pooka Exp $
+# $NetBSD: bsd.own.mk,v 1.784 2014/03/11 23:22:36 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -63,7 +63,8 @@ HAVE_GCC?=4
${MACHINE_CPU} == "arm" || \
${MACHINE_CPU} == "hppa" || \
${MACHINE_CPU} == "sparc" || \
- ${MACHINE_CPU} == "sparc64"
+ ${MACHINE_CPU} == "sparc64" || \
+ ${MACHINE_CPU} == "x86_64"
HAVE_GCC?=48
.else
CVS commit: src/sys/lib/libkern
Module Name:src
Committed By: pooka
Date: Wed Mar 12 00:22:53 UTC 2014
Modified Files:
src/sys/lib/libkern: Makefile.libkern
Log Message:
Do not include compiler-rt in librump. librump is not a toolchain support
library, and toolchain support belongs in the host libc or libgcc or
equivalent entity that is actually supposed to complement the toolchain.
Fixes librump build on (a) Linux ARM (collisions with libgcc)
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/lib/libkern/Makefile.libkern
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.31 src/sys/lib/libkern/Makefile.libkern:1.32
--- src/sys/lib/libkern/Makefile.libkern:1.31 Wed Jan 29 23:37:18 2014
+++ src/sys/lib/libkern/Makefile.libkern Wed Mar 12 00:22:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.31 2014/01/29 23:37:18 joerg Exp $
+# $NetBSD: Makefile.libkern,v 1.32 2014/03/12 00:22:53 pooka Exp $
#
# Variable definitions for libkern.
@@ -43,7 +43,9 @@ CPPFLAGS+= -I${KERNDIR}/../../../common/
.include "$M/Makefile.inc"
.endif
+.if !defined(RUMPKERNEL)
.include ".${PARSEDIR}/Makefile.compiler-rt"
+.endif
# Other stuff
SRCS+= kern_assert.c __main.c
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: para
Date: Tue Mar 11 20:55:19 UTC 2014
Modified Files:
src/sys/arch/x86/x86: vm_machdep.c
Log Message:
mark a diagnostic only variable
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/x86/x86/vm_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/x86/x86/vm_machdep.c
diff -u src/sys/arch/x86/x86/vm_machdep.c:1.24 src/sys/arch/x86/x86/vm_machdep.c:1.25
--- src/sys/arch/x86/x86/vm_machdep.c:1.24 Tue Feb 25 22:16:52 2014
+++ src/sys/arch/x86/x86/vm_machdep.c Tue Mar 11 20:55:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.24 2014/02/25 22:16:52 dsl Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.25 2014/03/11 20:55:19 para Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -80,7 +80,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.24 2014/02/25 22:16:52 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.25 2014/03/11 20:55:19 para Exp $");
#include "opt_mtrr.h"
@@ -270,7 +270,7 @@ paddr_t
kvtop(void *addr)
{
paddr_t pa;
- bool ret;
+ bool ret __diagused;
ret = pmap_extract(pmap_kernel(), (vaddr_t)addr, &pa);
KASSERT(ret == true);
CVS commit: src/sys/arch/amd64/amd64
Module Name:src
Committed By: para
Date: Tue Mar 11 20:54:29 UTC 2014
Modified Files:
src/sys/arch/amd64/amd64: trap.c
Log Message:
mark a diagnostic only variable
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/amd64/amd64/trap.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/amd64/amd64/trap.c
diff -u src/sys/arch/amd64/amd64/trap.c:1.77 src/sys/arch/amd64/amd64/trap.c:1.78
--- src/sys/arch/amd64/amd64/trap.c:1.77 Wed Feb 12 19:53:49 2014
+++ src/sys/arch/amd64/amd64/trap.c Tue Mar 11 20:54:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.77 2014/02/12 19:53:49 dsl Exp $ */
+/* $NetBSD: trap.c,v 1.78 2014/03/11 20:54:29 para Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.77 2014/02/12 19:53:49 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.78 2014/03/11 20:54:29 para Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -705,7 +705,7 @@ startlwp(void *arg)
{
ucontext_t *uc = arg;
lwp_t *l = curlwp;
- int error;
+ int error __diagused;
error = cpu_setmcontext(l, &uc->uc_mcontext, uc->uc_flags);
KASSERT(error == 0);
CVS commit: src/sys/dev
Module Name:src
Committed By: pooka
Date: Tue Mar 11 20:35:47 UTC 2014
Modified Files:
src/sys/dev: rndpseudo.c
Log Message:
kill _RUMPKERNEL ifdef
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/rndpseudo.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/rndpseudo.c
diff -u src/sys/dev/rndpseudo.c:1.17 src/sys/dev/rndpseudo.c:1.18
--- src/sys/dev/rndpseudo.c:1.17 Wed Sep 25 03:14:55 2013
+++ src/sys/dev/rndpseudo.c Tue Mar 11 20:35:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rndpseudo.c,v 1.17 2013/09/25 03:14:55 riastradh Exp $ */
+/* $NetBSD: rndpseudo.c,v 1.18 2014/03/11 20:35:47 pooka Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.17 2013/09/25 03:14:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.18 2014/03/11 20:35:47 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -66,7 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,
#include
-#if defined(__HAVE_CPU_COUNTER) && !defined(_RUMPKERNEL) /* XXX: bad pooka */
+#if defined(__HAVE_CPU_COUNTER)
#include
#endif
@@ -165,7 +165,7 @@ rndpseudo_counter(void)
{
struct timeval tv;
-#if defined(__HAVE_CPU_COUNTER) && !defined(_RUMPKERNEL) /* XXX: bad pooka */
+#if defined(__HAVE_CPU_COUNTER)
if (cpu_hascounter())
return (cpu_counter32());
#endif
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Tue Mar 11 20:32:05 UTC 2014
Modified Files:
src/sys/kern: subr_vmem.c
src/sys/rump/librump/rumpkern: vm.c
Log Message:
kill undesirable #ifndef _RUMPKERNEL
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/kern/subr_vmem.c
cvs rdiff -u -r1.151 -r1.152 src/sys/rump/librump/rumpkern/vm.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/subr_vmem.c
diff -u src/sys/kern/subr_vmem.c:1.88 src/sys/kern/subr_vmem.c:1.89
--- src/sys/kern/subr_vmem.c:1.88 Mon Feb 17 20:40:06 2014
+++ src/sys/kern/subr_vmem.c Tue Mar 11 20:32:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_vmem.c,v 1.88 2014/02/17 20:40:06 para Exp $ */
+/* $NetBSD: subr_vmem.c,v 1.89 2014/03/11 20:32:05 pooka Exp $ */
/*-
* Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi,
@@ -46,7 +46,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.88 2014/02/17 20:40:06 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.89 2014/03/11 20:32:05 pooka Exp $");
#if defined(_KERNEL)
#include "opt_ddb.h"
@@ -1176,7 +1176,7 @@ retry:
/* XXX */
if ((flags & VM_SLEEP) != 0) {
-#if defined(_KERNEL) && !defined(_RUMPKERNEL)
+#if defined(_KERNEL)
mutex_spin_enter(&uvm_fpageqlock);
uvm_kick_pdaemon();
mutex_spin_exit(&uvm_fpageqlock);
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.151 src/sys/rump/librump/rumpkern/vm.c:1.152
--- src/sys/rump/librump/rumpkern/vm.c:1.151 Tue Mar 11 20:22:47 2014
+++ src/sys/rump/librump/rumpkern/vm.c Tue Mar 11 20:32:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.151 2014/03/11 20:22:47 pooka Exp $ */
+/* $NetBSD: vm.c,v 1.152 2014/03/11 20:32:05 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.151 2014/03/11 20:22:47 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.152 2014/03/11 20:32:05 pooka Exp $");
#include
#include
@@ -66,7 +66,8 @@ __KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.151
#include "rump_private.h"
#include "rump_vfs_private.h"
-kmutex_t uvm_pageqlock;
+kmutex_t uvm_pageqlock; /* non-free page lock */
+kmutex_t uvm_fpageqlock; /* free page lock, non-gpl license */
kmutex_t uvm_swap_data_lock;
struct uvmexp uvmexp;
@@ -344,6 +345,9 @@ uvm_init(void)
mutex_init(&uvm_pageqlock, MUTEX_DEFAULT, IPL_NONE);
mutex_init(&uvm_swap_data_lock, MUTEX_DEFAULT, IPL_NONE);
+ /* just to appease linkage */
+ mutex_init(&uvm_fpageqlock, MUTEX_SPIN, IPL_VM);
+
mutex_init(&pdaemonmtx, MUTEX_DEFAULT, IPL_NONE);
cv_init(&pdaemoncv, "pdaemon");
cv_init(&oomwait, "oomwait");
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Tue Mar 11 20:26:08 UTC 2014
Modified Files:
src/sys/kern: kern_rndq.c
Log Message:
kill undesirable "#ifdef _RUMPKERNEL"
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/kern/kern_rndq.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/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.22 src/sys/kern/kern_rndq.c:1.23
--- src/sys/kern/kern_rndq.c:1.22 Tue Feb 25 23:15:43 2014
+++ src/sys/kern/kern_rndq.c Tue Mar 11 20:26:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndq.c,v 1.22 2014/02/25 23:15:43 riastradh Exp $ */
+/* $NetBSD: kern_rndq.c,v 1.23 2014/03/11 20:26:08 pooka Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.22 2014/02/25 23:15:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.23 2014/03/11 20:26:08 pooka Exp $");
#include
#include
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,
#include
-#if defined(__HAVE_CPU_COUNTER) && !defined(_RUMPKERNEL) /* XXX: bad pooka */
+#if defined(__HAVE_CPU_COUNTER)
#include
#endif
@@ -183,7 +183,7 @@ rnd_counter(void)
{
struct timeval tv;
-#if defined(__HAVE_CPU_COUNTER) && !defined(_RUMPKERNEL) /* XXX: bad pooka */
+#if defined(__HAVE_CPU_COUNTER)
if (cpu_hascounter())
return (cpu_counter32());
#endif
@@ -329,7 +329,7 @@ rnd_estimate_entropy(krndsource_t *rs, u
return (1);
}
-#if defined(__HAVE_CPU_COUNTER) && !defined(_RUMPKERNEL)
+#if defined(__HAVE_CPU_COUNTER)
static void
rnd_skew(void *arg)
{
@@ -432,7 +432,7 @@ rnd_init(void)
* XXX clocking the callout mechanism. How to get this right
* XXX without unsightly spelunking in the timecounter code?
*/
-#if defined(__HAVE_CPU_COUNTER) && !defined(_RUMPKERNEL) /* XXX: bad pooka */
+#if defined(__HAVE_CPU_COUNTER)
callout_init(&skew_callout, CALLOUT_MPSAFE);
callout_setfunc(&skew_callout, rnd_skew, NULL);
rnd_skew(NULL);
CVS commit: src/sys/rump/include/machine
Module Name:src Committed By: pooka Date: Tue Mar 11 20:25:05 UTC 2014 Added Files: src/sys/rump/include/machine: cpu_counter.h Log Message: Reinstance cpu_counter.h so that we don't have to work around the MD implications everywhere else. To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 src/sys/rump/include/machine/cpu_counter.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/rump/include/machine/cpu_counter.h diff -u /dev/null src/sys/rump/include/machine/cpu_counter.h:1.3 --- /dev/null Tue Mar 11 20:25:05 2014 +++ src/sys/rump/include/machine/cpu_counter.h Tue Mar 11 20:25:05 2014 @@ -0,0 +1,43 @@ +/* $NetBSD: cpu_counter.h,v 1.3 2014/03/11 20:25:05 pooka Exp $ */ + +/*- + * Copyright (c) 2014 Antti Kantee. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _SYS_RUMP_CPU_COUNTER_H_ +#define _SYS_RUMP_CPU_COUNTER_H_ + +#include + +#ifdef __HAVE_CPU_COUNTER +/* + * A very simple MI cpu "counter". Could start filling in MD ones ... + */ +#define cpu_hascounter() 0 +#define cpu_counter() 0 +#define cpu_counter32() 0 +#define cpu_frequency(a) 0 +#endif /* __HAVE_CPU_COUNTER */ + +#endif /* _SYS_RUMP_CPU_COUNTER_H_ */
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Tue Mar 11 20:22:47 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: vm.c
src/sys/uvm: uvm_object.c
Log Message:
deduplicate uvm_object_printit() implementation
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/rump/librump/rumpkern/vm.c
cvs rdiff -u -r1.11 -r1.12 src/sys/uvm/uvm_object.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/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.150 src/sys/rump/librump/rumpkern/vm.c:1.151
--- src/sys/rump/librump/rumpkern/vm.c:1.150 Mon Mar 3 16:50:28 2014
+++ src/sys/rump/librump/rumpkern/vm.c Tue Mar 11 20:22:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.150 2014/03/03 16:50:28 pooka Exp $ */
+/* $NetBSD: vm.c,v 1.151 2014/03/11 20:22:47 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.150 2014/03/03 16:50:28 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.151 2014/03/11 20:22:47 pooka Exp $");
#include
#include
@@ -659,16 +659,6 @@ ubc_purge(struct uvm_object *uobj)
}
-#ifdef DEBUGPRINT
-void
-uvm_object_printit(struct uvm_object *uobj, bool full,
- void (*pr)(const char *, ...))
-{
-
- pr("VM OBJECT at %p, refs %d", uobj, uobj->uo_refs);
-}
-#endif
-
vaddr_t
uvm_default_mapaddr(struct proc *p, vaddr_t base, vsize_t sz)
{
Index: src/sys/uvm/uvm_object.c
diff -u src/sys/uvm/uvm_object.c:1.11 src/sys/uvm/uvm_object.c:1.12
--- src/sys/uvm/uvm_object.c:1.11 Sat Aug 27 09:11:53 2011
+++ src/sys/uvm/uvm_object.c Tue Mar 11 20:22:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_object.c,v 1.11 2011/08/27 09:11:53 christos Exp $ */
+/* $NetBSD: uvm_object.c,v 1.12 2014/03/11 20:22:47 pooka Exp $ */
/*
* Copyright (c) 2006, 2010 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_object.c,v 1.11 2011/08/27 09:11:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_object.c,v 1.12 2014/03/11 20:22:47 pooka Exp $");
#include "opt_ddb.h"
@@ -227,7 +227,7 @@ uvm_obj_unwirepages(struct uvm_object *u
mutex_exit(uobj->vmobjlock);
}
-#if (defined(DDB) || defined(DEBUGPRINT)) && !defined(_RUMPKERNEL)
+#if defined(DDB) || defined(DEBUGPRINT)
/*
* uvm_object_printit: actually prints the object
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify
Module Name:src Committed By: agc Date: Tue Mar 11 17:48:31 UTC 2014 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgpverify: libverify.c Log Message: Add portability definitions in case they're not already defined XXX - these need to be consolidated in one single header To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.4 --- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.3 Tue Mar 11 17:38:48 2014 +++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c Tue Mar 11 17:48:31 2014 @@ -56,6 +56,14 @@ #define USE_ARG(x) /*LINTED*/(void)&(x) #endif +#ifndef __dead +#define __dead__attribute__((__noreturn__)) +#endif + +#ifndef __printflike +#define __printflike(n, m) __attribute__((format(printf,n,m))) +#endif + #define BITS_TO_BYTES(b) (((b) + (CHAR_BIT - 1)) / CHAR_BIT) /* packet types */
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify
Module Name:src
Committed By: agc
Date: Tue Mar 11 17:38:48 UTC 2014
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: libverify.c
Log Message:
cast arguments to the correct type for format strings
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.2 Tue Mar 11 17:21:05 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c Tue Mar 11 17:38:48 2014
@@ -1994,7 +1994,7 @@ setup_data(pgpv_cursor_t *cursor, pgpv_t
if (is_armored(buf, sizeof(buf))) {
read_ascii_armor_file(cursor, p);
} else {
- read_binary_file(pgp, "signature", "%s", p);
+ read_binary_file(pgp, "signature", "%s", (const char *)p);
}
fclose(fp);
} else {
@@ -2672,7 +2672,7 @@ pgpv_read_pubring(pgpv_t *pgp, const voi
if (keyring) {
return (size > 0) ?
read_binary_memory(pgp, "pubring", keyring, (size_t)size) :
- read_binary_file(pgp, "pubring", "%s", keyring);
+ read_binary_file(pgp, "pubring", "%s", (const char *)keyring);
}
return read_binary_file(pgp, "pubring", "%s/%s", nonnull_getenv("HOME"), ".gnupg/pubring.gpg");
}
@@ -2687,7 +2687,7 @@ pgpv_read_ssh_pubkeys(pgpv_t *pgp, const
return 0;
}
if (keyring) {
- if (!read_ssh_file(pgp, &primary, "%s", keyring)) {
+ if (!read_ssh_file(pgp, &primary, "%s", (const char *)keyring)) {
return 0;
}
} else if (!read_ssh_file(pgp, &primary, "%s/%s", nonnull_getenv("HOME"), ".ssh/id_rsa.pub")) {
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify
Module Name:src
Committed By: joerg
Date: Tue Mar 11 17:21:05 UTC 2014
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: libverify.c
misc.h
Log Message:
Annotate format strings. Remove string constant in front of real format
string.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.1 Sun Mar 9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c Tue Mar 11 17:21:05 2014
@@ -151,7 +151,7 @@
/* Forward declarations */
static int read_all_packets(pgpv_t */*pgp*/, pgpv_mem_t */*mem*/, const char */*op*/);
-static int read_binary_file(pgpv_t */*pgp*/, const char */*op*/, const char */*fmt*/, ...);
+static int read_binary_file(pgpv_t */*pgp*/, const char */*op*/, const char */*fmt*/, ...) __printflike(3, 4);
static int read_binary_memory(pgpv_t */*pgp*/, const char */*op*/, const void */*memory*/, size_t /*size*/);
/* read a file into the pgpv_mem_t struct */
@@ -2221,7 +2221,7 @@ findstr(str_t *array, const char *name)
}
/* read public key from the ssh pubkey file */
-static int
+static __printflike(3, 4) int
read_ssh_file(pgpv_t *pgp, pgpv_primarykey_t *primary, const char *fmt, ...)
{
pgpv_signed_userid_t userid;
@@ -2690,7 +2690,7 @@ pgpv_read_ssh_pubkeys(pgpv_t *pgp, const
if (!read_ssh_file(pgp, &primary, "%s", keyring)) {
return 0;
}
- } else if (!read_ssh_file(pgp, &primary, "pubring", "%s/%s", nonnull_getenv("HOME"), ".ssh/id_rsa.pub")) {
+ } else if (!read_ssh_file(pgp, &primary, "%s/%s", nonnull_getenv("HOME"), ".ssh/id_rsa.pub")) {
return 0;
}
ARRAY_APPEND(pgp->primaries, primary);
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h:1.1 Sun Mar 9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h Tue Mar 11 17:21:05 2014
@@ -45,7 +45,7 @@ void *netpgp_allocate(size_t /*n*/, size
void netpgp_deallocate(void */*ptr*/, size_t /*size*/);
#ifndef _KERNEL
-void logmessage(const int /*level*/, const char */*fmt*/, ...);
+void logmessage(const int /*level*/, const char */*fmt*/, ...) __printflike(2, 3);
#endif
__END_DECLS
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify
Module Name:src
Committed By: joerg
Date: Tue Mar 11 17:20:23 UTC 2014
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: bzlib_private.h
Log Message:
Mark assertion handler as dead.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h:1.1 Sun Mar 9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h Tue Mar 11 17:20:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bzlib_private.h,v 1.1 2014/03/09 00:15:45 agc Exp $ */
+/* $NetBSD: bzlib_private.h,v 1.2 2014/03/11 17:20:23 joerg Exp $ */
/*-*/
@@ -57,7 +57,7 @@ typedef unsigned short UInt16;
#ifndef BZ_NO_STDIO
-void BZ2_bz__AssertH__fail ( int errcode );
+void BZ2_bz__AssertH__fail ( int errcode ) __dead;
#define AssertH(cond,errcode) \
{ if (!(cond)) BZ2_bz__AssertH__fail ( errcode ); }
CVS commit: src/tests/lib/libexecinfo
Module Name:src
Committed By: joerg
Date: Tue Mar 11 13:43:23 UTC 2014
Modified Files:
src/tests/lib/libexecinfo: t_backtrace.c
Log Message:
Use a struct for pair of frame name and whether it is optional. Add some
additional entries found in a -O0 build of ATF on PowerPC.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/lib/libexecinfo/t_backtrace.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/lib/libexecinfo/t_backtrace.c
diff -u src/tests/lib/libexecinfo/t_backtrace.c:1.12 src/tests/lib/libexecinfo/t_backtrace.c:1.13
--- src/tests/lib/libexecinfo/t_backtrace.c:1.12 Sat Jan 11 19:48:22 2014
+++ src/tests/lib/libexecinfo/t_backtrace.c Tue Mar 11 13:43:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_backtrace.c,v 1.12 2014/01/11 19:48:22 martin Exp $ */
+/* $NetBSD: t_backtrace.c,v 1.13 2014/03/11 13:43:23 joerg Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_backtrace.c,v 1.12 2014/01/11 19:48:22 martin Exp $");
+__RCSID("$NetBSD: t_backtrace.c,v 1.13 2014/03/11 13:43:23 joerg Exp $");
#include
#include
@@ -53,19 +53,28 @@ volatile int prevent_inline;
void
myfunc3(size_t ncalls)
{
- static const char *top[] = { "myfunc", "atfu_backtrace_fmt_basic_body",
- "atf_tc_run", "atf_tp_run", "atf_tp_main", "main", "___start" };
- static bool optional_frame[] = { false, false, false, true, false,
- true, true };
+ static const struct {
+ const char *name;
+ bool is_optional;
+ } frames[] = {
+ { "myfunc", false },
+ { "atfu_backtrace_fmt_basic_body", false },
+ { "atf_tc_run", false },
+ { "atf_tp_run", true },
+ { "run_tc", true },
+ { "controlled_main", true },
+ { "atf_tp_main", false },
+ { "main", true },
+ { "___start", true },
+ };
size_t j, nptrs, min_frames, max_frames;
void *buffer[ncalls + 10];
char **strings;
- __CTASSERT(__arraycount(top) == __arraycount(optional_frame));
min_frames = 0;
max_frames = 0;
- for (j = 0; j < __arraycount(optional_frame); ++j) {
- if (!optional_frame[j])
+ for (j = 0; j < __arraycount(frames); ++j) {
+ if (!frames[j].is_optional)
++min_frames;
++max_frames;
}
@@ -90,11 +99,12 @@ myfunc3(size_t ncalls)
ATF_CHECK_STREQ(strings[j], "myfunc1");
for (size_t i = 0; j < nptrs; i++, j++) {
- if (optional_frame[i] && strcmp(strings[j], top[i])) {
+ if (frames[i].is_optional &&
+ strcmp(strings[j], frames[i].name)) {
--i;
continue;
}
- ATF_CHECK_STREQ(strings[j], top[i]);
+ ATF_CHECK_STREQ(strings[j], frames[i].name);
}
free(strings);
CVS commit: othersrc/external/bsd/transit/dist
Module Name:othersrc Committed By: wiz Date: Tue Mar 11 08:33:27 UTC 2014 Modified Files: othersrc/external/bsd/transit/dist: libtransit.3 Log Message: Remove trailing space. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/transit/dist/libtransit.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/transit/dist/libtransit.3 diff -u othersrc/external/bsd/transit/dist/libtransit.3:1.3 othersrc/external/bsd/transit/dist/libtransit.3:1.4 --- othersrc/external/bsd/transit/dist/libtransit.3:1.3 Fri Mar 7 01:34:19 2014 +++ othersrc/external/bsd/transit/dist/libtransit.3 Tue Mar 11 08:33:27 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: libtransit.3,v 1.3 2014/03/07 01:34:19 agc Exp $ +.\" $NetBSD: libtransit.3,v 1.4 2014/03/11 08:33:27 wiz Exp $ .\" .\" Copyright (c) 2014 Alistair Crooks .\" All rights reserved. @@ -207,7 +207,7 @@ By doing this, the number is encoded in The string of bytes is preceded by its length in bytes, encoded as a .Dq number . -When encoding strings, +When encoding strings, the byte string does not need to be NUL-terminated. Neither do any characters need to be escaped. .Pp
CVS commit: src/sys
Module Name:src
Committed By: mrg
Date: Tue Mar 11 08:19:45 UTC 2014
Modified Files:
src/sys/arch/evbmips/gdium: gdium_intr.c
src/sys/arch/mips/bonito: bonito_pci.c
src/sys/arch/mips/rmi: rmixl_pcix.c rmixlvar.h
src/sys/dev/pci/voyager: voyagerfb.c
Log Message:
avoid set but unused variables.
move variables under their usage #ifdef.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/gdium/gdium_intr.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mips/bonito/bonito_pci.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mips/rmi/rmixl_pcix.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/rmi/rmixlvar.h
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/voyager/voyagerfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/gdium/gdium_intr.c
diff -u src/sys/arch/evbmips/gdium/gdium_intr.c:1.5 src/sys/arch/evbmips/gdium/gdium_intr.c:1.6
--- src/sys/arch/evbmips/gdium/gdium_intr.c:1.5 Sun Jul 10 00:03:53 2011
+++ src/sys/arch/evbmips/gdium/gdium_intr.c Tue Mar 11 08:19:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gdium_intr.c,v 1.5 2011/07/10 00:03:53 matt Exp $ */
+/* $NetBSD: gdium_intr.c,v 1.6 2014/03/11 08:19:45 mrg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gdium_intr.c,v 1.5 2011/07/10 00:03:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdium_intr.c,v 1.6 2014/03/11 08:19:45 mrg Exp $");
#define __INTR_PRIVATE
@@ -299,7 +299,6 @@ evbmips_intr_disestablish(void *cookie)
void
evbmips_iointr(int ipl, vaddr_t pc, uint32_t ipending)
{
- const struct gdium_irqmap *irqmap;
struct evbmips_intrhand *ih;
int level;
uint32_t isr;
@@ -315,7 +314,6 @@ evbmips_iointr(int ipl, vaddr_t pc, uint
continue;
gdium_cpuintrs[level].cintr_count.ev_count++;
LIST_FOREACH (ih, &gdium_cpuintrs[level].cintr_list, ih_q) {
- irqmap = &gdium_irqmap[ih->ih_irq];
if (isr & (1 << ih->ih_irq)) {
gdium_intrtab[ih->ih_irq].intr_count.ev_count++;
(*ih->ih_func)(ih->ih_arg);
Index: src/sys/arch/mips/bonito/bonito_pci.c
diff -u src/sys/arch/mips/bonito/bonito_pci.c:1.10 src/sys/arch/mips/bonito/bonito_pci.c:1.11
--- src/sys/arch/mips/bonito/bonito_pci.c:1.10 Sat Aug 27 12:59:16 2011
+++ src/sys/arch/mips/bonito/bonito_pci.c Tue Mar 11 08:19:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bonito_pci.c,v 1.10 2011/08/27 12:59:16 bouyer Exp $ */
+/* $NetBSD: bonito_pci.c,v 1.11 2014/03/11 08:19:45 mrg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bonito_pci.c,v 1.10 2011/08/27 12:59:16 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bonito_pci.c,v 1.11 2014/03/11 08:19:45 mrg Exp $");
#include
#include
@@ -139,7 +139,7 @@ bonito_conf_read(void *v, pcitag_t tag,
{
struct bonito_config *bc = v;
pcireg_t data;
- u_int32_t cfgoff, dummy, pcimap_cfg;
+ u_int32_t cfgoff, pcimap_cfg;
int s;
if (bonito_conf_addr(bc, tag, offset, &cfgoff, &pcimap_cfg))
@@ -156,7 +156,7 @@ bonito_conf_read(void *v, pcitag_t tag,
wbflush();
/* Issue a read to make sure the write is posted */
- dummy = REGVAL(BONITO_PCIMAP_CFG);
+ (void)REGVAL(BONITO_PCIMAP_CFG);
/* low 16 bits of address are offset into config space */
data = REGVAL(BONITO_PCICFG_BASE + (cfgoff & 0xfffc));
@@ -175,7 +175,7 @@ void
bonito_conf_write(void *v, pcitag_t tag, int offset, pcireg_t data)
{
struct bonito_config *vt = v;
- u_int32_t cfgoff, dummy, pcimap_cfg;
+ u_int32_t cfgoff, pcimap_cfg;
int s;
if (bonito_conf_addr(vt, tag, offset, &cfgoff, &pcimap_cfg))
@@ -192,7 +192,7 @@ bonito_conf_write(void *v, pcitag_t tag,
wbflush();
/* Issue a read to make sure the write is posted */
- dummy = REGVAL(BONITO_PCIMAP_CFG);
+ (void)REGVAL(BONITO_PCIMAP_CFG);
/* low 16 bits of address are offset into config space */
REGVAL(BONITO_PCICFG_BASE + (cfgoff & 0xfffc)) = data;
Index: src/sys/arch/mips/rmi/rmixl_pcix.c
diff -u src/sys/arch/mips/rmi/rmixl_pcix.c:1.10 src/sys/arch/mips/rmi/rmixl_pcix.c:1.11
--- src/sys/arch/mips/rmi/rmixl_pcix.c:1.10 Sat Oct 27 17:18:03 2012
+++ src/sys/arch/mips/rmi/rmixl_pcix.c Tue Mar 11 08:19:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcix.c,v 1.10 2012/10/27 17:18:03 chs Exp $ */
+/* $NetBSD: rmixl_pcix.c,v 1.11 2014/03/11 08:19:45 mrg Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.10 2012/10/27 17:18:03 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.11 2014/03/11 08:19:45 mrg Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -385,11 +385,14 @@ rmixl_pcix_attach(device_t parent, devic
* check PCI-X interface byteswap setup
* ensure 'Match Byte Lane' is disabled
*/
- uint32_t mble, mba, mbs;
+ uint32_t mble;
mble = RMIXL_PCIXREG_READ(RMIXL_PCIX_ECFG_XLR_MBLE);
CVS commit: src/sys/arch/arm/marvell
Module Name:src
Committed By: martin
Date: Tue Mar 11 07:52:37 UTC 2014
Modified Files:
src/sys/arch/arm/marvell: kirkwood.c
Log Message:
Mark a diagnostic only variable
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/marvell/kirkwood.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/marvell/kirkwood.c
diff -u src/sys/arch/arm/marvell/kirkwood.c:1.8 src/sys/arch/arm/marvell/kirkwood.c:1.9
--- src/sys/arch/arm/marvell/kirkwood.c:1.8 Mon Dec 23 04:12:09 2013
+++ src/sys/arch/arm/marvell/kirkwood.c Tue Mar 11 07:52:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kirkwood.c,v 1.8 2013/12/23 04:12:09 kiyohara Exp $ */
+/* $NetBSD: kirkwood.c,v 1.9 2014/03/11 07:52:37 martin Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kirkwood.c,v 1.8 2013/12/23 04:12:09 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kirkwood.c,v 1.9 2014/03/11 07:52:37 martin Exp $");
#define _INTR_PRIVATE
@@ -145,7 +145,7 @@ static void
kirkwood_intr_init(void)
{
extern struct pic_softc mvsoc_bridge_pic;
- void *ih;
+ void *ih __diagused;
pic_add(&kirkwood_pic, 0);
