CVS commit: src/sys/kern
Module Name:src
Committed By: riastradh
Date: Fri Apr 22 05:34:58 UTC 2016
Modified Files:
src/sys/kern: vfs_lookup.c
Log Message:
#if DIAGNOSTIC panic ---> KASSERTMSG
To generate a diff of this commit:
cvs rdiff -u -r1.204 -r1.205 src/sys/kern/vfs_lookup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.204 src/sys/kern/vfs_lookup.c:1.205
--- src/sys/kern/vfs_lookup.c:1.204 Tue Apr 12 04:02:55 2016
+++ src/sys/kern/vfs_lookup.c Fri Apr 22 05:34:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.204 2016/04/12 04:02:55 dholland Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.205 2016/04/22 05:34:58 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.204 2016/04/12 04:02:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.205 2016/04/22 05:34:58 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_magiclinks.h"
@@ -492,14 +492,13 @@ namei_init(struct namei_state *state, st
state->rdonly = 0;
state->slashes = 0;
-#ifdef DIAGNOSTIC
- if (!state->cnp->cn_cred)
- panic("namei: bad cred/proc");
- if (state->cnp->cn_nameiop & (~OPMASK))
- panic("namei: nameiop contaminated with flags");
- if (state->cnp->cn_flags & OPMASK)
- panic("namei: flags contaminated with nameiops");
-#endif
+ KASSERTMSG((state->cnp->cn_cred != NULL), "namei: bad cred/proc");
+ KASSERTMSG(((state->cnp->cn_nameiop & (~OPMASK)) == 0),
+ "namei: nameiop contaminated with flags: %08"PRIx32,
+ state->cnp->cn_nameiop);
+ KASSERTMSG(((state->cnp->cn_flags & OPMASK) == 0),
+ "name: flags contaminated with nameiops: %08"PRIx32,
+ state->cnp->cn_flags);
/*
* The buffer for name translation shall be the one inside the
@@ -994,10 +993,9 @@ unionlookup:
error = VOP_LOOKUP(searchdir, , cnp);
if (error != 0) {
-#ifdef DIAGNOSTIC
- if (foundobj != NULL)
- panic("leaf `%s' should be empty", cnp->cn_nameptr);
-#endif /* DIAGNOSTIC */
+ KASSERTMSG((foundobj == NULL),
+ "leaf `%s' should be empty but is %p",
+ cnp->cn_nameptr, foundobj);
#ifdef NAMEI_DIAGNOSTIC
printf("not found\n");
#endif /* NAMEI_DIAGNOSTIC */
@@ -1787,21 +1785,19 @@ relookup(struct vnode *dvp, struct vnode
*vpp = NULL;
error = VOP_LOOKUP(dvp, vpp, cnp);
if ((error) != 0) {
-#ifdef DIAGNOSTIC
- if (*vpp != NULL)
- panic("leaf `%s' should be empty", cnp->cn_nameptr);
-#endif
+ KASSERTMSG((*vpp == NULL),
+ "leaf `%s' should be empty but is %p",
+ cnp->cn_nameptr, *vpp);
if (error != EJUSTRETURN)
goto bad;
}
-#ifdef DIAGNOSTIC
/*
* Check for symbolic link
*/
- if (*vpp && (*vpp)->v_type == VLNK && (cnp->cn_flags & FOLLOW))
- panic("relookup: symlink found");
-#endif
+ KASSERTMSG((*vpp == NULL || (*vpp)->v_type != VLNK ||
+ (cnp->cn_flags & FOLLOW) == 0),
+ "relookup: symlink found");
/*
* Check for read-only lookups.
CVS commit: src/sys/kern
Module Name:src Committed By: riastradh Date: Fri Apr 22 05:34:58 UTC 2016 Modified Files: src/sys/kern: vfs_lookup.c Log Message: #if DIAGNOSTIC panic ---> KASSERTMSG To generate a diff of this commit: cvs rdiff -u -r1.204 -r1.205 src/sys/kern/vfs_lookup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/usr.bin/gcc/arch
Module Name:src Committed By: mrg Date: Fri Apr 22 01:45:28 UTC 2016 Modified Files: src/external/gpl3/gcc/usr.bin/gcc/arch/arm: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/armeb: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/earm: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb: configargs.h defs.mk gtyp-input.list tm.h Log Message: mknative for GCC 5.3 and *arm* after netbsd-elf.h order fix. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 \ src/external/gpl3/gcc/usr.bin/gcc/arch/arm/configargs.h cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/usr.bin/gcc/arch/arm/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/arm/gtyp-input.list \ src/external/gpl3/gcc/usr.bin/gcc/arch/arm/tm.h cvs rdiff -u -r1.21 -r1.22 \ src/external/gpl3/gcc/usr.bin/gcc/arch/armeb/configargs.h cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gcc/usr.bin/gcc/arch/armeb/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/armeb/gtyp-input.list cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/gcc/arch/armeb/tm.h cvs rdiff -u -r1.18 -r1.19 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earm/configargs.h cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/gcc/arch/earm/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earm/gtyp-input.list \ src/external/gpl3/gcc/usr.bin/gcc/arch/earm/tm.h cvs rdiff -u -r1.14 -r1.15 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/configargs.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/gtyp-input.list \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/tm.h cvs rdiff -u -r1.15 -r1.16 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/configargs.h cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/gtyp-input.list \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/tm.h cvs rdiff -u -r1.13 -r1.14 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/configargs.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/gtyp-input.list \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/tm.h cvs rdiff -u -r1.12 -r1.13 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/configargs.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/gtyp-input.list \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/tm.h cvs rdiff -u -r1.12 -r1.13 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/configargs.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/gtyp-input.list \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/tm.h cvs rdiff -u -r1.12 -r1.13 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/configargs.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/gtyp-input.list \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/tm.h cvs rdiff -u -r1.12 -r1.13 \
CVS commit: src/sys/net
Module Name:src Committed By: roy Date: Fri Apr 22 00:25:42 UTC 2016 Modified Files: src/sys/net: if_bridge.c Log Message: Change used from int to bool. If used, abort the loop because we think we're already at the end. To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/sys/net/if_bridge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src
Committed By: roy
Date: Fri Apr 22 00:25:42 UTC 2016
Modified Files:
src/sys/net: if_bridge.c
Log Message:
Change used from int to bool.
If used, abort the loop because we think we're already at the end.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/net/if_bridge.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_bridge.c
diff -u src/sys/net/if_bridge.c:1.117 src/sys/net/if_bridge.c:1.118
--- src/sys/net/if_bridge.c:1.117 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if_bridge.c Fri Apr 22 00:25:42 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.117 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if_bridge.c,v 1.118 2016/04/22 00:25:42 roy Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.117 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.118 2016/04/22 00:25:42 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_bridge_ipf.h"
@@ -1453,7 +1453,7 @@ bridge_output(struct ifnet *ifp, struct
if (dst_if == NULL) {
struct bridge_iflist *bif;
struct mbuf *mc;
- int used = 0;
+ bool used = false;
BRIDGE_PSZ_RENTER(s);
BRIDGE_IFLIST_READER_FOREACH(bif, sc) {
@@ -1484,7 +1484,7 @@ bridge_output(struct ifnet *ifp, struct
if (PSLIST_READER_NEXT(bif, struct bridge_iflist,
bif_next) == NULL) {
-used = 1;
+used = true;
mc = m;
} else {
mc = m_copym(m, 0, M_COPYALL, M_NOWAIT);
@@ -1504,10 +1504,15 @@ bridge_output(struct ifnet *ifp, struct
next:
BRIDGE_PSZ_RENTER(s);
bridge_release_member(sc, bif, );
+
+ /* Guarantee we don't re-enter the loop as we already
+ * decided we're at the end. */
+ if (used)
+break;
}
BRIDGE_PSZ_REXIT(s);
- if (used == 0)
+ if (!used)
m_freem(m);
return (0);
}
CVS commit: src/share/misc
Module Name:src Committed By: riastradh Date: Thu Apr 21 23:14:25 UTC 2016 Modified Files: src/share/misc: acronyms.comp Log Message: MLD: multicast listener discovery To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.162 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: riastradh Date: Thu Apr 21 23:14:25 UTC 2016 Modified Files: src/share/misc: acronyms.comp Log Message: MLD: multicast listener discovery To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.162 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.161 src/share/misc/acronyms.comp:1.162 --- src/share/misc/acronyms.comp:1.161 Tue Mar 22 17:41:26 2016 +++ src/share/misc/acronyms.comp Thu Apr 21 23:14:25 2016 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.161 2016/03/22 17:41:26 ginsbach Exp $ +$NetBSD: acronyms.comp,v 1.162 2016/04/21 23:14:25 riastradh Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -750,6 +750,7 @@ ML mailing list ML markup language ML maximum likelihood MLC multi-level cell +MLD multicast listener discovery MLHP micro loop heat pipe MMIC monolithic microwave integrated circuit MMIO memory mapped input/output
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: macallan Date: Thu Apr 21 18:27:29 UTC 2016 Modified Files: src/sys/arch/sparc/conf: files.sparc Log Message: cgfourteen needs vcons To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/sys/arch/sparc/conf/files.sparc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: macallan Date: Thu Apr 21 18:27:29 UTC 2016 Modified Files: src/sys/arch/sparc/conf: files.sparc Log Message: cgfourteen needs vcons To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/sys/arch/sparc/conf/files.sparc 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/sparc/conf/files.sparc diff -u src/sys/arch/sparc/conf/files.sparc:1.154 src/sys/arch/sparc/conf/files.sparc:1.155 --- src/sys/arch/sparc/conf/files.sparc:1.154 Tue Apr 16 06:57:05 2013 +++ src/sys/arch/sparc/conf/files.sparc Thu Apr 21 18:27:29 2016 @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc,v 1.154 2013/04/16 06:57:05 jdc Exp $ +# $NetBSD: files.sparc,v 1.155 2016/04/21 18:27:29 macallan Exp $ # @(#)files.sparc 8.1 (Berkeley) 7/19/93 # sparc-specific configuration info @@ -256,7 +256,7 @@ device cgeight: bt_dac, fb, rasops24, pf attach cgeight at obio file arch/sparc/dev/cgeight.c cgeight needs-flag -device cgfourteen: fb, rasops8, wsemuldisplaydev +device cgfourteen: fb, rasops8, wsemuldisplaydev, vcons attach cgfourteen at obio file arch/sparc/dev/cgfourteen.c cgfourteen needs-flag
CVS commit: src/sys/dev/sbus
Module Name:src Committed By: macallan Date: Thu Apr 21 18:24:02 UTC 2016 Modified Files: src/sys/dev/sbus: cgtwelve.c cgtwelvereg.h Log Message: fix some tpyos, add some comments To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/sbus/cgtwelve.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/sbus/cgtwelvereg.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/sbus/cgtwelve.c diff -u src/sys/dev/sbus/cgtwelve.c:1.5 src/sys/dev/sbus/cgtwelve.c:1.6 --- src/sys/dev/sbus/cgtwelve.c:1.5 Wed Jan 11 16:08:57 2012 +++ src/sys/dev/sbus/cgtwelve.c Thu Apr 21 18:24:02 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: cgtwelve.c,v 1.5 2012/01/11 16:08:57 macallan Exp $ */ +/* $NetBSD: cgtwelve.c,v 1.6 2016/04/21 18:24:02 macallan Exp $ */ /*- * Copyright (c) 2010 Michael Lorenz @@ -29,7 +29,7 @@ /* a console driver for the Sun CG12 / Matrox SG3 graphics board */ #include -__KERNEL_RCSID(0, "$NetBSD: cgtwelve.c,v 1.5 2012/01/11 16:08:57 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgtwelve.c,v 1.6 2016/04/21 18:24:02 macallan Exp $"); #include #include @@ -422,7 +422,7 @@ cgtwelve_setup(struct cgtwelve_softc *sc cgtwelve_select_ovl(sc, CG12_SEL_OVL); memset(sc->sc_fbaddr, 0, 0x2); - /* and make sure we can write the 24bit fb */ + /* and make sure we can write the 8bit fb */ cgtwelve_select_ovl(sc, CG12_SEL_8BIT); break; case 24: Index: src/sys/dev/sbus/cgtwelvereg.h diff -u src/sys/dev/sbus/cgtwelvereg.h:1.2 src/sys/dev/sbus/cgtwelvereg.h:1.3 --- src/sys/dev/sbus/cgtwelvereg.h:1.2 Wed Apr 14 04:37:11 2010 +++ src/sys/dev/sbus/cgtwelvereg.h Thu Apr 21 18:24:02 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: cgtwelvereg.h,v 1.2 2010/04/14 04:37:11 macallan Exp $ */ +/* $NetBSD: cgtwelvereg.h,v 1.3 2016/04/21 18:24:02 macallan Exp $ */ /*- * Copyright (c) 2010 Michael Lorenz @@ -156,7 +156,7 @@ #define DWGCTL_AUTOLINE_OPEN 0x0001 #define DWGCTL_LINE_CLOSED 0x0002 #define DWGCTL_AUTOLINE_CLOSED 0x0003 -#define DWGCTL_TRAPEXOID 0x0004 +#define DWGCTL_TRAPEZOID 0x0004 #define DWGCTL_BITBLT 0x0008 #define DWGCTL_UPLOAD 0x0009 #define DWGCTL_DOWNLOAD 0x000a @@ -181,7 +181,7 @@ #define DWGCTL_BLT_TRANSPARENT 0x4000 /* for color exp. */ #define CG12APU_SAM 0x0274 -#define CG12APU_SGN 0x0278 +#define CG12APU_SGN 0x0278 /* analog to Athena's SIGN register? */ #define CG12APU_LENGTH 0x027c #define CG12APU_DWG_R0 0x0280 #define CG12APU_DWG_R1 0x0284 @@ -193,7 +193,7 @@ #define CG12APU_DWG_R7 0x029c #define CG12APU_RELOAD_CTL 0x02a0 #define CG12APU_RELOAD_STB 0x02a4 -#define CG12APU_C_XLEFT 0x02a8 +#define CG12APU_C_XLEFT 0x02a8 /* clipping? */ #define CG12APU_C_YTOP 0x02ac #define CG12APU_C_XRIGHT 0x02b0 #define CG12APU_C_YBOTTOM 0x02b4 @@ -270,7 +270,7 @@ #define CG12_WID_ENABLE_3 3 /* overlay/cursor enable has 3 colors */ #define CG12_WID_ALT_CMAP 4 /* use alternate colormap */ #define CG12_WID_DBL_BUF_DISP_A 5 /* double buffering display A */ -#define CG12_WID_DBL_BUF_DISP_B 6 /* double buffering display A */ +#define CG12_WID_DBL_BUF_DISP_B 6 /* double buffering display B */ #define CG12_WID_ATTRS 7 /* total no of attributes */ /* WSC */ @@ -293,5 +293,7 @@ #define CG12_EIC_DCLONGR 0x0730 #define CG12_EIC_DCFLOATR 0x0734 #define CG12_EIC_RESET 0x073c +#define CG12EIC_RESET_SYS 0x0100 +#define CG12EIC_RESET_DSP 0x0200 #endif /* CG12REG_H */
CVS commit: src/sys/dev/sbus
Module Name:src Committed By: macallan Date: Thu Apr 21 18:24:02 UTC 2016 Modified Files: src/sys/dev/sbus: cgtwelve.c cgtwelvereg.h Log Message: fix some tpyos, add some comments To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/sbus/cgtwelve.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/sbus/cgtwelvereg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/sbus
Module Name:src Committed By: macallan Date: Thu Apr 21 18:10:57 UTC 2016 Modified Files: src/sys/dev/sbus: cgthree_sbus.c p9100.c zx.c Log Message: more RASTERCONSOLE purging To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/sbus/cgthree_sbus.c cvs rdiff -u -r1.62 -r1.63 src/sys/dev/sbus/p9100.c cvs rdiff -u -r1.40 -r1.41 src/sys/dev/sbus/zx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: macallan
Date: Thu Apr 21 18:10:57 UTC 2016
Modified Files:
src/sys/dev/sbus: cgthree_sbus.c p9100.c zx.c
Log Message:
more RASTERCONSOLE purging
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/sbus/cgthree_sbus.c
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/sbus/p9100.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/sbus/zx.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/sbus/cgthree_sbus.c
diff -u src/sys/dev/sbus/cgthree_sbus.c:1.30 src/sys/dev/sbus/cgthree_sbus.c:1.31
--- src/sys/dev/sbus/cgthree_sbus.c:1.30 Tue Sep 14 18:28:18 2010
+++ src/sys/dev/sbus/cgthree_sbus.c Thu Apr 21 18:10:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree_sbus.c,v 1.30 2010/09/14 18:28:18 macallan Exp $ */
+/* $NetBSD: cgthree_sbus.c,v 1.31 2016/04/21 18:10:57 macallan Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.30 2010/09/14 18:28:18 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.31 2016/04/21 18:10:57 macallan Exp $");
#include
#include
@@ -172,6 +172,7 @@ cgthreeattach_sbus(device_t parent, devi
if (name == NULL)
name = "cgthree";
+ fb->fb_pixels = NULL;
if (sa->sa_npromvaddrs != 0)
fb->fb_pixels = (void *)(u_long)sa->sa_promvaddrs[0];
if (fb->fb_pixels == NULL) {
Index: src/sys/dev/sbus/p9100.c
diff -u src/sys/dev/sbus/p9100.c:1.62 src/sys/dev/sbus/p9100.c:1.63
--- src/sys/dev/sbus/p9100.c:1.62 Fri Jul 25 08:10:38 2014
+++ src/sys/dev/sbus/p9100.c Thu Apr 21 18:10:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: p9100.c,v 1.62 2014/07/25 08:10:38 dholland Exp $ */
+/* $NetBSD: p9100.c,v 1.63 2016/04/21 18:10:57 macallan Exp $ */
/*-
* Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.62 2014/07/25 08:10:38 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.63 2016/04/21 18:10:57 macallan Exp $");
#include
#include
@@ -207,7 +207,6 @@ static void p9100_ramdac_write_ctl(struc
static void p9100_init_engine(struct p9100_softc *);
static int p9100_set_depth(struct p9100_softc *, int);
-#if NWSDISPLAY > 0
static void p9100_sync(struct p9100_softc *);
static void p9100_bitblt(void *, int, int, int, int, int, int, int);
static void p9100_rectfill(void *, int, int, int, int, uint32_t);
@@ -236,7 +235,6 @@ static paddr_t p9100_mmap(void *, void *
static void p9100_init_screen(void *, struct vcons_screen *, int,
long *);
-#endif
static void p9100_init_cursor(struct p9100_softc *);
@@ -256,7 +254,6 @@ static bool p9100_resume(device_t, const
static void p9100_set_extvga(void *, int);
#endif
-#if NWSDISPLAY > 0
struct wsdisplay_accessops p9100_accessops = {
p9100_ioctl,
p9100_mmap,
@@ -267,7 +264,6 @@ struct wsdisplay_accessops p9100_accesso
NULL, /* polls */
NULL, /* scroll */
};
-#endif
#ifdef PNOZZ_USE_LATCH
#define PNOZZ_LATCH(sc, off) if(sc->sc_last_offset != (off & 0xff80)) { \
@@ -305,11 +301,9 @@ p9100_sbus_attach(device_t parent, devic
int i, j;
uint8_t ver, cmap[768];
-#if NWSDISPLAY > 0
struct wsemuldisplaydev_attach_args aa;
struct rasops_info *ri;
unsigned long defattr;
-#endif
sc->sc_last_offset = 0x;
sc->sc_dev = self;
@@ -354,7 +348,7 @@ p9100_sbus_attach(device_t parent, devic
* P9100 - all register accesses need to be 'latched in' whenever we
* go to another 0x80 aligned 'page' by reading the framebuffer at the
* same offset
- * XXX apparently the latter isn't true - my SP3GX works fine without
+ * XXX apparently the latter isn't true - my SB3GX works fine without
*/
#ifdef PNOZZ_USE_LATCH
if (fb->fb_pixels == NULL) {
@@ -424,8 +418,14 @@ p9100_sbus_attach(device_t parent, devic
printf(", %d entry colormap", fb->fb_type.fb_cmsize);
/* make sure we are not blanked */
- if (isconsole)
+ if (isconsole) {
+ p9100_set_video(sc, 1);
+ delay(1000);
+ /* hopefully make my oldish PLL lock */
+ p9100_set_video(sc, 0);
+ delay(100);
p9100_set_video(sc, 1);
+ }
/* register with power management */
sc->sc_video = 1;
@@ -437,14 +437,9 @@ p9100_sbus_attach(device_t parent, devic
if (isconsole) {
printf(" (console)\n");
-#ifdef RASTERCONSOLE
- /*p9100loadcmap(sc, 255, 1);*/
- fbrcons_init(fb);
-#endif
} else
printf("\n");
-#if NWSDISPLAY > 0
wsfont_init();
#ifdef PNOZZ_DEBUG
@@ -504,7 +499,7 @@ p9100_sbus_attach(device_t parent, devic
aa.accesscookie = >vd;
config_found(self, , wsemuldisplaydevprint);
-#endif
+
fb->fb_type.fb_size = fb->fb_type.fb_height * fb->fb_linebytes;
printf("%s: rev %d / %x, %dx%d, depth %d mem %x\n",
device_xname(self),
@@ -518,7 +513,7 @@ p9100_sbus_attach(device_t parent, devic
#if NTCTRL > 0
/* register callback for external monitor status change */
CVS commit: src/sys/dev/sun
Module Name:src Committed By: macallan Date: Thu Apr 21 18:06:06 UTC 2016 Modified Files: src/sys/dev/sun: bwtwo.c cgsix.c cgsixvar.h cgthree.c fb.c fbvar.h Log Message: RASTERCONSOLE is gone, wsdisplay no longer optional To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/dev/sun/bwtwo.c cvs rdiff -u -r1.66 -r1.67 src/sys/dev/sun/cgsix.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/sun/cgsixvar.h cvs rdiff -u -r1.31 -r1.32 src/sys/dev/sun/cgthree.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/sun/fb.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/sun/fbvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/sun
Module Name:src
Committed By: macallan
Date: Thu Apr 21 18:06:06 UTC 2016
Modified Files:
src/sys/dev/sun: bwtwo.c cgsix.c cgsixvar.h cgthree.c fb.c fbvar.h
Log Message:
RASTERCONSOLE is gone, wsdisplay no longer optional
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/sun/bwtwo.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/sun/cgsix.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/sun/cgsixvar.h
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/sun/cgthree.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/sun/fb.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/sun/fbvar.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/sun/bwtwo.c
diff -u src/sys/dev/sun/bwtwo.c:1.34 src/sys/dev/sun/bwtwo.c:1.35
--- src/sys/dev/sun/bwtwo.c:1.34 Fri Jul 25 08:10:39 2014
+++ src/sys/dev/sun/bwtwo.c Thu Apr 21 18:06:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwo.c,v 1.34 2014/07/25 08:10:39 dholland Exp $ */
+/* $NetBSD: bwtwo.c,v 1.35 2016/04/21 18:06:06 macallan Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.34 2014/07/25 08:10:39 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.35 2016/04/21 18:06:06 macallan Exp $");
#include
#include
@@ -310,7 +310,6 @@ bwtwoattach(struct bwtwo_softc *sc, cons
* definition. In this case we fill it from fb to
* avoid problems in case no bwtwo is the console
*/
- ri = >sc_fb.fb_rinfo;
bwtwo_defaultscreen.textops = >ri_ops;
bwtwo_defaultscreen.capabilities = ri->ri_caps;
bwtwo_defaultscreen.nrows = ri->ri_rows;
@@ -404,8 +403,8 @@ bwtwo_ioctl(void *v, void *vs, u_long cm
struct vcons_data *vd = v;
struct bwtwo_softc *sc = vd->cookie;
struct wsdisplay_fbinfo *wdf;
- struct rasops_info *ri = >sc_fb.fb_rinfo;
struct vcons_screen *ms = sc->vd.active;
+ struct rasops_info *ri = >scr_ri;
switch (cmd) {
case WSDISPLAYIO_GTYPE:
*(u_int *)data = WSDISPLAY_TYPE_GENFB;
Index: src/sys/dev/sun/cgsix.c
diff -u src/sys/dev/sun/cgsix.c:1.66 src/sys/dev/sun/cgsix.c:1.67
--- src/sys/dev/sun/cgsix.c:1.66 Wed Apr 13 17:26:08 2016
+++ src/sys/dev/sun/cgsix.c Thu Apr 21 18:06:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.66 2016/04/13 17:26:08 macallan Exp $ */
+/* $NetBSD: cgsix.c,v 1.67 2016/04/21 18:06:06 macallan Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.66 2016/04/13 17:26:08 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.67 2016/04/21 18:06:06 macallan Exp $");
#include
#include
@@ -151,11 +151,6 @@ static void cg6_loadomap (struct cgsix_s
static void cg6_setcursor (struct cgsix_softc *);/* set position */
static void cg6_loadcursor (struct cgsix_softc *);/* set shape */
-#if NWSDISPLAY > 0
-#ifdef RASTERCONSOLE
-#error RASTERCONSOLE and wsdisplay are mutually exclusive
-#endif
-
static void cg6_setup_palette(struct cgsix_softc *);
struct wsscreen_descr cgsix_defaultscreen = {
@@ -208,18 +203,9 @@ struct wsscreen_list cgsix_screenlist =
extern const u_char rasops_cmap[768];
-#endif /* NWSDISPLAY > 0 */
-
-#if (NWSDISPLAY > 0) || defined(RASTERCONSOLE)
void cg6_invert(struct cgsix_softc *, int, int, int, int);
-/* need this for both cases because ri_hw points to it */
static struct vcons_screen cg6_console_screen;
-#endif
-
-#ifdef RASTERCONSOLE
-int cgsix_use_rasterconsole = 1;
-#endif
/*
* cg6 accelerated console routines.
@@ -326,15 +312,11 @@ int cgsix_use_rasterconsole = 1;
/*EMPTY*/; \
} while (0)
-#if (NWSDISPLAY > 0) || defined(RASTERCONSOLE)
static void cg6_ras_init(struct cgsix_softc *);
static void cg6_ras_copyrows(void *, int, int, int);
static void cg6_ras_copycols(void *, int, int, int, int);
static void cg6_ras_erasecols(void *, int, int, int, long int);
static void cg6_ras_eraserows(void *, int, int, long int);
-#if defined(RASTERCONSOLE) && defined(CG6_BLIT_CURSOR)
-static void cg6_ras_do_cursor(struct rasops_info *);
-#endif
static void
cg6_ras_init(struct cgsix_softc *sc)
@@ -522,38 +504,13 @@ cg6_ras_eraserows(void *cookie, int row,
CG6_DRAW(fbc);
}
-#if defined(RASTERCONSOLE) && defined(CG6_BLIT_CURSOR)
-/*
- * Really want something more like fg^bg here, but that would be more
- * or less impossible to migrate to colors. So we hope there's
- * something not too inappropriate in the colormap...besides, it's what
- * the non-accelerated code did. :-)
- */
-static void
-cg6_ras_do_cursor(struct rasops_info *ri)
-{
- struct vcons_screen *scr = ri->ri_hw;
- struct cgsix_softc *sc = scr->cookie;
- int row, col;
-
- row = ri->ri_crow * ri->ri_font->fontheight;
- col = ri->ri_ccol * ri->ri_font->fontwidth;
- cg6_invert(sc, ri->ri_xorigin + col,ri->ri_yorigin +
- row, ri->ri_font->fontwidth, ri->ri_font->fontheight);
-}
-#endif /* RASTERCONSOLE */
CVS commit: src/sys/arch/sparc/dev
Module Name:src Committed By: macallan Date: Thu Apr 21 17:59:18 UTC 2016 Modified Files: src/sys/arch/sparc/dev: cgsix_obio.c Log Message: RASTERCONSOLE is no more To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc/dev/cgsix_obio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc/dev
Module Name:src
Committed By: macallan
Date: Thu Apr 21 17:59:18 UTC 2016
Modified Files:
src/sys/arch/sparc/dev: cgsix_obio.c
Log Message:
RASTERCONSOLE is no more
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc/dev/cgsix_obio.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/sparc/dev/cgsix_obio.c
diff -u src/sys/arch/sparc/dev/cgsix_obio.c:1.26 src/sys/arch/sparc/dev/cgsix_obio.c:1.27
--- src/sys/arch/sparc/dev/cgsix_obio.c:1.26 Sat Oct 27 17:18:11 2012
+++ src/sys/arch/sparc/dev/cgsix_obio.c Thu Apr 21 17:59:18 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix_obio.c,v 1.26 2012/10/27 17:18:11 chs Exp $ */
+/* $NetBSD: cgsix_obio.c,v 1.27 2016/04/21 17:59:18 macallan Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cgsix_obio.c,v 1.26 2012/10/27 17:18:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix_obio.c,v 1.27 2016/04/21 17:59:18 macallan Exp $");
#include
#include
@@ -204,17 +204,15 @@ cgsixattach(device_t parent, device_t se
else
isconsole = 0;
- if (isconsole && cgsix_use_rasterconsole) {
- if (bus_space_map(oba->oba_bustag,
- oba->oba_paddr + CGSIX_RAM_OFFSET,
- sc->sc_ramsize,
- BUS_SPACE_MAP_LINEAR,
- ) != 0) {
- printf("%s: cannot map pixels\n", device_xname(self));
- return;
- }
- sc->sc_fb.fb_pixels = (void *)bh;
+ if (bus_space_map(oba->oba_bustag,
+ oba->oba_paddr + CGSIX_RAM_OFFSET,
+ sc->sc_ramsize,
+ BUS_SPACE_MAP_LINEAR,
+ ) != 0) {
+ printf("%s: cannot map pixels\n", device_xname(self));
+ return;
}
+ sc->sc_fb.fb_pixels = (void *)bh;
cg6attach(sc, name, isconsole);
}
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: skrll
Date: Thu Apr 21 16:09:16 UTC 2016
Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc
Log Message:
Re-order includes so that ARM_TARGET2_DWARF_FORMAT takes effect
Fixes PR/51066: C++ text relocations
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 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.35 src/external/gpl3/gcc/dist/gcc/config.gcc:1.36
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.35 Sun Jan 24 09:43:31 2016
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Thu Apr 21 16:09:16 2016
@@ -1060,7 +1060,7 @@ arm*-*-freebsd*)# ARM Fr
;;
arm*-*-netbsdelf*)
tmake_file="${tmake_file} arm/t-arm"
- tm_file="dbxelf.h elfos.h ${nbsd_tm_file} arm/elf.h arm/aout.h arm/arm.h"
+ tm_file="dbxelf.h elfos.h ${nbsd_tm_file} arm/elf.h"
extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
case ${target} in
arm*eb-*) tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1" ;;
@@ -1081,6 +1081,7 @@ arm*-*-netbsdelf*)
tmake_file="$tmake_file arm/t-netbsd"
;;
esac
+ tm_file="${tm_file} arm/aout.h arm/arm.h"
case ${target} in
arm*-*-netbsdelf-*eabihf*)
tm_defines="${tm_defines} TARGET_DEFAULT_FLOAT_ABI=ARM_FLOAT_ABI_HARD"
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src Committed By: skrll Date: Thu Apr 21 16:09:16 UTC 2016 Modified Files: src/external/gpl3/gcc/dist/gcc: config.gcc Log Message: Re-order includes so that ARM_TARGET2_DWARF_FORMAT takes effect Fixes PR/51066: C++ text relocations To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 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.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Thu Apr 21 15:42:56 UTC 2016 Modified Files: src/sys/dev/usb: usb_subr.c Log Message: autoconf(9) requires the kernel_lock so take it while discovering new devices. PR/51081: calling ioctl while attaching wifi device causes a jump to NULL To generate a diff of this commit: cvs rdiff -u -r1.208 -r1.209 src/sys/dev/usb/usb_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Thu Apr 21 15:42:56 UTC 2016
Modified Files:
src/sys/dev/usb: usb_subr.c
Log Message:
autoconf(9) requires the kernel_lock so take it while discovering new
devices.
PR/51081: calling ioctl while attaching wifi device causes a jump to NULL
To generate a diff of this commit:
cvs rdiff -u -r1.208 -r1.209 src/sys/dev/usb/usb_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.208 src/sys/dev/usb/usb_subr.c:1.209
--- src/sys/dev/usb/usb_subr.c:1.208 Thu Jan 7 07:59:08 2016
+++ src/sys/dev/usb/usb_subr.c Thu Apr 21 15:42:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.208 2016/01/07 07:59:08 skrll Exp $ */
+/* $NetBSD: usb_subr.c,v 1.209 2016/04/21 15:42:56 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.208 2016/01/07 07:59:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.209 2016/04/21 15:42:56 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -861,8 +861,10 @@ usbd_attachwholedevice(device_t parent,
dlocs[USBDEVIFCF_CONFIGURATION] = -1;
dlocs[USBDEVIFCF_INTERFACE] = -1;
+ KERNEL_LOCK(1, NULL);
dv = config_found_sm_loc(parent, "usbdevif", dlocs, , usbd_print,
config_stdsubmatch);
+ KERNEL_UNLOCK_ONE(NULL);
if (dv) {
dev->subdevs = malloc(sizeof dv, M_USB, M_NOWAIT);
if (dev->subdevs == NULL)
@@ -939,8 +941,10 @@ usbd_attachinterfaces(device_t parent, u
loc != uiaa.ifaceno)
continue;
}
+ KERNEL_LOCK(1, NULL);
dv = config_found_sm_loc(parent, "usbifif", ilocs, ,
usbd_ifprint, config_stdsubmatch);
+ KERNEL_UNLOCK_ONE(NULL);
if (!dv)
continue;
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: martin Date: Thu Apr 21 15:24:39 UTC 2016 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: Note ticket #1378 To generate a diff of this commit: cvs rdiff -u -r1.1.2.60 -r1.1.2.61 src/doc/CHANGES-6.1.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.6 diff -u src/doc/CHANGES-6.1.6:1.1.2.60 src/doc/CHANGES-6.1.6:1.1.2.61 --- src/doc/CHANGES-6.1.6:1.1.2.60 Sat Apr 16 20:59:49 2016 +++ src/doc/CHANGES-6.1.6 Thu Apr 21 15:24:39 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.60 2016/04/16 20:59:49 snj Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.61 2016/04/21 15:24:39 martin Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -7511,3 +7511,8 @@ libexec/httpd/tilde-luzah-bozo.c o -C option supports now CGI scripts only [mrg, ticket #1377] +sys/compat/netbsd32/netbsd32_socket.c 1.42 + + Memory leak, triggerable from an unprivileged user. + [christos, ticket #1378] +
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: martin Date: Thu Apr 21 15:27:10 UTC 2016 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: Note ticket #1378 To generate a diff of this commit: cvs rdiff -u -r1.1.2.62 -r1.1.2.63 src/doc/CHANGES-6.0.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.7 diff -u src/doc/CHANGES-6.0.7:1.1.2.62 src/doc/CHANGES-6.0.7:1.1.2.63 --- src/doc/CHANGES-6.0.7:1.1.2.62 Sat Apr 16 21:00:16 2016 +++ src/doc/CHANGES-6.0.7 Thu Apr 21 15:27:09 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.7,v 1.1.2.62 2016/04/16 21:00:16 snj Exp $ +# $NetBSD: CHANGES-6.0.7,v 1.1.2.63 2016/04/21 15:27:09 martin Exp $ A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7 release: @@ -7791,3 +7791,8 @@ libexec/httpd/tilde-luzah-bozo.c o -C option supports now CGI scripts only [mrg, ticket #1377] +sys/compat/netbsd32/netbsd32_socket.c 1.42 + + Memory leak, triggerable from an unprivileged user. + [christos, ticket #1378] +
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: martin Date: Thu Apr 21 15:27:10 UTC 2016 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: Note ticket #1378 To generate a diff of this commit: cvs rdiff -u -r1.1.2.62 -r1.1.2.63 src/doc/CHANGES-6.0.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Thu Apr 21 15:25:52 UTC 2016
Modified Files:
src/sys/compat/netbsd32 [netbsd-6-0]: netbsd32_socket.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1378):
sys/compat/netbsd32/netbsd32_socket.c: revision 1.42
Memory leak, triggerable from an unprivileged user.
To generate a diff of this commit:
cvs rdiff -u -r1.39.2.2 -r1.39.2.2.4.1 \
src/sys/compat/netbsd32/netbsd32_socket.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/compat/netbsd32/netbsd32_socket.c
diff -u src/sys/compat/netbsd32/netbsd32_socket.c:1.39.2.2 src/sys/compat/netbsd32/netbsd32_socket.c:1.39.2.2.4.1
--- src/sys/compat/netbsd32/netbsd32_socket.c:1.39.2.2 Sat Aug 18 22:01:40 2012
+++ src/sys/compat/netbsd32/netbsd32_socket.c Thu Apr 21 15:25:52 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_socket.c,v 1.39.2.2 2012/08/18 22:01:40 riz Exp $ */
+/* $NetBSD: netbsd32_socket.c,v 1.39.2.2.4.1 2016/04/21 15:25:52 martin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.39.2.2 2012/08/18 22:01:40 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.39.2.2.4.1 2016/04/21 15:25:52 martin Exp $");
#include
#include
@@ -331,7 +331,7 @@ netbsd32_sendmsg(struct lwp *l, const st
} */
struct msghdr msg;
struct netbsd32_msghdr msg32;
- struct iovec aiov[UIO_SMALLIOV], *iov;
+ struct iovec aiov[UIO_SMALLIOV], *iov = aiov;
struct netbsd32_iovec *iov32;
size_t iovsz;
int error;
@@ -346,6 +346,7 @@ netbsd32_sendmsg(struct lwp *l, const st
error = copyin32_msg_control(l, );
if (error)
return (error);
+ /* From here on, msg.msg_control is allocated */
} else {
msg.msg_control = NULL;
msg.msg_controllen = 0;
@@ -353,23 +354,32 @@ netbsd32_sendmsg(struct lwp *l, const st
iovsz = msg.msg_iovlen * sizeof(struct iovec);
if ((u_int)msg.msg_iovlen > UIO_SMALLIOV) {
- if ((u_int)msg.msg_iovlen > IOV_MAX)
- return (EMSGSIZE);
+ if ((u_int)msg.msg_iovlen > IOV_MAX) {
+ error = EMSGSIZE;
+ goto out;
+ }
iov = kmem_alloc(iovsz, KM_SLEEP);
- } else
- iov = aiov;
+ }
iov32 = NETBSD32PTR64(msg32.msg_iov);
error = netbsd32_to_iovecin(iov32, iov, msg.msg_iovlen);
if (error)
- goto done;
+ goto out;
msg.msg_iov = iov;
error = do_sys_sendmsg(l, SCARG(uap, s), , SCARG(uap, flags), retval);
-done:
+ /* msg.msg_control freed by do_sys_sendmsg() */
+
if (iov != aiov)
kmem_free(iov, iovsz);
return (error);
+
+out:
+ if (iov != aiov)
+ kmem_free(iov, iovsz);
+ if (msg.msg_control)
+ m_free(msg.msg_control);
+ return error;
}
int
CVS commit: [netbsd-6-0] src/sys/compat/netbsd32
Module Name:src Committed By: martin Date: Thu Apr 21 15:25:52 UTC 2016 Modified Files: src/sys/compat/netbsd32 [netbsd-6-0]: netbsd32_socket.c Log Message: Pull up following revision(s) (requested by christos in ticket #1378): sys/compat/netbsd32/netbsd32_socket.c: revision 1.42 Memory leak, triggerable from an unprivileged user. To generate a diff of this commit: cvs rdiff -u -r1.39.2.2 -r1.39.2.2.4.1 \ src/sys/compat/netbsd32/netbsd32_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: martin Date: Thu Apr 21 15:24:39 UTC 2016 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: Note ticket #1378 To generate a diff of this commit: cvs rdiff -u -r1.1.2.60 -r1.1.2.61 src/doc/CHANGES-6.1.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-1] src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Thu Apr 21 15:23:59 UTC 2016
Modified Files:
src/sys/compat/netbsd32 [netbsd-6-1]: netbsd32_socket.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1378):
sys/compat/netbsd32/netbsd32_socket.c: revision 1.42
Memory leak, triggerable from an unprivileged user.
To generate a diff of this commit:
cvs rdiff -u -r1.39.2.2 -r1.39.2.2.6.1 \
src/sys/compat/netbsd32/netbsd32_socket.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/compat/netbsd32/netbsd32_socket.c
diff -u src/sys/compat/netbsd32/netbsd32_socket.c:1.39.2.2 src/sys/compat/netbsd32/netbsd32_socket.c:1.39.2.2.6.1
--- src/sys/compat/netbsd32/netbsd32_socket.c:1.39.2.2 Sat Aug 18 22:01:40 2012
+++ src/sys/compat/netbsd32/netbsd32_socket.c Thu Apr 21 15:23:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_socket.c,v 1.39.2.2 2012/08/18 22:01:40 riz Exp $ */
+/* $NetBSD: netbsd32_socket.c,v 1.39.2.2.6.1 2016/04/21 15:23:59 martin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.39.2.2 2012/08/18 22:01:40 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.39.2.2.6.1 2016/04/21 15:23:59 martin Exp $");
#include
#include
@@ -331,7 +331,7 @@ netbsd32_sendmsg(struct lwp *l, const st
} */
struct msghdr msg;
struct netbsd32_msghdr msg32;
- struct iovec aiov[UIO_SMALLIOV], *iov;
+ struct iovec aiov[UIO_SMALLIOV], *iov = aiov;
struct netbsd32_iovec *iov32;
size_t iovsz;
int error;
@@ -346,6 +346,7 @@ netbsd32_sendmsg(struct lwp *l, const st
error = copyin32_msg_control(l, );
if (error)
return (error);
+ /* From here on, msg.msg_control is allocated */
} else {
msg.msg_control = NULL;
msg.msg_controllen = 0;
@@ -353,23 +354,32 @@ netbsd32_sendmsg(struct lwp *l, const st
iovsz = msg.msg_iovlen * sizeof(struct iovec);
if ((u_int)msg.msg_iovlen > UIO_SMALLIOV) {
- if ((u_int)msg.msg_iovlen > IOV_MAX)
- return (EMSGSIZE);
+ if ((u_int)msg.msg_iovlen > IOV_MAX) {
+ error = EMSGSIZE;
+ goto out;
+ }
iov = kmem_alloc(iovsz, KM_SLEEP);
- } else
- iov = aiov;
+ }
iov32 = NETBSD32PTR64(msg32.msg_iov);
error = netbsd32_to_iovecin(iov32, iov, msg.msg_iovlen);
if (error)
- goto done;
+ goto out;
msg.msg_iov = iov;
error = do_sys_sendmsg(l, SCARG(uap, s), , SCARG(uap, flags), retval);
-done:
+ /* msg.msg_control freed by do_sys_sendmsg() */
+
if (iov != aiov)
kmem_free(iov, iovsz);
return (error);
+
+out:
+ if (iov != aiov)
+ kmem_free(iov, iovsz);
+ if (msg.msg_control)
+ m_free(msg.msg_control);
+ return error;
}
int
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Thu Apr 21 15:21:10 UTC 2016 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Note ticket #1378 To generate a diff of this commit: cvs rdiff -u -r1.1.2.244 -r1.1.2.245 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.244 src/doc/CHANGES-6.2:1.1.2.245 --- src/doc/CHANGES-6.2:1.1.2.244 Sat Apr 16 20:59:18 2016 +++ src/doc/CHANGES-6.2 Thu Apr 21 15:21:10 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.244 2016/04/16 20:59:18 snj Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.245 2016/04/21 15:21:10 martin Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -13445,3 +13445,8 @@ libexec/httpd/tilde-luzah-bozo.c o -C option supports now CGI scripts only [mrg, ticket #1377] +sys/compat/netbsd32/netbsd32_socket.c 1.42 + + Memory leak, triggerable from an unprivileged user. + [christos, ticket #1378] +
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Thu Apr 21 15:21:10 UTC 2016 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Note ticket #1378 To generate a diff of this commit: cvs rdiff -u -r1.1.2.244 -r1.1.2.245 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/compat/netbsd32
Module Name:src Committed By: martin Date: Thu Apr 21 15:20:17 UTC 2016 Modified Files: src/sys/compat/netbsd32 [netbsd-6]: netbsd32_socket.c Log Message: Pull up following revision(s) (requested by christos in ticket #1378): sys/compat/netbsd32/netbsd32_socket.c: revision 1.42 Memory leak, triggerable from an unprivileged user. To generate a diff of this commit: cvs rdiff -u -r1.39.2.2 -r1.39.2.3 src/sys/compat/netbsd32/netbsd32_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Thu Apr 21 15:20:17 UTC 2016
Modified Files:
src/sys/compat/netbsd32 [netbsd-6]: netbsd32_socket.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1378):
sys/compat/netbsd32/netbsd32_socket.c: revision 1.42
Memory leak, triggerable from an unprivileged user.
To generate a diff of this commit:
cvs rdiff -u -r1.39.2.2 -r1.39.2.3 src/sys/compat/netbsd32/netbsd32_socket.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/compat/netbsd32/netbsd32_socket.c
diff -u src/sys/compat/netbsd32/netbsd32_socket.c:1.39.2.2 src/sys/compat/netbsd32/netbsd32_socket.c:1.39.2.3
--- src/sys/compat/netbsd32/netbsd32_socket.c:1.39.2.2 Sat Aug 18 22:01:40 2012
+++ src/sys/compat/netbsd32/netbsd32_socket.c Thu Apr 21 15:20:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_socket.c,v 1.39.2.2 2012/08/18 22:01:40 riz Exp $ */
+/* $NetBSD: netbsd32_socket.c,v 1.39.2.3 2016/04/21 15:20:17 martin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.39.2.2 2012/08/18 22:01:40 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.39.2.3 2016/04/21 15:20:17 martin Exp $");
#include
#include
@@ -331,7 +331,7 @@ netbsd32_sendmsg(struct lwp *l, const st
} */
struct msghdr msg;
struct netbsd32_msghdr msg32;
- struct iovec aiov[UIO_SMALLIOV], *iov;
+ struct iovec aiov[UIO_SMALLIOV], *iov = aiov;
struct netbsd32_iovec *iov32;
size_t iovsz;
int error;
@@ -346,6 +346,7 @@ netbsd32_sendmsg(struct lwp *l, const st
error = copyin32_msg_control(l, );
if (error)
return (error);
+ /* From here on, msg.msg_control is allocated */
} else {
msg.msg_control = NULL;
msg.msg_controllen = 0;
@@ -353,23 +354,32 @@ netbsd32_sendmsg(struct lwp *l, const st
iovsz = msg.msg_iovlen * sizeof(struct iovec);
if ((u_int)msg.msg_iovlen > UIO_SMALLIOV) {
- if ((u_int)msg.msg_iovlen > IOV_MAX)
- return (EMSGSIZE);
+ if ((u_int)msg.msg_iovlen > IOV_MAX) {
+ error = EMSGSIZE;
+ goto out;
+ }
iov = kmem_alloc(iovsz, KM_SLEEP);
- } else
- iov = aiov;
+ }
iov32 = NETBSD32PTR64(msg32.msg_iov);
error = netbsd32_to_iovecin(iov32, iov, msg.msg_iovlen);
if (error)
- goto done;
+ goto out;
msg.msg_iov = iov;
error = do_sys_sendmsg(l, SCARG(uap, s), , SCARG(uap, flags), retval);
-done:
+ /* msg.msg_control freed by do_sys_sendmsg() */
+
if (iov != aiov)
kmem_free(iov, iovsz);
return (error);
+
+out:
+ if (iov != aiov)
+ kmem_free(iov, iovsz);
+ if (msg.msg_control)
+ m_free(msg.msg_control);
+ return error;
}
int
CVS commit: src/tests/net/route
Module Name:src Committed By: ozaki-r Date: Thu Apr 21 09:46:49 UTC 2016 Modified Files: src/tests/net/route: t_flags.sh t_flags6.sh Log Message: Fix tests for blackhole routes The gateway of a blackhole route must be a loopback interface. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/net/route/t_flags.sh cvs rdiff -u -r1.1 -r1.2 src/tests/net/route/t_flags6.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/net/route/t_flags.sh diff -u src/tests/net/route/t_flags.sh:1.4 src/tests/net/route/t_flags.sh:1.5 --- src/tests/net/route/t_flags.sh:1.4 Mon Apr 4 07:37:08 2016 +++ src/tests/net/route/t_flags.sh Thu Apr 21 09:46:49 2016 @@ -1,4 +1,4 @@ -# $NetBSD: t_flags.sh,v 1.4 2016/04/04 07:37:08 ozaki-r Exp $ +# $NetBSD: t_flags.sh,v 1.5 2016/04/21 09:46:49 ozaki-r Exp $ # # Copyright (c) 2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -181,16 +181,20 @@ test_blackhole() export RUMP_SERVER=$SOCK_LOCAL + atf_check -s exit:0 -o ignore rump.ping -n -w 1 -c 1 10.0.0.1 + # Delete an existing route first atf_check -s exit:0 -o ignore rump.route delete -net 10.0.0.0/24 - atf_check -s exit:0 -o ignore rump.route add -net 10.0.0.0/24 10.0.0.1 -blackhole + # Gateway must be lo0 + atf_check -s exit:0 -o ignore \ + rump.route add -net 10.0.0.0/24 127.0.0.1 -blackhole $DEBUG && rump.netstat -rn -f inet # Up, Gateway, Blackhole, Static check_entry_flags 10.0.0/24 UGBS - atf_check -s not-exit:0 -o ignore -e match:'No route to host' \ + atf_check -s not-exit:0 -o match:'100.0% packet loss' \ rump.ping -n -w 1 -c 1 10.0.0.1 $DEBUG && rump.netstat -rn -f inet Index: src/tests/net/route/t_flags6.sh diff -u src/tests/net/route/t_flags6.sh:1.1 src/tests/net/route/t_flags6.sh:1.2 --- src/tests/net/route/t_flags6.sh:1.1 Thu Apr 21 05:10:15 2016 +++ src/tests/net/route/t_flags6.sh Thu Apr 21 09:46:49 2016 @@ -1,4 +1,4 @@ -# $NetBSD: t_flags6.sh,v 1.1 2016/04/21 05:10:15 ozaki-r Exp $ +# $NetBSD: t_flags6.sh,v 1.2 2016/04/21 09:46:49 ozaki-r Exp $ # # Copyright (c) 2016 Internet Initiative Japan Inc. # All rights reserved. @@ -158,18 +158,21 @@ test_blackhole() export RUMP_SERVER=$SOCK_LOCAL + atf_check -s exit:0 -o ignore rump.ping6 -n -X 1 -c 1 $IP6_PEER + # Delete an existing route first atf_check -s exit:0 -o ignore \ rump.route delete -inet6 -net fc00::/64 + # Gateway must be lo0 atf_check -s exit:0 -o ignore \ - rump.route add -inet6 -net fc00::/64 $IP6_PEER -blackhole + rump.route add -inet6 -net fc00::/64 ::1 -blackhole $DEBUG && rump.netstat -rn -f inet6 # Up, Gateway, Blackhole, Static check_entry_flags fc00::/64 UGBS - atf_check -s not-exit:0 -o ignore -e match:'No route to host' \ + atf_check -s not-exit:0 -o match:'100.0% packet loss' \ rump.ping6 -n -X 1 -c 1 $IP6_PEER $DEBUG && rump.netstat -rn -f inet6
CVS commit: src/tests/net/route
Module Name:src Committed By: ozaki-r Date: Thu Apr 21 09:46:49 UTC 2016 Modified Files: src/tests/net/route: t_flags.sh t_flags6.sh Log Message: Fix tests for blackhole routes The gateway of a blackhole route must be a loopback interface. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/net/route/t_flags.sh cvs rdiff -u -r1.1 -r1.2 src/tests/net/route/t_flags6.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc.old
Module Name:src Committed By: mrg Date: Thu Apr 21 07:24:12 UTC 2016 Modified Files: src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/arm: gstdint.h src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/armeb: gstdint.h src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earm: gstdint.h src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmeb: gstdint.h src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmhf: gstdint.h src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmhfeb: gstdint.h src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv4: gstdint.h src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv4eb: gstdint.h src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6: gstdint.h src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6eb: gstdint.h src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6hf: gstdint.h src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6hfeb: gstdint.h src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7: gstdint.h src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7eb: gstdint.h src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7hf: gstdint.h src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7hfeb: gstdint.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/arm: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/armeb: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/earm: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/earmeb: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/earmhf: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/earmhfeb: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/earmv4: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/earmv4eb: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/earmv6: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/earmv6eb: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/earmv6hf: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/earmv6hfeb: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/earmv7: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/earmv7eb: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/earmv7hf: configargs.h defs.mk gtyp-input.list tm.h src/external/gpl3/gcc.old/usr.bin/gcc/arch/earmv7hfeb: configargs.h defs.mk gtyp-input.list tm.h Log Message: regenerate mknative-gcc for GCC 4.8 and *arm* To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/arm/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/armeb/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earm/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmeb/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmhf/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmhfeb/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv4/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv4eb/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6eb/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6hf/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6hfeb/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7eb/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7hf/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7hfeb/gstdint.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc.old/usr.bin/gcc/arch/arm/configargs.h \ src/external/gpl3/gcc.old/usr.bin/gcc/arch/arm/defs.mk \ src/external/gpl3/gcc.old/usr.bin/gcc/arch/arm/gtyp-input.list \
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Thu Apr 21 07:22:15 UTC 2016 Modified Files: src/tools/gcc: mknative-gcc.old Log Message: set _OUTDIR and _OUTDIRBASE properly for gcc.old, and fix a sed. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tools/gcc/mknative-gcc.old Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Thu Apr 21 07:22:15 UTC 2016
Modified Files:
src/tools/gcc: mknative-gcc.old
Log Message:
set _OUTDIR and _OUTDIRBASE properly for gcc.old, and fix a sed.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tools/gcc/mknative-gcc.old
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/mknative-gcc.old
diff -u src/tools/gcc/mknative-gcc.old:1.2 src/tools/gcc/mknative-gcc.old:1.3
--- src/tools/gcc/mknative-gcc.old:1.2 Sun Jan 24 05:10:26 2016
+++ src/tools/gcc/mknative-gcc.old Thu Apr 21 07:22:15 2016
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc.old,v 1.2 2016/01/24 05:10:26 mrg Exp $
+# $NetBSD: mknative-gcc.old,v 1.3 2016/04/21 07:22:15 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -24,9 +24,8 @@ fi
. $_TOP/tools/gcc/mknative.common
-# default to GCC 4.1 for now
-_OUTDIR="$_TOP/gnu"
-_OUTDIRBASE="gnu"
+_OUTDIR="$_TOP/external/gpl3/gcc.old"
+_OUTDIRBASE="external/gpl3/gcc.old"
sanitise_includes () {
sed \
@@ -381,7 +380,7 @@ __EOF__
# special transforms
for f in gtyp-input.list; do
- sed -e 's/^.*external\/gpl3\/gcc\/dist/SRCDIR/' < $_TMPDIR/gcc/$f > $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f
+ sed -e 's/^.*external\/gpl3\/gcc\.old\/dist/SRCDIR/' < $_TMPDIR/gcc/$f > $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f
done
# special platforms
@@ -396,8 +395,6 @@ case "$1" in
# .mk and .h files for libgcc bootstrap (from host build)
libgcc*-bootstrap)
- _OUTDIR="$_TOP/external/gpl3/gcc"
- _OUTDIRBASE="external/gpl3/gcc"
get_libgcc gcc
get_libgcov gcc $_PLATFORM/libgcc/Makefile
get_crtstuff crtstuff
@@ -406,15 +403,11 @@ libgcc*-bootstrap)
;;
libstdc++-bootstrap)
- _OUTDIR="$_TOP/external/gpl3/gcc"
- _OUTDIRBASE="external/gpl3/gcc"
get_libstdcxx_v3 libstdc++-v3 gcc
exit 0
;;
gcc*)
- _OUTDIR="$_TOP/external/gpl3/gcc"
- _OUTDIRBASE="external/gpl3/gcc"
get_gcc gcc
get_libgcc gcc
get_libgcov gcc $_PLATFORM/libgcc/Makefile
