CVS commit: src/usr.bin/window
Module Name:src
Committed By: mrg
Date: Wed Jun 22 06:23:07 UTC 2011
Modified Files:
src/usr.bin/window: string.c
Log Message:
don't bother casting the return value of malloc.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/window/string.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/window/string.c
diff -u src/usr.bin/window/string.c:1.10 src/usr.bin/window/string.c:1.11
--- src/usr.bin/window/string.c:1.10 Tue Apr 14 08:50:06 2009
+++ src/usr.bin/window/string.c Wed Jun 22 06:23:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: string.c,v 1.10 2009/04/14 08:50:06 lukem Exp $ */
+/* $NetBSD: string.c,v 1.11 2011/06/22 06:23:07 mrg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)string.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: string.c,v 1.10 2009/04/14 08:50:06 lukem Exp $");
+__RCSID("$NetBSD: string.c,v 1.11 2011/06/22 06:23:07 mrg Exp $");
#endif
#endif /* not lint */
@@ -124,7 +124,7 @@
{
struct string *s;
- s = (struct string *) malloc(l + str_offset);
+ s = malloc(l + str_offset);
if (s == 0)
return 0;
if (str_head.s_forw == 0)
CVS commit: src/usr.bin/window
Module Name:src Committed By: mrg Date: Wed Jun 22 06:22:49 UTC 2011 Modified Files: src/usr.bin/window: window_string.h Log Message: use offsetof() instead of some strange local hack. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.bin/window/window_string.h 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/window/window_string.h diff -u src/usr.bin/window/window_string.h:1.8 src/usr.bin/window/window_string.h:1.9 --- src/usr.bin/window/window_string.h:1.8 Tue Apr 14 08:50:06 2009 +++ src/usr.bin/window/window_string.h Wed Jun 22 06:22:48 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: window_string.h,v 1.8 2009/04/14 08:50:06 lukem Exp $ */ +/* $NetBSD: window_string.h,v 1.9 2011/06/22 06:22:48 mrg Exp $ */ /* * Copyright (c) 1983, 1993 @@ -62,7 +62,7 @@ EXTERN struct string str_head; -#define str_offset ((unsigned)str_head.s_data - (unsigned)&str_head) +#define str_offset offsetof(struct string, s_data) #define str_stos(s) ((struct string *)((unsigned)(s) - str_offset)) char *str_alloc(size_t);
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: mrg
Date: Wed Jun 22 05:50:47 UTC 2011
Modified Files:
src/sys/arch/sparc64/sparc64: db_interface.c
Log Message:
there's no fr_arg[6] or fr_arg[7] -- they're called fr_fp and fr_pc.
use the right names and avoid some array bounds violations picked up
by GCC 4.5. it's a real bug, but the code would have been generated
correctly for the sparc* ABIs.
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/sparc64/sparc64/db_interface.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/sparc64/sparc64/db_interface.c
diff -u src/sys/arch/sparc64/sparc64/db_interface.c:1.128 src/sys/arch/sparc64/sparc64/db_interface.c:1.129
--- src/sys/arch/sparc64/sparc64/db_interface.c:1.128 Wed Apr 13 03:34:37 2011
+++ src/sys/arch/sparc64/sparc64/db_interface.c Wed Jun 22 05:50:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.128 2011/04/13 03:34:37 mrg Exp $ */
+/* $NetBSD: db_interface.c,v 1.129 2011/06/22 05:50:47 mrg Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.128 2011/04/13 03:34:37 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.129 2011/06/22 05:50:47 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -243,8 +243,8 @@
{ "i3", dbregfr(arg[3]), db_sparc_regop, 0 },
{ "i4", dbregfr(arg[4]), db_sparc_regop, 0 },
{ "i5", dbregfr(arg[5]), db_sparc_regop, 0 },
- { "i6", dbregfr(arg[6]), db_sparc_regop, 0 },
- { "i7", dbregfr(arg[7]), db_sparc_regop, 0 },
+ { "i6", dbregfr(fp), db_sparc_regop, 0 },
+ { "i7", dbregfr(pc), db_sparc_regop, 0 },
{ "f0", dbregfp(regs[0]), db_sparc_regop, 0 },
{ "f2", dbregfp(regs[2]), db_sparc_regop, 0 },
{ "f4", dbregfp(regs[4]), db_sparc_regop, 0 },
CVS commit: src
Module Name:src
Committed By: mrg
Date: Wed Jun 22 05:23:54 UTC 2011
Modified Files:
src/lib/libc/arch/sparc64: Makefile.inc
src/usr.bin/m4: Makefile
src/usr.sbin/altq/altqd: Makefile
Log Message:
apply some -Wno-error/-Wno-enum-compare/-Wno-array-bounds.
this should be looked at more closely.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/arch/sparc64/Makefile.inc
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/m4/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/altq/altqd/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/arch/sparc64/Makefile.inc
diff -u src/lib/libc/arch/sparc64/Makefile.inc:1.15 src/lib/libc/arch/sparc64/Makefile.inc:1.16
--- src/lib/libc/arch/sparc64/Makefile.inc:1.15 Tue Mar 22 12:24:53 2011
+++ src/lib/libc/arch/sparc64/Makefile.inc Wed Jun 22 05:23:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.15 2011/03/22 12:24:53 martin Exp $
+# $NetBSD: Makefile.inc,v 1.16 2011/06/22 05:23:53 mrg Exp $
SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
@@ -18,4 +18,9 @@
SRCS+= ${SRCS.softfloat}
CPPFLAGS+= -I${ARCHDIR}/softfloat -I${.CURDIR}/softfloat \
-I${.CURDIR}/softfloat/bits64
+
+.if ${HAVE_GCC} == 45
+COPTS.softfloat-wrapper.c+= -Wno-enum-compare
+.endif
+
.endif
Index: src/usr.bin/m4/Makefile
diff -u src/usr.bin/m4/Makefile:1.15 src/usr.bin/m4/Makefile:1.16
--- src/usr.bin/m4/Makefile:1.15 Mon Oct 26 21:11:28 2009
+++ src/usr.bin/m4/Makefile Wed Jun 22 05:23:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/10/26 21:11:28 christos Exp $
+# $NetBSD: Makefile,v 1.16 2011/06/22 05:23:53 mrg Exp $
#
# @(#)Makefile 8.1 (Berkeley) 6/6/93
@@ -25,3 +25,8 @@
CLEANFILES+=parser.c parser.h tokenizer.o
.include
+
+# XXX
+.if ${HAVE_GCC} == 45
+COPTS.main.c+= -Wno-error
+.endif
Index: src/usr.sbin/altq/altqd/Makefile
diff -u src/usr.sbin/altq/altqd/Makefile:1.4 src/usr.sbin/altq/altqd/Makefile:1.5
--- src/usr.sbin/altq/altqd/Makefile:1.4 Tue Mar 5 04:11:51 2002
+++ src/usr.sbin/altq/altqd/Makefile Wed Jun 22 05:23:54 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/03/05 04:11:51 itojun Exp $
+# $NetBSD: Makefile,v 1.5 2011/06/22 05:23:54 mrg Exp $
.include
@@ -17,3 +17,8 @@
LDADD+= -lutil -lm
.include
+
+# XXX
+.if ${HAVE_GCC} == 45
+COPTS.altqd.c+= -Wno-array-bounds
+.endif
CVS commit: src/sbin/scsictl
Module Name:src
Committed By: mrg
Date: Wed Jun 22 05:18:03 UTC 2011
Modified Files:
src/sbin/scsictl: scsi_sense.c
Log Message:
when checking for SKSV data, use the same test as before. fixes an
always true conditional GCC 4.5 found, and is also a real bug fix.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/scsictl/scsi_sense.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/scsictl/scsi_sense.c
diff -u src/sbin/scsictl/scsi_sense.c:1.8 src/sbin/scsictl/scsi_sense.c:1.9
--- src/sbin/scsictl/scsi_sense.c:1.8 Mon Apr 28 20:23:09 2008
+++ src/sbin/scsictl/scsi_sense.c Wed Jun 22 05:18:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_sense.c,v 1.8 2008/04/28 20:23:09 martin Exp $ */
+/* $NetBSD: scsi_sense.c,v 1.9 2011/06/22 05:18:03 mrg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: scsi_sense.c,v 1.8 2008/04/28 20:23:09 martin Exp $");
+__RCSID("$NetBSD: scsi_sense.c,v 1.9 2011/06/22 05:18:03 mrg Exp $");
#endif
@@ -380,7 +380,7 @@
* nonzero data. If we have some, go back and print the lot,
* otherwise we're done.
*/
- if (sbs)
+ if (cp)
i = 18;
else
i = 15;
CVS commit: src/lib
Module Name:src
Committed By: mrg
Date: Wed Jun 22 05:16:37 UTC 2011
Modified Files:
src/lib: Makefile
Log Message:
fix the paths for GCC 4.5. don't build the non-tools gmp/mpfr/mpc libs
yet since we don't have them fully working. XXX.
To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/lib/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/Makefile
diff -u src/lib/Makefile:1.168 src/lib/Makefile:1.169
--- src/lib/Makefile:1.168 Tue Jun 21 04:04:13 2011
+++ src/lib/Makefile Wed Jun 22 05:16:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.168 2011/06/21 04:04:13 mrg Exp $
+# $NetBSD: Makefile,v 1.169 2011/06/22 05:16:37 mrg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include
@@ -6,10 +6,18 @@
SUBDIR= csu
.if (${MKGCC} != "no")
-.if (${USE_COMPILERCRTSTUFF} == "yes")
+. if ${HAVE_GCC} == 4
+. if (${USE_COMPILERCRTSTUFF} == "yes")
SUBDIR+= ../gnu/lib/crtstuff4
-.endif
+. endif
SUBDIR+= ../gnu/lib/libgcc4
+. else
+. if (${USE_COMPILERCRTSTUFF} == "yes")
+# XXX not yet
+#SUBDIR+= ../external/gpl3/gcc/lib/crtstuff
+. endif
+#SUBDIR+= ../external/gpl3/gcc/lib/libgcc
+. endif
.endif
SUBDIR+= libc
@@ -70,9 +78,10 @@
.endif
. if ${HAVE_GCC} >= 45
-SUBDIR+= ../external/lgpl3/gmp/lib/libgmp
-SUBDIR+= ../external/lgpl3/mpfr/lib/libmpfr
-SUBDIR+= ../external/lgpl2/mpc/lib/libmpc
+# XXX not yet
+#SUBDIR+= ../external/lgpl3/gmp/lib/libgmp
+#SUBDIR+= ../external/lgpl3/mpfr/lib/libmpfr
+#SUBDIR+= ../external/lgpl2/mpc/lib/libmpc
.endif
#
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: mrg
Date: Wed Jun 22 05:15:15 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc: gcc.c
Log Message:
port this change from our gcc 4.1 tree. not entirely sure it's correct
yet, but not yet able to test ...
revision 1.5
date: 2011/04/10 16:50:18; author: joerg; state: Exp; lines: +2 -2
Reduce difference between src/tools/gcc and src/gnu/usr.bin/gcc4
configuration. All but the target to helper programs should be the same.
Mark include directories as sysroot-relative.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/gcc.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/gpl3/gcc/dist/gcc/gcc.c
diff -u src/external/gpl3/gcc/dist/gcc/gcc.c:1.2 src/external/gpl3/gcc/dist/gcc/gcc.c:1.3
--- src/external/gpl3/gcc/dist/gcc/gcc.c:1.2 Tue Jun 21 02:41:36 2011
+++ src/external/gpl3/gcc/dist/gcc/gcc.c Wed Jun 22 05:15:15 2011
@@ -7108,15 +7108,18 @@
PREFIX_PRIORITY_LAST, 0, 1);
else if (*cross_compile == '0')
{
+/* XXXMRG not sure this one is right? */
+#if !defined(NETBSD_NATIVE) && !defined(NETBSD_TOOLS)
add_prefix (&startfile_prefixes,
concat (gcc_exec_prefix
? gcc_exec_prefix : standard_exec_prefix,
machine_suffix,
standard_startfile_prefix, NULL),
NULL, PREFIX_PRIORITY_LAST, 0, 1);
+#endif /* NETBSD_NATIVE */
}
-#ifndef NETBSD_NATIVE
+#if !defined(NETBSD_NATIVE) && !defined(NETBSD_TOOLS)
/* Sysrooted prefixes are relocated because target_system_root is
also relocated by gcc_exec_prefix. */
if (*standard_startfile_prefix_1)
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: mrg
Date: Wed Jun 22 05:14:26 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc: Makefile.in
Log Message:
avoid installing limits.h and friends.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/Makefile.in
diff -u src/external/gpl3/gcc/dist/gcc/Makefile.in:1.2 src/external/gpl3/gcc/dist/gcc/Makefile.in:1.3
--- src/external/gpl3/gcc/dist/gcc/Makefile.in:1.2 Tue Jun 21 02:41:35 2011
+++ src/external/gpl3/gcc/dist/gcc/Makefile.in Wed Jun 22 05:14:26 2011
@@ -727,6 +727,7 @@
# Control whether header files are installed.
INSTALL_HEADERS=install-headers install-mkheaders
+INSTALL_HEADERS=install-headers
# Control whether Info documentation is built and installed.
BUILD_INFO = @BUILD_INFO@
@@ -3830,6 +3831,7 @@
# The touch command is here to workaround an AIX/Linux NFS bug.
-if [ -d include ] ; then true; else mkdir include; chmod a+rx include; fi
-if [ -d include-fixed ] ; then true; else mkdir include-fixed; chmod a+rx include-fixed; fi
+ if false; then \
for file in .. $(USER_H); do \
if [ X$$file != X.. ]; then \
realfile=`echo $$file | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
@@ -3838,11 +3840,13 @@
cp $$file include; \
chmod a+r include/$$realfile; \
fi; \
- done
+ done; \
+ fi
rm -f include/unwind.h
cp $(UNWIND_H) include/unwind.h
chmod a+r include/unwind.h
- rm -f include/stdint.h
+ if false; then \
+ rm -f include/stdint.h; \
if [ $(USE_GCC_STDINT) = wrap ]; then \
rm -f include/stdint-gcc.h; \
cp $(srcdir)/ginclude/stdint-gcc.h include/stdint-gcc.h; \
@@ -3852,7 +3856,7 @@
elif [ $(USE_GCC_STDINT) = provide ]; then \
cp $(srcdir)/ginclude/stdint-gcc.h include/stdint.h; \
chmod a+r include/stdint.h; \
- fi
+ fi; \
set -e; for ml in `cat fixinc_list`; do \
sysroot_headers_suffix=`echo $${ml} | sed -e 's/;.*$$//'`; \
multi_dir=`echo $${ml} | sed -e 's/^[^;]*;//'`; \
@@ -3867,7 +3871,8 @@
rm -f $${fix_dir}/limits.h; \
mv tmp-xlimits.h $${fix_dir}/limits.h; \
chmod a+r $${fix_dir}/limits.h; \
- done
+ done; \
+ fi
# Install the README
rm -f include-fixed/README
cp $(srcdir)/../fixincludes/README-fixinc include-fixed/README
@@ -3929,8 +3934,9 @@
stmp-fixinc: gsyslimits.h macro_list fixinc_list \
$(build_objdir)/fixincludes/fixincl$(build_exeext) \
$(build_objdir)/fixincludes/fixinc.sh
- rm -rf include-fixed; mkdir include-fixed
- -chmod a+rx include-fixed
+ if false; then \
+ rm -rf include-fixed; mkdir include-fixed; \
+ -chmod a+rx include-fixed; \
if [ -d ../prev-gcc ]; then \
cd ../prev-gcc && \
$(MAKE) real-$(INSTALL_HEADERS_DIR) DESTDIR=`pwd`/../gcc/ \
@@ -3964,6 +3970,7 @@
fi; \
chmod a+r $${fix_dir}/syslimits.h; \
done; \
+ fi; \
fi
$(STAMP) stmp-fixinc
#
CVS commit: src
Module Name:src
Committed By: mrg
Date: Wed Jun 22 05:13:20 UTC 2011
Modified Files:
src: Makefile
Log Message:
fix the parts that build libgcc/crtstuff, etc., for GCC 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.284 -r1.285 src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.284 src/Makefile:1.285
--- src/Makefile:1.284 Mon Jun 20 06:52:36 2011
+++ src/Makefile Wed Jun 22 05:13:20 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.284 2011/06/20 06:52:36 mrg Exp $
+# $NetBSD: Makefile,v 1.285 2011/06/22 05:13:20 mrg Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -201,8 +201,12 @@
.if defined(HAVE_GCC)
.if ${HAVE_GCC} == "4"
LIBGCC_EXT=4
+BUILD_CC_LIB_BASEDIR= gnu/lib
+BUILD_CC_LIB_BASETARGET= gnu-lib
.else
-LIBGCC_EXT=45
+LIBGCC_EXT=
+BUILD_CC_LIB_BASEDIR= external/gpl3/gcc/lib
+BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib
.endif
.endif
@@ -408,10 +412,12 @@
.endfor
.if defined(HAVE_GCC)
+.if ${HAVE_GCC} != 45 # XXX for now
.if ${USE_COMPILERCRTSTUFF} == "yes"
-BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT}
+BUILD_CC_LIB= ${BUILD_CC_LIB_BASEDIR}/crtstuff${LIBGCC_EXT}
.endif
-BUILD_CC_LIB+= gnu/lib/libgcc${LIBGCC_EXT}
+BUILD_CC_LIB+= ${BUILD_CC_LIB_BASEDIR}/libgcc${LIBGCC_EXT}
+.endif
.elif defined(HAVE_PCC)
BUILD_CC_LIB+= external/bsd/pcc/crtstuff
BUILD_CC_LIB+= external/bsd/pcc/libpcc
@@ -442,22 +448,26 @@
do-libgcc: .PHONY .MAKE
.if defined(HAVE_GCC)
+.if ${HAVE_GCC} != 45 # XXX for now
.if ${MKGCC} != "no"
.if ${USE_COMPILERCRTSTUFF} == "yes"
- ${MAKEDIRTARGET} . do-gnu-lib-crtstuff${LIBGCC_EXT}
+ ${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}
.endif
- ${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT}
+ ${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT}
.endif
+.endif
.endif
do-compat-libgcc: .PHONY .MAKE
.if defined(HAVE_GCC)
+.if ${HAVE_GCC} != 45 # XXX for now
.if ${MKGCC} != "no"
.if ${USE_COMPILERCRTSTUFF} == "yes"
- ${MAKEDIRTARGET} . do-compat-gnu-lib-crtstuff${LIBGCC_EXT}
+ ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}
.endif
- ${MAKEDIRTARGET} . do-compat-gnu-lib-libgcc${LIBGCC_EXT}
+ ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT}
.endif
+.endif
.endif
do-libpcc: .PHONY .MAKE
CVS commit: src/sys/arch/evbppc/include
Module Name:src Committed By: matt Date: Wed Jun 22 05:09:25 UTC 2011 Removed Files: src/sys/arch/evbppc/include: pmppc_pci_machdep.h Log Message: This is no longer needed. To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/sys/arch/evbppc/include/pmppc_pci_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbppc
Module Name:src
Committed By: matt
Date: Wed Jun 22 05:08:56 UTC 2011
Modified Files:
src/sys/arch/evbppc/conf: std.pmppc
src/sys/arch/evbppc/include: pmppc_intr.h
src/sys/arch/evbppc/pmppc/dev: mainbus.h
Log Message:
Make pmppc use stock
Move some private declartions to
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/conf/std.pmppc
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/include/pmppc_intr.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/pmppc/dev/mainbus.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/evbppc/conf/std.pmppc
diff -u src/sys/arch/evbppc/conf/std.pmppc:1.3 src/sys/arch/evbppc/conf/std.pmppc:1.4
--- src/sys/arch/evbppc/conf/std.pmppc:1.3 Tue Jan 8 13:47:49 2008
+++ src/sys/arch/evbppc/conf/std.pmppc Wed Jun 22 05:08:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: std.pmppc,v 1.3 2008/01/08 13:47:49 joerg Exp $
+# $NetBSD: std.pmppc,v 1.4 2011/06/22 05:08:56 matt Exp $
#
# standard, required NetBSD/pmppc 'options'
@@ -20,6 +20,6 @@
makeoptions NEED_BINARY=1
options PPC_INTR_IMPL=""
-options PPC_PCI_MACHDEP_IMPL=""
+options PPC_PCI_MACHDEP_IMPL=""
include "arch/evbppc/conf/files.pmppc"
Index: src/sys/arch/evbppc/include/pmppc_intr.h
diff -u src/sys/arch/evbppc/include/pmppc_intr.h:1.4 src/sys/arch/evbppc/include/pmppc_intr.h:1.5
--- src/sys/arch/evbppc/include/pmppc_intr.h:1.4 Fri Jun 17 23:36:17 2011
+++ src/sys/arch/evbppc/include/pmppc_intr.h Wed Jun 22 05:08:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmppc_intr.h,v 1.4 2011/06/17 23:36:17 matt Exp $ */
+/* $NetBSD: pmppc_intr.h,v 1.5 2011/06/22 05:08:56 matt Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include
-#ifndef _LOCORE
+#if !defined(_LOCORE) && !defined(_MODULE)
struct pic_ops *setup_cpc700(void);
@@ -46,6 +46,6 @@
#define LEGAL_HWIRQ_P(x) ((u_int)(x) < ICU_LEN && (ICU_MASK & (0x8000 >> (x
-#endif /* !_LOCORE */
+#endif /* !_LOCORE && !_MODULE */
#endif /* !_PMPPC_INTR_H_ */
Index: src/sys/arch/evbppc/pmppc/dev/mainbus.h
diff -u src/sys/arch/evbppc/pmppc/dev/mainbus.h:1.3 src/sys/arch/evbppc/pmppc/dev/mainbus.h:1.4
--- src/sys/arch/evbppc/pmppc/dev/mainbus.h:1.3 Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbppc/pmppc/dev/mainbus.h Wed Jun 22 05:08:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.h,v 1.3 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: mainbus.h,v 1.4 2011/06/22 05:08:56 matt Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -29,6 +29,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _PMPPC_DEV_MAINBUS_H_
+#define _PMPPC_DEV_MAINBUS_H_
+
+#include
+#include
+
struct mainbus_attach_args {
const char *mb_name;
u_long mb_addr;
@@ -46,3 +52,10 @@
extern struct powerpc_bus_space pmppc_mem_tag;
extern struct powerpc_bus_space pmppc_pci_io_tag;
+extern struct powerpc_bus_dma_tag pci_bus_dma_tag;
+
+int pmppc_pci_intr_map(const struct pci_attach_args *, pci_intr_handle_t *);
+void pmppc_pci_conf_interrupt(pci_chipset_tag_t, int, int, int, int, int *);
+void pmppc_pci_get_chipset_tag(pci_chipset_tag_t);
+
+#endif /* _PMPPC_DEV_MAINBUS_H_ */
CVS commit: src/sbin/route
Module Name:src
Committed By: kefren
Date: Wed Jun 22 04:57:28 UTC 2011
Modified Files:
src/sbin/route: route.c
Log Message:
don't compile tag functions if SMALL is defined. Should fix the build
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sbin/route/route.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/route/route.c
diff -u src/sbin/route/route.c:1.129 src/sbin/route/route.c:1.130
--- src/sbin/route/route.c:1.129 Tue Jun 21 14:33:14 2011
+++ src/sbin/route/route.c Wed Jun 22 04:57:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.129 2011/06/21 14:33:14 kefren Exp $ */
+/* $NetBSD: route.c,v 1.130 2011/06/22 04:57:28 kefren Exp $ */
/*
* Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: route.c,v 1.129 2011/06/21 14:33:14 kefren Exp $");
+__RCSID("$NetBSD: route.c,v 1.130 2011/06/22 04:57:28 kefren Exp $");
#endif
#endif /* not lint */
@@ -1384,6 +1384,7 @@
/*NOTREACHED*/
}
+#ifndef SMALL
static sup
readtag(sup su, const char *s)
{
@@ -1433,6 +1434,7 @@
ms[where].shim.label = atoi(s);
ms[where].s_addr = htonl(ms[where].s_addr);
}
+#endif /* SMALL */
int
prefixlen(const char *s, struct sou *soup)
CVS commit: src/usr.sbin/puffs
Module Name:src
Committed By: mrg
Date: Wed Jun 22 04:03:24 UTC 2011
Modified Files:
src/usr.sbin/puffs/mount_9p: fs.c
src/usr.sbin/puffs/mount_psshfs: fs.c
Log Message:
remove some always true if () checks GCC 4.5.3 picks up.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/puffs/mount_9p/fs.c
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/puffs/mount_psshfs/fs.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.sbin/puffs/mount_9p/fs.c
diff -u src/usr.sbin/puffs/mount_9p/fs.c:1.8 src/usr.sbin/puffs/mount_9p/fs.c:1.9
--- src/usr.sbin/puffs/mount_9p/fs.c:1.8 Sun Aug 24 18:26:05 2008
+++ src/usr.sbin/puffs/mount_9p/fs.c Wed Jun 22 04:03:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fs.c,v 1.8 2008/08/24 18:26:05 pooka Exp $ */
+/* $NetBSD: fs.c,v 1.9 2011/06/22 04:03:23 mrg Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: fs.c,v 1.8 2008/08/24 18:26:05 pooka Exp $");
+__RCSID("$NetBSD: fs.c,v 1.9 2011/06/22 04:03:23 mrg Exp $");
#endif /* !lint */
#include
@@ -46,7 +46,7 @@
puffs_framebuf_seekset(a2, 0); \
*(a4) = 0; \
rv = fname(a1, a2, a3, a4); \
- if (rv || a4 == 0) errx(1, "p9p_handshake io failed %d, %d", rv, *a4)
+ if (rv) errx(1, "p9p_handshake io failed %d, %d", rv, *a4)
struct puffs_node *
p9p_handshake(struct puffs_usermount *pu,
Index: src/usr.sbin/puffs/mount_psshfs/fs.c
diff -u src/usr.sbin/puffs/mount_psshfs/fs.c:1.23 src/usr.sbin/puffs/mount_psshfs/fs.c:1.24
--- src/usr.sbin/puffs/mount_psshfs/fs.c:1.23 Fri Oct 29 16:13:51 2010
+++ src/usr.sbin/puffs/mount_psshfs/fs.c Wed Jun 22 04:03:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fs.c,v 1.23 2010/10/29 16:13:51 pooka Exp $ */
+/* $NetBSD: fs.c,v 1.24 2011/06/22 04:03:23 mrg Exp $ */
/*
* Copyright (c) 2006-2009 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: fs.c,v 1.23 2010/10/29 16:13:51 pooka Exp $");
+__RCSID("$NetBSD: fs.c,v 1.24 2011/06/22 04:03:23 mrg Exp $");
#endif /* !lint */
#include
@@ -46,7 +46,7 @@
puffs_framebuf_seekset(a2, 0); \
*(a4) = 0; \
rv = fname(a1, a2, a3, a4); \
- if (rv || a4 == 0) { \
+ if (rv) { \
return rv ? rv : EPROTO;\
}\
} while (/*CONSTCOND*/0)
CVS commit: src/usr.sbin/mrinfo
Module Name:src
Committed By: mrg
Date: Wed Jun 22 04:02:47 UTC 2011
Modified Files:
src/usr.sbin/mrinfo: mrinfo.c
Log Message:
fix the length argument to a memcpy() to refer to the size of the
destination, not the size of the pointer. real bug on 64 bit platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/mrinfo/mrinfo.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.sbin/mrinfo/mrinfo.c
diff -u src/usr.sbin/mrinfo/mrinfo.c:1.27 src/usr.sbin/mrinfo/mrinfo.c:1.28
--- src/usr.sbin/mrinfo/mrinfo.c:1.27 Fri Apr 17 14:07:45 2009
+++ src/usr.sbin/mrinfo/mrinfo.c Wed Jun 22 04:02:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mrinfo.c,v 1.27 2009/04/17 14:07:45 lukem Exp $ */
+/* $NetBSD: mrinfo.c,v 1.28 2011/06/22 04:02:46 mrg Exp $ */
/*
* This tool requests configuration info from a multicast router
@@ -80,7 +80,7 @@
static char rcsid[] =
"@(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp (LBL)";
#else
-__RCSID("$NetBSD: mrinfo.c,v 1.27 2009/04/17 14:07:45 lukem Exp $");
+__RCSID("$NetBSD: mrinfo.c,v 1.28 2011/06/22 04:02:46 mrg Exp $");
#endif
#endif
@@ -373,7 +373,7 @@
hp->h_addr_list[0] = malloc(hp->h_length);
if (hp->h_addr_list[0] == NULL)
logit(LOG_ERR, errno, "malloc");
- memcpy(hp->h_addr_list[0], &target_addr, sizeof(hp->h_addr_list[0]));
+ memcpy(hp->h_addr_list[0], &target_addr, hp->h_length);
hp->h_addr_list[1] = NULL;
} else
hp = gethostbyname(host);
CVS commit: src/sys/ufs/ffs
Module Name:src
Committed By: mrg
Date: Wed Jun 22 04:01:33 UTC 2011
Modified Files:
src/sys/ufs/ffs: ffs_appleufs.c
Log Message:
fix an off by one array overflow found by GCC 4.5.3.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/ufs/ffs/ffs_appleufs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ffs/ffs_appleufs.c
diff -u src/sys/ufs/ffs/ffs_appleufs.c:1.10 src/sys/ufs/ffs/ffs_appleufs.c:1.11
--- src/sys/ufs/ffs/ffs_appleufs.c:1.10 Sat Apr 24 19:58:13 2010
+++ src/sys/ufs/ffs/ffs_appleufs.c Wed Jun 22 04:01:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_appleufs.c,v 1.10 2010/04/24 19:58:13 dbj Exp $ */
+/* $NetBSD: ffs_appleufs.c,v 1.11 2011/06/22 04:01:33 mrg Exp $ */
/*
* Copyright (c) 2002 Darrin B. Jewell
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ffs_appleufs.c,v 1.10 2010/04/24 19:58:13 dbj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_appleufs.c,v 1.11 2011/06/22 04:01:33 mrg Exp $");
#include
#include
@@ -108,7 +108,7 @@
n->ul_namelen = APPLEUFS_MAX_LABEL_NAME;
}
/* if len is max, will set ul_unused1 */
- n->ul_name[n->ul_namelen] = '\0';
+ n->ul_name[n->ul_namelen - 1] = '\0';
#ifdef DEBUG
printf("%s: found APPLE UFS label v%d: \"%s\"\n",
CVS commit: src/sys/rump/net/lib/libvirtif
Module Name:src
Committed By: mrg
Date: Wed Jun 22 04:01:09 UTC 2011
Modified Files:
src/sys/rump/net/lib/libvirtif: if_virt.c
Log Message:
fix an operator precedence error picked up by GCC 4.5.3. real bug.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/rump/net/lib/libvirtif/if_virt.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/net/lib/libvirtif/if_virt.c
diff -u src/sys/rump/net/lib/libvirtif/if_virt.c:1.22 src/sys/rump/net/lib/libvirtif/if_virt.c:1.23
--- src/sys/rump/net/lib/libvirtif/if_virt.c:1.22 Wed Dec 1 15:13:24 2010
+++ src/sys/rump/net/lib/libvirtif/if_virt.c Wed Jun 22 04:01:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_virt.c,v 1.22 2010/12/01 15:13:24 pooka Exp $ */
+/* $NetBSD: if_virt.c,v 1.23 2011/06/22 04:01:08 mrg Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_virt.c,v 1.22 2010/12/01 15:13:24 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_virt.c,v 1.23 2011/06/22 04:01:08 mrg Exp $");
#include
#include
@@ -319,7 +319,7 @@
mutex_enter(&sc->sc_mtx);
KERNEL_LOCK(1, NULL);
while (!sc->sc_dying) {
- if (!ifp->if_flags & IFF_RUNNING) {
+ if (!(ifp->if_flags & IFF_RUNNING)) {
cv_wait(&sc->sc_cv, &sc->sc_mtx);
continue;
}
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: mrg Date: Wed Jun 22 04:00:43 UTC 2011 Modified Files: src/sys/arch/vax/include: stdarg.h Log Message: deal with __builtin_va_start()'s introduction. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/include/stdarg.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/vax/include/stdarg.h diff -u src/sys/arch/vax/include/stdarg.h:1.17 src/sys/arch/vax/include/stdarg.h:1.18 --- src/sys/arch/vax/include/stdarg.h:1.17 Sun Dec 11 12:19:34 2005 +++ src/sys/arch/vax/include/stdarg.h Wed Jun 22 04:00:43 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: stdarg.h,v 1.17 2005/12/11 12:19:34 christos Exp $ */ +/* $NetBSD: stdarg.h,v 1.18 2011/06/22 04:00:43 mrg Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -44,7 +44,11 @@ #endif #if __GNUC_PREREQ__(2, 96) +#if __GNUC_PREREQ__(4, 5) +#define va_start(ap, last) __builtin_va_start((ap), (last)) +#else #define va_start(ap, last) __builtin_stdarg_start((ap), (last)) +#endif #define va_arg __builtin_va_arg #define va_end __builtin_va_end #define __va_copy(dest, src) __builtin_va_copy((dest), (src))
CVS commit: src/external/bsd/ntp/dist/ntpd
Module Name:src
Committed By: mrg
Date: Wed Jun 22 03:59:50 UTC 2011
Modified Files:
src/external/bsd/ntp/dist/ntpd: refclock_parse.c
Log Message:
fix a potential off-by-two array overflow found by GCC 4.5.3.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/ntpd/refclock_parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/ntpd/refclock_parse.c
diff -u src/external/bsd/ntp/dist/ntpd/refclock_parse.c:1.3 src/external/bsd/ntp/dist/ntpd/refclock_parse.c:1.4
--- src/external/bsd/ntp/dist/ntpd/refclock_parse.c:1.3 Sat Dec 4 23:08:35 2010
+++ src/external/bsd/ntp/dist/ntpd/refclock_parse.c Wed Jun 22 03:59:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: refclock_parse.c,v 1.3 2010/12/04 23:08:35 christos Exp $ */
+/* $NetBSD: refclock_parse.c,v 1.4 2011/06/22 03:59:49 mrg Exp $ */
/*
* /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.81 2009/05/01 10:15:29 kardel RELEASE_20090105_A
@@ -2455,7 +2455,7 @@
{
if (buffer[0])
strncat(buffer, "; ", size);
- strncat(buffer, flagstrings[i].name, size);
+ strncat(buffer, flagstrings[i].name, size - 2);
}
i++;
}
CVS commit: src/external/bsd/am-utils/dist
Module Name:src
Committed By: mrg
Date: Wed Jun 22 03:58:52 UTC 2011
Modified Files:
src/external/bsd/am-utils/dist/amd: conf_tok.l sun_map_tok.l
src/external/bsd/am-utils/dist/fsinfo: fsi_lex.l
Log Message:
use %option noinput since we need it. found by GCC 4.5.3.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/am-utils/dist/amd/conf_tok.l \
src/external/bsd/am-utils/dist/amd/sun_map_tok.l
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/am-utils/dist/fsinfo/fsi_lex.l
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/am-utils/dist/amd/conf_tok.l
diff -u src/external/bsd/am-utils/dist/amd/conf_tok.l:1.3 src/external/bsd/am-utils/dist/amd/conf_tok.l:1.4
--- src/external/bsd/am-utils/dist/amd/conf_tok.l:1.3 Fri Mar 20 20:30:52 2009
+++ src/external/bsd/am-utils/dist/amd/conf_tok.l Wed Jun 22 03:58:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: conf_tok.l,v 1.3 2009/03/20 20:30:52 christos Exp $ */
+/* $NetBSD: conf_tok.l,v 1.4 2011/06/22 03:58:51 mrg Exp $ */
%{
/*
@@ -110,6 +110,7 @@
/* This option causes Solaris lex to fail. Use flex. See BUGS file */
/* no need to use yyunput() */
%option nounput
+%option noinput
/* allocate more output slots so lex scanners don't run out of mem */
%o 1024
Index: src/external/bsd/am-utils/dist/amd/sun_map_tok.l
diff -u src/external/bsd/am-utils/dist/amd/sun_map_tok.l:1.3 src/external/bsd/am-utils/dist/amd/sun_map_tok.l:1.4
--- src/external/bsd/am-utils/dist/amd/sun_map_tok.l:1.3 Fri Mar 20 20:30:52 2009
+++ src/external/bsd/am-utils/dist/amd/sun_map_tok.l Wed Jun 22 03:58:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sun_map_tok.l,v 1.3 2009/03/20 20:30:52 christos Exp $ */
+/* $NetBSD: sun_map_tok.l,v 1.4 2011/06/22 03:58:52 mrg Exp $ */
%{
/*
@@ -145,6 +145,7 @@
/* This option causes Solaris lex to fail. Use flex. See BUGS file */
/* no need to use yyunput() */
%option nounput
+%option noinput
/* allocate more output slots so lex scanners don't run out of mem */
%o 1024
Index: src/external/bsd/am-utils/dist/fsinfo/fsi_lex.l
diff -u src/external/bsd/am-utils/dist/fsinfo/fsi_lex.l:1.3 src/external/bsd/am-utils/dist/fsinfo/fsi_lex.l:1.4
--- src/external/bsd/am-utils/dist/fsinfo/fsi_lex.l:1.3 Fri Mar 20 20:30:52 2009
+++ src/external/bsd/am-utils/dist/fsinfo/fsi_lex.l Wed Jun 22 03:58:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fsi_lex.l,v 1.3 2009/03/20 20:30:52 christos Exp $ */
+/* $NetBSD: fsi_lex.l,v 1.4 2011/06/22 03:58:52 mrg Exp $ */
%{
/*
@@ -166,6 +166,7 @@
/* This option causes Solaris lex to fail. Use flex. See BUGS file */
/* no need to use yyunput() */
%option nounput
+%option noinput
/* allocate more output slots so lex scanners don't run out of mem */
%o 1024
CVS commit: src/external/bsd/am-utils/dist/hlfsd
Module Name:src Committed By: mrg Date: Wed Jun 22 03:58:24 UTC 2011 Modified Files: src/external/bsd/am-utils/dist/hlfsd: homedir.c Log Message: remove an always true test found by GCC 4.5.3. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/am-utils/dist/hlfsd/homedir.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/am-utils/dist/hlfsd/homedir.c diff -u src/external/bsd/am-utils/dist/hlfsd/homedir.c:1.1.1.2 src/external/bsd/am-utils/dist/hlfsd/homedir.c:1.2 --- src/external/bsd/am-utils/dist/hlfsd/homedir.c:1.1.1.2 Fri Mar 20 20:26:55 2009 +++ src/external/bsd/am-utils/dist/hlfsd/homedir.c Wed Jun 22 03:58:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: homedir.c,v 1.1.1.2 2009/03/20 20:26:55 christos Exp $ */ +/* $NetBSD: homedir.c,v 1.2 2011/06/22 03:58:24 mrg Exp $ */ /* * Copyright (c) 1997-2009 Erez Zadok @@ -498,7 +498,7 @@ buf[0] = '\0'; fgets(buf, 256, passwd_fp); passwd_line++; - if (!buf || buf[0] == '\0') + if (buf[0] == '\0') goto readent; /* read user name */
CVS commit: src/dist/nvi/ex
Module Name:src
Committed By: mrg
Date: Wed Jun 22 03:57:47 UTC 2011
Modified Files:
src/dist/nvi/ex: ex_cscope.c
Log Message:
initialise from_cs[1] instead of from_cs[0] twice. from GCC 4.5.3.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/dist/nvi/ex/ex_cscope.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/nvi/ex/ex_cscope.c
diff -u src/dist/nvi/ex/ex_cscope.c:1.7 src/dist/nvi/ex/ex_cscope.c:1.8
--- src/dist/nvi/ex/ex_cscope.c:1.7 Mon Mar 21 14:53:03 2011
+++ src/dist/nvi/ex/ex_cscope.c Wed Jun 22 03:57:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_cscope.c,v 1.7 2011/03/21 14:53:03 tnozaki Exp $ */
+/* $NetBSD: ex_cscope.c,v 1.8 2011/06/22 03:57:46 mrg Exp $ */
/*-
* Copyright (c) 1994, 1996
@@ -379,7 +379,7 @@
* Cscope reads from to_cs[0] and writes to from_cs[1]; vi reads from
* from_cs[0] and writes to to_cs[1].
*/
- to_cs[0] = to_cs[1] = from_cs[0] = from_cs[0] = -1;
+ to_cs[0] = to_cs[1] = from_cs[0] = from_cs[1] = -1;
if (pipe(to_cs) < 0 || pipe(from_cs) < 0) {
msgq(sp, M_SYSERR, "pipe");
goto err;
CVS commit: src/dist/dhcp/dst
Module Name:src
Committed By: mrg
Date: Wed Jun 22 03:57:20 UTC 2011
Modified Files:
src/dist/dhcp/dst: dst_support.c
Log Message:
don't write "(u_char) NULL".
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/dist/dhcp/dst/dst_support.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/dhcp/dst/dst_support.c
diff -u src/dist/dhcp/dst/dst_support.c:1.3 src/dist/dhcp/dst/dst_support.c:1.4
--- src/dist/dhcp/dst/dst_support.c:1.3 Thu Aug 11 17:13:21 2005
+++ src/dist/dhcp/dst/dst_support.c Wed Jun 22 03:57:20 2011
@@ -1,4 +1,4 @@
-static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/dst_support.c,v 1.3 2005/08/11 17:13:21 drochner Exp $";
+static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/dst_support.c,v 1.4 2011/06/22 03:57:20 mrg Exp $";
/*
@@ -155,7 +155,7 @@
}
bp = strchr(*buf, '\n'); /* find length of input line */
if (bp != NULL)
- *bp = (u_char) NULL;
+ *bp = 0;
blen = b64_pton(*buf, bstr, sizeof(bstr));
if (blen <= 0) {
CVS commit: src/bin/ksh
Module Name:src
Committed By: mrg
Date: Wed Jun 22 03:56:17 UTC 2011
Modified Files:
src/bin/ksh: vi.c
Log Message:
add a missing part from rev 1.10 and s/newline/newlinex/. found by GCC 4.5.3.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/bin/ksh/vi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ksh/vi.c
diff -u src/bin/ksh/vi.c:1.11 src/bin/ksh/vi.c:1.12
--- src/bin/ksh/vi.c:1.11 Sat Apr 25 05:11:37 2009
+++ src/bin/ksh/vi.c Wed Jun 22 03:56:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vi.c,v 1.11 2009/04/25 05:11:37 lukem Exp $ */
+/* $NetBSD: vi.c,v 1.12 2011/06/22 03:56:17 mrg Exp $ */
/*
* vi command editing
@@ -9,7 +9,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: vi.c,v 1.11 2009/04/25 05:11:37 lukem Exp $");
+__RCSID("$NetBSD: vi.c,v 1.12 2011/06/22 03:56:17 mrg Exp $");
#endif
#include "config.h"
@@ -1763,7 +1763,7 @@
int newlinex;
{
(void) memset(wbuf[win], ' ', wbuf_len);
- if (newline) {
+ if (newlinex) {
x_putc('\r');
x_putc('\n');
}
CVS commit: src
Module Name:src
Committed By: mrg
Date: Wed Jun 22 02:49:45 UTC 2011
Modified Files:
src/bin/ksh: Makefile
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssl/bin: Makefile
src/external/bsd/am-utils/bin/amd: Makefile
src/external/bsd/am-utils/bin/hlfsd: Makefile
src/external/bsd/iscsi/initiator: Makefile
src/external/bsd/mdocml/lib/libmandoc: Makefile
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/bsd/ntp/lib/libiscntp: Makefile
src/external/bsd/tcpdump/bin: Makefile
src/games/hack: Makefile
src/lib/libc/rpc: Makefile.inc
src/libexec/ftpd: Makefile
src/regress/sys/kern/getcwd: Makefile
src/sbin/dump_lfs: Makefile
src/sbin/fsdb: Makefile
src/sbin/ifconfig: Makefile
src/sbin/mount_smbfs: Makefile
src/sbin/ping6: Makefile
src/sys/arch/i386/stand/lib: Makefile
src/usr.bin/cap_mkdb: Makefile
src/usr.bin/ftp: Makefile
src/usr.bin/make: Makefile
src/usr.bin/midiplay: Makefile
src/usr.bin/sdpquery: Makefile
src/usr.sbin/altq/libaltq: Makefile
src/usr.sbin/dhcp/omshell: Makefile
src/usr.sbin/fwctl: Makefile
src/usr.sbin/installboot: Makefile
src/usr.sbin/iopctl: Makefile
src/usr.sbin/mlxctl: Makefile
src/usr.sbin/mopd/common: Makefile
Log Message:
apply some -Wno-error and/or -fno-strict-aliasing.
all of this should be looked at closer, but some of them are not
very trivial.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/bin/ksh/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/bin/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/am-utils/bin/amd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/am-utils/bin/hlfsd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/iscsi/initiator/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/mdocml/lib/libmandoc/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ntp/lib/libiscntp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.42 -r1.43 src/games/hack/Makefile
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/rpc/Makefile.inc
cvs rdiff -u -r1.61 -r1.62 src/libexec/ftpd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/regress/sys/kern/getcwd/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sbin/dump_lfs/Makefile
cvs rdiff -u -r1.29 -r1.30 src/sbin/fsdb/Makefile
cvs rdiff -u -r1.50 -r1.51 src/sbin/ifconfig/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sbin/mount_smbfs/Makefile
cvs rdiff -u -r1.12 -r1.13 src/sbin/ping6/Makefile
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/stand/lib/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/cap_mkdb/Makefile
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/ftp/Makefile
cvs rdiff -u -r1.53 -r1.54 src/usr.bin/make/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/midiplay/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/sdpquery/Makefile
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/altq/libaltq/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/dhcp/omshell/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/fwctl/Makefile
cvs rdiff -u -r1.44 -r1.45 src/usr.sbin/installboot/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/iopctl/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/mlxctl/Makefile
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/mopd/common/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ksh/Makefile
diff -u src/bin/ksh/Makefile:1.27 src/bin/ksh/Makefile:1.28
--- src/bin/ksh/Makefile:1.27 Thu May 26 12:56:24 2011
+++ src/bin/ksh/Makefile Wed Jun 22 02:49:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2011/05/26 12:56:24 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2011/06/22 02:49:41 mrg Exp $
WARNS=3
@@ -50,3 +50,8 @@
CWARNFLAGS.clang+= -Wno-format-security
.include
+
+# XXX
+.if ${HAVE_GCC} == 45
+COPTS.eval.c+= -Wno-error
+.endif
Index: src/crypto/external/bsd/openssh/bin/ssh/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.5 src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.6
--- src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.5 Mon Jun 20 07:43:56 2011
+++ src/crypto/external/bsd/openssh/bin/ssh/Makefile Wed Jun 22 02:49:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:56 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2011/06/22 02:49:42 mrg Exp $
.include
@@ -36,3 +36,8 @@
.endif
.include
+
+# XXX
+.if ${HAVE_GCC} == 45
+COPTS.clientloop.c+= -Wno-error
+.endif
Index: src/crypto/external/bsd/openssl/bin/Makefile
diff -u src/crypto/external/bsd/openssl/bin/Makefile:1.3 src/crypto/external/bsd/openssl/bin/Makefile:1.4
--- src/crypto/external/bsd/openssl/bin/Makefile:1.3 Mon Jun 6 13:43:48 2011
+++ src/crypto/external/bsd/openssl/b
CVS commit: othersrc/external/bsd/iscsi/sbin/iscsid
Module Name:othersrc
Committed By: riz
Date: Tue Jun 21 22:48:57 UTC 2011
Modified Files:
othersrc/external/bsd/iscsi/sbin/iscsid: iscsid_targets.c
Log Message:
Take the sizeof the *correct* structure. Now iscsid returns sensible
data to iscsictl that the display code can display (more) sensibly.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c
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/iscsi/sbin/iscsid/iscsid_targets.c
diff -u othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c:1.1.1.1 othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c:1.2
--- othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c:1.1.1.1 Mon May 2 07:01:08 2011
+++ othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c Tue Jun 21 22:48:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_targets.c,v 1.1.1.1 2011/05/02 07:01:08 agc Exp $ */
+/* $NetBSD: iscsid_targets.c,v 1.2 2011/06/21 22:48:56 riz Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -364,7 +364,7 @@
sizeof(target->entry.sid.name));
}
- rsp = make_rsp(sizeof(*rsp) + (par->num_portals * sizeof(uint32_t)),
+ rsp = make_rsp(sizeof(*res) + (par->num_portals * sizeof(uint32_t)),
prsp, prsp_temp);
if (rsp == NULL)
return;
@@ -539,7 +539,7 @@
} else if (par->list_kind != SEND_TARGETS_LIST) {
num = target->num_portals;
}
- rsp = make_rsp(sizeof(*rsp) + (num - 1) * sizeof(uint32_t),
+ rsp = make_rsp(sizeof(*res) + (num - 1) * sizeof(uint32_t),
prsp, prsp_temp);
if (rsp == NULL)
return;
@@ -615,7 +615,7 @@
}
portal->options = par->options;
- rsp = make_rsp(sizeof(*rsp), prsp, prsp_temp);
+ rsp = make_rsp(sizeof(*res), prsp, prsp_temp);
if (rsp == NULL)
return;
@@ -661,7 +661,7 @@
return;
}
- rsp = make_rsp(sizeof(*rsp), prsp, prsp_temp);
+ rsp = make_rsp(sizeof(*res), prsp, prsp_temp);
if (rsp == NULL)
return;
CVS commit: src/lib/libm/arch/i387
Module Name:src
Committed By: joerg
Date: Tue Jun 21 21:52:49 UTC 2011
Modified Files:
src/lib/libm/arch/i387: s_copysignf.S
Log Message:
Actually used SSE branch. Noticed by enami@
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libm/arch/i387/s_copysignf.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/arch/i387/s_copysignf.S
diff -u src/lib/libm/arch/i387/s_copysignf.S:1.6 src/lib/libm/arch/i387/s_copysignf.S:1.7
--- src/lib/libm/arch/i387/s_copysignf.S:1.6 Sat Jun 18 20:49:26 2011
+++ src/lib/libm/arch/i387/s_copysignf.S Tue Jun 21 21:52:49 2011
@@ -9,7 +9,7 @@
* XXXfvdl split this file.
*/
-RCSID("$NetBSD: s_copysignf.S,v 1.6 2011/06/18 20:49:26 joerg Exp $")
+RCSID("$NetBSD: s_copysignf.S,v 1.7 2011/06/21 21:52:49 joerg Exp $")
#ifdef __x86_64__
.Lneg:
@@ -28,14 +28,10 @@
movl %eax,4(%esp)
flds 4(%esp)
#else
- movss %xmm0,-4(%rsp)
- movss %xmm1,-8(%rsp)
- movl -8(%rsp),%edx
- andl $0x8000,%edx
- movl -4(%rsp),%eax
- andl $0x7fff,%eax
- orl %edx,%eax
- movl %eax,-4(%rsp)
- movss -4(%rsp),%xmm0
+ movss .Lpos(%rip),%xmm2
+ movss .Lneg(%rip),%xmm3
+ pand %xmm2,%xmm1
+ pand %xmm3,%xmm0
+ por %xmm1,%xmm0
#endif
ret
CVS commit: src/distrib
Module Name:src Committed By: joerg Date: Tue Jun 21 21:49:23 UTC 2011 Modified Files: src/distrib/amd64/cdroms: Makefile.cdrom src/distrib/i386/cdroms: Makefile.cdrom Log Message: Include liblzma to unbreak gzip on the install CD. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/amd64/cdroms/Makefile.cdrom cvs rdiff -u -r1.25 -r1.26 src/distrib/i386/cdroms/Makefile.cdrom Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/amd64/cdroms/Makefile.cdrom diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.5 src/distrib/amd64/cdroms/Makefile.cdrom:1.6 --- src/distrib/amd64/cdroms/Makefile.cdrom:1.5 Sat Jun 18 14:47:36 2011 +++ src/distrib/amd64/cdroms/Makefile.cdrom Tue Jun 21 21:49:22 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.cdrom,v 1.5 2011/06/18 14:47:36 joerg Exp $ +# $NetBSD: Makefile.cdrom,v 1.6 2011/06/21 21:49:22 joerg Exp $ .include @@ -43,6 +43,7 @@ CDRUNTIME+= ./usr/lib/libgcc_s.so* CDRUNTIME+= ./usr/lib/libintl.so* CDRUNTIME+= ./usr/lib/libkvm.so* +CDRUNTIME+= ./usr/lib/liblzma.so* CDRUNTIME+= ./usr/lib/libterminfo.so* CDRUNTIME+= ./usr/lib/libutil.so* CDRUNTIME+= ./usr/lib/libz.so* Index: src/distrib/i386/cdroms/Makefile.cdrom diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.25 src/distrib/i386/cdroms/Makefile.cdrom:1.26 --- src/distrib/i386/cdroms/Makefile.cdrom:1.25 Sat Jun 18 14:47:36 2011 +++ src/distrib/i386/cdroms/Makefile.cdrom Tue Jun 21 21:49:23 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.cdrom,v 1.25 2011/06/18 14:47:36 joerg Exp $ +# $NetBSD: Makefile.cdrom,v 1.26 2011/06/21 21:49:23 joerg Exp $ .include @@ -43,6 +43,7 @@ CDRUNTIME+= ./usr/lib/libgcc_s.so* CDRUNTIME+= ./usr/lib/libintl.so* CDRUNTIME+= ./usr/lib/libkvm.so* +CDRUNTIME+= ./usr/lib/liblzma.so* CDRUNTIME+= ./usr/lib/libterminfo.so* CDRUNTIME+= ./usr/lib/libutil.so* CDRUNTIME+= ./usr/lib/libz.so*
CVS commit: src/usr.bin/netstat
Module Name:src Committed By: wiz Date: Tue Jun 21 20:51:27 UTC 2011 Modified Files: src/usr.bin/netstat: netstat.1 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/usr.bin/netstat/netstat.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/netstat/netstat.1 diff -u src/usr.bin/netstat/netstat.1:1.60 src/usr.bin/netstat/netstat.1:1.61 --- src/usr.bin/netstat/netstat.1:1.60 Tue Jun 21 19:46:36 2011 +++ src/usr.bin/netstat/netstat.1 Tue Jun 21 20:51:27 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: netstat.1,v 1.60 2011/06/21 19:46:36 kefren Exp $ +.\" $NetBSD: netstat.1,v 1.61 2011/06/21 20:51:27 wiz Exp $ .\" .\" Copyright (c) 1983, 1990, 1992, 1993 .\" The Regents of the University of California. All rights reserved. @@ -268,7 +268,8 @@ Show per-protocol statistics. If this option is repeated, counters with a value of zero are suppressed. .It Fl T -Show MPLS Tags for the routing tables. If multiple tags exists, they will +Show MPLS Tags for the routing tables. +If multiple tags exists, they will be comma separated, first tag being the BoS one. .It Fl v Show extra (verbose) detail for the routing tables
CVS commit: src/usr.bin/netstat
Module Name:src Committed By: kefren Date: Tue Jun 21 19:46:36 UTC 2011 Modified Files: src/usr.bin/netstat: netstat.1 Log Message: add a sentence regarding multiple tags To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/usr.bin/netstat/netstat.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/netstat/netstat.1 diff -u src/usr.bin/netstat/netstat.1:1.59 src/usr.bin/netstat/netstat.1:1.60 --- src/usr.bin/netstat/netstat.1:1.59 Mon Dec 6 09:28:38 2010 +++ src/usr.bin/netstat/netstat.1 Tue Jun 21 19:46:36 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: netstat.1,v 1.59 2010/12/06 09:28:38 pooka Exp $ +.\" $NetBSD: netstat.1,v 1.60 2011/06/21 19:46:36 kefren Exp $ .\" .\" Copyright (c) 1983, 1990, 1992, 1993 .\" The Regents of the University of California. All rights reserved. @@ -268,7 +268,8 @@ Show per-protocol statistics. If this option is repeated, counters with a value of zero are suppressed. .It Fl T -Show MPLS Tags for the routing tables. +Show MPLS Tags for the routing tables. If multiple tags exists, they will +be comma separated, first tag being the BoS one. .It Fl v Show extra (verbose) detail for the routing tables .Pq Fl r ,
CVS commit: src/usr.bin/netstat
Module Name:src
Committed By: kefren
Date: Tue Jun 21 19:42:46 UTC 2011
Modified Files:
src/usr.bin/netstat: netstat.h route.c show.c
Log Message:
print multiple tags if exists, comma separated
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/netstat/netstat.h
cvs rdiff -u -r1.77 -r1.78 src/usr.bin/netstat/route.c
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/netstat/show.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/netstat/netstat.h
diff -u src/usr.bin/netstat/netstat.h:1.42 src/usr.bin/netstat/netstat.h:1.43
--- src/usr.bin/netstat/netstat.h:1.42 Tue May 3 18:28:46 2011
+++ src/usr.bin/netstat/netstat.h Tue Jun 21 19:42:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: netstat.h,v 1.42 2011/05/03 18:28:46 dyoung Exp $ */
+/* $NetBSD: netstat.h,v 1.43 2011/06/21 19:42:45 kefren Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -175,4 +175,6 @@
kvm_t *get_kvmd(void);
+char *mpls_ntoa(const struct sockaddr *);
+
#define PLEN(LONG_BIT / 4 + 2)
Index: src/usr.bin/netstat/route.c
diff -u src/usr.bin/netstat/route.c:1.77 src/usr.bin/netstat/route.c:1.78
--- src/usr.bin/netstat/route.c:1.77 Fri Feb 4 14:31:23 2011
+++ src/usr.bin/netstat/route.c Tue Jun 21 19:42:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.77 2011/02/04 14:31:23 martin Exp $ */
+/* $NetBSD: route.c,v 1.78 2011/06/21 19:42:45 kefren Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)route.c 8.3 (Berkeley) 3/9/94";
#else
-__RCSID("$NetBSD: route.c,v 1.77 2011/02/04 14:31:23 martin Exp $");
+__RCSID("$NetBSD: route.c,v 1.78 2011/06/21 19:42:45 kefren Exp $");
#endif
#endif /* not lint */
@@ -270,13 +270,15 @@
putchar((rt->rt_rmx.rmx_locks & RTV_MTU) ? 'L' : ' ');
if (tagflag == 1) {
if (rt->rt_tag != NULL) {
- const struct sockaddr_mpls *sampls =
- (const struct sockaddr_mpls*)kgetsa(rt->rt_tag);
- union mpls_shim shim;
-
- if (sampls->smpls_family == AF_MPLS) {
-shim.s_addr = ntohl(sampls->smpls_addr.s_addr);
-printf("%7d", shim.shim.label);
+ const struct sockaddr *tagsa = kgetsa(rt->rt_tag);
+ char *tagstr;
+
+ if (tagsa->sa_family == AF_MPLS) {
+tagstr = mpls_ntoa(tagsa);
+if (strlen(tagstr) < 7)
+ printf("%7s", tagstr);
+else
+ printf("%s", tagstr);
}
else
printf("%7s", "-");
Index: src/usr.bin/netstat/show.c
diff -u src/usr.bin/netstat/show.c:1.13 src/usr.bin/netstat/show.c:1.14
--- src/usr.bin/netstat/show.c:1.13 Fri Feb 4 14:31:23 2011
+++ src/usr.bin/netstat/show.c Tue Jun 21 19:42:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: show.c,v 1.13 2011/02/04 14:31:23 martin Exp $ */
+/* $NetBSD: show.c,v 1.14 2011/06/21 19:42:45 kefren Exp $ */
/* $OpenBSD: show.c,v 1.1 2006/05/27 19:16:37 claudio Exp $ */
/*
@@ -61,7 +61,6 @@
char *any_ntoa(const struct sockaddr *);
char *link_print(struct sockaddr *);
-char *mpls_ntoa(const struct sockaddr *);
#define PFKEYV2_CHUNK sizeof(u_int64_t)
@@ -382,17 +381,17 @@
static void
p_tag(const struct sockaddr *sa)
{
- const struct sockaddr_mpls *sampls =
- (const struct sockaddr_mpls *)sa;
- union mpls_shim mshim;
+ char *line;
if (sa == NULL || sa->sa_family != AF_MPLS) {
printf("%7s", "-");
return;
}
-
- mshim.s_addr = ntohl(sampls->smpls_addr.s_addr);
- printf("%7d", mshim.shim.label);
+ line = mpls_ntoa(sa);
+ if (strlen(line) < 7)
+ printf("%7s", line);
+ else
+ printf("%s", line);
}
static char line[MAXHOSTNAMELEN];
@@ -718,15 +717,22 @@
char *
mpls_ntoa(const struct sockaddr *sa)
{
- static char obuf[100];
- const struct sockaddr_mpls *sm;
+ static char obuf[16];
+ const union mpls_shim *pms;
union mpls_shim ms;
+ int psize = sizeof(struct sockaddr_mpls);
- sm = (const struct sockaddr_mpls*)sa;
- ms.s_addr = ntohl(sm->smpls_addr.s_addr);
+ pms = &((const struct sockaddr_mpls*)sa)->smpls_addr;
+ ms.s_addr = ntohl(pms->s_addr);
- snprintf(obuf, sizeof(obuf), "%u",
- ms.shim.label);
+ snprintf(obuf, sizeof(obuf), "%u", ms.shim.label);
+ while(psize < sa->sa_len) {
+ pms++;
+ ms.s_addr = ntohl(pms->s_addr);
+ snprintf(obuf, sizeof(obuf), "%s,%u", obuf,
+ ms.shim.label);
+ psize+=sizeof(ms);
+ }
return obuf;
}
CVS commit: src/sys/arch/zaurus/dev
Module Name:src
Committed By: nonaka
Date: Tue Jun 21 18:13:20 UTC 2011
Modified Files:
src/sys/arch/zaurus/dev: zkbd.c zlcd.c zlcdvar.h
Log Message:
backout previous.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/zaurus/dev/zkbd.c \
src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/dev/zlcdvar.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/zaurus/dev/zkbd.c
diff -u src/sys/arch/zaurus/dev/zkbd.c:1.13 src/sys/arch/zaurus/dev/zkbd.c:1.14
--- src/sys/arch/zaurus/dev/zkbd.c:1.13 Tue Jun 21 17:17:27 2011
+++ src/sys/arch/zaurus/dev/zkbd.c Tue Jun 21 18:13:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zkbd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $ */
+/* $NetBSD: zkbd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $ */
/* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $");
#include "opt_wsdisplay_compat.h"
#if 0 /* XXX */
@@ -44,6 +44,7 @@
#include
#include
+#include
static const int gpio_sense_pins_c3000[] = {
12,
@@ -298,10 +299,11 @@
{
struct zkbd_softc *sc = (struct zkbd_softc *)v;
int i, j, col, pin, type, keysdown = 0;
+ int stuck;
int keystate;
int s;
#ifdef WSDISPLAY_COMPAT_RAWKBD
- int npress = 0, ncbuf = 0;
+ int npress = 0, ncbuf = 0, c;
char cbuf[MAXKEYS * 2];
#endif
@@ -372,7 +374,7 @@
(sc->sc_keystate[14] ? (1 << 2) : 0)); /* 'alt' */
for (i = 0; i < sc->sc_nsense * sc->sc_nstrobe; i++) {
- int stuck = 0;
+ stuck = 0;
/* extend xt_keymap to do this faster. */
/* ignore 'stuck' keys' */
for (j = 0; j < __arraycount(stuck_keys); j++) {
@@ -388,9 +390,9 @@
keysdown |= keystate; /* if any keys held */
#ifdef WSDISPLAY_COMPAT_RAWKBD
- if (!sc->sc_polling && sc->sc_rawkbd) {
- if (keystate || sc->sc_okeystate[i] != keystate) {
-int c = sc->sc_xt_keymap[i];
+ if (sc->sc_polling == 0 && sc->sc_rawkbd) {
+ if ((keystate) || (sc->sc_okeystate[i] != keystate)) {
+c = sc->sc_xt_keymap[i];
if (c & 0x80) {
cbuf[ncbuf++] = 0xe0;
}
@@ -410,7 +412,7 @@
}
#endif
- if (!sc->sc_rawkbd && (sc->sc_okeystate[i] != keystate)) {
+ if ((!sc->sc_rawkbd) && (sc->sc_okeystate[i] != keystate)) {
type = keystate ? WSCONS_EVENT_KEY_DOWN :
WSCONS_EVENT_KEY_UP;
@@ -426,7 +428,7 @@
}
#ifdef WSDISPLAY_COMPAT_RAWKBD
- if (!sc->sc_polling && sc->sc_rawkbd) {
+ if (sc->sc_polling == 0 && sc->sc_rawkbd) {
wskbd_rawinput(sc->sc_wskbddev, cbuf, ncbuf);
sc->sc_nrep = npress;
if (npress != 0)
@@ -511,9 +513,9 @@
if (lid_suspend)
apm_suspends++;
#endif
- pmf_event_inject(NULL, PMFE_DISPLAY_OFF);
+ lcd_blank(1);
} else {
- pmf_event_inject(NULL, PMFE_DISPLAY_ON);
+ lcd_blank(0);
}
return 1;
Index: src/sys/arch/zaurus/dev/zlcd.c
diff -u src/sys/arch/zaurus/dev/zlcd.c:1.13 src/sys/arch/zaurus/dev/zlcd.c:1.14
--- src/sys/arch/zaurus/dev/zlcd.c:1.13 Tue Jun 21 17:17:27 2011
+++ src/sys/arch/zaurus/dev/zlcd.c Tue Jun 21 18:13:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zlcd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $ */
+/* $NetBSD: zlcd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $ */
/* $OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod Exp $ */
/* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $");
#include
#include
@@ -169,7 +169,6 @@
static void lcd_set_brightness_internal(int);
static int lcd_get_backlight(void);
static void lcd_set_backlight(int);
-static void lcd_blank(int);
static int
lcd_match(device_t parent, cfdata_t cf, void *aux)
@@ -267,12 +266,14 @@
{
lcd_blank(0);
+ lcd_set_backlight(1);
}
static void
lcd_display_off(device_t dv)
{
+ lcd_set_backlight(0);
lcd_blank(1);
}
@@ -500,7 +501,7 @@
else if (newval > maxval)
newval = maxval;
- if (lcdislit && !lcdisblank)
+ if (lcd_get_backlight() && !lcdisblank)
lcd_set_brightness_internal(newval);
if (newval > 0)
@@ -564,7 +565,7 @@
}
}
-static void
+void
lcd_blank(int blank)
{
Index: src/sys/arch/zaurus/dev/zlcdvar.h
diff -u src/sys/arch/zaurus/dev/zlcdvar.h:1.2 src/sys/arch/zaurus/dev/zlcdvar.h:1.3
--- src/sys/arch/zaurus/dev/zlcdvar.h:1.2 Tue Jun 21 17:17:27 2011
+++ src/sys/arch/zaurus/dev/zlcdvar.h Tue Jun 21 18:13:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zlcdvar.h,v 1.2 2011/06/21 17:17:27 nonaka Exp $ */
+/* $NetBSD: zlcdvar.h,v 1.3 2011/06/21 18:13:19 nonaka Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,6 +32,13 @@
#ifndef _ZAURUS_DEV_ZLCDVAR_H_
#define _ZAURUS_DEV_ZLCDVAR_H_
+#incl
CVS commit: src/sys/arch/powerpc/pic
Module Name:src
Committed By: rjs
Date: Tue Jun 21 18:02:43 UTC 2011
Modified Files:
src/sys/arch/powerpc/pic: intr.c
Log Message:
Make it compile when PIC_DEBUG is defined.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/pic/intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/pic/intr.c
diff -u src/sys/arch/powerpc/pic/intr.c:1.16 src/sys/arch/powerpc/pic/intr.c:1.17
--- src/sys/arch/powerpc/pic/intr.c:1.16 Mon Jun 20 06:23:52 2011
+++ src/sys/arch/powerpc/pic/intr.c Tue Jun 21 18:02:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.16 2011/06/20 06:23:52 matt Exp $ */
+/* $NetBSD: intr.c,v 1.17 2011/06/21 18:02:43 rjs Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.16 2011/06/20 06:23:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.17 2011/06/21 18:02:43 rjs Exp $");
#include "opt_interrupt.h"
#include "opt_multiprocessor.h"
@@ -319,7 +319,7 @@
is->is_pic = pic;
virq_map[hwirq] = virq;
#ifdef PIC_DEBUG
- printf("mapping hwirq %d to virq %d\n", irq, virq);
+ printf("mapping hwirq %d to virq %d\n", hwirq, virq);
#endif
return virq;
}
CVS commit: src/sys/sys
Module Name:src Committed By: riz Date: Tue Jun 21 17:28:11 UTC 2011 Modified Files: src/sys/sys: vnode.h Log Message: The referred-to comment was moved to vfs_vnode.c; update the pointer. To generate a diff of this commit: cvs rdiff -u -r1.231 -r1.232 src/sys/sys/vnode.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/sys/vnode.h diff -u src/sys/sys/vnode.h:1.231 src/sys/sys/vnode.h:1.232 --- src/sys/sys/vnode.h:1.231 Sun Jun 12 03:36:00 2011 +++ src/sys/sys/vnode.h Tue Jun 21 17:28:11 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: vnode.h,v 1.231 2011/06/12 03:36:00 rmind Exp $ */ +/* $NetBSD: vnode.h,v 1.232 2011/06/21 17:28:11 riz Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -228,7 +228,7 @@ #define VSIZENOTSET ((voff_t)-1) /* - * v_usecount; see the comment in vfs_subr.c + * v_usecount; see the comment near the top of vfs_vnode.c */ #define VC_XLOCK 0x8000 #define VC_MASK 0x7fff
CVS commit: src/sys/arch/zaurus/dev
Module Name:src
Committed By: nonaka
Date: Tue Jun 21 17:17:27 UTC 2011
Modified Files:
src/sys/arch/zaurus/dev: zkbd.c zlcd.c zlcdvar.h
Log Message:
use pmf_event_inject() instead of call lcd_blank() directly.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/zaurus/dev/zkbd.c \
src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/dev/zlcdvar.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/zaurus/dev/zkbd.c
diff -u src/sys/arch/zaurus/dev/zkbd.c:1.12 src/sys/arch/zaurus/dev/zkbd.c:1.13
--- src/sys/arch/zaurus/dev/zkbd.c:1.12 Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zkbd.c Tue Jun 21 17:17:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zkbd.c,v 1.12 2011/06/19 16:20:09 nonaka Exp $ */
+/* $NetBSD: zkbd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $ */
/* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.12 2011/06/19 16:20:09 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $");
#include "opt_wsdisplay_compat.h"
#if 0 /* XXX */
@@ -44,7 +44,6 @@
#include
#include
-#include
static const int gpio_sense_pins_c3000[] = {
12,
@@ -299,11 +298,10 @@
{
struct zkbd_softc *sc = (struct zkbd_softc *)v;
int i, j, col, pin, type, keysdown = 0;
- int stuck;
int keystate;
int s;
#ifdef WSDISPLAY_COMPAT_RAWKBD
- int npress = 0, ncbuf = 0, c;
+ int npress = 0, ncbuf = 0;
char cbuf[MAXKEYS * 2];
#endif
@@ -374,7 +372,7 @@
(sc->sc_keystate[14] ? (1 << 2) : 0)); /* 'alt' */
for (i = 0; i < sc->sc_nsense * sc->sc_nstrobe; i++) {
- stuck = 0;
+ int stuck = 0;
/* extend xt_keymap to do this faster. */
/* ignore 'stuck' keys' */
for (j = 0; j < __arraycount(stuck_keys); j++) {
@@ -390,9 +388,9 @@
keysdown |= keystate; /* if any keys held */
#ifdef WSDISPLAY_COMPAT_RAWKBD
- if (sc->sc_polling == 0 && sc->sc_rawkbd) {
- if ((keystate) || (sc->sc_okeystate[i] != keystate)) {
-c = sc->sc_xt_keymap[i];
+ if (!sc->sc_polling && sc->sc_rawkbd) {
+ if (keystate || sc->sc_okeystate[i] != keystate) {
+int c = sc->sc_xt_keymap[i];
if (c & 0x80) {
cbuf[ncbuf++] = 0xe0;
}
@@ -412,7 +410,7 @@
}
#endif
- if ((!sc->sc_rawkbd) && (sc->sc_okeystate[i] != keystate)) {
+ if (!sc->sc_rawkbd && (sc->sc_okeystate[i] != keystate)) {
type = keystate ? WSCONS_EVENT_KEY_DOWN :
WSCONS_EVENT_KEY_UP;
@@ -428,7 +426,7 @@
}
#ifdef WSDISPLAY_COMPAT_RAWKBD
- if (sc->sc_polling == 0 && sc->sc_rawkbd) {
+ if (!sc->sc_polling && sc->sc_rawkbd) {
wskbd_rawinput(sc->sc_wskbddev, cbuf, ncbuf);
sc->sc_nrep = npress;
if (npress != 0)
@@ -513,9 +511,9 @@
if (lid_suspend)
apm_suspends++;
#endif
- lcd_blank(1);
+ pmf_event_inject(NULL, PMFE_DISPLAY_OFF);
} else {
- lcd_blank(0);
+ pmf_event_inject(NULL, PMFE_DISPLAY_ON);
}
return 1;
Index: src/sys/arch/zaurus/dev/zlcd.c
diff -u src/sys/arch/zaurus/dev/zlcd.c:1.12 src/sys/arch/zaurus/dev/zlcd.c:1.13
--- src/sys/arch/zaurus/dev/zlcd.c:1.12 Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zlcd.c Tue Jun 21 17:17:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zlcd.c,v 1.12 2011/06/19 16:20:09 nonaka Exp $ */
+/* $NetBSD: zlcd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $ */
/* $OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod Exp $ */
/* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.12 2011/06/19 16:20:09 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $");
#include
#include
@@ -169,6 +169,7 @@
static void lcd_set_brightness_internal(int);
static int lcd_get_backlight(void);
static void lcd_set_backlight(int);
+static void lcd_blank(int);
static int
lcd_match(device_t parent, cfdata_t cf, void *aux)
@@ -266,14 +267,12 @@
{
lcd_blank(0);
- lcd_set_backlight(1);
}
static void
lcd_display_off(device_t dv)
{
- lcd_set_backlight(0);
lcd_blank(1);
}
@@ -501,7 +500,7 @@
else if (newval > maxval)
newval = maxval;
- if (lcd_get_backlight() && !lcdisblank)
+ if (lcdislit && !lcdisblank)
lcd_set_brightness_internal(newval);
if (newval > 0)
@@ -565,7 +564,7 @@
}
}
-void
+static void
lcd_blank(int blank)
{
Index: src/sys/arch/zaurus/dev/zlcdvar.h
diff -u src/sys/arch/zaurus/dev/zlcdvar.h:1.1 src/sys/arch/zaurus/dev/zlcdvar.h:1.2
--- src/sys/arch/zaurus/dev/zlcdvar.h:1.1 Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zlcdvar.h Tue Jun 21 17:17:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zlcdvar.h,v 1.1 2011/06/19 16:20:09 nonaka Exp $ */
+/* $NetBSD: zlcdvar.h,v 1.2 2011/06/21 17:17:27 nonaka Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,13 +32,6 @@
#ifndef _ZAURUS_DEV_ZLCDVAR_
CVS commit: othersrc/external/bsd/hashtree/dist
Module Name:othersrc Committed By: wiz Date: Tue Jun 21 15:40:22 UTC 2011 Modified Files: othersrc/external/bsd/hashtree/dist: hashtree.1 Log Message: Fix a typo. Markup nit. Remove trailing whitespace, and uncustomary dot at end of SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/hashtree/dist/hashtree.1 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/hashtree/dist/hashtree.1 diff -u othersrc/external/bsd/hashtree/dist/hashtree.1:1.1.1.1 othersrc/external/bsd/hashtree/dist/hashtree.1:1.2 --- othersrc/external/bsd/hashtree/dist/hashtree.1:1.1.1.1 Tue Jun 21 14:51:37 2011 +++ othersrc/external/bsd/hashtree/dist/hashtree.1 Tue Jun 21 15:40:22 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: hashtree.1,v 1.1.1.1 2011/06/21 14:51:37 agc Exp $ +.\" $NetBSD: hashtree.1,v 1.2 2011/06/21 15:40:22 wiz Exp $ .\" .\" Copyright (c) 2011 Alistair Crooks .\" All rights reserved. @@ -56,7 +56,7 @@ .Dv level of digests, a further set of digests is calculated on the first set of digests, -thereby forming a pyranmid of digests. +thereby forming a pyramid of digests. This process stops when there is only one digest in a level. .Pp The resulting complete digest is output with the first level at @@ -90,14 +90,16 @@ .Dv md5 , .Dv rmd160 , .Dv sha256 , -.Dv sha1 , and +.Dv sha1 , +and .Dv md5 . In addition, HMAC sums can be specified: possible values are: .Dv hmacsha1 , .Dv hmacrmd160 , .Dv hmacsha256 , -.Dv hmacsha1 , and +.Dv hmacsha1 , +and .Dv hmacmd5 . .Pp The following options are available: @@ -140,7 +142,7 @@ .Bd -literal % hashtree -n 1 dist/hashtree.c HASHTREE/sha1/1/10358/10358 (dist/hashtree.c) = 253f185d39783fd29ca6a7936fee4b50e3775f39 -% sha1 dist/hashtree.c +% sha1 dist/hashtree.c SHA1 (dist/hashtree.c) = 253f185d39783fd29ca6a7936fee4b50e3775f39 % hashtree dist/hashtree.c HASHTREE/sha1/2/10358/1024 (dist/hashtree.c) = 6a765d5809534fa75fd2f4f2f88168e65cb1182f91ac14db77b0052ae083743c10ed0ccea98ebf44a945eb72ee0303a8b5b89a2a590ec2e684418942bae3e0be34567bd12721167239fdf641c24ec51b59426924a32760adf11370aca375d60a97364613f93e1e44f848a3557c141b7422aa7e63fef99ff4e056124513c228c9a33e0dff08e6baa2903f959f428dd60f9a6390b0d4108d0826713d33ab6e5520fe20e61ac700659eb5e6a1cf5653da05d65c0d792cd3affaadd037372cfbf7085e14caea50dd89e2790cd982824fec985e2a97fcbbc415e91c27dc4f3089ec446784262269677aa1736fba2e5a768114 @@ -157,7 +159,7 @@ .Xr rmd160 3 , .Xr sha1 3 , .Xr sha256 3 , -.Xr sha512 3 . +.Xr sha512 3 .Sh HISTORY The .Nm
CVS commit: othersrc/external/bsd/hashtree/dist
Module Name:othersrc Committed By: wiz Date: Tue Jun 21 15:39:43 UTC 2011 Modified Files: othersrc/external/bsd/hashtree/dist: libhashtree.3 Log Message: Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ othersrc/external/bsd/hashtree/dist/libhashtree.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/hashtree/dist/libhashtree.3 diff -u othersrc/external/bsd/hashtree/dist/libhashtree.3:1.1.1.1 othersrc/external/bsd/hashtree/dist/libhashtree.3:1.2 --- othersrc/external/bsd/hashtree/dist/libhashtree.3:1.1.1.1 Tue Jun 21 14:51:37 2011 +++ othersrc/external/bsd/hashtree/dist/libhashtree.3 Tue Jun 21 15:39:43 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: libhashtree.3,v 1.1.1.1 2011/06/21 14:51:37 agc Exp $ +.\" $NetBSD: libhashtree.3,v 1.2 2011/06/21 15:39:43 wiz Exp $ .\" .\" Copyright (c) 2011 Alistair Crooks .\" All rights reserved. @@ -126,7 +126,7 @@ array. The .Fn HASHTREE_File -function will open the file, read its contents, calculate +function will open the file, read its contents, calculate the hash tree desired, and then close the file again. It is designed as a utility function.
CVS commit: src/sys/arch/hpcarm/hpcarm
Module Name:src
Committed By: kiyohara
Date: Tue Jun 21 15:28:05 UTC 2011
Modified Files:
src/sys/arch/hpcarm/hpcarm: autoconf.c
Log Message:
Add bicons to constab.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcarm/hpcarm/autoconf.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/hpcarm/hpcarm/autoconf.c
diff -u src/sys/arch/hpcarm/hpcarm/autoconf.c:1.18 src/sys/arch/hpcarm/hpcarm/autoconf.c:1.19
--- src/sys/arch/hpcarm/hpcarm/autoconf.c:1.18 Sat Apr 17 13:36:21 2010
+++ src/sys/arch/hpcarm/hpcarm/autoconf.c Tue Jun 21 15:28:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.18 2010/04/17 13:36:21 nonaka Exp $ */
+/* $NetBSD: autoconf.c,v 1.19 2011/06/21 15:28:05 kiyohara Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2010/04/17 13:36:21 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2011/06/21 15:28:05 kiyohara Exp $");
#include "opt_md.h"
@@ -188,14 +188,20 @@
* known algorithm unless we see a pressing need otherwise.
*/
+#include "biconsdev.h"
+
#include
-cons_decl(com);
cons_decl(sacom);
+#define biconscnpollc nullcnpollc
+cons_decl(bicons);
struct consdev constab[] = {
#if (NSACOM > 0)
cons_init(sacom),
#endif
+#if (NBICONSDEV > 0)
+ cons_init(bicons),
+#endif
{ NULL },
};
CVS commit: src/sys/arch/hpcarm
Module Name:src
Committed By: kiyohara
Date: Tue Jun 21 15:23:58 UTC 2011
Modified Files:
src/sys/arch/hpcarm/conf: WZERO3 files.pxa2x0
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c
Added Files:
src/sys/arch/hpcarm/conf: files.wzero3
src/sys/arch/hpcarm/hpcarm: wzero3_machdep.c
Log Message:
Split pxa2x0_hpc/wzero3.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcarm/conf/WZERO3
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpcarm/conf/files.pxa2x0
cvs rdiff -u -r0 -r1.1 src/sys/arch/hpcarm/conf/files.wzero3
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/hpcarm/hpcarm/wzero3_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/hpcarm/conf/WZERO3
diff -u src/sys/arch/hpcarm/conf/WZERO3:1.19 src/sys/arch/hpcarm/conf/WZERO3:1.20
--- src/sys/arch/hpcarm/conf/WZERO3:1.19 Sun Mar 6 17:08:25 2011
+++ src/sys/arch/hpcarm/conf/WZERO3 Tue Jun 21 15:23:57 2011
@@ -1,13 +1,14 @@
-# $NetBSD: WZERO3,v 1.19 2011/03/06 17:08:25 bouyer Exp $
+# $NetBSD: WZERO3,v 1.20 2011/06/21 15:23:57 kiyohara Exp $
#
# WZERO3 -- Sharp Windows Mobile 5 based PDA
#
include "arch/hpcarm/conf/std.pxa2x0"
+include "arch/hpcarm/conf/files.wzero3"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.19 $"
+#ident "GENERIC-$Revision: 1.20 $"
# estimated number of users
maxusers 32
Index: src/sys/arch/hpcarm/conf/files.pxa2x0
diff -u src/sys/arch/hpcarm/conf/files.pxa2x0:1.3 src/sys/arch/hpcarm/conf/files.pxa2x0:1.4
--- src/sys/arch/hpcarm/conf/files.pxa2x0:1.3 Sun May 30 10:00:27 2010
+++ src/sys/arch/hpcarm/conf/files.pxa2x0 Tue Jun 21 15:23:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.pxa2x0,v 1.3 2010/05/30 10:00:27 nonaka Exp $
+# $NetBSD: files.pxa2x0,v 1.4 2011/06/21 15:23:57 kiyohara Exp $
#
# PXA2x0 specific configuration info
#
@@ -7,40 +7,3 @@
# Include hpcarm/XScale config definitions.
include "arch/arm/xscale/files.pxa2x0"
-
-#
-# W-ZERO3 specific configuration info
-#
-
-# Dedicated SSP unit for touch screen, keypad
-device wzero3ssp
-attach wzero3ssp at pxaip
-file arch/hpcarm/dev/wzero3_ssp.c wzero3ssp
-
-# LCD frame buffer
-attach lcd at pxaip with wzero3lcd
-file arch/hpcarm/dev/wzero3_lcd.c wzero3lcd needs-flag
-
-# keyboard
-device wzero3kbd: hpckbdif, sysmon_power, sysmon_taskq
-attach wzero3kbd at pxaip
-file arch/hpcarm/dev/wzero3_kbd.c wzero3kbd
-
-# keypad
-device wzero3keypad: wskbddev
-attach wzero3keypad at pxaip
-file arch/hpcarm/dev/wzero3_keypad.c wzero3keypad
-
-# touchpad
-device wzero3tp: wsmousedev, hpctpanel
-attach wzero3tp at pxaip
-file arch/hpcarm/dev/wzero3_tp.c wzero3tp
-
-# MMC/SD controller
-attach pxamci at pxaip with wzero3mci
-file arch/hpcarm/dev/wzero3_mci.c wzero3mci
-
-# USB power control
-device wzero3usb
-attach wzero3usb at pxaip
-file arch/hpcarm/dev/wzero3_usb.c wzero3usb
Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.9 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.10
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.9 Tue Jun 14 14:33:50 2011
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c Tue Jun 21 15:23:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.9 2011/06/14 14:33:50 kiyohara Exp $ */
+/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.10 2011/06/21 15:23:57 kiyohara Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.9 2011/06/14 14:33:50 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.10 2011/06/21 15:23:57 kiyohara Exp $");
#include "opt_ddb.h"
#include "opt_dram_pages.h"
@@ -59,7 +59,6 @@
#include
#include /* XXX for consinit related hacks */
#include
-#include
#if NKSYMS || defined(DDB) || defined(MODULAR)
#include
@@ -89,21 +88,11 @@
#include
#include
#include
-#include
#include
#include
-#include
#include
-#include
-
-#include "com.h"
-#if (NCOM > 0)
-#include "opt_com.h"
-#include
-#endif /* NCOM > 0 */
-#include "lcd.h"
-#include "wzero3lcd.h"
+#include
#include
#include
@@ -181,12 +170,13 @@
u_int initarm(int, char **, struct bootinfo *);
+/* Machine dependent initialize function */
+extern void pxa2x0_machdep_init(void);
+
/* Mode dependent sleep function holder */
extern void (*__sleep_func)(void *);
extern void *__sleep_ctx;
-extern void (*__cpu_reset)(void);
-
#ifdef DEBUG_BEFOREMMU
static void fakecninit(void);
#endif
@@ -261,85 +251,8 @@
};
#undef _A
#undef _S
+extern const struct pmap_devmap machdep_devmap[];
-static void
-ws003sh_cpu_reset(void)
-{
- uint32_t rv;
-
- rv = pxa2x0_memctl_read(MEMCTL_MSC0);
- if ((rv & 0x) == 0x7ff0) {
- pxa2x0_memctl_write(MEMCTL_MSC0, (rv & 0x) | 0x7e
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: kiyohara
Date: Tue Jun 21 15:13:34 UTC 2011
Modified Files:
src/sys/dev/ic: sl811hs.c sl811hsvar.h
Log Message:
More stride for PSIONTEKLOGIX NETBOOK PRO.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/sl811hs.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/sl811hsvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.28 src/sys/dev/ic/sl811hs.c:1.29
--- src/sys/dev/ic/sl811hs.c:1.28 Tue May 17 04:18:06 2011
+++ src/sys/dev/ic/sl811hs.c Tue Jun 21 15:13:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.28 2011/05/17 04:18:06 mrg Exp $ */
+/* $NetBSD: sl811hs.c,v 1.29 2011/06/21 15:13:34 kiyohara Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -84,7 +84,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.28 2011/05/17 04:18:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.29 2011/06/21 15:13:34 kiyohara Exp $");
#include "opt_slhci.h"
@@ -1142,7 +1142,7 @@
* Note max_current argument is actual current, but stored as current/2 */
void
slhci_preinit(struct slhci_softc *sc, PowerFunc pow, bus_space_tag_t iot,
-bus_space_handle_t ioh, uint16_t max_current, uint8_t stride)
+bus_space_handle_t ioh, uint16_t max_current, uint32_t stride)
{
struct slhci_transfers *t;
int i;
Index: src/sys/dev/ic/sl811hsvar.h
diff -u src/sys/dev/ic/sl811hsvar.h:1.7 src/sys/dev/ic/sl811hsvar.h:1.8
--- src/sys/dev/ic/sl811hsvar.h:1.7 Sat May 8 01:33:00 2010
+++ src/sys/dev/ic/sl811hsvar.h Tue Jun 21 15:13:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hsvar.h,v 1.7 2010/05/08 01:33:00 isaki Exp $ */
+/* $NetBSD: sl811hsvar.h,v 1.8 2011/06/21 15:13:34 kiyohara Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -81,14 +81,14 @@
int sc_mem_use; /* XXX SLHCI_MEM_ACCOUNTING */
uint8_t sc_ier; /* enabled interrupts */
- uint8_t sc_stride; /* port stride */
+ uint32_t sc_stride; /* port stride */
};
/* last preinit arguments are: max current (in mA, not mA/2), port stride */
/* register access uses byte access, but stride offsets the data port */
int slhci_supported_rev(uint8_t);
void slhci_preinit(struct slhci_softc *, PowerFunc, bus_space_tag_t,
-bus_space_handle_t, uint16_t, uint8_t);
+bus_space_handle_t, uint16_t, uint32_t);
int slhci_attach(struct slhci_softc *);
int slhci_detach(struct slhci_softc *, int);
int slhci_activate(device_t, enum devact);
CVS commit: othersrc/external/bsd/hashtree
Module Name:othersrc Committed By: agc Date: Tue Jun 21 14:51:38 UTC 2011 Update of /cvsroot/othersrc/external/bsd/hashtree In directory ivanova.netbsd.org:/tmp/cvs-serv26431 Log Message: Initial import of hashtree functions into othersrc. The hashtree, or Merkle tree algorithms, split a file up into blocks, and calculate a message digest on those blocks. Subsequent digests are concatenated onto the previous digests. If there is more than one digest calculated, a higher level of digest is then calculated across the lower-order digests, to provide a tree-like structure of message digests. If there is only one digest calculated, then the hashtree in this degenerate case is the same as the digets of the file. % hashtree -n 1 dist/hashtree.c HASHTREE/sha1/1/10358/10358 (dist/hashtree.c) = 253f185d39783fd29ca6a7936fee4b50e3775f39 % sha1 dist/hashtree.c SHA1 (dist/hashtree.c) = 253f185d39783fd29ca6a7936fee4b50e3775f39 % hashtree(1) can be used to specify the hashing algorithm used (including hmac algorithms), and the size of the blocks. % hashtree -b 4096 dist/hashtree.c HASHTREE/sha1/2/10358/4096 (dist/hashtree.c) = 1a958db53705b1ef4ef4e7418f7aa6e25226c4468783684b4ff3d152a66a38e7ad3e5c8d88ad0851b5f916e7d015015c6e0ddf0cef4cf7af2d48a0ad6db45855c61ea5454b579221bcbeeb5e282e626d % Alternatively, the number of desired blocks can be specified, and hashtree will work out the block size from that parameter and the size of the file. By default, a blocksize of 1024 is used. There is the possibility of producing very large digests using hashtree(1): % hashtree dist/hashtree.c HASHTREE/sha1/2/10358/1024 (dist/hashtree.c) = 6a765d5809534fa75fd2f4f2f88168e65cb1182f91ac14db77b0052ae083743c10ed0ccea98ebf44a945eb72ee0303a8b5b89a2a590ec2e684418942bae3e0be34567bd12721167239fdf641c24ec51b59426924a32760adf11370aca375d60a97364613f93e1e44f848a3557c141b7422aa7e63fef99ff4e056124513c228c9a33e0dff08e6baa2903f959f428dd60f9a6390b0d4108d0826713d33ab6e5520fe20e61ac700659eb5e6a1cf5653da05d65c0d792cd3affaadd037372cfbf7085e14caea50dd89e2790cd982824fec985e2a97fcbbc415e91c27dc4f3089ec446784262269677aa1736fba2e5a768114 Merkle trees can be used to implement Lamport's signature scheme - see http://www.rsa.com/rsalabs/node.asp?id=2003 and there are also uses in ZFS: http://blogs.oracle.com/bonwick/entry/zfs_end_to_end_data (although indirect pointers can be a tad difficult here?) Hash trees are written up more generally in: http://en.wikipedia.org/wiki/Hash_tree There are also uses of the tiger algorithm being used to produce more specific "tiger trees". Status: Vendor Tag: CROOKS Release Tags: hashtree-base N othersrc/external/bsd/hashtree/Makefile N othersrc/external/bsd/hashtree/dist/hashtree.c N othersrc/external/bsd/hashtree/dist/Makefile N othersrc/external/bsd/hashtree/dist/TODO N othersrc/external/bsd/hashtree/dist/libhashtree.3 N othersrc/external/bsd/hashtree/dist/hashtree.h N othersrc/external/bsd/hashtree/dist/main.c N othersrc/external/bsd/hashtree/dist/hashtree.1 N othersrc/external/bsd/hashtree/hashtree/Makefile N othersrc/external/bsd/hashtree/libhashtree/Makefile N othersrc/external/bsd/hashtree/libhashtree/shlib_version No conflicts created by this import
CVS commit: src/sbin/route
Module Name:src
Committed By: kefren
Date: Tue Jun 21 14:33:14 UTC 2011
Modified Files:
src/sbin/route: route.c
Log Message:
Alloc dynamically sockunions in sou.
Teach route(8) about multiple tags. E.G.: -tag 100,20,33
XXX: needs documentation
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sbin/route/route.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/route/route.c
diff -u src/sbin/route/route.c:1.128 src/sbin/route/route.c:1.129
--- src/sbin/route/route.c:1.128 Tue Feb 1 01:39:19 2011
+++ src/sbin/route/route.c Tue Jun 21 14:33:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.128 2011/02/01 01:39:19 matt Exp $ */
+/* $NetBSD: route.c,v 1.129 2011/06/21 14:33:14 kefren Exp $ */
/*
* Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: route.c,v 1.128 2011/02/01 01:39:19 matt Exp $");
+__RCSID("$NetBSD: route.c,v 1.129 2011/06/21 14:33:14 kefren Exp $");
#endif
#endif /* not lint */
@@ -97,7 +97,8 @@
typedef union sockunion *sup;
struct sou {
- union sockunion so_dst, so_gate, so_mask, so_genmask, so_ifa, so_ifp, so_mpls;
+ union sockunion *so_dst, *so_gate, *so_mask, *so_genmask, *so_ifa,
+ *so_ifp, *so_mpls;
};
static char *any_ntoa(const struct sockaddr *);
@@ -116,6 +117,8 @@
static void monitor(void);
static int print_getmsg(struct rt_msghdr *, int, struct sou *);
static const char *linkstate(struct if_msghdr *);
+static sup readtag(sup, const char *);
+static void addtag(sup, const char *, int);
#endif /* SMALL */
static int rtmsg(int, int, struct sou *);
static void mask_addr(struct sou *);
@@ -588,11 +591,21 @@
case AF_MPLS:
{
union mpls_shim ms;
+ const union mpls_shim *pms;
+ int psize = sizeof(struct sockaddr_mpls);
ms.s_addr =((const struct sockaddr_mpls*)sa)->smpls_addr.s_addr;
ms.s_addr = ntohl(ms.s_addr);
snprintf(line, sizeof(line), "%u", ms.shim.label);
+ pms = &((const struct sockaddr_mpls*)sa)->smpls_addr;
+ while(psize < sa->sa_len) {
+ pms++;
+ ms.s_addr = ntohl(pms->s_addr);
+ snprintf(line, sizeof(line), "%s %u", line,
+ ms.shim.label);
+ psize += sizeof(ms);
+ }
break;
}
#endif /* SMALL */
@@ -795,7 +808,18 @@
struct hostent *hp = 0;
struct sou sou, *soup = &sou;
- memset(&sou, 0, sizeof(sou));
+ sou.so_dst = calloc(1, sizeof(union sockunion));
+ sou.so_gate = calloc(1, sizeof(union sockunion));
+ sou.so_mask = calloc(1, sizeof(union sockunion));
+ sou.so_genmask = calloc(1, sizeof(union sockunion));
+ sou.so_ifa = calloc(1, sizeof(union sockunion));
+ sou.so_ifp = calloc(1, sizeof(union sockunion));
+ sou.so_mpls = calloc(1, sizeof(union sockunion));
+
+ if (sou.so_dst == NULL || sou.so_gate == NULL || sou.so_mask == NULL ||
+ sou.so_genmask == NULL || sou.so_ifa == NULL || sou.so_ifp == NULL ||
+ sou.so_mpls == NULL)
+ errx(EXIT_FAILURE, "Cannot allocate memory");
cmd = argv[0];
af = AF_UNSPEC;
@@ -849,6 +873,7 @@
case K_TAG:
if (!--argc)
usage(1+*argv);
+af = AF_MPLS;
aflen = sizeof(struct sockaddr_mpls);
(void)getaddr(RTA_TAG, *++argv, 0, soup);
break;
@@ -1016,7 +1041,7 @@
break;
if (af == AF_INET && *gateway && hp && hp->h_addr_list[1]) {
hp->h_addr_list++;
- memmove(&soup->so_gate.sin.sin_addr, hp->h_addr_list[0],
+ memmove(&soup->so_gate->sin.sin_addr, hp->h_addr_list[0],
hp->h_length);
} else
break;
@@ -1030,13 +1055,21 @@
(void)printf(": gateway %s", gateway);
if (attempts > 1 && ret == 0 && af == AF_INET)
(void)printf(" (%s)",
- inet_ntoa(soup->so_gate.sin.sin_addr));
+ inet_ntoa(soup->so_gate->sin.sin_addr));
}
if (ret == 0)
(void)printf("\n");
else
(void)printf(": %s\n", route_strerror(oerrno));
}
+ free(sou.so_dst);
+ free(sou.so_gate);
+ free(sou.so_mask);
+ free(sou.so_genmask);
+ free(sou.so_ifa);
+ free(sou.so_ifp);
+ free(sou.so_mpls);
+
return ret != 0;
}
@@ -1090,7 +1123,7 @@
mask = -1;
}
isin->sin_addr.s_addr = htonl(addr);
- sin = &soup->so_mask.sin;
+ sin = &soup->so_mask->sin;
sin->sin_addr.s_addr = htonl(mask);
sin->sin_len = 0;
sin->sin_family = 0;
@@ -1154,28 +1187,28 @@
rtm_addrs |= which;
switch (which) {
case RTA_DST:
- su = &soup->so_dst;
+ su = soup->so_dst;
break;
case RTA_GATEWAY:
- su = &soup->so_gate;
+ su = soup->so_gate;
break;
case RTA_NETMASK:
- su = &soup->so_mask;
+ su = soup->so_mask;
break;
case RTA_GENMASK:
- su = &soup->so_genmask;
+ su = soup->so_genmask;
break;
case RTA_IFP:
- su = &soup->so_ifp;
+ su = soup->so_ifp;
afamily = AF_LINK;
break;
case RTA_IFA:
- su = &soup->so_ifa;
+ su = soup->so_ifa;
su->sa.sa_family = af;
break;
#ifndef SMALL
case RTA_TAG:
- su = &soup->so_mpls;
+ su = soup->so_mpls;
afamily
CVS commit: src/sys/net
Module Name:src
Committed By: kefren
Date: Tue Jun 21 14:30:20 UTC 2011
Modified Files:
src/sys/net: if_mpls.c
Log Message:
learn mpls interface how to prepend multiple shims by using a vector of
smpls_addrs in sockaddr_mpls. The number of smpls_addrs is found from
smpls_len. First label encountered is BoS.
XXX: need to do the same for LSE and this feature needs to be documented.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/net/if_mpls.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/net/if_mpls.c
diff -u src/sys/net/if_mpls.c:1.5 src/sys/net/if_mpls.c:1.6
--- src/sys/net/if_mpls.c:1.5 Fri Jun 17 09:15:24 2011
+++ src/sys/net/if_mpls.c Tue Jun 21 14:30:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mpls.c,v 1.5 2011/06/17 09:15:24 kefren Exp $ */
+/* $NetBSD: if_mpls.c,v 1.6 2011/06/21 14:30:19 kefren Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.5 2011/06/17 09:15:24 kefren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.6 2011/06/21 14:30:19 kefren Exp $");
#include "opt_inet.h"
#include "opt_mpls.h"
@@ -38,6 +38,7 @@
#include
#include
+#include
#include
#include
#include
@@ -84,12 +85,12 @@
#ifdef INET
static int mpls_unlabel_inet(struct mbuf *);
-static struct mbuf *mpls_label_inet(struct mbuf *, union mpls_shim *);
+static struct mbuf *mpls_label_inet(struct mbuf *, union mpls_shim *, uint);
#endif
#ifdef INET6
static int mpls_unlabel_inet6(struct mbuf *);
-static struct mbuf *mpls_label_inet6(struct mbuf *, union mpls_shim *);
+static struct mbuf *mpls_label_inet6(struct mbuf *, union mpls_shim *, uint);
#endif
static struct mbuf *mpls_prepend_shim(struct mbuf *, union mpls_shim *);
@@ -190,9 +191,10 @@
static int
mpls_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, struct rtentry *rt)
{
- union mpls_shim mh;
+ union mpls_shim mh, *pms;
struct rtentry *rt1;
int err;
+ uint psize = sizeof(struct sockaddr_mpls);
if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING)) {
m_freem(m);
@@ -206,20 +208,33 @@
bpf_mtap_af(ifp, dst->sa_family, m);
- mh.s_addr=MPLS_GETSADDR(rt);
- mh.shim.bos=1;
- mh.shim.exp=0;
- mh.shim.ttl=mpls_defttl;
+ memset(&mh, 0, sizeof(mh));
+ mh.s_addr = MPLS_GETSADDR(rt);
+ mh.shim.bos = 1;
+ mh.shim.exp = 0;
+ mh.shim.ttl = mpls_defttl;
+
+ pms = &((struct sockaddr_mpls*)rt_gettag(rt))->smpls_addr;
+
+ while (psize <= rt_gettag(rt)->sa_len - sizeof(mh)) {
+ pms++;
+ m = mpls_prepend_shim(m, &mh);
+ memset(&mh, 0, sizeof(mh));
+ mh.s_addr = ntohl(pms->s_addr);
+ mh.shim.bos = mh.shim.exp = 0;
+ mh.shim.ttl = mpls_defttl;
+ psize += sizeof(mh);
+ }
switch(dst->sa_family) {
#ifdef INET
case AF_INET:
- m = mpls_label_inet(m, &mh);
+ m = mpls_label_inet(m, &mh, psize - sizeof(struct sockaddr_mpls));
break;
#endif
#ifdef INET6
case AF_INET6:
- m = mpls_label_inet6(m, &mh);
+ m = mpls_label_inet6(m, &mh, psize - sizeof(struct sockaddr_mpls));
break;
#endif
default:
@@ -484,15 +499,18 @@
* Prepend MPLS label
*/
static struct mbuf *
-mpls_label_inet(struct mbuf *m, union mpls_shim *ms)
+mpls_label_inet(struct mbuf *m, union mpls_shim *ms, uint offset)
{
struct ip *iphdr;
if (mpls_mapttl_inet || mpls_mapprec_inet) {
if ((m->m_len < sizeof(struct ip)) &&
- (m = m_pullup(m, sizeof(struct ip))) == 0)
+ (m = m_pullup(m, offset + sizeof(struct ip))) == 0)
+ return NULL; /* XXX */
+ iphdr = kmem_alloc(sizeof(struct ip), KM_NOSLEEP);
+ if (iphdr == NULL)
return NULL;
- iphdr = mtod(m, struct ip *);
+ m_copydata(m, offset, sizeof(struct ip), iphdr);
/* Map TTL */
if (mpls_mapttl_inet)
@@ -501,6 +519,7 @@
/* Copy IP precedence to EXP */
if (mpls_mapprec_inet)
ms->shim.exp = ((u_int8_t)iphdr->ip_tos) >> 5;
+ kmem_free (iphdr, sizeof(struct ip));
}
if ((m = mpls_prepend_shim(m, ms)) == NULL)
@@ -554,21 +573,25 @@
}
static struct mbuf *
-mpls_label_inet6(struct mbuf *m, union mpls_shim *ms)
+mpls_label_inet6(struct mbuf *m, union mpls_shim *ms, uint offset)
{
struct ip6_hdr *ip6h;
if (mpls_mapttl_inet6 || mpls_mapclass_inet6) {
if (m->m_len < sizeof(struct ip6_hdr) &&
- (m = m_pullup(m, sizeof(struct ip6_hdr))) == 0)
+ (m = m_pullup(m, offset + sizeof(struct ip6_hdr))) == 0)
+ return NULL;
+ ip6h = kmem_alloc(sizeof(struct ip6_hdr), KM_NOSLEEP);
+ if (ip6h == NULL)
return NULL;
- ip6h = mtod(m, struct ip6_hdr *);
+ m_copydata(m, offset, sizeof(struct ip6_hdr), ip6h);
if (mpls_mapttl_inet6)
ms->shim.ttl = ip6h->ip6_hlim;
if (mpls_mapclass_inet6)
ms->shim.exp = ip6h->ip6_vfc << 1 >> 5;
+ kmem_free(ip6h, sizeof(struct ip6_hdr));
}
if ((m = mpls_prepend_shim(m, ms)) == NULL)
CVS commit: src/sys/dev
Module Name:src
Committed By: hannken
Date: Tue Jun 21 13:59:42 UTC 2011
Modified Files:
src/sys/dev: fss.c
Log Message:
Use kthread_join() to wait for the termination of the helper thread.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/fss.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/fss.c
diff -u src/sys/dev/fss.c:1.76 src/sys/dev/fss.c:1.77
--- src/sys/dev/fss.c:1.76 Tue Jun 21 12:41:24 2011
+++ src/sys/dev/fss.c Tue Jun 21 13:59:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.76 2011/06/21 12:41:24 hannken Exp $ */
+/* $NetBSD: fss.c,v 1.77 2011/06/21 13:59:41 hannken Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.76 2011/06/21 12:41:24 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.77 2011/06/21 13:59:41 hannken Exp $");
#include
#include
@@ -455,8 +455,9 @@
}
sc->sc_flags |= FSS_BS_THREAD;
- if ((error = kthread_create(PRI_BIO, 0, NULL, fss_bs_thread, sc,
- &sc->sc_bs_lwp, "%s", device_xname(sc->sc_dev))) != 0) {
+ if ((error = kthread_create(PRI_BIO, KTHREAD_JOINABLE, NULL,
+ fss_bs_thread, sc, &sc->sc_bs_lwp,
+ "%s", device_xname(sc->sc_dev))) != 0) {
sc->sc_flags &= ~FSS_BS_THREAD;
return error;
}
@@ -478,9 +479,8 @@
mutex_enter(&sc->sc_slock);
sc->sc_flags &= ~FSS_BS_THREAD;
cv_signal(&sc->sc_work_cv);
- while (sc->sc_bs_lwp != NULL)
- kpause("fssdetach", false, 1, &sc->sc_slock);
mutex_exit(&sc->sc_slock);
+ kthread_join(sc->sc_bs_lwp);
disk_detach(sc->sc_dkdev);
}
@@ -1056,7 +1056,6 @@
cv_wait(&sc->sc_work_cv, &sc->sc_slock);
thread_idle = true;
if ((sc->sc_flags & FSS_BS_THREAD) == 0) {
- sc->sc_bs_lwp = NULL;
mutex_exit(&sc->sc_slock);
kthread_exit(0);
}
CVS commit: src/usr.bin/gzip
Module Name:src
Committed By: joerg
Date: Tue Jun 21 13:25:45 UTC 2011
Modified Files:
src/usr.bin/gzip: Makefile gzip.c
Log Message:
Add a few explicit casts for sign mismatches.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/gzip/Makefile
cvs rdiff -u -r1.102 -r1.103 src/usr.bin/gzip/gzip.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/gzip/Makefile
diff -u src/usr.bin/gzip/Makefile:1.15 src/usr.bin/gzip/Makefile:1.16
--- src/usr.bin/gzip/Makefile:1.15 Mon Jun 20 07:44:01 2011
+++ src/usr.bin/gzip/Makefile Tue Jun 21 13:25:45 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/06/20 07:44:01 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2011/06/21 13:25:45 joerg Exp $
USE_FORT?= yes # data-driven bugs?
@@ -25,7 +25,3 @@
${BINDIR}/zgrep ${BINDIR}/zfgrep
.include
-
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
-COPTS.gzip.c+= -Wno-pointer-sign
-.endif
Index: src/usr.bin/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.102 src/usr.bin/gzip/gzip.c:1.103
--- src/usr.bin/gzip/gzip.c:1.102 Sun Jun 19 02:19:09 2011
+++ src/usr.bin/gzip/gzip.c Tue Jun 21 13:25:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gzip.c,v 1.102 2011/06/19 02:19:09 christos Exp $ */
+/* $NetBSD: gzip.c,v 1.103 2011/06/21 13:25:45 joerg Exp $ */
/*
* Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green
@@ -30,7 +30,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006\
Matthew R. Green. All rights reserved.");
-__RCSID("$NetBSD: gzip.c,v 1.102 2011/06/19 02:19:09 christos Exp $");
+__RCSID("$NetBSD: gzip.c,v 1.103 2011/06/21 13:25:45 joerg Exp $");
#endif /* not lint */
/*
@@ -580,7 +580,7 @@
i++;
#endif
- z.next_out = outbufp + i;
+ z.next_out = (unsigned char *)outbufp + i;
z.avail_out = BUFLEN - i;
error = deflateInit2(&z, numflag, Z_DEFLATED,
@@ -601,7 +601,7 @@
}
out_tot += BUFLEN;
- z.next_out = outbufp;
+ z.next_out = (unsigned char *)outbufp;
z.avail_out = BUFLEN;
}
@@ -617,7 +617,7 @@
crc = crc32(crc, (const Bytef *)inbufp, (unsigned)in_size);
in_tot += in_size;
- z.next_in = inbufp;
+ z.next_in = (unsigned char *)inbufp;
z.avail_in = in_size;
}
@@ -650,7 +650,7 @@
goto out;
}
out_tot += len;
- z.next_out = outbufp;
+ z.next_out = (unsigned char *)outbufp;
z.avail_out = BUFLEN;
if (error == Z_STREAM_END)
@@ -744,9 +744,9 @@
memset(&z, 0, sizeof z);
z.avail_in = prelen;
- z.next_in = pre;
+ z.next_in = (unsigned char *)pre;
z.avail_out = BUFLEN;
- z.next_out = outbufp;
+ z.next_out = (unsigned char *)outbufp;
z.zalloc = NULL;
z.zfree = NULL;
z.opaque = 0;
@@ -761,7 +761,7 @@
if (z.avail_in > 0) {
memmove(inbufp, z.next_in, z.avail_in);
}
- z.next_in = inbufp;
+ z.next_in = (unsigned char *)inbufp;
in_size = read(in, z.next_in + z.avail_in,
BUFLEN - z.avail_in);
@@ -956,7 +956,7 @@
state++;
}
- z.next_out = outbufp;
+ z.next_out = (unsigned char *)outbufp;
z.avail_out = BUFLEN;
break;
@@ -1671,12 +1671,12 @@
#endif
case FT_GZIP:
usize = gz_uncompress(STDIN_FILENO, STDOUT_FILENO,
- header1, sizeof header1, &gsize, "(stdin)");
+ (char *)header1, sizeof header1, &gsize, "(stdin)");
break;
#ifndef NO_BZIP2_SUPPORT
case FT_BZIP2:
usize = unbzip2(STDIN_FILENO, STDOUT_FILENO,
-header1, sizeof header1, &gsize);
+(char *)header1, sizeof header1, &gsize);
break;
#endif
#ifndef NO_COMPRESS_SUPPORT
@@ -1686,7 +1686,8 @@
return;
}
- usize = zuncompress(in, stdout, header1, sizeof header1, &gsize);
+ usize = zuncompress(in, stdout, (char *)header1,
+ sizeof header1, &gsize);
fclose(in);
break;
#endif
CVS commit: src/sys/dev
Module Name:src
Committed By: hannken
Date: Tue Jun 21 12:41:24 UTC 2011
Modified Files:
src/sys/dev: fss.c
Log Message:
When reading or writing the backing store us POSIX_FADV_NOREUSE access hint
to prevent read ahead.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/fss.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/fss.c
diff -u src/sys/dev/fss.c:1.75 src/sys/dev/fss.c:1.76
--- src/sys/dev/fss.c:1.75 Sun Jun 12 03:35:51 2011
+++ src/sys/dev/fss.c Tue Jun 21 12:41:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.75 2011/06/12 03:35:51 rmind Exp $ */
+/* $NetBSD: fss.c,v 1.76 2011/06/21 12:41:24 hannken Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.75 2011/06/12 03:35:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.76 2011/06/21 12:41:24 hannken Exp $");
#include
#include
@@ -978,12 +978,13 @@
vn_lock(sc->sc_bs_vp, LK_EXCLUSIVE|LK_RETRY);
error = vn_rdwr((rw == FSS_READ ? UIO_READ : UIO_WRITE), sc->sc_bs_vp,
- data, len, off, UIO_SYSSPACE, IO_UNIT|IO_NODELOCKED,
+ data, len, off, UIO_SYSSPACE,
+ IO_ADV_ENCODE(POSIX_FADV_NOREUSE) | IO_NODELOCKED,
sc->sc_bs_lwp->l_cred, NULL, NULL);
if (error == 0) {
mutex_enter(sc->sc_bs_vp->v_interlock);
error = VOP_PUTPAGES(sc->sc_bs_vp, trunc_page(off),
- round_page(off+len), PGO_CLEANIT|PGO_SYNCIO|PGO_FREE);
+ round_page(off+len), PGO_CLEANIT | PGO_FREE | PGO_SYNCIO);
}
VOP_UNLOCK(sc->sc_bs_vp);
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: hannken
Date: Tue Jun 21 12:38:28 UTC 2011
Modified Files:
src/sys/dev/i2c: ibmhawk.c
Log Message:
Make sure sensor state is valid before calling sysmon_envsys_sensor_attach().
Ok: Paul Goyette
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/ibmhawk.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/i2c/ibmhawk.c
diff -u src/sys/dev/i2c/ibmhawk.c:1.2 src/sys/dev/i2c/ibmhawk.c:1.3
--- src/sys/dev/i2c/ibmhawk.c:1.2 Mon Feb 14 14:15:25 2011
+++ src/sys/dev/i2c/ibmhawk.c Tue Jun 21 12:38:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ibmhawk.c,v 1.2 2011/02/14 14:15:25 hannken Exp $ */
+/* $NetBSD: ibmhawk.c,v 1.3 2011/06/21 12:38:27 hannken Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -313,9 +313,6 @@
ibmhawk_normalize(sd->ihs_warnmax, dp->units);
dp->flags |= ENVSYS_FMONLIMITS;
}
- if (sysmon_envsys_sensor_attach(sc->sc_sme, dp))
- aprint_error_dev(sc->sc_dev,
- "failed to attach \"%s\"\n", dp->desc);
}
if (valid) {
@@ -323,6 +320,12 @@
dp->state = ENVSYS_SVALID;
} else
dp->state = ENVSYS_SINVALID;
+
+ if (create) {
+ if (sysmon_envsys_sensor_attach(sc->sc_sme, dp))
+ aprint_error_dev(sc->sc_dev,
+ "failed to attach \"%s\"\n", dp->desc);
+ }
}
static void
CVS commit: src/distrib/alpha/instkernel/ramdisk
Module Name:src
Committed By: tsutsui
Date: Tue Jun 21 11:52:46 UTC 2011
Modified Files:
src/distrib/alpha/instkernel/ramdisk: list
Log Message:
Revert rev 1.42 which is not necessary after rev 1.41.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/distrib/alpha/instkernel/ramdisk/list
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/alpha/instkernel/ramdisk/list
diff -u src/distrib/alpha/instkernel/ramdisk/list:1.42 src/distrib/alpha/instkernel/ramdisk/list:1.43
--- src/distrib/alpha/instkernel/ramdisk/list:1.42 Mon Jun 20 23:00:53 2011
+++ src/distrib/alpha/instkernel/ramdisk/list Tue Jun 21 11:52:45 2011
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.42 2011/06/20 23:00:53 he Exp $
+# $NetBSD: list,v 1.43 2011/06/21 11:52:45 tsutsui Exp $
SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin
@@ -60,7 +60,7 @@
SPECIAL gzip srcdir distrib/utils/x_gzip
SPECIAL ping srcdir distrib/utils/x_ping
-LIBS -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lbz2 -llzma -lprop
+LIBS -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
# we need the boot blocks /usr/mdec
COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard
Module Name:src
Committed By: nonaka
Date: Tue Jun 21 11:42:20 UTC 2011
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile
Log Message:
fix typo.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.12 Thu Apr 28 23:28:11 2011
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Tue Jun 21 11:42:20 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2011/04/28 23:28:11 macallan Exp $
+# $NetBSD: Makefile,v 1.13 2011/06/21 11:42:20 nonaka Exp $
DRIVER= xf86-input-keyboard
DRIVER_NAME= kbd_drv
@@ -6,7 +6,7 @@
SRCS= kbd.c bsd_KbdMap.c bsd_kbd.c at_scancode.c
MAN= kbd.4
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "Xcats"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "cats"
CPPFLAGS+= -DPCVT_SUPPORT
.endif
CVS commit: src/sys/arch/evbarm/gumstix
Module Name:src
Committed By: kiyohara
Date: Tue Jun 21 11:38:03 UTC 2011
Modified Files:
src/sys/arch/evbarm/gumstix: gxiic.c
Log Message:
Use CFATTACH_DECL_NEW().
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/gumstix/gxiic.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/evbarm/gumstix/gxiic.c
diff -u src/sys/arch/evbarm/gumstix/gxiic.c:1.6 src/sys/arch/evbarm/gumstix/gxiic.c:1.7
--- src/sys/arch/evbarm/gumstix/gxiic.c:1.6 Sun Jun 19 16:16:42 2011
+++ src/sys/arch/evbarm/gumstix/gxiic.c Tue Jun 21 11:38:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gxiic.c,v 1.6 2011/06/19 16:16:42 nonaka Exp $ */
+/* $NetBSD: gxiic.c,v 1.7 2011/06/21 11:38:03 kiyohara Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gxiic.c,v 1.6 2011/06/19 16:16:42 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gxiic.c,v 1.7 2011/06/21 11:38:03 kiyohara Exp $");
#include
#include
@@ -58,7 +58,7 @@
void *, size_t, int);
-CFATTACH_DECL(gxiic, sizeof(struct gxiic_softc),
+CFATTACH_DECL_NEW(gxiic, sizeof(struct gxiic_softc),
gxiicmatch, gxiicattach, NULL, NULL);
@@ -88,6 +88,7 @@
sc->sc_pxa_i2c.sc_dev = self;
sc->sc_pxa_i2c.sc_iot = pxa->pxa_iot;
+ sc->sc_pxa_i2c.sc_addr = pxa->pxa_addr;
sc->sc_pxa_i2c.sc_size = pxa->pxa_size;
sc->sc_pxa_i2c.sc_flags = 0;
if (pxa2x0_i2c_attach_sub(&sc->sc_pxa_i2c)) {
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Tue Jun 21 09:49:05 UTC 2011 Modified Files: src/sys/dev/acpi: acpi_fan.c acpi_pmtr.c Log Message: Revert the previous commit as it was wrong/redundant. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/acpi_fan.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/acpi_pmtr.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/acpi/acpi_fan.c diff -u src/sys/dev/acpi/acpi_fan.c:1.5 src/sys/dev/acpi/acpi_fan.c:1.6 --- src/sys/dev/acpi/acpi_fan.c:1.5 Mon Jun 20 17:21:50 2011 +++ src/sys/dev/acpi/acpi_fan.c Tue Jun 21 09:49:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_fan.c,v 1.5 2011/06/20 17:21:50 pgoyette Exp $ */ +/* $NetBSD: acpi_fan.c,v 1.6 2011/06/21 09:49:05 jruoho Exp $ */ /*- * Copyright (c) 2011 Jukka Ruohonen @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_fan.c,v 1.5 2011/06/20 17:21:50 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_fan.c,v 1.6 2011/06/21 09:49:05 jruoho Exp $"); #include #include @@ -172,7 +172,6 @@ acpifan_sensor_state(self); sc->sc_sensor.units = ENVSYS_INDICATOR; - sc->sc_sensor.state = ENVSYS_SINVALID; (void)strlcpy(sc->sc_sensor.desc, "state", sizeof(sc->sc_sensor.desc)); Index: src/sys/dev/acpi/acpi_pmtr.c diff -u src/sys/dev/acpi/acpi_pmtr.c:1.6 src/sys/dev/acpi/acpi_pmtr.c:1.7 --- src/sys/dev/acpi/acpi_pmtr.c:1.6 Tue Jun 21 03:37:21 2011 +++ src/sys/dev/acpi/acpi_pmtr.c Tue Jun 21 09:49:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_pmtr.c,v 1.6 2011/06/21 03:37:21 jruoho Exp $ */ +/* $NetBSD: acpi_pmtr.c,v 1.7 2011/06/21 09:49:05 jruoho Exp $ */ /*- * Copyright (c) 2011 Jukka Ruohonen @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_pmtr.c,v 1.6 2011/06/21 03:37:21 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_pmtr.c,v 1.7 2011/06/21 09:49:05 jruoho Exp $"); #include #include @@ -338,8 +338,6 @@ sc->sc_sensor_o.units = ENVSYS_SWATTS; sc->sc_sensor_i.value_cur = val * 1000; sc->sc_sensor_o.value_cur = val * 1000; - sc->sc_sensor_i.state = ENVSYS_SINVALID; - sc->sc_sensor_o.state = ENVSYS_SINVALID; acpipmtr_sensor_type(self);
CVS commit: othersrc/external/bsd/mat/dist
Module Name:othersrc Committed By: wiz Date: Tue Jun 21 09:45:49 UTC 2011 Modified Files: othersrc/external/bsd/mat/dist: matpax.1 Log Message: Sort option descriptions. Add -v to SYNOPSIS. Remove empty EXAMPLES section. Increase Bl width so everything fits. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/mat/dist/matpax.1 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/mat/dist/matpax.1 diff -u othersrc/external/bsd/mat/dist/matpax.1:1.3 othersrc/external/bsd/mat/dist/matpax.1:1.4 --- othersrc/external/bsd/mat/dist/matpax.1:1.3 Tue Jun 21 04:21:24 2011 +++ othersrc/external/bsd/mat/dist/matpax.1 Tue Jun 21 09:45:49 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: matpax.1,v 1.3 2011/06/21 04:21:24 agc Exp $ +.\" $NetBSD: matpax.1,v 1.4 2011/06/21 09:45:49 wiz Exp $ .\" .\" Copyright (c) 2011 Alistair Crooks .\" All rights reserved. @@ -31,7 +31,7 @@ .Nd minimalist archive tool program with pax frontend .Sh SYNOPSIS .Nm -.Op Fl Valrw +.Op Fl alrVvw .Op Fl C Ar directory .Op Fl f Ar archive .Op Ar file ... @@ -50,11 +50,7 @@ digests to protect the contents of the archive. .Pp The options are as follows: -.Bl -tag -width template123 -.It Fl C Ar directory -perform an initial -.Xr chdir 2 -into the specified directory before attempting to resolve any filenames. +.Bl -tag -width XCXdirectoryXX .It Fl a Perform an .Dq audit @@ -68,6 +64,10 @@ .Xr diff 1 can be used to compare packages and installed file system entries to see if anything has been changed. +.It Fl C Ar directory +perform an initial +.Xr chdir 2 +into the specified directory before attempting to resolve any filenames. .It Fl f Ar archive Use the .Xr libmat 3 @@ -83,8 +83,6 @@ list the archive .It Fl r extract the named components from the archive. -.It Fl w -create the archive from the named components. .It Fl V verify the archive does not contain dangerous entries which could compromise a machine if the archive @@ -97,6 +95,8 @@ digests associated with the archive component. .It Fl v increase the verbosity level by one unit. +.It Fl w +create the archive from the named components. .El .Pp .Nm @@ -117,9 +117,6 @@ argument, has been provided. The archive is verified before listing or extracting from the archive. -.Sh EXAMPLES -.Bd -literal -.Ed .Sh SEE ALSO .Xr mat 1 , .Xr pax 1 ,
CVS commit: othersrc/external/bsd/mat/dist
Module Name:othersrc Committed By: wiz Date: Tue Jun 21 09:45:10 UTC 2011 Modified Files: othersrc/external/bsd/mat/dist: mat.1 Log Message: Sort option descriptions. Add matpax(1) to SEE ALSO. Increase Bl width so everything fits. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 othersrc/external/bsd/mat/dist/mat.1 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/mat/dist/mat.1 diff -u othersrc/external/bsd/mat/dist/mat.1:1.6 othersrc/external/bsd/mat/dist/mat.1:1.7 --- othersrc/external/bsd/mat/dist/mat.1:1.6 Tue Jun 21 09:38:15 2011 +++ othersrc/external/bsd/mat/dist/mat.1 Tue Jun 21 09:45:10 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: mat.1,v 1.6 2011/06/21 09:38:15 wiz Exp $ +.\" $NetBSD: mat.1,v 1.7 2011/06/21 09:45:10 wiz Exp $ .\" .\" Copyright (c) 2011 Alistair Crooks .\" All rights reserved. @@ -51,11 +51,7 @@ digests to protect the contents of the archive. .Pp The options are as follows: -.Bl -tag -width template123 -.It Fl C Ar directory -perform an initial -.Xr chdir 2 -into the specified directory before attempting to resolve any filenames. +.Bl -tag -width XCXdirectoryXX .It Fl a audit the contents of the archive against the installed versions of the file system. The output is the same as would be output using the @@ -70,6 +66,10 @@ .Xr diff 1 to see if anything has been modified since the archive contents were extracted. +.It Fl C Ar directory +perform an initial +.Xr chdir 2 +into the specified directory before attempting to resolve any filenames. .It Fl c create the archive .It Fl f Ar archive @@ -259,6 +259,7 @@ % .Ed .Sh SEE ALSO +.Xr matpax 1 , .Xr pax 1 , .Xr tar 1 , .Xr libmat 3 ,
CVS commit: othersrc/external/bsd/mat/dist
Module Name:othersrc Committed By: wiz Date: Tue Jun 21 09:38:15 UTC 2011 Modified Files: othersrc/external/bsd/mat/dist: mat.1 Log Message: Fix typo in option letter. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 othersrc/external/bsd/mat/dist/mat.1 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/mat/dist/mat.1 diff -u othersrc/external/bsd/mat/dist/mat.1:1.5 othersrc/external/bsd/mat/dist/mat.1:1.6 --- othersrc/external/bsd/mat/dist/mat.1:1.5 Tue Jun 21 04:21:24 2011 +++ othersrc/external/bsd/mat/dist/mat.1 Tue Jun 21 09:38:15 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: mat.1,v 1.5 2011/06/21 04:21:24 agc Exp $ +.\" $NetBSD: mat.1,v 1.6 2011/06/21 09:38:15 wiz Exp $ .\" .\" Copyright (c) 2011 Alistair Crooks .\" All rights reserved. @@ -56,7 +56,7 @@ perform an initial .Xr chdir 2 into the specified directory before attempting to resolve any filenames. -.It Fl c +.It Fl a audit the contents of the archive against the installed versions of the file system. The output is the same as would be output using the .Fl t
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Tue Jun 21 09:37:41 UTC 2011
Modified Files:
src/tools/gcc: Makefile
Log Message:
use --sysroot with GCC 4.5. (maybe could with 4.1 too? the 4.1 code
here is broken right now, anyway, ever since the sysroot changes were
merged into our tree.)
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.37 src/tools/gcc/Makefile:1.38
--- src/tools/gcc/Makefile:1.37 Tue Jun 21 04:11:12 2011
+++ src/tools/gcc/Makefile Tue Jun 21 09:37:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2011/06/21 04:11:12 mrg Exp $
+# $NetBSD: Makefile,v 1.38 2011/06/21 09:37:41 mrg Exp $
.include
@@ -98,8 +98,13 @@
GCCSRCDIR=${.CURDIR}/../../external/gpl3/gcc/dist
.endif
+.if ${HAVE_GCC} >= 45
+CXXADDFLAGS= --sysroot=${DESTDIR}
+CCADDFLAGS= --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
+.else
CXXADDFLAGS= ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++
CCADDFLAGS= ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
+.endif
NEWCONFIGDIR?= ${.CURDIR}/../..
MKNATIVE?= ${.CURDIR}/mknative-gcc
CVS commit: src
Module Name:src
Committed By: mrg
Date: Tue Jun 21 09:36:46 UTC 2011
Modified Files:
src/sbin/fsck_lfs: lfs.c
src/usr.sbin/acpitools/aml: aml_parse.c
Log Message:
avoid code that looks like this:
x = x = y;
since GCC 4.5 complains about it having sequence point issues.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.33 src/sbin/fsck_lfs/lfs.c:1.34
--- src/sbin/fsck_lfs/lfs.c:1.33 Sun Feb 21 16:24:21 2010
+++ src/sbin/fsck_lfs/lfs.c Tue Jun 21 09:36:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.33 2010/02/21 16:24:21 mlelstv Exp $ */
+/* $NetBSD: lfs.c,v 1.34 2011/06/21 09:36:46 mrg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -1020,8 +1020,7 @@
lastblock,
(bpp ? &bp : NULL
return (error);
- ip->i_ffs1_size = ip->i_ffs1_size =
- (lastblock + 1) * fs->lfs_bsize;
+ ip->i_ffs1_size = (lastblock + 1) * fs->lfs_bsize;
ip->i_flag |= IN_CHANGE | IN_UPDATE;
if (bpp)
(void) VOP_BWRITE(bp);
Index: src/usr.sbin/acpitools/aml/aml_parse.c
diff -u src/usr.sbin/acpitools/aml/aml_parse.c:1.2 src/usr.sbin/acpitools/aml/aml_parse.c:1.3
--- src/usr.sbin/acpitools/aml/aml_parse.c:1.2 Mon May 30 01:15:30 2011
+++ src/usr.sbin/acpitools/aml/aml_parse.c Tue Jun 21 09:36:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aml_parse.c,v 1.2 2011/05/30 01:15:30 dyoung Exp $ */
+/* $NetBSD: aml_parse.c,v 1.3 2011/06/21 09:36:46 mrg Exp $ */
/*-
* Copyright (c) 1999 Doug Rabson
@@ -30,7 +30,7 @@
* $FreeBSD: src/usr.sbin/acpi/amldb/aml/aml_parse.c,v 1.7 2001/10/23 14:54:15 takawata Exp $
*/
#include
-__RCSID("$NetBSD: aml_parse.c,v 1.2 2011/05/30 01:15:30 dyoung Exp $");
+__RCSID("$NetBSD: aml_parse.c,v 1.3 2011/06/21 09:36:46 mrg Exp $");
#include
@@ -798,7 +798,7 @@
aml_print_namestring(name = aml_parse_namestring(env));
fieldtemplate.type = aml_t_field;
flags = aml_parse_bytedata(env);
- fieldtemplate.flags = fieldtemplate.flags = flags;
+ fieldtemplate.flags = flags;
*copy = *env;
env->dp = copy->end = start + pkglength;
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: wiz Date: Tue Jun 21 09:36:43 UTC 2011 Modified Files: src/lib/libc/stdlib: jemalloc.3 Log Message: Sort sections. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/stdlib/jemalloc.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/stdlib/jemalloc.3 diff -u src/lib/libc/stdlib/jemalloc.3:1.7 src/lib/libc/stdlib/jemalloc.3:1.8 --- src/lib/libc/stdlib/jemalloc.3:1.7 Tue Jun 21 03:02:57 2011 +++ src/lib/libc/stdlib/jemalloc.3 Tue Jun 21 09:36:43 2011 @@ -294,6 +294,28 @@ There are a number of allocator implementations available on the Internet which focus on detecting and pinpointing problems by trading performance for extra sanity checks and detailed diagnostics. +.Sh ENVIRONMENT +The following environment variables affect the execution of the allocation +functions: +.Bl -tag -width ".Ev MALLOC_OPTIONS" +.It Ev MALLOC_OPTIONS +If the environment variable +.Ev MALLOC_OPTIONS +is set, the characters it contains will be interpreted as flags to the +allocation functions. +.El +.Sh EXAMPLES +To dump core whenever a problem occurs: +.Pp +.Bd -literal -offset indent +ln -s 'A' /etc/malloc.conf +.Ed +.Pp +To specify in the source that a program does no return value checking +on calls to these functions: +.Bd -literal -offset indent +_malloc_options = "X"; +.Ed .Sh DIAGNOSTICS If any of the memory allocation/deallocation functions detect an error or warning condition, a message will be printed to file descriptor @@ -319,28 +341,6 @@ .Pp All messages are prefixed by .Dq Ao Ar progname Ac Ns Li \&: Pq malloc . -.Sh ENVIRONMENT -The following environment variables affect the execution of the allocation -functions: -.Bl -tag -width ".Ev MALLOC_OPTIONS" -.It Ev MALLOC_OPTIONS -If the environment variable -.Ev MALLOC_OPTIONS -is set, the characters it contains will be interpreted as flags to the -allocation functions. -.El -.Sh EXAMPLES -To dump core whenever a problem occurs: -.Pp -.Bd -literal -offset indent -ln -s 'A' /etc/malloc.conf -.Ed -.Pp -To specify in the source that a program does no return value checking -on calls to these functions: -.Bd -literal -offset indent -_malloc_options = "X"; -.Ed .Sh SEE ALSO .Xr emalloc 3 , .Xr malloc 3 ,
CVS commit: src/lib/librmt
Module Name:src
Committed By: mrg
Date: Tue Jun 21 09:35:23 UTC 2011
Modified Files:
src/lib/librmt: rmtlib.c
Log Message:
add a missing " to a string literal in some #if'd out code that GCC 4.5 found.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/lib/librmt/rmtlib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librmt/rmtlib.c
diff -u src/lib/librmt/rmtlib.c:1.24 src/lib/librmt/rmtlib.c:1.25
--- src/lib/librmt/rmtlib.c:1.24 Tue May 31 12:24:33 2011
+++ src/lib/librmt/rmtlib.c Tue Jun 21 09:35:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmtlib.c,v 1.24 2011/05/31 12:24:33 christos Exp $ */
+/* $NetBSD: rmtlib.c,v 1.25 2011/06/21 09:35:23 mrg Exp $ */
/*
* rmt --- remote tape emulator subroutines
@@ -28,7 +28,7 @@
*/
#include
-__RCSID("$NetBSD: rmtlib.c,v 1.24 2011/05/31 12:24:33 christos Exp $");
+__RCSID("$NetBSD: rmtlib.c,v 1.25 2011/06/21 09:35:23 mrg Exp $");
#define RMTIOCTL 1
/* #define USE_REXEC 1 */ /* rexec code courtesy of Dan Kegel, srs!dan */
@@ -224,7 +224,7 @@
rexecserv = getservbyname("exec", "tcp");
if (rexecserv == NULL)
- errx(1, exec/tcp: service not available.");
+ errx(1, "exec/tcp: service not available.");
if ((user != NULL) && *user == '\0')
user = NULL;
return rexec(&host, rexecserv->s_port, user, NULL,
CVS commit: src/external/bsd/libpcap/dist
Module Name:src Committed By: mrg Date: Tue Jun 21 09:34:55 UTC 2011 Modified Files: src/external/bsd/libpcap/dist: scanner.l Log Message: this needs %option noinput. thanks to martin. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/scanner.l 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/libpcap/dist/scanner.l diff -u src/external/bsd/libpcap/dist/scanner.l:1.2 src/external/bsd/libpcap/dist/scanner.l:1.3 --- src/external/bsd/libpcap/dist/scanner.l:1.2 Sun Dec 5 01:45:46 2010 +++ src/external/bsd/libpcap/dist/scanner.l Tue Jun 21 09:34:54 2011 @@ -185,6 +185,7 @@ %option nounput +%option noinput %% dst return DST;
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src Committed By: mrg Date: Tue Jun 21 07:39:19 UTC 2011 Modified Files: src/external/gpl3/gcc/dist/gcc: configure configure.ac Log Message: pull across these revisions from gcc 4.1: configure: revision 1.12 date: 2011/03/10 15:14:49; author: skrll; state: Exp; lines: +1 -1 Look for TLS on hppa on netbsd. configure.ac: revision 1.11 date: 2011/03/10 15:14:49; author: skrll; state: Exp; lines: +1 -1 Look for TLS on hppa on netbsd. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/configure \ src/external/gpl3/gcc/dist/gcc/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/configure diff -u src/external/gpl3/gcc/dist/gcc/configure:1.2 src/external/gpl3/gcc/dist/gcc/configure:1.3 --- src/external/gpl3/gcc/dist/gcc/configure:1.2 Tue Jun 21 02:41:36 2011 +++ src/external/gpl3/gcc/dist/gcc/configure Tue Jun 21 07:39:18 2011 @@ -22048,7 +22048,7 @@ tls_first_major=2 tls_first_minor=14 ;; - hppa*-*-linux*) + hppa*-*-linux* | hppa*-*-netbsd*) conftest_s=' t1: .reg %r20 t2: .reg %r21 Index: src/external/gpl3/gcc/dist/gcc/configure.ac diff -u src/external/gpl3/gcc/dist/gcc/configure.ac:1.2 src/external/gpl3/gcc/dist/gcc/configure.ac:1.3 --- src/external/gpl3/gcc/dist/gcc/configure.ac:1.2 Tue Jun 21 02:41:36 2011 +++ src/external/gpl3/gcc/dist/gcc/configure.ac Tue Jun 21 07:39:18 2011 @@ -2628,7 +2628,7 @@ tls_first_major=2 tls_first_minor=14 ;; - hppa*-*-linux*) + hppa*-*-linux* | hppa*-*-netbsd*) conftest_s=' t1: .reg %r20 t2: .reg %r21
CVS commit: src/external/gpl3/gcc/dist/gcc/config/rs6000
Module Name:src
Committed By: mrg
Date: Tue Jun 21 07:31:13 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd.h
Log Message:
pull across these revisions from gcc 4.1:
revision 1.8
date: 2011/06/11 00:57:29; author: matt; state: Exp; lines: +2 -0
If we are compiling -msoft-float, define _SOFT_FLOAT
revision 1.7
date: 2011/03/12 07:57:38; author: matt; state: Exp; lines: +3 -1
Define HAVE_AS_TLS until our build tools figure out how to do it.
revision 1.6
date: 2011/02/25 22:36:10; author: matt; state: Exp; lines: +7 -0
Explicitly make sure TARGET_SECURE_PLT is defined correctly rather than
relying on HAVE_AS_REL16 from "auto-host.h".
revision 1.5
date: 2011/02/10 07:18:29; author: matt; state: Exp; lines: +3 -0
Default NetBSD to -msecure-plt now.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.2 src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.3
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h:1.2 Tue Jun 21 02:41:37 2011
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h Tue Jun 21 07:31:13 2011
@@ -43,6 +43,10 @@
builtin_define ("__powerpc__"); \
builtin_assert ("cpu=powerpc"); \
builtin_assert ("machine=powerpc"); \
+ if (TARGET_SECURE_PLT) \
+builtin_define ("_SECURE_PLT"); \
+ if (TARGET_SOFT_FLOAT) \
+builtin_define ("_SOFT_FLOAT"); \
} \
while (0)
@@ -109,6 +113,7 @@
#undef SUBTARGET_EXTRA_SPECS
#define SUBTARGET_EXTRA_SPECS \
+ { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
{ "netbsd_link_spec", NETBSD_LINK_SPEC_ELF }, \
{ "netbsd_entry_point", NETBSD_ENTRY_POINT }, \
{ "netbsd_endfile_spec", NETBSD_ENDFILE_SPEC },
@@ -119,6 +124,15 @@
#undef TARGET_DEFAULT
#define TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS | MASK_STRICT_ALIGN)
+/*
+ * We know we have the right binutils for this (we shouldn't need to do this
+ * but until the cross build does the right thing...)
+ */
+#undef TARGET_SECURE_PLT
+#define TARGET_SECURE_PLT secure_plt
+#undef HAVE_AS_TLS
+#define HAVE_AS_TLS 1
+
/* Attempt to enable execute permissions on the stack. */
#define TRANSFER_FROM_TRAMPOLINE NETBSD_ENABLE_EXECUTE_STACK
#ifdef L_trampoline
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: mrg
Date: Tue Jun 21 07:28:44 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc
Log Message:
pull across these revisions from gcc 4.1:
revision 1.21
date: 2011/01/23 06:29:52; author: matt; state: Exp; lines: +1 -1
Default mips64 to softfloat.
revision 1.22
date: 2011/02/10 07:18:29; author: matt; state: Exp; lines: +3 -0
Default NetBSD to -msecure-plt now.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config.gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.2 src/external/gpl3/gcc/dist/gcc/config.gcc:1.3
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.2 Tue Jun 21 02:41:36 2011
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Tue Jun 21 07:28:44 2011
@@ -1749,7 +1749,7 @@
esac
;;
mips64*-*-netbsd*) # NetBSD/mips64, either endian.
- target_cpu_default="MASK_ABICALLS|MASK_64BIT|MASK_FLOAT64"
+ target_cpu_default="MASK_ABICALLS|MASK_64BIT|MASK_FLOAT64|MASK_SOFT_FLOAT"
tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h mips/netbsd64.h"
tmake_file="${tmake_file} mips/t-netbsd64"
# tm_defines="${tm_defines} MIPS_ISA_DEFAULT=64"
@@ -1986,6 +1986,9 @@
tmake_file="${tmake_file} rs6000/t-netbsd"
;;
esac
+ if test x${enable_secureplt} != xno; then
+ tm_file="rs6000/secureplt.h ${tm_file}"
+ fi
extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
;;
powerpc-*-eabispe*)
CVS commit: src/sys/sys
Module Name:src Committed By: cherry Date: Tue Jun 21 07:20:57 UTC 2011 Modified Files: src/sys/sys: userret.h Log Message: #include before using struct proc.p_timerpend To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/sys/userret.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/sys/userret.h diff -u src/sys/sys/userret.h:1.23 src/sys/sys/userret.h:1.24 --- src/sys/sys/userret.h:1.23 Fri Apr 8 10:36:58 2011 +++ src/sys/sys/userret.h Tue Jun 21 07:20:56 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: userret.h,v 1.23 2011/04/08 10:36:58 yamt Exp $ */ +/* $NetBSD: userret.h,v 1.24 2011/06/21 07:20:56 cherry Exp $ */ /*- * Copyright (c) 1998, 2000, 2003, 2006, 2008 The NetBSD Foundation, Inc. @@ -66,6 +66,7 @@ #define _SYS_USERRET_H_ #include +#include #include /*
