CVS commit: src/lib/libutil
Module Name:src Committed By: wiz Date: Fri Jun 21 08:18:25 UTC 2013 Modified Files: src/lib/libutil: login_cap.3 Log Message: Punctuation nit. (Shouldn't the whole line be .Dl or .Bl -literal instead?) To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/lib/libutil/login_cap.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/libutil/login_cap.3 diff -u src/lib/libutil/login_cap.3:1.19 src/lib/libutil/login_cap.3:1.20 --- src/lib/libutil/login_cap.3:1.19 Thu Jun 20 20:42:30 2013 +++ src/lib/libutil/login_cap.3 Fri Jun 21 08:18:24 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: login_cap.3,v 1.19 2013/06/20 20:42:30 christos Exp $ +.\ $NetBSD: login_cap.3,v 1.20 2013/06/21 08:18:24 wiz Exp $ .\ .\ Copyright (c) 1996,1997 Berkeley Software Design, Inc. All rights reserved. .\ @@ -105,7 +105,7 @@ function is equivalent to: login_getclass( .Fa pwd ? pwd-pw_class : -.Dv NULL ). +.Dv NULL ) . .Pp Once .Ar lc
CVS commit: src/distrib/notes/common
Module Name:src Committed By: shm Date: Fri Jun 21 10:05:52 UTC 2013 Modified Files: src/distrib/notes/common: main Log Message: Add myself. To generate a diff of this commit: cvs rdiff -u -r1.495 -r1.496 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.495 src/distrib/notes/common/main:1.496 --- src/distrib/notes/common/main:1.495 Mon May 6 21:21:14 2013 +++ src/distrib/notes/common/main Fri Jun 21 10:05:52 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.495 2013/05/06 21:21:14 jnemeth Exp $ +.\ $NetBSD: main,v 1.496 2013/06/21 10:05:52 shm Exp $ .\ .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1253,6 +1253,7 @@ If you're one of them, and would like to .It Ta John Klos Ta Mt jk...@netbsd.org .It Ta Wayne Knowles Ta Mt w...@netbsd.org .It Ta Takayoshi Kochi Ta Mt ko...@netbsd.org +.It Ta Mateusz Kocielski Ta Mt s...@netbsd.org .It Ta Jonathan A. Kollasch Ta Mt jakll...@netbsd.org .It Ta Joseph Koshy Ta Mt jko...@netbsd.org .It Ta Radoslaw Kujawa Ta Mt rkuj...@netbsd.org
CVS commit: src/usr.sbin/ndp
Module Name:src Committed By: uwe Date: Fri Jun 21 12:42:56 UTC 2013 Removed Files: src/usr.sbin/ndp: gnuc.h Log Message: Remove this stub that hasn't been necessary in a decade or so. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/usr.sbin/ndp/gnuc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/ndp
Module Name:src
Committed By: uwe
Date: Fri Jun 21 12:50:50 UTC 2013
Modified Files:
src/usr.sbin/ndp: Makefile
Log Message:
Don't check MKINET6 - parent makefile doesn't descend to ndp if it's no.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/ndp/Makefile
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/ndp/Makefile
diff -u src/usr.sbin/ndp/Makefile:1.8 src/usr.sbin/ndp/Makefile:1.9
--- src/usr.sbin/ndp/Makefile:1.8 Sun Dec 12 18:50:31 2010
+++ src/usr.sbin/ndp/Makefile Fri Jun 21 12:50:50 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/12/12 18:50:31 christos Exp $
+# $NetBSD: Makefile,v 1.9 2013/06/21 12:50:50 uwe Exp $
.include bsd.own.mk
@@ -11,9 +11,7 @@ PROG= ndp
SRCS= ndp.c gmt2local.c
MAN= ndp.8
-.if ${MKINET6} != no
CPPFLAGS+=-DINET6
-.endif
CPPFLAGS+=-I. -I${TCPDUMP}
.include bsd.prog.mk
CVS commit: src/lib/csu/arch/vax
Module Name:src Committed By: matt Date: Fri Jun 21 15:54:08 UTC 2013 Modified Files: src/lib/csu/arch/vax: Makefile.inc crt0.S Added Files: src/lib/csu/arch/vax: crtbegin.S crtend.S Log Message: USE_COMPILERCRTSTUFF=no support for vax. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/csu/arch/vax/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/vax/crt0.S cvs rdiff -u -r0 -r1.1 src/lib/csu/arch/vax/crtbegin.S \ src/lib/csu/arch/vax/crtend.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/csu/arch/vax/Makefile.inc diff -u src/lib/csu/arch/vax/Makefile.inc:1.1 src/lib/csu/arch/vax/Makefile.inc:1.2 --- src/lib/csu/arch/vax/Makefile.inc:1.1 Sat Aug 7 18:01:34 2010 +++ src/lib/csu/arch/vax/Makefile.inc Fri Jun 21 15:54:08 2013 @@ -1,5 +1,3 @@ -# $NetBSD: Makefile.inc,v 1.1 2010/08/07 18:01:34 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.2 2013/06/21 15:54:08 matt Exp $ CPPFLAGS+= -DELFSIZE=32 - - Index: src/lib/csu/arch/vax/crt0.S diff -u src/lib/csu/arch/vax/crt0.S:1.2 src/lib/csu/arch/vax/crt0.S:1.3 --- src/lib/csu/arch/vax/crt0.S:1.2 Sat Jul 2 20:14:10 2011 +++ src/lib/csu/arch/vax/crt0.S Fri Jun 21 15:54:08 2013 @@ -1,10 +1,12 @@ -/* $NetBSD: crt0.S,v 1.2 2011/07/02 20:14:10 matt Exp $ */ +/* $NetBSD: crt0.S,v 1.3 2013/06/21 15:54:08 matt Exp $ */ -/* - * Copyright (c) 1999 Matt Thomas - * Copyright (c) 1995 Christopher G. Demetriou +/*- + * Copyright (c) 2013 The NetBSD Foundation, Inc. * All rights reserved. - * + * + * This code is derived from software contributed to The NetBSD Foundation + * by Matt Thomas of 3am Software Foundry. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -13,37 +15,28 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed for the - * NetBSD Project. See http://www.NetBSD.org/ for - * information about NetBSD. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ -#include machine/asm.h +#include vax/asm.h -RCSID($NetBSD: crt0.S,v 1.2 2011/07/02 20:14:10 matt Exp $) +RCSID($NetBSD: crt0.S,v 1.3 2013/06/21 15:54:08 matt Exp $) STRONG_ALIAS(_start,__start) -_ENTRY(__start) - .word 0x0101 - pushl %r9 /* ps_strings */ - pushl %r8 /* obj */ +_ENTRY(__start, 0x0101) + movq %r8,-(%sp) /* ps_strings / obj */ pushl %r7 /* cleanup */ calls $3,___start +END(__start) Added files: Index: src/lib/csu/arch/vax/crtbegin.S diff -u /dev/null src/lib/csu/arch/vax/crtbegin.S:1.1 --- /dev/null Fri Jun 21 15:54:08 2013 +++ src/lib/csu/arch/vax/crtbegin.S Fri Jun 21 15:54:08 2013 @@ -0,0 +1,178 @@ +/* $NetBSD: crtbegin.S,v 1.1 2013/06/21 15:54:08 matt Exp $ */ +/*- + * Copyright (c) 2013 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code
CVS commit: src/external/cddl/osnet
Module Name:src
Committed By: christos
Date: Fri Jun 21 19:16:01 UTC 2013
Modified Files:
src/external/cddl/osnet/dev/lockstat: lockstat.c
src/external/cddl/osnet/lib/libdtrace: Makefile
src/external/cddl/osnet/lib/libzpool: Makefile
Added Files:
src/external/cddl/osnet/dev/dtrace/arm: dtrace_asm.S dtrace_isa.c
dtrace_subr.c regset.h
src/external/cddl/osnet/dist/lib/libdtrace/arm: dt_isadep.c
src/external/cddl/osnet/dist/uts/arm/sys: fasttrap_isa.h
src/external/cddl/osnet/lib/libzpool: atomic.c
Log Message:
Make dtrace/zfs compile on arm based on the diff from:
http://people.freebsd.org/~gonzo/arm/dtrace-arm.diff
Completely untested, kernel support not added.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S \
src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c \
src/external/cddl/osnet/dev/dtrace/arm/dtrace_subr.c \
src/external/cddl/osnet/dev/dtrace/arm/regset.h
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dev/lockstat/lockstat.c
cvs rdiff -u -r0 -r1.1 \
src/external/cddl/osnet/dist/lib/libdtrace/arm/dt_isadep.c
cvs rdiff -u -r0 -r1.1 \
src/external/cddl/osnet/dist/uts/arm/sys/fasttrap_isa.h
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/lib/libdtrace/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/lib/libzpool/Makefile
cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/lib/libzpool/atomic.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/cddl/osnet/dev/lockstat/lockstat.c
diff -u src/external/cddl/osnet/dev/lockstat/lockstat.c:1.2 src/external/cddl/osnet/dev/lockstat/lockstat.c:1.3
--- src/external/cddl/osnet/dev/lockstat/lockstat.c:1.2 Sat Feb 20 20:46:33 2010
+++ src/external/cddl/osnet/dev/lockstat/lockstat.c Fri Jun 21 15:16:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lockstat.c,v 1.2 2010/02/21 01:46:33 darran Exp $ */
+/* $NetBSD: lockstat.c,v 1.3 2013/06/21 19:16:00 christos Exp $ */
/*
* CDDL HEADER START
@@ -47,7 +47,7 @@
#include sys/dtrace.h
#include sys/lockstat.h
-#if defined(__i386__) || defined(__amd64__)
+#if defined(__i386__) || defined(__amd64__) || defined(__arm__)
#define LOCKSTAT_AFRAMES 1
#else
#error architecture not supported
Index: src/external/cddl/osnet/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.6 src/external/cddl/osnet/lib/libdtrace/Makefile:1.7
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.6 Mon Feb 13 07:52:54 2012
+++ src/external/cddl/osnet/lib/libdtrace/Makefile Fri Jun 21 15:16:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/02/13 12:52:54 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2013/06/21 19:16:01 christos Exp $
# $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
@@ -86,6 +86,10 @@ COPTS.dt_subr.c += -Wno-stack-protector
CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
.elif ${MACHINE_ARCH} == sparc64
CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
+.elif ${MACHINE_ARCH} == arm
+CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
+.PATH: ${.CURDIR}/../../dist/lib/libdtrace/arm
+SRCS+= dt_isadep.c
.endif
LFLAGS+=-l
Index: src/external/cddl/osnet/lib/libzpool/Makefile
diff -u src/external/cddl/osnet/lib/libzpool/Makefile:1.6 src/external/cddl/osnet/lib/libzpool/Makefile:1.7
--- src/external/cddl/osnet/lib/libzpool/Makefile:1.6 Tue Dec 14 18:39:11 2010
+++ src/external/cddl/osnet/lib/libzpool/Makefile Fri Jun 21 15:16:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/12/14 23:39:11 haad Exp $
+# $NetBSD: Makefile,v 1.7 2013/06/21 19:16:01 christos Exp $
.include ${.CURDIR}/../../dist/uts/common/Makefile.files
.include ../../Makefile.zfs
@@ -17,6 +17,9 @@ CPPFLAGS+= -std=c99
# Local stuff
SRCS= kernel.c kernel2.c
+.if ${MACHINE_ARCH} == arm
+SRCS+= atomic.c
+.endif
# Sun stuff
SRCS+= ${ZFS_COMMON_OBJS:C/.o$/.c/}
Added files:
Index: src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S
diff -u /dev/null src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S:1.1
--- /dev/null Fri Jun 21 15:16:01 2013
+++ src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S Fri Jun 21 15:16:00 2013
@@ -0,0 +1,222 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the License). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri Jun 21 19:33:08 UTC 2013 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6066 Log Message: Import dhcpcd-6.0.0 with the following changes: * DHCPv6 support * wpa_supplicant hook script * route IPv4 addresses to 127.0.0.1 for machine centric traffic * DHCPv6 Prefix Delegation support * DHCPv6 FQDN support * Control existing IPv4 routes * less spamy to syslog by default * IPv6 protocols now wait for a valid LL address before starting * IPv6 DAD support now listens to kernel for more accurate timings * IPv4 code split out more cleanly so dhcpcd can be compiled for IPv4, IPv6 or IPv4 AND IPv6 * MTU is no longer requested by default * a DUID is now generated in /etc/dhcpcd.duid and this is used as a client ID for DHCPv4 and DHCPv6 This does mean that you may get new DHCPv4 addresses Many bugs have also been fixed along the way and this release addresses the following PR's PR bin/47364 PR bin/47502 PR bin/47666 PR bin/47699 PR bin/47775 PR bin/47776 Status: Vendor Tag: roy Release Tags: dhcpcd_6_0_0 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c U src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/if-pref.c U src/external/bsd/dhcpcd/dist/net.c N src/external/bsd/dhcpcd/dist/script.c N src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/bpf.c U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/platform-bsd.c U src/external/bsd/dhcpcd/dist/arp.c C src/external/bsd/dhcpcd/dist/dhcp.c N src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c U src/external/bsd/dhcpcd/dist/ipv6rs.c U src/external/bsd/dhcpcd/dist/ipv6ns.c N src/external/bsd/dhcpcd/dist/dhcp6.c C src/external/bsd/dhcpcd/dist/dhcpcd.conf C src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in C src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h C src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h N src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h N src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if-pref.h N src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6ns.h U src/external/bsd/dhcpcd/dist/ipv6rs.h U src/external/bsd/dhcpcd/dist/net.h U src/external/bsd/dhcpcd/dist/platform.h N src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu N src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant N src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind 5 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: roy Date: Fri Jun 21 19:46:58 UTC 2013 Modified Files: src/distrib/sets/lists/base: mi Log Message: Add wpa_supplicant hook To generate a diff of this commit: cvs rdiff -u -r1.1031 -r1.1032 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1031 src/distrib/sets/lists/base/mi:1.1032 --- src/distrib/sets/lists/base/mi:1.1031 Sun Jun 9 18:40:50 2013 +++ src/distrib/sets/lists/base/mi Fri Jun 21 19:46:58 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1031 2013/06/09 18:40:50 christos Exp $ +# $NetBSD: mi,v 1.1032 2013/06/21 19:46:58 roy Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -214,6 +214,7 @@ ./libexec/dhcpcd-hooks/01-test base-dhcpcd-root ./libexec/dhcpcd-hooks/02-dump base-dhcpcd-root ./libexec/dhcpcd-hooks/10-mtu base-dhcpcd-root +./libexec/dhcpcd-hooks/10-wpa_supplicant base-dhcpcd-root ./libexec/dhcpcd-hooks/10-resolv.conf base-obsolete obsolete ./libexec/dhcpcd-hooks/14-lookup-hostname base-obsolete obsolete ./libexec/dhcpcd-hooks/15-hostname base-obsolete obsolete
CVS commit: src/external/bsd/dhcpcd/sbin/dhcpcd
Module Name:src
Committed By: roy
Date: Fri Jun 21 19:47:29 UTC 2013
Modified Files:
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile
Log Message:
Build dhcpcd-6.0.0
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.13 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.14
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.13 Sat Aug 4 19:11:39 2012
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Fri Jun 21 19:47:29 2013
@@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.13 2012/08/04 19:11:39 roy Exp $
+# $NetBSD: Makefile,v 1.14 2013/06/21 19:47:29 roy Exp $
#
PROG= dhcpcd
-SRCS= arp.c bind.c common.c control.c configure.c dhcp.c dhcpcd.c \
- duid.c eloop.c if-options.c if-pref.c \
- ipv4ll.c ipv6.c ipv6ns.c ipv6rs.c \
- net.c signals.c
+SRCS= common.c control.c dhcpcd.c duid.c eloop.c
+SRCS+= if-options.c if-pref.c net.c script.c
+SRCS+= dhcp-common.c
SRCS+= bpf.c if-bsd.c platform-bsd.c
.include bsd.own.mk
-DIST= ${NETBSDSRCDIR}/external/bsd/dhcpcd/dist
-CPPFLAGS+= -I${DIST}
+CPPFLAGS+= -DINET
+SRCS+= arp.c dhcp.c ipv4.c ipv4ll.c
-# Workaround libc not exporting in6addr_any when MKINET6=no
-.if defined(MKINET6) empty(MKINET6:M[yY][eE][sS])
-LIBC_NET= ${NETBSDSRCDIR}/lib/libc/net
-SRCS+= vars6.c
-CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libc/include
+.if (${USE_INET6} != no)
+CPPFLAGS+= -DINET6
+SRCS+= ipv6.c ipv6rs.c ipv6ns.c dhcp6.c
.endif
+DIST= ${NETBSDSRCDIR}/external/bsd/dhcpcd/dist
+CPPFLAGS+= -I${DIST}
+
.PATH: ${DIST} ${LIBC_NET}
SCRIPTS= dhcpcd-run-hooks
@@ -28,8 +28,9 @@ SCRIPTSDIR_dhcpcd-run-hooks= /libexec
CONFIGFILES= dhcpcd.conf
FILESDIR_dhcpcd.conf= /etc
-HOOKS= 01-test 02-dump 10-mtu 20-resolv.conf 29-lookup-hostname \
- 30-hostname 50-ntp.conf
+HOOKS= 01-test 02-dump 10-mtu 10-wpa_supplicant
+HOOKS+= 20-resolv.conf 29-lookup-hostname 30-hostname
+HOOKS+= 50-ntp.conf
FILES= ${HOOKS:C,^,${DIST}/dhcpcd-hooks/,}
FILESDIR= /libexec/dhcpcd-hooks
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri Jun 21 19:50:13 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.0.0 To generate a diff of this commit: cvs rdiff -u -r1.1038 -r1.1039 src/doc/3RDPARTY cvs rdiff -u -r1.1828 -r1.1829 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1038 src/doc/3RDPARTY:1.1039 --- src/doc/3RDPARTY:1.1038 Mon May 20 11:40:06 2013 +++ src/doc/3RDPARTY Fri Jun 21 19:50:13 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1038 2013/05/20 11:40:06 mbalmer Exp $ +# $NetBSD: 3RDPARTY,v 1.1039 2013/06/21 19:50:13 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -299,8 +299,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 5.6.7 -Current Vers: 5.6.7 +Version: 6.0.0 +Current Vers: 6.0.0 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ @@ -883,8 +883,8 @@ Notes: Next import will need $ Id removal.. Package: openresolv -Version: 3.5.3 -Current Vers: 3.5.3 +Version: 3.5.5 +Current Vers: 3.5.5 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/openresolv/ Home Page: http://roy.marples.name/projects/openresolv/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1828 src/doc/CHANGES:1.1829 --- src/doc/CHANGES:1.1828 Wed Jun 19 13:31:33 2013 +++ src/doc/CHANGES Fri Jun 21 19:50:13 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1828 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1829 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -251,3 +251,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: Ported by kardel@ from a patch for OpenBSD. [kardel 20130609] cgfourteen: both kernel and Xorg driver now support hardware acceleration using SX [macallan 20130619] + dhcpcd(8): Import dhcpcd-6.0.0 [roy 20130621]
CVS commit: src/sys/arch/sparc64
Module Name:src
Committed By: nakayama
Date: Fri Jun 21 20:09:59 UTC 2013
Modified Files:
src/sys/arch/sparc64/dev: psycho.c pyro.c schizo.c
src/sys/arch/sparc64/include: cpu.h
src/sys/arch/sparc64/sparc64: trap.c
Log Message:
Avoid data_access_error trap panic when reading unused PCI
configuration space.
This method is described in UltraSPARC IIi User's Manual 16.2.1
Probing PCI during boot using deferred errors, and refer to the
implementation of OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sparc64/dev/psycho.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc64/dev/pyro.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sparc64/dev/schizo.c
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/sparc64/include/cpu.h
cvs rdiff -u -r1.177 -r1.178 src/sys/arch/sparc64/sparc64/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/psycho.c
diff -u src/sys/arch/sparc64/dev/psycho.c:1.112 src/sys/arch/sparc64/dev/psycho.c:1.113
--- src/sys/arch/sparc64/dev/psycho.c:1.112 Fri Jan 27 18:53:03 2012
+++ src/sys/arch/sparc64/dev/psycho.c Fri Jun 21 20:09:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: psycho.c,v 1.112 2012/01/27 18:53:03 para Exp $ */
+/* $NetBSD: psycho.c,v 1.113 2013/06/21 20:09:58 nakayama Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -55,7 +55,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: psycho.c,v 1.112 2012/01/27 18:53:03 para Exp $);
+__KERNEL_RCSID(0, $NetBSD: psycho.c,v 1.113 2013/06/21 20:09:58 nakayama Exp $);
#include opt_ddb.h
@@ -1350,7 +1350,9 @@ psycho_pci_conf_read(pci_chipset_tag_t p
{
struct psycho_pbm *pp = pc-cookie;
struct psycho_softc *sc = pp-pp_sc;
+ struct cpu_info *ci = curcpu();
pcireg_t val = (pcireg_t)~0;
+ int s;
DPRINTF(PDB_CONF, (%s: tag %lx reg %x , __func__,
(long)tag, reg));
@@ -1362,8 +1364,16 @@ psycho_pci_conf_read(pci_chipset_tag_t p
PCITAG_OFFSET(tag) + reg),
(int)PCITAG_OFFSET(tag) + reg));
+ s = splhigh();
+ ci-ci_pci_probe = true;
+ membar_Sync();
val = bus_space_read_4(sc-sc_configtag, sc-sc_configaddr,
PCITAG_OFFSET(tag) + reg);
+ membar_Sync();
+ if (ci-ci_pci_fault)
+ val = (pcireg_t)~0;
+ ci-ci_pci_probe = ci-ci_pci_fault = false;
+ splx(s);
}
#ifdef DEBUG
else DPRINTF(PDB_CONF, (%s: bogus pcitag %x\n, __func__,
Index: src/sys/arch/sparc64/dev/pyro.c
diff -u src/sys/arch/sparc64/dev/pyro.c:1.12 src/sys/arch/sparc64/dev/pyro.c:1.13
--- src/sys/arch/sparc64/dev/pyro.c:1.12 Sat Oct 27 17:18:12 2012
+++ src/sys/arch/sparc64/dev/pyro.c Fri Jun 21 20:09:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pyro.c,v 1.12 2012/10/27 17:18:12 chs Exp $ */
+/* $NetBSD: pyro.c,v 1.13 2013/06/21 20:09:58 nakayama Exp $ */
/* from: $OpenBSD: pyro.c,v 1.20 2010/12/05 15:15:14 kettenis Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pyro.c,v 1.12 2012/10/27 17:18:12 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: pyro.c,v 1.13 2013/06/21 20:09:58 nakayama Exp $);
#include sys/param.h
#include sys/device.h
@@ -290,12 +290,23 @@ pcireg_t
pyro_conf_read(pci_chipset_tag_t pc, pcitag_t tag, int reg)
{
struct pyro_pbm *pp = pc-cookie;
+ struct cpu_info *ci = curcpu();
pcireg_t val = (pcireg_t)~0;
+ int s;
DPRINTF(PDB_CONF, (%s: tag %lx reg %x , __func__, (long)tag, reg));
- if (PCITAG_NODE(tag) != -1)
+ if (PCITAG_NODE(tag) != -1) {
+ s = splhigh();
+ ci-ci_pci_probe = true;
+ membar_Sync();
val = bus_space_read_4(pp-pp_cfgt, pp-pp_cfgh,
(PCITAG_OFFSET(tag) 4) + reg);
+ membar_Sync();
+ if (ci-ci_pci_fault)
+ val = (pcireg_t)~0;
+ ci-ci_pci_probe = ci-ci_pci_fault = false;
+ splx(s);
+ }
DPRINTF(PDB_CONF, ( returning %08x\n, (u_int)val));
return (val);
}
Index: src/sys/arch/sparc64/dev/schizo.c
diff -u src/sys/arch/sparc64/dev/schizo.c:1.30 src/sys/arch/sparc64/dev/schizo.c:1.31
--- src/sys/arch/sparc64/dev/schizo.c:1.30 Sat Oct 27 17:18:12 2012
+++ src/sys/arch/sparc64/dev/schizo.c Fri Jun 21 20:09:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: schizo.c,v 1.30 2012/10/27 17:18:12 chs Exp $ */
+/* $NetBSD: schizo.c,v 1.31 2013/06/21 20:09:58 nakayama Exp $ */
/* $OpenBSD: schizo.c,v 1.55 2008/08/18 20:29:37 brad Exp $ */
/*
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: schizo.c,v 1.30 2012/10/27 17:18:12 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: schizo.c,v 1.31 2013/06/21 20:09:58 nakayama Exp $);
#include sys/param.h
#include sys/device.h
@@ -491,12 +491,23 @@ pcireg_t
schizo_conf_read(pci_chipset_tag_t pc, pcitag_t tag, int reg)
{
struct schizo_pbm *sp = pc-cookie;
+ struct cpu_info *ci = curcpu();
pcireg_t val = (pcireg_t)~0;
+ int s;
DPRINTF(SDB_CONF, (%s: tag %lx reg %x , __func__, (long)tag, reg));
- if (PCITAG_NODE(tag) != -1)
+ if (PCITAG_NODE(tag) != -1) {
+ s = splhigh();
+ ci-ci_pci_probe = true;
+ membar_Sync();
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: matt Date: Fri Jun 21 21:13:49 UTC 2013 Modified Files: src/distrib/sets/lists/debug: ad.mips Log Message: Fix entries for ./usr/libdata/debug/usr/libexec/ld.elf_so-64.debug ./usr/libdata/debug/usr/libexec/ld.elf_so-o32.debug to not be obsolete. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/debug/ad.mips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/ad.mips diff -u src/distrib/sets/lists/debug/ad.mips:1.2 src/distrib/sets/lists/debug/ad.mips:1.3 --- src/distrib/sets/lists/debug/ad.mips:1.2 Tue Apr 30 23:41:24 2013 +++ src/distrib/sets/lists/debug/ad.mips Fri Jun 21 21:13:49 2013 @@ -1,14 +1,12 @@ -# $NetBSD: ad.mips,v 1.2 2013/04/30 23:41:24 matt Exp $ +# $NetBSD: ad.mips,v 1.3 2013/06/21 21:13:49 matt Exp $ ./usr/libdata/debug/lib/64/npf/ext_log.so.0.0.debug comp-npf-debug debug,compat,arch64 ./usr/libdata/debug/lib/64/npf/ext_normalize.so.0.0.debug comp-npf-debug debug,compat,arch64 ./usr/libdata/debug/lib/64/npf/ext_rndblock.so.0.0.debug comp-npf-debug debug,compat,arch64 ./usr/libdata/debug/lib/o32/npf/ext_log.so.0.0.debug comp-npf-debug debug,compat,arch64 ./usr/libdata/debug/lib/o32/npf/ext_normalize.so.0.0.debug comp-npf-debug debug,compat,arch64 ./usr/libdata/debug/lib/o32/npf/ext_rndblock.so.0.0.debug comp-npf-debug debug,compat,arch64 -./usr/libdata/debug/libexec/ld.elf_so-64.debug comp-sys-debug debug,arch64 -./usr/libdata/debug/libexec/ld.elf_so-o32.debug comp-sys-debug debug,arch64 -./usr/libdata/debug/usr/libexec/ld.elf_so-o32 comp-obsolete obsolete -./usr/libdata/debug/usr/libexec/ld.elf_so-64 comp-obsolete obsolete +./usr/libdata/debug/libexec/ld.elf_so-64.debug comp-sys-debug debug,compat,arch64 +./usr/libdata/debug/libexec/ld.elf_so-o32.debug comp-sys-debug debug,compat,arch64 ./usr/libdata/debug/usr/bin/elf2aout.debug comp-obsolete obsolete ./usr/libdata/debug/usr/bin/elf2ecoff.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/lib/64/i18n/libBIG5.so.5.0.debug comp-i18n-debug debug,compat,arch64 @@ -345,6 +343,8 @@ ./usr/libdata/debug/usr/lib/o32/libz.so.1.0.debug comp-sys-debug debug,compat,arch64 ./usr/libdata/debug/usr/lib/o32/libzfs.so.0.0.debug comp-zfs-debug zfs,dynamicroot,debug,compat,arch64 ./usr/libdata/debug/usr/lib/o32/libzpool.so.0.0.debug comp-zfs-debug zfs,dynamicroot,debug,compat,arch64 +./usr/libdata/debug/usr/libexec/ld.elf_so-64.debug comp-sys-debug debug,compat,arch64 +./usr/libdata/debug/usr/libexec/ld.elf_so-o32.debug comp-sys-debug debug,compat,arch64 ./usr/lib/64/libcrypto_g.a comp-c-proflib compat,crypto,debuglib,arch64 ./usr/lib/64/libcrypto_idea_g.a comp-obsolete obsolete ./usr/lib/64/libcrypto_mdc2_g.a comp-obsolete obsolete
CVS commit: src/sys/arch/arm/conf
Module Name:src Committed By: matt Date: Sat Jun 22 00:35:31 UTC 2013 Modified Files: src/sys/arch/arm/conf: files.arm Log Message: File VBAR option To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/sys/arch/arm/conf/files.arm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/conf/files.arm diff -u src/sys/arch/arm/conf/files.arm:1.119 src/sys/arch/arm/conf/files.arm:1.120 --- src/sys/arch/arm/conf/files.arm:1.119 Wed Jun 12 21:34:12 2013 +++ src/sys/arch/arm/conf/files.arm Sat Jun 22 00:35:31 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files.arm,v 1.119 2013/06/12 21:34:12 matt Exp $ +# $NetBSD: files.arm,v 1.120 2013/06/22 00:35:31 matt Exp $ # temporary define to allow easy moving to ../arch/arm/arm32 defflagARM32 @@ -36,7 +36,7 @@ defflag opt_cpuoptions.h TPIDRPRW_IS_CU defflag opt_cpuoptions.h ARM11_PMC CORTEX_PMC defflag opt_cpuoptions.h ARM11_CACHE_WRITE_THROUGH defflag opt_cpuoptions.h ARM11MPCORE_COMPAT_MMU -defflag opt_cpuoptions.h ARM_USE_VBAR +defflag opt_cpuoptions.h ARM_HAS_VBAR # use extended small page in compatible MMU mode for ARMv6 defflag opt_cpuoptions.h ARMV6_EXTENDED_SMALL_PAGE
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: matt Date: Sat Jun 22 00:44:17 UTC 2013 Modified Files: src/sys/arch/arm/arm32: arm32_kvminit.c Log Message: Fix inverted logic for mapping exception vector. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/arm32/arm32_kvminit.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/arm32_kvminit.c diff -u src/sys/arch/arm/arm32/arm32_kvminit.c:1.20 src/sys/arch/arm/arm32/arm32_kvminit.c:1.21 --- src/sys/arch/arm/arm32/arm32_kvminit.c:1.20 Wed Jun 12 21:34:12 2013 +++ src/sys/arch/arm/arm32/arm32_kvminit.c Sat Jun 22 00:44:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: arm32_kvminit.c,v 1.20 2013/06/12 21:34:12 matt Exp $ */ +/* $NetBSD: arm32_kvminit.c,v 1.21 2013/06/22 00:44:17 matt Exp $ */ /* * Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved. @@ -122,7 +122,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: arm32_kvminit.c,v 1.20 2013/06/12 21:34:12 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: arm32_kvminit.c,v 1.21 2013/06/22 00:44:17 matt Exp $); #include sys/param.h #include sys/device.h @@ -375,8 +375,8 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b #ifdef ARM_HAS_VBAR const bool map_vectors_p = false; #elif defined(CPU_ARMV7) || defined(CPU_ARM11) - const bool map_vectors_p = vectors == ARM_VECTORS_LOW - !(armreg_pfr1_read() ARM_PFR1_SEC_MASK); + const bool map_vectors_p = vectors == ARM_VECTORS_HIGH + || (armreg_pfr1_read() ARM_PFR1_SEC_MASK) == 0; #else const bool map_vectors_p = true; #endif
CVS commit: src/lib/csu/common
Module Name:src
Committed By: matt
Date: Sat Jun 22 02:21:58 UTC 2013
Modified Files:
src/lib/csu/common: Makefile.inc
Log Message:
Allow crtbegin to be a C file.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/csu/common/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/common/Makefile.inc
diff -u src/lib/csu/common/Makefile.inc:1.7 src/lib/csu/common/Makefile.inc:1.8
--- src/lib/csu/common/Makefile.inc:1.7 Sun Mar 25 06:55:19 2012
+++ src/lib/csu/common/Makefile.inc Sat Jun 22 02:21:58 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2012/03/25 06:55:19 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.8 2013/06/22 02:21:58 matt Exp $
.include bsd.own.mk
@@ -12,18 +12,30 @@ OBJS+= crtbegin.o crtbeginS.o crtend.o
realall: ${OBJS}
+.if exists(${ARCHDIR}/crtbegin.c)
+crtbegin.o: crtbegin.c
+ ${_MKTARGET_COMPILE}
+ ${COMPILE.c} ${ARCHDIR}/crtbegin.c -o ${.TARGET}.o
+.else
crtbegin.o: crtbegin.S
${_MKTARGET_COMPILE}
${COMPILE.S} ${ARCHDIR}/crtbegin.S -o ${.TARGET}.o
+.endif
${LD} -x -r -o ${.TARGET} ${.TARGET}.o
rm -f ${.TARGET}.o
.if ${MKSTRIPIDENT} != no
${OBJCOPY} -R .ident ${.TARGET}
.endif
+.if exists(${ARCHDIR}/crtbegin.c)
+crtbeginS.o: crtbegin.c
+ ${_MKTARGET_COMPILE}
+ ${COMPILE.c} -DPIC -DSHARED ${ARCHDIR}/crtbegin.c -o ${.TARGET}.o
+.else
crtbeginS.o: crtbegin.S
${_MKTARGET_COMPILE}
${COMPILE.S} -DPIC -DSHARED ${ARCHDIR}/crtbegin.S -o ${.TARGET}.o
+.endif
${LD} -x -r -o ${.TARGET} ${.TARGET}.o
rm -f ${.TARGET}.o
.if ${MKSTRIPIDENT} != no
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: uebayasi Date: Sat Jun 22 02:33:44 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: amd64func.S Log Message: Use END() to set ELF symbol size. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/amd64/amd64func.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/amd64func.S diff -u src/sys/arch/amd64/amd64/amd64func.S:1.6 src/sys/arch/amd64/amd64/amd64func.S:1.7 --- src/sys/arch/amd64/amd64/amd64func.S:1.6 Sat May 10 16:12:32 2008 +++ src/sys/arch/amd64/amd64/amd64func.S Sat Jun 22 02:33:44 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: amd64func.S,v 1.6 2008/05/10 16:12:32 ad Exp $ */ +/* $NetBSD: amd64func.S,v 1.7 2013/06/22 02:33:44 uebayasi Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -47,3 +47,4 @@ ENTRY(tsc_get_timecount) ret 2: jmp 1b +END(tsc_get_timecount)
CVS commit: src/lib/csu
Module Name:src
Committed By: matt
Date: Sat Jun 22 02:37:09 UTC 2013
Modified Files:
src/lib/csu/common: Makefile.inc
Added Files:
src/lib/csu/arch/mips: Makefile.inc crt0.S crtbegin.h crtend.S crti.S
crtn.S
src/lib/csu/common: crtbegin.c
Log Message:
Add a common crtbegin.c file and use a machine dependent crtbegin.h to
fill in .init/.fini.
Add mips support for USE_COMPILERCRTSTUFF=no (compiled only)
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/lib/csu/arch/mips/Makefile.inc \
src/lib/csu/arch/mips/crt0.S src/lib/csu/arch/mips/crtbegin.h \
src/lib/csu/arch/mips/crtend.S src/lib/csu/arch/mips/crti.S \
src/lib/csu/arch/mips/crtn.S
cvs rdiff -u -r1.8 -r1.9 src/lib/csu/common/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/csu/common/crtbegin.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/csu/common/Makefile.inc
diff -u src/lib/csu/common/Makefile.inc:1.8 src/lib/csu/common/Makefile.inc:1.9
--- src/lib/csu/common/Makefile.inc:1.8 Sat Jun 22 02:21:58 2013
+++ src/lib/csu/common/Makefile.inc Sat Jun 22 02:37:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2013/06/22 02:21:58 matt Exp $
+# $NetBSD: Makefile.inc,v 1.9 2013/06/22 02:37:09 matt Exp $
.include bsd.own.mk
@@ -12,10 +12,10 @@ OBJS+= crtbegin.o crtbeginS.o crtend.o
realall: ${OBJS}
-.if exists(${ARCHDIR}/crtbegin.c)
+.if !exists(${ARCHDIR}/crtbegin.S)
crtbegin.o: crtbegin.c
${_MKTARGET_COMPILE}
- ${COMPILE.c} ${ARCHDIR}/crtbegin.c -o ${.TARGET}.o
+ ${COMPILE.c} ${COMMON_DIR}/crtbegin.c -o ${.TARGET}.o
.else
crtbegin.o: crtbegin.S
${_MKTARGET_COMPILE}
@@ -27,10 +27,10 @@ crtbegin.o: crtbegin.S
${OBJCOPY} -R .ident ${.TARGET}
.endif
-.if exists(${ARCHDIR}/crtbegin.c)
+.if !exists(${ARCHDIR}/crtbegin.S)
crtbeginS.o: crtbegin.c
${_MKTARGET_COMPILE}
- ${COMPILE.c} -DPIC -DSHARED ${ARCHDIR}/crtbegin.c -o ${.TARGET}.o
+ ${COMPILE.c} -DPIC -DSHARED ${COMMON_DIR}/crtbegin.c -o ${.TARGET}.o
.else
crtbeginS.o: crtbegin.S
${_MKTARGET_COMPILE}
Added files:
Index: src/lib/csu/arch/mips/Makefile.inc
diff -u /dev/null src/lib/csu/arch/mips/Makefile.inc:1.1
--- /dev/null Sat Jun 22 02:37:09 2013
+++ src/lib/csu/arch/mips/Makefile.inc Sat Jun 22 02:37:09 2013
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2013/06/22 02:37:09 matt Exp $
+
+CPPFLAGS+= -I${ARCHDIR}
Index: src/lib/csu/arch/mips/crt0.S
diff -u /dev/null src/lib/csu/arch/mips/crt0.S:1.1
--- /dev/null Sat Jun 22 02:37:09 2013
+++ src/lib/csu/arch/mips/crt0.S Sat Jun 22 02:37:09 2013
@@ -0,0 +1,56 @@
+/* $NetBSD: crt0.S,v 1.1 2013/06/22 02:37:09 matt Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include mips/asm.h
+
+RCSID($NetBSD: crt0.S,v 1.1 2013/06/22 02:37:09 matt Exp $)
+
+STRONG_ALIAS(_start,__start)
+
+/*
+ * Assumes kernel (or ld_elf.so) passes the following parameters to
+ * user-space in registers:
+ *
+ * a0 stack pointer (0 if setregs didn't fill this in)
+ * a1 cleanup
+ * a2 Obj_Entry
+ * a3 ps_strings
+ *
+ * XXX Does this violate the ABI?
+ * as well as the usual registers (pc, sp, and t9 == pc for ABI).
+ */
+
+NESTED_NOPROFILE(__start, CALLFRAME_SIZ, ra)
+ move a0, a1 /* cleanup */
+ move a1, a2 /* Obj_Entry */
+ move a2, a3 /* ps_strings */
+ j _C_LABEL(___start)
+END(__start)
Index: src/lib/csu/arch/mips/crtbegin.h
diff -u /dev/null
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Sat Jun 22 05:20:57 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: busfunc.S src/sys/arch/i386/i386: busfunc.S Log Message: Use END() to set ELF symbol size. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amd64/amd64/busfunc.S cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/i386/busfunc.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/busfunc.S diff -u src/sys/arch/amd64/amd64/busfunc.S:1.10 src/sys/arch/amd64/amd64/busfunc.S:1.11 --- src/sys/arch/amd64/amd64/busfunc.S:1.10 Fri May 20 13:33:11 2011 +++ src/sys/arch/amd64/amd64/busfunc.S Sat Jun 22 05:20:57 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: busfunc.S,v 1.10 2011/05/20 13:33:11 joerg Exp $ */ +/* $NetBSD: busfunc.S,v 1.11 2013/06/22 05:20:57 uebayasi Exp $ */ /*- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. @@ -52,6 +52,7 @@ ENTRY(bus_space_read_1) xorl %eax, %eax inb %dx, %al ret +END(bus_space_read_1) /* * uint16_t bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -67,6 +68,7 @@ ENTRY(bus_space_read_2) xorl %eax, %eax inw %dx, %ax ret +END(bus_space_read_2) /* * uint32_t bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -81,6 +83,7 @@ ENTRY(bus_space_read_4) 1: inl %dx, %eax ret +END(bus_space_read_4) /* * uint64_t bus_space_read_8(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -92,6 +95,7 @@ ENTRY(bus_space_read_8) je .Ldopanic movq (%rdx), %rax ret +END(bus_space_read_8) STRONG_ALIAS(bus_space_read_stream_1,bus_space_read_1) STRONG_ALIAS(bus_space_read_stream_2,bus_space_read_2) @@ -112,6 +116,7 @@ ENTRY(bus_space_write_1) movl %ecx, %eax outb %al, %dx ret +END(bus_space_write_1) /* * void bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -127,6 +132,7 @@ ENTRY(bus_space_write_2) movl %ecx, %eax outw %ax, %dx ret +END(bus_space_write_2) /* * void bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -142,6 +148,7 @@ ENTRY(bus_space_write_4) movl %ecx, %eax outl %eax, %dx ret +END(bus_space_write_4) /* * void bus_space_write_8(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -153,6 +160,7 @@ ENTRY(bus_space_write_8) je .Ldopanic movq %rcx, (%rdx) ret +END(bus_space_write_8) STRONG_ALIAS(bus_space_write_stream_1,bus_space_write_1) STRONG_ALIAS(bus_space_write_stream_2,bus_space_write_2) @@ -180,6 +188,7 @@ ENTRY(bus_space_read_multi_1) decq %r8 jnz 1b ret +END(bus_space_read_multi_1) /* * void bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -202,6 +211,7 @@ ENTRY(bus_space_read_multi_2) decq %r8 jnz 1b ret +END(bus_space_read_multi_2) /* * void bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -224,6 +234,7 @@ ENTRY(bus_space_read_multi_4) decq %r8 jnz 1b ret +END(bus_space_read_multi_4) /* * void bus_space_read_multi_8(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -241,6 +252,7 @@ ENTRY(bus_space_read_multi_8) decq %r8 jnz 1b ret +END(bus_space_read_multi_8) STRONG_ALIAS(bus_space_read_multi_stream_1,bus_space_read_multi_1) STRONG_ALIAS(bus_space_read_multi_stream_2,bus_space_read_multi_2) @@ -268,6 +280,7 @@ ENTRY(bus_space_write_multi_1) decq %r8 jnz 1b ret +END(bus_space_write_multi_1) /* * void bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -290,6 +303,7 @@ ENTRY(bus_space_write_multi_2) decq %r8 jnz 1b ret +END(bus_space_write_multi_2) /* * void bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -312,6 +326,7 @@ ENTRY(bus_space_write_multi_4) decq %r8 jnz 1b ret +END(bus_space_write_multi_4) /* * void bus_space_write_multi_8(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -329,6 +344,7 @@ ENTRY(bus_space_write_multi_8) decq %r8 jnz 1b ret +END(bus_space_write_multi_8) STRONG_ALIAS(bus_space_write_multi_stream_1,bus_space_write_multi_1) STRONG_ALIAS(bus_space_write_multi_stream_2,bus_space_write_multi_2) @@ -358,6 +374,7 @@ ENTRY(bus_space_read_region_1) leaq 1(%rcx), %rcx jnz 3b ret +END(bus_space_read_region_1) /* * void bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -382,6 +399,7 @@ ENTRY(bus_space_read_region_2) leaq 2(%rcx), %rcx jnz 3b ret +END(bus_space_read_region_2) /* * void bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -406,6 +424,7 @@ ENTRY(bus_space_read_region_4) leaq 4(%rcx), %rcx jnz 3b ret +END(bus_space_read_region_4) /* * void bus_space_read_region_8(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -420,6 +439,7 @@ ENTRY(bus_space_read_region_8) rep movsq %ds:(%rsi), %es:(%rdi) ret +END(bus_space_read_region_8) STRONG_ALIAS(bus_space_read_region_stream_1,bus_space_read_region_1)
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: matt
Date: Sat Jun 22 05:37:06 UTC 2013
Modified Files:
src/sys/dev/pci: pciide_common.c
Log Message:
When allocating the channel queue, make sure the return memory is zeroed.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/pciide_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pciide_common.c
diff -u src/sys/dev/pci/pciide_common.c:1.58 src/sys/dev/pci/pciide_common.c:1.59
--- src/sys/dev/pci/pciide_common.c:1.58 Wed Nov 14 01:04:45 2012
+++ src/sys/dev/pci/pciide_common.c Sat Jun 22 05:37:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_common.c,v 1.58 2012/11/14 01:04:45 jakllsch Exp $ */
+/* $NetBSD: pciide_common.c,v 1.59 2013/06/22 05:37:06 matt Exp $ */
/*
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pciide_common.c,v 1.58 2012/11/14 01:04:45 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: pciide_common.c,v 1.59 2013/06/22 05:37:06 matt Exp $);
#include sys/param.h
#include sys/malloc.h
@@ -872,7 +872,7 @@ pciide_chansetup(struct pciide_softc *sc
cp-ata_channel.ch_channel = channel;
cp-ata_channel.ch_atac = sc-sc_wdcdev.sc_atac;
cp-ata_channel.ch_queue =
- malloc(sizeof(struct ata_queue), M_DEVBUF, M_NOWAIT);
+ malloc(sizeof(struct ata_queue), M_DEVBUF, M_NOWAIT|M_ZERO);
if (cp-ata_channel.ch_queue == NULL) {
aprint_error(%s %s channel:
can't allocate memory for command queue,
CVS commit: src/sys
Module Name:src
Committed By: matt
Date: Sat Jun 22 05:41:25 UTC 2013
Modified Files:
src/sys/arch/i386/pnpbios: pciide_pnpbios.c
src/sys/dev/ic: ahcisata_core.c siisata.c
Log Message:
Make sure dynamically allocated channel_queue struct are zero-filled.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/i386/pnpbios/pciide_pnpbios.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/siisata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/pnpbios/pciide_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/pciide_pnpbios.c:1.30 src/sys/arch/i386/pnpbios/pciide_pnpbios.c:1.31
--- src/sys/arch/i386/pnpbios/pciide_pnpbios.c:1.30 Tue Jul 31 15:50:32 2012
+++ src/sys/arch/i386/pnpbios/pciide_pnpbios.c Sat Jun 22 05:41:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_pnpbios.c,v 1.30 2012/07/31 15:50:32 bouyer Exp $ */
+/* $NetBSD: pciide_pnpbios.c,v 1.31 2013/06/22 05:41:25 matt Exp $ */
/*
* Copyright (c) 1999 Soren S. Jorvang. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pciide_pnpbios.c,v 1.30 2012/07/31 15:50:32 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: pciide_pnpbios.c,v 1.31 2013/06/22 05:41:25 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -119,7 +119,7 @@ pciide_pnpbios_attach(device_t parent, d
cp-ata_channel.ch_channel = 0;
cp-ata_channel.ch_atac = sc-sc_wdcdev.sc_atac;
cp-ata_channel.ch_queue = malloc(sizeof(struct ata_queue),
- M_DEVBUF, M_NOWAIT);
+ M_DEVBUF, M_NOWAIT|M_ZERO);
if (cp-ata_channel.ch_queue == NULL) {
aprint_error_dev(self, unable to allocate memory for command
queue\n);
Index: src/sys/dev/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.47 src/sys/dev/ic/ahcisata_core.c:1.48
--- src/sys/dev/ic/ahcisata_core.c:1.47 Wed Apr 3 17:15:07 2013
+++ src/sys/dev/ic/ahcisata_core.c Sat Jun 22 05:41:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_core.c,v 1.47 2013/04/03 17:15:07 bouyer Exp $ */
+/* $NetBSD: ahcisata_core.c,v 1.48 2013/06/22 05:41:25 matt Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ahcisata_core.c,v 1.47 2013/04/03 17:15:07 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ahcisata_core.c,v 1.48 2013/06/22 05:41:25 matt Exp $);
#include sys/types.h
#include sys/malloc.h
@@ -326,7 +326,7 @@ ahci_attach(struct ahci_softc *sc)
chp-ch_channel = i;
chp-ch_atac = sc-sc_atac;
chp-ch_queue = malloc(sizeof(struct ata_queue),
- M_DEVBUF, M_NOWAIT);
+ M_DEVBUF, M_NOWAIT|M_ZERO);
if (chp-ch_queue == NULL) {
aprint_error(%s port %d: can't allocate memory for
command queue, AHCINAME(sc), i);
Index: src/sys/dev/ic/siisata.c
diff -u src/sys/dev/ic/siisata.c:1.25 src/sys/dev/ic/siisata.c:1.26
--- src/sys/dev/ic/siisata.c:1.25 Sun Jun 9 09:44:51 2013
+++ src/sys/dev/ic/siisata.c Sat Jun 22 05:41:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata.c,v 1.25 2013/06/09 09:44:51 njoly Exp $ */
+/* $NetBSD: siisata.c,v 1.26 2013/06/22 05:41:25 matt Exp $ */
/* from ahcisata_core.c */
@@ -79,7 +79,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: siisata.c,v 1.25 2013/06/09 09:44:51 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: siisata.c,v 1.26 2013/06/22 05:41:25 matt Exp $);
#include sys/types.h
#include sys/malloc.h
@@ -291,7 +291,7 @@ siisata_attach_port(struct siisata_softc
chp-ch_channel = port;
chp-ch_atac = sc-sc_atac;
chp-ch_queue = malloc(sizeof(struct ata_queue),
- M_DEVBUF, M_NOWAIT);
+ M_DEVBUF, M_NOWAIT|M_ZERO);
if (chp-ch_queue == NULL) {
aprint_error_dev(sc-sc_atac.atac_dev,
port %d: can't allocate memory
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: uebayasi Date: Sat Jun 22 05:56:32 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: cpu_in_cksum.S Log Message: Use END() to set ELF symbol size. Set local string type/size too. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amd64/amd64/cpu_in_cksum.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/cpu_in_cksum.S diff -u src/sys/arch/amd64/amd64/cpu_in_cksum.S:1.1 src/sys/arch/amd64/amd64/cpu_in_cksum.S:1.2 --- src/sys/arch/amd64/amd64/cpu_in_cksum.S:1.1 Fri Jan 25 21:12:10 2008 +++ src/sys/arch/amd64/amd64/cpu_in_cksum.S Sat Jun 22 05:56:32 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_in_cksum.S,v 1.1 2008/01/25 21:12:10 joerg Exp $ */ +/* $NetBSD: cpu_in_cksum.S,v 1.2 2013/06/22 05:56:32 uebayasi Exp $ */ /*- * Copyright (c) 2008 Joerg Sonnenberger jo...@netbsd.org. @@ -289,7 +289,10 @@ ENTRY(cpu_in_cksum) movl $0, %eax call _C_LABEL(printf) jmp .Mreturn +END(cpu_in_cksum) .section .rodata + .type .Mout_of_mbufs_msg, @object .Mout_of_mbufs_msg: .string in_cksum: out of data\n +END(.Mout_of_mbufs_msg)
