CVS commit: [netbsd-7] src/external/mit/xorg/lib
Module Name:src
Committed By: martin
Date: Tue Jan 6 11:00:40 UTC 2015
Modified Files:
src/external/mit/xorg/lib/dri [netbsd-7]: Makefile
src/external/mit/xorg/lib/gallium [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #381):
external/mit/xorg/lib/dri/Makefile: revision 1.21,1.22,1.24-1.26
external/mit/xorg/lib/gallium/Makefile: revision 1.3-1.6
Fix yacc (.y-.c) handling.
Make it compile with clang.
Fix MKDEBUG handling.
To generate a diff of this commit:
cvs rdiff -u -r1.18.24.1 -r1.18.24.2 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.6.2.2 -r1.6.2.3 src/external/mit/xorg/lib/gallium/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.18.24.1 src/external/mit/xorg/lib/dri/Makefile:1.18.24.2
--- src/external/mit/xorg/lib/dri/Makefile:1.18.24.1 Mon Jan 5 21:23:50 2015
+++ src/external/mit/xorg/lib/dri/Makefile Tue Jan 6 11:00:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18.24.1 2015/01/05 21:23:50 martin Exp $
+# $NetBSD: Makefile,v 1.18.24.2 2015/01/06 11:00:40 martin Exp $
# Link the mesa_dri_drivers mega driver.
@@ -26,6 +26,8 @@ CPPFLAGS+= \
#CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS
# We don't actually build this on non-x86 at all, currently.
+# The following if statements are not effective since we only
+# get here for x86
.if ${MACHINE_ARCH} == alpha
DRIVERS= r200 radeon
.elif ${MACHINE} == macppc || ${MACHINE} == ofppc
@@ -360,7 +362,7 @@ MESA_SRC_MODULES= main math math_xform
.include ../libmesa.mk
.include ../libglsl.mk
-.if ${MACHINE} == amd64 || ${MACHINE} == i386
+.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
SRCS+= streaming-load-memcpy.c
CPPFLAGS.streaming-load-memcpy.c+= -msse4.1
.endif
@@ -370,7 +372,7 @@ CPPFLAGS.streaming-load-memcpy.c+= -msse
.for _d in ${DRIVERS}
SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
SYMLINKS+= ${_d}_dri.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so
-.if ${MKDEBUG:Uno} == yes
+.if ${MKDEBUG} != no
SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR}.debug ${DRIDEBUGDIR}/${_d}_dri.so.${SHLIB_MAJOR}.debug
.endif
.endfor
@@ -393,6 +395,15 @@ FILES= drirc
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common
.include bsd.x11.mk
+.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
LIBDIR= ${X11USRLIBDIR}/modules/dri
+CWARNFLAGS.clang+= -Wno-error=initializer-overrides -Wno-error=switch \
+ -Wno-error=tautological-constant-out-of-range-compare
+
.include bsd.lib.mk
+.else
+.include bsd.inc.mk
+.endif
+# Don't re-build .c files when .y files change
+.y.c:
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.6.2.2 src/external/mit/xorg/lib/gallium/Makefile:1.6.2.3
--- src/external/mit/xorg/lib/gallium/Makefile:1.6.2.2 Mon Jan 5 21:23:51 2015
+++ src/external/mit/xorg/lib/gallium/Makefile Tue Jan 6 11:00:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6.2.2 2015/01/05 21:23:51 martin Exp $
+# $NetBSD: Makefile,v 1.6.2.3 2015/01/06 11:00:40 martin Exp $
# Link the gallium mega driver.
@@ -463,15 +463,25 @@ CPPFLAGS.target.c += \
-I${X11SRCDIR.MesaLib}/src/loader \
-I${X11SRCDIR.MesaLib}/src/gallium/winsys
+CWARNFLAGS.clang+= -Wno-error=constant-conversion \
+ -Wno-error=tautological-constant-out-of-range-compare \
+ -Wno-error=pointer-sign \
+ -Wno-error=switch \
+ -Wno-error=absolute-value \
+ -Wno-error=tautological-compare \
+ -Wno-error=static-in-inline
+
.include bsd.x11.mk
LIBDIR= ${X11USRLIBDIR}/modules/dri
.for _d in ${DRIVERS}
SYMLINKS+= gallium_dri.so ${DRIDIR}/${_d}_dri.so
SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
-.if ${MKDEBUG:Uno} == yes
+.if ${MKDEBUG} != no
SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR}.debug ${DRIDEBUGDIR}/${_d}_dri.so.${SHLIB_MAJOR}.debug
.endif
.endfor
.include bsd.lib.mk
+# Don't regenerate c files
+.y.c:
CVS commit: src/sys/fs/ntfs
Module Name:src
Committed By: hannken
Date: Tue Jan 6 11:03:09 UTC 2015
Modified Files:
src/sys/fs/ntfs: ntfs_vfsops.c
Log Message:
Adjust printf and add missing ntfs_ntput().
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/fs/ntfs/ntfs_vfsops.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/fs/ntfs/ntfs_vfsops.c
diff -u src/sys/fs/ntfs/ntfs_vfsops.c:1.101 src/sys/fs/ntfs/ntfs_vfsops.c:1.102
--- src/sys/fs/ntfs/ntfs_vfsops.c:1.101 Sun Jan 4 16:19:12 2015
+++ src/sys/fs/ntfs/ntfs_vfsops.c Tue Jan 6 11:03:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_vfsops.c,v 1.101 2015/01/04 16:19:12 christos Exp $ */
+/* $NetBSD: ntfs_vfsops.c,v 1.102 2015/01/06 11:03:09 hannken Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ntfs_vfsops.c,v 1.101 2015/01/04 16:19:12 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ntfs_vfsops.c,v 1.102 2015/01/06 11:03:09 hannken Exp $);
#include sys/param.h
#include sys/systm.h
@@ -737,8 +737,8 @@ ntfs_loadvnode(struct mount *mp, struct
error = ntfs_ntvattrget(ntmp, ip, NTFS_A_NAME, NULL, 0, vap);
if (error) {
- printf(%s: ino %jd (error %d)\n, __func__,
- (intmax_t)ip-i_number, error);
+ printf(%s: attr %x for ino % PRId64 : error %d\n,
+ __func__, NTFS_A_NAME, ip-i_number, error);
ntfs_ntput(ip);
goto out;
}
@@ -766,8 +766,9 @@ ntfs_loadvnode(struct mount *mp, struct
fp-f_allocated = 0;
error = 0;
} else {
- printf(%s: ino %jd attr %u (error %d)\n, __func__,
- (intmax_t)ip-i_number, ntkey-k_attrtype, error);
+ printf(%s: attr %x for ino % PRId64 : error %d\n,
+ __func__, ntkey-k_attrtype, ip-i_number, error);
+ ntfs_ntput(ip);
goto out;
}
}
CVS commit: src/sys/fs/ntfs
Module Name:src
Committed By: hannken
Date: Tue Jan 6 11:04:00 UTC 2015
Modified Files:
src/sys/fs/ntfs: ntfs_subr.c
Log Message:
No need to load a vnode/fnode pair to lookup attributes on a ntnode.
Use ntfs_ntlookup()/ntfs_ntput() instead.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/fs/ntfs/ntfs_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/fs/ntfs/ntfs_subr.c
diff -u src/sys/fs/ntfs/ntfs_subr.c:1.57 src/sys/fs/ntfs/ntfs_subr.c:1.58
--- src/sys/fs/ntfs/ntfs_subr.c:1.57 Sun Jan 4 16:19:12 2015
+++ src/sys/fs/ntfs/ntfs_subr.c Tue Jan 6 11:04:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_subr.c,v 1.57 2015/01/04 16:19:12 christos Exp $ */
+/* $NetBSD: ntfs_subr.c,v 1.58 2015/01/06 11:04:00 hannken Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko (sem...@freebsd.org)
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ntfs_subr.c,v 1.57 2015/01/04 16:19:12 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ntfs_subr.c,v 1.58 2015/01/06 11:04:00 hannken Exp $);
#include sys/param.h
#include sys/systm.h
@@ -150,7 +150,6 @@ ntfs_findvattr(struct ntfsmount *ntmp, s
/*
* Search attribute specified in ntnode (load ntnode if necessary).
* If not found but ATTR_A_ATTRLIST present, read it in and search through.
- * VOP_VGET node needed, and lookup through its ntnode (load if necessary).
*
* ntnode should be locked
*/
@@ -161,7 +160,6 @@ ntfs_ntvattrget(struct ntfsmount *ntmp,
struct ntvattr *lvap = NULL;
struct attr_attrlist *aalp;
struct attr_attrlist *nextaalp;
- struct vnode *newvp;
struct ntnode *newip;
void *alpool;
size_t namelen, len;
@@ -224,18 +222,17 @@ ntfs_ntvattrget(struct ntfsmount *ntmp,
dprintf((%s: attribute in ino: %d\n, __func__,
aalp-al_inumber));
- error = ntfs_vgetex(ntmp-ntm_mountp, aalp-al_inumber,
-NTFS_A_DATA, , LK_EXCLUSIVE, newvp);
+ error = ntfs_ntlookup(ntmp, aalp-al_inumber, newip);
if (error) {
- printf(%s: CAN'T VGET INO: %d (error %d)\n, __func__,
- aalp-al_inumber, error);
+ printf(%s: can't lookup ino %d
+ for % PRId64 attr %x: error %d\n, __func__,
+ aalp-al_inumber, ip-i_number, type, error);
goto out;
}
- newip = VTONT(newvp);
/* XXX have to lock ntnode */
error = ntfs_findvattr(ntmp, newip, lvap, vapp,
type, name, namelen, vcn);
- vput(newvp);
+ ntfs_ntput(newip);
if (error == 0)
goto out;
printf(%s: ATTRLIST ERROR.\n, __func__);
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jmcneill Date: Tue Jan 6 11:19:16 UTC 2015 Modified Files: src/sys/arch/arm/rockchip: rockchip_emac.c Log Message: fix multicast hash calculation To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/rockchip/rockchip_emac.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/rockchip/rockchip_emac.c diff -u src/sys/arch/arm/rockchip/rockchip_emac.c:1.5 src/sys/arch/arm/rockchip/rockchip_emac.c:1.6 --- src/sys/arch/arm/rockchip/rockchip_emac.c:1.5 Mon Jan 5 23:00:52 2015 +++ src/sys/arch/arm/rockchip/rockchip_emac.c Tue Jan 6 11:19:16 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rockchip_emac.c,v 1.5 2015/01/05 23:00:52 jmcneill Exp $ */ +/* $NetBSD: rockchip_emac.c,v 1.6 2015/01/06 11:19:16 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca @@ -29,7 +29,7 @@ #include opt_rkemac.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rockchip_emac.c,v 1.5 2015/01/05 23:00:52 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: rockchip_emac.c,v 1.6 2015/01/06 11:19:16 jmcneill Exp $); #include sys/param.h #include sys/bus.h @@ -908,7 +908,7 @@ rkemac_setmulti(struct rkemac_softc *sc) hashes[0] = hashes[1] = 0x; goto done; } - h = ether_crc32_le(enm-enm_addrlo, ETHER_ADDR_LEN); + h = ~ether_crc32_le(enm-enm_addrlo, ETHER_ADDR_LEN) 26; hashes[h 5] |= (1 (h 0x1f)); ETHER_NEXT_MULTI(step, enm); }
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jmcneill Date: Tue Jan 6 11:22:09 UTC 2015 Modified Files: src/sys/arch/arm/rockchip: rockchip_emac.c Log Message: Make sure to write our MAC address to the chip To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/rockchip/rockchip_emac.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/rockchip/rockchip_emac.c diff -u src/sys/arch/arm/rockchip/rockchip_emac.c:1.6 src/sys/arch/arm/rockchip/rockchip_emac.c:1.7 --- src/sys/arch/arm/rockchip/rockchip_emac.c:1.6 Tue Jan 6 11:19:16 2015 +++ src/sys/arch/arm/rockchip/rockchip_emac.c Tue Jan 6 11:22:09 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rockchip_emac.c,v 1.6 2015/01/06 11:19:16 jmcneill Exp $ */ +/* $NetBSD: rockchip_emac.c,v 1.7 2015/01/06 11:22:09 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca @@ -29,7 +29,7 @@ #include opt_rkemac.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rockchip_emac.c,v 1.6 2015/01/06 11:19:16 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: rockchip_emac.c,v 1.7 2015/01/06 11:22:09 jmcneill Exp $); #include sys/param.h #include sys/bus.h @@ -232,6 +232,12 @@ rkemac_attach(device_t parent, device_t enaddr[5] = (addrh 8) 0xff; } + const uint32_t addrl = enaddr[0] | (enaddr[1] 8) | + (enaddr[2] 16) | (enaddr[3] 24); + const uint32_t addrh = enaddr[4] | (enaddr[5] 8); + EMAC_WRITE(sc, EMAC_ADDRL_REG, addrl); + EMAC_WRITE(sc, EMAC_ADDRH_REG, addrh); + aprint_normal_dev(sc-sc_dev, Ethernet address: %s\n, ether_sprintf(enaddr));
CVS commit: src/sys/coda
Module Name:src Committed By: hannken Date: Tue Jan 6 11:24:46 UTC 2015 Modified Files: src/sys/coda: coda_subr.c Log Message: Add missing vrele() and vfs_vnode_iterator_destroy() to coda_cacheprint(). To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/coda/coda_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/coda/coda_subr.c diff -u src/sys/coda/coda_subr.c:1.30 src/sys/coda/coda_subr.c:1.31 --- src/sys/coda/coda_subr.c:1.30 Sat Dec 13 15:59:30 2014 +++ src/sys/coda/coda_subr.c Tue Jan 6 11:24:46 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: coda_subr.c,v 1.30 2014/12/13 15:59:30 hannken Exp $ */ +/* $NetBSD: coda_subr.c,v 1.31 2015/01/06 11:24:46 hannken Exp $ */ /* * @@ -55,7 +55,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: coda_subr.c,v 1.30 2014/12/13 15:59:30 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: coda_subr.c,v 1.31 2015/01/06 11:24:46 hannken Exp $); #include sys/param.h #include sys/systm.h @@ -297,8 +297,10 @@ coda_cacheprint(struct mount *whoIam) coda_nc_name(VTOC(vp)); printf(\n); count++; + vrele(vp); } printf(coda_cacheprint: count %d\n, count); + vfs_vnode_iterator_destroy(marker); } #endif
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: macallan
Date: Tue Jan 6 13:54:18 UTC 2015
Modified Files:
src/sys/dev/sbus: mgx.c
Log Message:
- enable alpha fonts now that we have acceleration and glyphcache
- fix drawing of underlined characters
- try to flush framebuffer writes before reading them with the blitter
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/sbus/mgx.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/mgx.c
diff -u src/sys/dev/sbus/mgx.c:1.2 src/sys/dev/sbus/mgx.c:1.3
--- src/sys/dev/sbus/mgx.c:1.2 Sun Jan 4 18:18:20 2015
+++ src/sys/dev/sbus/mgx.c Tue Jan 6 13:54:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mgx.c,v 1.2 2015/01/04 18:18:20 macallan Exp $ */
+/* $NetBSD: mgx.c,v 1.3 2015/01/06 13:54:18 macallan Exp $ */
/*-
* Copyright (c) 2014 Michael Lorenz
@@ -29,7 +29,7 @@
/* a console driver for the SSB 4096V-MGX graphics card */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mgx.c,v 1.2 2015/01/04 18:18:20 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: mgx.c,v 1.3 2015/01/06 13:54:18 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -465,17 +465,17 @@ mgx_putchar(void *cookie, int row, int c
return;
}
rv = glyphcache_try(sc-sc_gc, c, x, y, attr);
- if (rv == GC_OK)
- return;
- mgx_wait_engine(sc);
- sc-sc_putchar(cookie, row, col, c, attr ~1);
+ if (rv != GC_OK) {
+ volatile uint32_t junk;
- if (rv == GC_ADD) {
- glyphcache_add(sc-sc_gc, c, x, y);
- } else {
- if (attr 1)
- mgx_rectfill(sc, x, y + he - 2, wi, 1, fg);
+ mgx_wait_engine(sc);
+ sc-sc_putchar(cookie, row, col, c, attr ~1);
+ junk = *(uint32_t *)sc-sc_fbaddr;
+ if (rv == GC_ADD)
+ glyphcache_add(sc-sc_gc, c, x, y);
}
+ if (attr 1)
+ mgx_rectfill(sc, x, y + he - 2, wi, 1, fg);
}
static void
@@ -589,18 +589,10 @@ mgx_init_screen(void *cookie, struct vco
ri-ri_width = sc-sc_width;
ri-ri_height = sc-sc_height;
ri-ri_stride = sc-sc_stride;
- ri-ri_flg = RI_CENTER;
+ ri-ri_flg = RI_CENTER | RI_ENABLE_ALPHA;
-#if _LP64
- /*
- * XXX
- * Assuming all 64bit SPARCs are fast enough to render anti-aliased
- * text on the fly. Matters only as long as we don't have acceleration
- * and glyphcache.
- */
if (ri-ri_depth == 8)
- ri-ri_flg |= RI_8BIT_IS_RGB | RI_ENABLE_ALPHA;
-#endif
+ ri-ri_flg |= RI_8BIT_IS_RGB;
ri-ri_bits = sc-sc_fbaddr;
CVS commit: src/tests/net/in_cksum
Module Name:src
Committed By: martin
Date: Tue Jan 6 15:13:16 UTC 2015
Modified Files:
src/tests/net/in_cksum: t_in_cksum.sh
Log Message:
Invoke the helper program from the test installation directory (instead
of the current/temporary).
Properly register failure.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/in_cksum/t_in_cksum.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/in_cksum/t_in_cksum.sh
diff -u src/tests/net/in_cksum/t_in_cksum.sh:1.1 src/tests/net/in_cksum/t_in_cksum.sh:1.2
--- src/tests/net/in_cksum/t_in_cksum.sh:1.1 Mon Jan 5 22:38:36 2015
+++ src/tests/net/in_cksum/t_in_cksum.sh Tue Jan 6 15:13:16 2015
@@ -1,28 +1,38 @@
#! /usr/bin/atf-sh
-# $NetBSD: t_in_cksum.sh,v 1.1 2015/01/05 22:38:36 christos Exp $
+# $NetBSD: t_in_cksum.sh,v 1.2 2015/01/06 15:13:16 martin Exp $
#
TIMING_LOOPS=1
+incksum=$(atf_get_srcdir)/in_cksum
+
+fail() {
+atf_fail see output for details
+}
mbufs() {
-./in_cksum -l 16 -u $0 -i ${TIMING_LOOPS} \
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-./in_cksum -l 16 -u $0 -i ${TIMING_LOOPS} \
+${incksum} -l 16 -u $0 -i ${TIMING_LOOPS} \
+ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 \
+ || fail
+${incksum} -l 16 -u $0 -i ${TIMING_LOOPS} \
+ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 \
+ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 \
+ || fail
+${incksum} -l 64 -u $0 -i ${TIMING_LOOPS} \
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 \
- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
-./in_cksum -l 64 -u $0 -i ${TIMING_LOOPS} \
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 \
- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
-./in_cksum -l 16 -u $0 -i ${TIMING_LOOPS} \
- 1 3 1 3 1 3 1
+ || fail
+${incksum} -l 16 -u $0 -i ${TIMING_LOOPS} \
+ 1 3 1 3 1 3 1 \
+ || fail
}
sizes() {
-./in_cksum -l 16 -u $1 -i ${TIMING_LOOPS} 2048
-./in_cksum -l 16 -u $1 -i ${TIMING_LOOPS} 40
-./in_cksum -l 16 -u $1 -i ${TIMING_LOOPS} 1536
-./in_cksum -l 16 -u $1 -i ${TIMING_LOOPS} 576
-./in_cksum -l 16 -u $1 -i ${TIMING_LOOPS} 1536 1536 1536 1536 1536 640
+${incksum} -l 16 -u $1 -i ${TIMING_LOOPS} 2048 || fail
+${incksum} -l 16 -u $1 -i ${TIMING_LOOPS} 40 || fail
+${incksum} -l 16 -u $1 -i ${TIMING_LOOPS} 1536 || fail
+${incksum} -l 16 -u $1 -i ${TIMING_LOOPS} 576 || fail
+${incksum} -l 16 -u $1 -i ${TIMING_LOOPS} 1536 1536 1536 1536 1536 640 \
+ || fail
}
atf_test_case mbufs_aligned
CVS commit: src/sys/dev/wscons
Module Name:src
Committed By: christos
Date: Tue Jan 6 19:19:10 UTC 2015
Modified Files:
src/sys/dev/wscons: wsconsio.h
Log Message:
add MGX
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/dev/wscons/wsconsio.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/wscons/wsconsio.h
diff -u src/sys/dev/wscons/wsconsio.h:1.110 src/sys/dev/wscons/wsconsio.h:1.111
--- src/sys/dev/wscons/wsconsio.h:1.110 Tue Jan 6 14:18:21 2015
+++ src/sys/dev/wscons/wsconsio.h Tue Jan 6 14:19:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.110 2015/01/06 19:18:21 christos Exp $ */
+/* $NetBSD: wsconsio.h,v 1.111 2015/01/06 19:19:10 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -334,7 +334,8 @@ struct wsmouse_repeat {
#define WSDISPLAY_TYPE_OMAP3 57 /* OMAP 3530 */
#define WSDISPLAY_TYPE_WINDERMERE 58 /* SoC for EPOC32 Series 5mx */
#define WSDISPLAY_TYPE_CLPS711X 59 /* CL PS-711x */
-#define WSDISPLAY_TYPE_ALLWINNER 60 /* Allwinner ARM SoC */
+#define WSDISPLAY_TYPE_ALLWINNER 60 /* Allwinner ARM SoC */
+#define WSDISPLAY_TYPE_MGX 61 /* SSB 4096V-MGX */
/* Basic display information. Not applicable to all display types. */
struct wsdisplay_fbinfo {
CVS commit: src/sys/dev/wscons
Module Name:src
Committed By: christos
Date: Tue Jan 6 19:18:21 UTC 2015
Modified Files:
src/sys/dev/wscons: wsconsio.h
Log Message:
tab police
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/wscons/wsconsio.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/wscons/wsconsio.h
diff -u src/sys/dev/wscons/wsconsio.h:1.109 src/sys/dev/wscons/wsconsio.h:1.110
--- src/sys/dev/wscons/wsconsio.h:1.109 Sun Nov 9 09:33:21 2014
+++ src/sys/dev/wscons/wsconsio.h Tue Jan 6 14:18:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.109 2014/11/09 14:33:21 jmcneill Exp $ */
+/* $NetBSD: wsconsio.h,v 1.110 2015/01/06 19:18:21 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -317,24 +317,24 @@ struct wsmouse_repeat {
#define WSDISPLAY_TYPE_STI 40 /* HP STI framebuffers */
#define WSDISPLAY_TYPE_HDLCD 41 /* Hitachi HD44780 based LCDs */
#define WSDISPLAY_TYPE_VESA 42 /* VESA BIOS framebuffer */
-#define WSDISPLAY_TYPE_XILFB 43 /* Xilinx TFT cores */
-#define WSDISPLAY_TYPE_LIGHT 44 /* SGI Light (a.k.a. Entry/Starter) */
-#define WSDISPLAY_TYPE_GENFB 45 /* generic nondescript framebuffer */
-#define WSDISPLAY_TYPE_CRIME 46 /* SGI O2 */
-#define WSDISPLAY_TYPE_PXALCD 47 /* PXA2x0 LCD controller */
-#define WSDISPLAY_TYPE_AG10 48 /* Fujitsu AG-10e */
-#define WSDISPLAY_TYPE_DL 49 /* DisplayLink DL-1x0/DL-1x5 */
-#define WSDISPLAY_TYPE_XVR1000 50 /* Sun XVR-1000 */
-#define WSDISPLAY_TYPE_LUNA 51 /* OMRON SX-9100 LUNA */
-#define WSDISPLAY_TYPE_GRF 52 /* wsdisplay on top of grf(4) */
-#define WSDISPLAY_TYPE_VNC 53 /* Usermode vnc framebuffer */
-#define WSDISPLAY_TYPE_VALKYRIE 54 /* Apple onboard video 'valkyrie' */
-#define WSDISPLAY_TYPE_IMXIPU 55 /* i.MX ipu */
-#define WSDISPLAY_TYPE_VC4 56 /* Broadcom VideoCore 4 */
-#define WSDISPLAY_TYPE_OMAP3 57 /* OMAP 3530 */
-#define WSDISPLAY_TYPE_WINDERMERE 58 /* SoC for EPOC32 Series 5mx */
-#define WSDISPLAY_TYPE_CLPS711X 59 /* CL PS-711x */
-#define WSDISPLAY_TYPE_ALLWINNER 60 /* Allwinner ARM SoC */
+#define WSDISPLAY_TYPE_XILFB 43 /* Xilinx TFT cores */
+#define WSDISPLAY_TYPE_LIGHT 44 /* SGI Light (a.k.a. Entry/Starter) */
+#define WSDISPLAY_TYPE_GENFB 45 /* generic nondescript framebuffer */
+#define WSDISPLAY_TYPE_CRIME 46 /* SGI O2 */
+#define WSDISPLAY_TYPE_PXALCD 47 /* PXA2x0 LCD controller */
+#define WSDISPLAY_TYPE_AG10 48 /* Fujitsu AG-10e */
+#define WSDISPLAY_TYPE_DL 49 /* DisplayLink DL-1x0/DL-1x5 */
+#define WSDISPLAY_TYPE_XVR1000 50 /* Sun XVR-1000 */
+#define WSDISPLAY_TYPE_LUNA 51 /* OMRON SX-9100 LUNA */
+#define WSDISPLAY_TYPE_GRF 52 /* wsdisplay on top of grf(4) */
+#define WSDISPLAY_TYPE_VNC 53 /* Usermode vnc framebuffer */
+#define WSDISPLAY_TYPE_VALKYRIE 54 /* Apple onboard video 'valkyrie' */
+#define WSDISPLAY_TYPE_IMXIPU 55 /* i.MX ipu */
+#define WSDISPLAY_TYPE_VC4 56 /* Broadcom VideoCore 4 */
+#define WSDISPLAY_TYPE_OMAP3 57 /* OMAP 3530 */
+#define WSDISPLAY_TYPE_WINDERMERE 58 /* SoC for EPOC32 Series 5mx */
+#define WSDISPLAY_TYPE_CLPS711X 59 /* CL PS-711x */
+#define WSDISPLAY_TYPE_ALLWINNER 60 /* Allwinner ARM SoC */
/* Basic display information. Not applicable to all display types. */
struct wsdisplay_fbinfo {
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: dholland Date: Tue Jan 6 22:38:41 UTC 2015 Modified Files: src/games/fortune/datfiles: fortunes Log Message: add something To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/games/fortune/datfiles/fortunes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes diff -u src/games/fortune/datfiles/fortunes:1.57 src/games/fortune/datfiles/fortunes:1.58 --- src/games/fortune/datfiles/fortunes:1.57 Fri Dec 5 23:21:23 2014 +++ src/games/fortune/datfiles/fortunes Tue Jan 6 22:38:41 2015 @@ -16176,3 +16176,6 @@ now there's 63,005 bugs in the code!! % 1) Don't expect fairings. 2) If confused read #1. +% +Cheer up. You could have all the problems you have now, and then also +be named Eustace Clarence Scrubb.
CVS commit: src/tests/net/in_cksum
Module Name:src
Committed By: joerg
Date: Tue Jan 6 21:36:38 UTC 2015
Modified Files:
src/tests/net/in_cksum: in_cksum.c
Log Message:
panic is printflike.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/in_cksum/in_cksum.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/in_cksum/in_cksum.c
diff -u src/tests/net/in_cksum/in_cksum.c:1.2 src/tests/net/in_cksum/in_cksum.c:1.3
--- src/tests/net/in_cksum/in_cksum.c:1.2 Mon Jan 5 23:25:10 2015
+++ src/tests/net/in_cksum/in_cksum.c Tue Jan 6 21:36:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in_cksum.c,v 1.2 2015/01/05 23:25:10 christos Exp $ */
+/* $NetBSD: in_cksum.c,v 1.3 2015/01/06 21:36:38 joerg Exp $ */
/*-
* Copyright (c) 2008 Joerg Sonnenberger jo...@netbsd.org.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: in_cksum.c,v 1.2 2015/01/05 23:25:10 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: in_cksum.c,v 1.3 2015/01/06 21:36:38 joerg Exp $);
#include sys/param.h
#include sys/mbuf.h
@@ -52,7 +52,7 @@ int cpu_in_cksum(struct mbuf*, int, int,
static bool random_aligned;
-void panic(const char *, ...);
+void panic(const char *, ...) __printflike(1, 2);
void
panic(const char *fmt, ...)
{
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Tue Jan 6 21:04:06 UTC 2015 Modified Files: src/distrib/sets/lists/comp: mi Log Message: revert the previous, it is incorrect and breaks MKGCCCMDS=no. fixes for MKGCC=no should appear next. To generate a diff of this commit: cvs rdiff -u -r1.1933 -r1.1934 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1933 src/distrib/sets/lists/comp/mi:1.1934 --- src/distrib/sets/lists/comp/mi:1.1933 Mon Jan 5 18:03:59 2015 +++ src/distrib/sets/lists/comp/mi Tue Jan 6 21:04:06 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1933 2015/01/05 18:03:59 joerg Exp $ +# $NetBSD: mi,v 1.1934 2015/01/06 21:04:06 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3584,10 +3584,10 @@ ./usr/lib/libg2c.acomp-obsolete gcc=4,obsolete ./usr/lib/libg2c_p.acomp-fortran-proflib gcc=3,profile ./usr/lib/libg2c_p.acomp-obsolete gcc=4,obsolete -./usr/lib/libgcc.acomp-c-lib gcccmds +./usr/lib/libgcc.acomp-c-lib ./usr/lib/libgcc_p.acomp-c-proflib obsolete ./usr/lib/libgcc_s.acomp-obsolete obsolete -./usr/lib/libgcov.acomp-c-lib gcccmds +./usr/lib/libgcov.acomp-c-lib ./usr/lib/libgmp.a-unknown- obsolete ./usr/lib/libgmp.acomp-c-lib obsolete ./usr/lib/libgmp_p.acomp-c-proflib obsolete @@ -3696,8 +3696,8 @@ ./usr/lib/libntp_p.acomp-obsolete obsolete ./usr/lib/libnvpair.acomp-zfs-lib zfs ./usr/lib/libnvpair_p.acomp-zfs-proflib profile,zfs -./usr/lib/libobjc.acomp-objc-lib gcccmds -./usr/lib/libobjc_p.acomp-objc-proflib profile,gcccmds +./usr/lib/libobjc.acomp-objc-lib +./usr/lib/libobjc_p.acomp-objc-proflib profile ./usr/lib/libopenpgpsdk.a comp-obsolete obsolete ./usr/lib/libopenpgpsdk_p.a comp-obsolete obsolete ./usr/lib/libossaudio.acomp-c-lib @@ -3931,9 +3931,9 @@ ./usr/lib/libssl_p.acomp-c-proflib profile,crypto ./usr/lib/libssp.acomp-obsolete obsolete ./usr/lib/libssp_p.acomp-obsolete obsolete -./usr/lib/libstdc++.acomp-cxx-lib cxx,libstdcxx,gcccmds -./usr/lib/libstdc++_p.acomp-cxx-proflib profile,cxx,libstdcxx,gcccmds -./usr/lib/libsupc++.acomp-cxx-lib cxx,libstdcxx,gcccmds +./usr/lib/libstdc++.acomp-cxx-lib cxx,libstdcxx +./usr/lib/libstdc++_p.acomp-cxx-proflib profile,cxx,libstdcxx +./usr/lib/libsupc++.acomp-cxx-lib cxx,libstdcxx ./usr/lib/libtddl.acomp-c-lib tpm ./usr/lib/libtddl_p.acomp-c-proflib tpm,profile ./usr/lib/libtelnet.acomp-obsolete obsolete
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Tue Jan 6 21:42:02 UTC 2015 Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: fix MKGCC=no builds. To generate a diff of this commit: cvs rdiff -u -r1.1934 -r1.1935 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.99 -r1.100 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.608 -r1.609 src/distrib/sets/lists/tests/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1934 src/distrib/sets/lists/comp/mi:1.1935 --- src/distrib/sets/lists/comp/mi:1.1934 Tue Jan 6 21:04:06 2015 +++ src/distrib/sets/lists/comp/mi Tue Jan 6 21:42:02 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1934 2015/01/06 21:04:06 mrg Exp $ +# $NetBSD: mi,v 1.1935 2015/01/06 21:42:02 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3584,10 +3584,12 @@ ./usr/lib/libg2c.acomp-obsolete gcc=4,obsolete ./usr/lib/libg2c_p.acomp-fortran-proflib gcc=3,profile ./usr/lib/libg2c_p.acomp-obsolete gcc=4,obsolete -./usr/lib/libgcc.acomp-c-lib +./usr/lib/libgcc.acomp-c-lib gcc=45 +./usr/lib/libgcc.acomp-c-lib gcc=48 ./usr/lib/libgcc_p.acomp-c-proflib obsolete ./usr/lib/libgcc_s.acomp-obsolete obsolete -./usr/lib/libgcov.acomp-c-lib +./usr/lib/libgcov.acomp-c-lib gcc=45 +./usr/lib/libgcov.acomp-c-lib gcc=48 ./usr/lib/libgmp.a-unknown- obsolete ./usr/lib/libgmp.acomp-c-lib obsolete ./usr/lib/libgmp_p.acomp-c-proflib obsolete @@ -3696,8 +3698,10 @@ ./usr/lib/libntp_p.acomp-obsolete obsolete ./usr/lib/libnvpair.acomp-zfs-lib zfs ./usr/lib/libnvpair_p.acomp-zfs-proflib profile,zfs -./usr/lib/libobjc.acomp-objc-lib -./usr/lib/libobjc_p.acomp-objc-proflib profile +./usr/lib/libobjc.acomp-objc-lib gcc=45 +./usr/lib/libobjc.acomp-objc-lib gcc=48 +./usr/lib/libobjc_p.acomp-objc-proflib profile,gcc=45 +./usr/lib/libobjc_p.acomp-objc-proflib profile,gcc=45 ./usr/lib/libopenpgpsdk.a comp-obsolete obsolete ./usr/lib/libopenpgpsdk_p.a comp-obsolete obsolete ./usr/lib/libossaudio.acomp-c-lib @@ -3931,9 +3935,12 @@ ./usr/lib/libssl_p.acomp-c-proflib profile,crypto ./usr/lib/libssp.acomp-obsolete obsolete ./usr/lib/libssp_p.acomp-obsolete obsolete -./usr/lib/libstdc++.acomp-cxx-lib cxx,libstdcxx -./usr/lib/libstdc++_p.acomp-cxx-proflib profile,cxx,libstdcxx -./usr/lib/libsupc++.acomp-cxx-lib cxx,libstdcxx +./usr/lib/libstdc++.acomp-cxx-lib cxx,libstdcxx,gcc=45 +./usr/lib/libstdc++.acomp-cxx-lib cxx,libstdcxx,gcc=48 +./usr/lib/libstdc++_p.acomp-cxx-proflib profile,cxx,libstdcxx,gcc=45 +./usr/lib/libstdc++_p.acomp-cxx-proflib profile,cxx,libstdcxx,gcc=48 +./usr/lib/libsupc++.acomp-cxx-lib cxx,libstdcxx,gcc=45 +./usr/lib/libsupc++.acomp-cxx-lib cxx,libstdcxx,gcc=48 ./usr/lib/libtddl.acomp-c-lib tpm ./usr/lib/libtddl_p.acomp-c-proflib tpm,profile ./usr/lib/libtelnet.acomp-obsolete obsolete Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.99 src/distrib/sets/lists/debug/mi:1.100 --- src/distrib/sets/lists/debug/mi:1.99 Mon Jan 5 22:45:09 2015 +++ src/distrib/sets/lists/debug/mi Tue Jan 6 21:42:02 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.99 2015/01/05 22:45:09 christos Exp $ +# $NetBSD: mi,v 1.100 2015/01/06 21:42:02 mrg Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -2076,7 +2076,8 @@ ./usr/libdata/debug/usr/tests/lib/libm/t_sqrt.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libm/t_tan.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libm/t_tanh.debug tests-lib-debug debug,atf -./usr/libdata/debug/usr/tests/lib/libobjc/t_threads.debug tests-lib-debug debug,atf,gcccmds +./usr/libdata/debug/usr/tests/lib/libobjc/t_threads.debug tests-lib-debug debug,atf,gcc=45 +./usr/libdata/debug/usr/tests/lib/libobjc/t_threads.debug tests-lib-debug debug,atf,gcc=48 ./usr/libdata/debug/usr/tests/lib/libposix/bsd/t_rename.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libposix/posix1/t_rename.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libposix/posix2/t_rename.debug tests-lib-debug debug,atf Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.608 src/distrib/sets/lists/tests/mi:1.609 --- src/distrib/sets/lists/tests/mi:1.608 Mon Jan 5 22:45:09 2015 +++ src/distrib/sets/lists/tests/mi Tue Jan 6 21:42:02 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.608 2015/01/05 22:45:09 christos Exp $ +# $NetBSD: mi,v 1.609 2015/01/06 21:42:02 mrg Exp $ # # Note: don't delete entries from here - mark them
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: christos
Date: Wed Jan 7 02:02:44 UTC 2015
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile
Added Files:
src/external/gpl3/gcc/usr.bin/lto-wrapper: Makefile
src/external/gpl3/gcc/usr.bin/lto1: Makefile
Log Message:
build lto
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/lto1/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/gpl3/gcc/usr.bin/Makefile
diff -u src/external/gpl3/gcc/usr.bin/Makefile:1.5 src/external/gpl3/gcc/usr.bin/Makefile:1.6
--- src/external/gpl3/gcc/usr.bin/Makefile:1.5 Sat Mar 1 05:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile Tue Jan 6 21:02:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/03/01 10:00:49 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2015/01/07 02:02:44 christos Exp $
NOOBJ=# defined
@@ -16,6 +16,7 @@ SUBDIR+= host-libiberty .WAIT \
common common-target .WAIT \
libcpp libdecnumber .WAIT \
gcov cc1 cc1obj cc1plus cpp g++ gcc \
+ lto lto-wrapper \
include
.include bsd.subdir.mk
Added files:
Index: src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile
diff -u /dev/null src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile:1.1
--- /dev/null Tue Jan 6 21:02:44 2015
+++ src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile Tue Jan 6 21:02:44 2015
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1 2015/01/07 02:02:44 christos Exp $
+
+NOMAN=1
+PROG= lto-wrapper
+SRCS= lto-wrapper.c
+CPPFLAGS+= -DPREFIX=\/usr\
+
+.include ../Makefile.backend
+.include ../Makefile.backtrace
+.include ../Makefile.common-target
+.include ../Makefile.libcpp
+
+DPADD+= ${LIBIBERTYOBJ}/libiberty.a
+LDADD+= ${LIBIBERTYOBJ}/libiberty.a
+
+
+# VER_CPPFLAGS from Makefile.inc
+
+LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
+DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}
+
+.PATH: ${DIST}/gcc ${DIST}/gcc/c ${DIST}/gcc/c-family ${DIST}/gcc/config
+.PATH: ${G_out_file:H}
Index: src/external/gpl3/gcc/usr.bin/lto1/Makefile
diff -u /dev/null src/external/gpl3/gcc/usr.bin/lto1/Makefile:1.1
--- /dev/null Tue Jan 6 21:02:44 2015
+++ src/external/gpl3/gcc/usr.bin/lto1/Makefile Tue Jan 6 21:02:44 2015
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2015/01/07 02:02:44 christos Exp $
+
+PROG= lto1
+SRCS= lto-partition.c lto-object.c lto.c lto-lang.c attribs.c main.c
+
+CPPFLAGS+= -DPREFIX=\/usr\
+
+.include ../Makefile.backend
+.include ../Makefile.backtrace
+.include ../Makefile.common
+.include ../Makefile.common-target
+.include ../Makefile.libcpp
+.include ../Makefile.libdecnumber
+.include ../Makefile.libiberty
+
+LDADD+= ${LIBIBERTYOBJ}/libiberty.a
+DPADD+= ${LIBIBERTYOBJ}/libiberty.a
+LDADD+= ${LIBIBERTY} ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
+DPADD+= ${LIBIBERTY} ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}
+
+.PATH: ${DIST}/gcc/lto ${DIST}/gcc # ${DIST}/gcc/c ${DIST}/gcc/c-family ${DIST}/gcc/config
+.PATH: ${G_out_file:H}
CVS commit: src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64
Module Name:src
Committed By: christos
Date: Wed Jan 7 02:08:06 UTC 2015
Modified Files:
src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64: configargs.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h:1.17 src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h:1.18
--- src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h:1.17 Mon Oct 20 19:49:18 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h Tue Jan 6 21:08:06 2015
@@ -3,7 +3,7 @@
/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp */
/* Generated automatically. */
-static const char configuration_arguments[] = /usr/src7/tools/gcc/../../external/gpl3/gcc/dist/configure --target=x86_64--netbsd --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb1 20141012' --with-system-zlib --enable-__cxa_atexit --enable-libstdcxx-threads --with-tune=nocona --enable-libstdcxx-time=rt --with-mpc-lib=/var/obj/mknative/amd64-x86_64/usr/src7/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/mknative/amd64-x86_64/usr/src7/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/mknative/amd64-x86_64/usr/src7/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src7/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src7/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src7/external/lgpl3/gmp/lib/libgmp/arch/x86_64 --enable-tls --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd6.0. --host=x86_64--netbsd --with-sysroot=/var/obj/mknative/amd64-x
86_64/usr/src7/destdir.amd64;
+static const char configuration_arguments[] = /usr/src/tools/gcc/../../external/gpl3/gcc/dist/configure --target=x86_64--netbsd --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb1 20141012' --with-system-zlib --enable-__cxa_atexit --enable-libstdcxx-threads --with-tune=nocona --enable-libstdcxx-time=rt --enable-lto --with-mpc-lib=/net/quasar/src-5/NetBSD/src/external/lgpl3/mpc/lib/libmpc/obj.amd64 --with-mpfr-lib=/net/quasar/src-5/NetBSD/src/external/lgpl3/mpfr/lib/libmpfr/obj.amd64 --with-gmp-lib=/net/quasar/src-5/NetBSD/src/external/lgpl3/gmp/lib/libgmp/obj.amd64 --with-mpc-include=/net/quasar/src-5/NetBSD/src/external/lgpl3/mpc/dist/src --with-mpfr-include=/net/quasar/src-5/NetBSD/src/external/lgpl3/mpfr/dist/src --with-gmp-include=/net/quasar/src-5/NetBSD/src/external/lgpl3/gmp/lib/libgmp/arch/x86_64 --enable-tls --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd7
.99.4 --host=x86_64--netbsd --with-sysroot=/usr/obj/amd64/release;
static const char thread_model[] = posix;
static const struct {
CVS commit: src/external/gpl3/gcc/lib/libtsan
Module Name:src
Committed By: christos
Date: Wed Jan 7 03:49:14 UTC 2015
Modified Files:
src/external/gpl3/gcc/lib/libtsan: Makefile
Added Files:
src/external/gpl3/gcc/lib/libtsan: shlib_version
Log Message:
fix library name; add shared library version
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libtsan/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libtsan/shlib_version
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/lib/libtsan/Makefile
diff -u src/external/gpl3/gcc/lib/libtsan/Makefile:1.1 src/external/gpl3/gcc/lib/libtsan/Makefile:1.2
--- src/external/gpl3/gcc/lib/libtsan/Makefile:1.1 Wed Oct 22 17:22:06 2014
+++ src/external/gpl3/gcc/lib/libtsan/Makefile Tue Jan 6 22:49:13 2015
@@ -1,3 +1,4 @@
+# $NetBSD: Makefile,v 1.2 2015/01/07 03:49:13 christos Exp $
.include bsd.own.mk
@@ -56,7 +57,7 @@ SANITIZER_SRCS= \
# The linux build does this to avoid preinit sections on shared libraries
CSHLIBFLAGS+= -DPIC
-LIB= asan
+LIB= tsan
SRCS= ${TSAN_SRCS} ${INTERCEPTION_SRCS} ${SANITIZER_SRCS}
CPPFLAGS+=-I${TSAN}/include -I${TSAN}
Added files:
Index: src/external/gpl3/gcc/lib/libtsan/shlib_version
diff -u /dev/null src/external/gpl3/gcc/lib/libtsan/shlib_version:1.1
--- /dev/null Tue Jan 6 22:49:14 2015
+++ src/external/gpl3/gcc/lib/libtsan/shlib_version Tue Jan 6 22:49:13 2015
@@ -0,0 +1,2 @@
+major=0
+minor=0
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src Committed By: christos Date: Wed Jan 7 02:18:10 UTC 2015 Modified Files: src/external/gpl3/gcc/usr.bin: Makefile Log Message: it is lto1 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/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/gpl3/gcc/usr.bin/Makefile diff -u src/external/gpl3/gcc/usr.bin/Makefile:1.6 src/external/gpl3/gcc/usr.bin/Makefile:1.7 --- src/external/gpl3/gcc/usr.bin/Makefile:1.6 Tue Jan 6 21:02:44 2015 +++ src/external/gpl3/gcc/usr.bin/Makefile Tue Jan 6 21:18:10 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2015/01/07 02:02:44 christos Exp $ +# $NetBSD: Makefile,v 1.7 2015/01/07 02:18:10 christos Exp $ NOOBJ=# defined @@ -16,7 +16,7 @@ SUBDIR+= host-libiberty .WAIT \ common common-target .WAIT \ libcpp libdecnumber .WAIT \ gcov cc1 cc1obj cc1plus cpp g++ gcc \ - lto lto-wrapper \ + lto1 lto-wrapper \ include .include bsd.subdir.mk
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Wed Jan 7 02:46:37 UTC 2015 Modified Files: src/distrib/sets/lists/comp: mi Log Message: fix a gcc tag, pointed out by uebayasi@. To generate a diff of this commit: cvs rdiff -u -r1.1935 -r1.1936 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1935 src/distrib/sets/lists/comp/mi:1.1936 --- src/distrib/sets/lists/comp/mi:1.1935 Tue Jan 6 21:42:02 2015 +++ src/distrib/sets/lists/comp/mi Wed Jan 7 02:46:36 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1935 2015/01/06 21:42:02 mrg Exp $ +# $NetBSD: mi,v 1.1936 2015/01/07 02:46:36 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3701,7 +3701,7 @@ ./usr/lib/libobjc.acomp-objc-lib gcc=45 ./usr/lib/libobjc.acomp-objc-lib gcc=48 ./usr/lib/libobjc_p.acomp-objc-proflib profile,gcc=45 -./usr/lib/libobjc_p.acomp-objc-proflib profile,gcc=45 +./usr/lib/libobjc_p.acomp-objc-proflib profile,gcc=48 ./usr/lib/libopenpgpsdk.a comp-obsolete obsolete ./usr/lib/libopenpgpsdk_p.a comp-obsolete obsolete ./usr/lib/libossaudio.acomp-c-lib
CVS commit: src/external/gpl3/gcc/usr.bin/frontend
Module Name:src Committed By: christos Date: Wed Jan 7 02:05:41 UTC 2015 Modified Files: src/external/gpl3/gcc/usr.bin/frontend: Makefile Log Message: enable the rest of the languages To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/frontend/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/gpl3/gcc/usr.bin/frontend/Makefile diff -u src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.8 src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.9 --- src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.8 Sat May 31 18:55:17 2014 +++ src/external/gpl3/gcc/usr.bin/frontend/Makefile Tue Jan 6 21:05:41 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/05/31 22:55:17 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2015/01/07 02:05:41 christos Exp $ LIBISPRIVATE= yes @@ -53,6 +53,6 @@ CPPFLAGS+= -I../backend # Build the specs.h file CLEANFILES+= specs.h specs.h: Makefile - for f in cp objc; do \ + for f in cp lto objc objcp; do \ echo #include \$$f/lang-specs.h\; \ done specs.h
CVS commit: src/external/gpl3/gcc/usr.bin/backend
Module Name:src
Committed By: christos
Date: Wed Jan 7 02:06:03 UTC 2015
Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile
Log Message:
enable lto
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/gpl3/gcc/usr.bin/backend/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/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.22 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.23
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.22 Sat Jul 5 20:21:24 2014
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Tue Jan 6 21:06:03 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/07/06 00:21:24 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2015/01/07 02:06:03 christos Exp $
LIBISPRIVATE= yes
@@ -176,6 +176,7 @@ auto-build.h: gmp.h Makefile
gcc_cv_ld=${LD} \
gcc_cv_as=${AS} \
${HOST_SH} ${GNUHOSTDIST}/gcc/configure \
+ --enable-lto \
--build=`${HOST_SH} ${GNUHOSTDIST}/config.guess` \
--host=`${HOST_SH} ${GNUHOSTDIST}/config.guess` \
--target=${MACHINE_GNU_PLATFORM} \
CVS commit: src/external/gpl3/gcc/lib/liblto_plugin
Module Name:src
Committed By: christos
Date: Wed Jan 7 02:06:23 UTC 2015
Modified Files:
src/external/gpl3/gcc/lib/liblto_plugin: Makefile
Log Message:
fix build
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/liblto_plugin/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/gpl3/gcc/lib/liblto_plugin/Makefile
diff -u src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.2 src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.3
--- src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.2 Sun Jun 1 16:24:45 2014
+++ src/external/gpl3/gcc/lib/liblto_plugin/Makefile Tue Jan 6 21:06:23 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2015/01/07 02:06:23 christos Exp $
.include bsd.init.mk
.include bsd.shlib.mk
@@ -8,9 +8,15 @@ LIB= liblto_plugin
DIST= ${GCCDIST}
GNUHOSTDIST= ${DIST}
-SRCS= lto-plugin.c
-
-CPPFLAGS+= -DHAVE_CONFIG_H -I${DIST}/include -I.
+SRCS= lto-plugin.c hashtab.c simple-object.c pex-unix.c \
+ pex-common.c argv.c make-temp-file.c concat.c \
+ simple-object-elf.c simple-object-mach-o.c \
+ simple-object-coff.c simple-object-xcoff.c
+
+CPPFLAGS+= -I${DIST}/include -I.
+CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -Dxstrdup=strdup -Dxexit=exit
+CPPFLAGS+= -Dxcalloc=calloc -Dxmalloc=malloc -Dxrealloc=realloc
LIBISMODULE= 1
USE_SHLIBDIR= yes
@@ -38,7 +44,7 @@ config.h: Makefile
CC=${HOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} \
MAKE=${MAKE:Q} \
CONFIG_SHELL=${HOST_SH:Q} \
- ${HOST_SH} ${DIST}/lto-plugin/configure \
+ ${HOST_SH} ${DIST}/libiberty/configure \
--build=`${HOST_SH} ${GNUHOSTDIST}/config.guess` \
--host=`${HOST_SH} ${GNUHOSTDIST}/config.guess` \
--target=${MACHINE_GNU_PLATFORM} \
@@ -47,7 +53,7 @@ config.h: Makefile
.include bsd.lib.mk
-.PATH: ${DIST}/lto-plugin
+.PATH: ${DIST}/lto-plugin ${DIST}/libiberty
.else
.include bsd.prog.mk # do nothing
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src
Committed By: riastradh
Date: Wed Jan 7 03:45:18 UTC 2015
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
Don't leak rn on vcache_get failure.
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/sys/rump/librump/rumpvfs/rumpfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.132 src/sys/rump/librump/rumpvfs/rumpfs.c:1.133
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.132 Sat Jan 3 16:30:32 2015
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Wed Jan 7 03:45:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.132 2015/01/03 16:30:32 hannken Exp $ */
+/* $NetBSD: rumpfs.c,v 1.133 2015/01/07 03:45:18 riastradh Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.132 2015/01/03 16:30:32 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.133 2015/01/07 03:45:18 riastradh Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -749,6 +749,10 @@ rump_vop_lookup(void *v)
getvnode:
KASSERT(rn);
rv = vcache_get(dvp-v_mount, rn, sizeof(rn), vpp);
+ if (rv) {
+ if (rnd-rn_flags RUMPNODE_DIR_ET)
+ kmem_free(rn, sizeof(*rn));
+ }
return rv;
}
@@ -948,8 +952,10 @@ rump_vop_mkdir(void *v)
rn-rn_va.va_flags |= UF_OPAQUE;
rn-rn_parent = rnd;
rv = vcache_get(dvp-v_mount, rn, sizeof(rn), vpp);
- if (rv)
+ if (rv) {
+ kmem_free(rn, sizeof(*rn));
return rv;
+ }
makedir(rnd, cnp, rn);
@@ -1044,8 +1050,10 @@ rump_vop_mknod(void *v)
if ((cnp-cn_flags ISWHITEOUT) != 0)
rn-rn_va.va_flags |= UF_OPAQUE;
rv = vcache_get(dvp-v_mount, rn, sizeof(rn), vpp);
- if (rv)
+ if (rv) {
+ kmem_free(rn, sizeof(*rn));
return rv;
+ }
makedir(rnd, cnp, rn);
@@ -1075,8 +1083,10 @@ rump_vop_create(void *v)
if ((cnp-cn_flags ISWHITEOUT) != 0)
rn-rn_va.va_flags |= UF_OPAQUE;
rv = vcache_get(dvp-v_mount, rn, sizeof(rn), vpp);
- if (rv)
+ if (rv) {
+ kmem_free(rn, sizeof(*rn));
return rv;
+ }
makedir(rnd, cnp, rn);
@@ -1108,8 +1118,10 @@ rump_vop_symlink(void *v)
if ((cnp-cn_flags ISWHITEOUT) != 0)
rn-rn_va.va_flags |= UF_OPAQUE;
rv = vcache_get(dvp-v_mount, rn, sizeof(rn), vpp);
- if (rv)
+ if (rv) {
+ kmem_free(rn, sizeof(*rn));
return rv;
+ }
makedir(rnd, cnp, rn);
@@ -1698,7 +1710,9 @@ rumpfs_mountfs(struct mount *mp)
rn = makeprivate(VDIR, RUMPFS_DEFAULTMODE, NODEV, DEV_BSIZE, false);
rn-rn_parent = rn;
- if ((error = vcache_get(mp, rn, sizeof(rn), rfsmp-rfsmp_rvp)) != 0) {
+ if ((error = vcache_get(mp, rn, sizeof(rn), rfsmp-rfsmp_rvp))
+ != 0) {
+ kmem_free(rn, sizeof(*rn));
kmem_free(rfsmp, sizeof(*rfsmp));
return error;
}
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src
Committed By: riastradh
Date: Wed Jan 7 04:05:26 UTC 2015
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
Name kmem_free(rn, sizeof(*rn)) as freeprivate to match makeprivate.
Per pooka's request from a year or so ago when I passed this patch by
him a year or so ago, if I recall correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/rump/librump/rumpvfs/rumpfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.133 src/sys/rump/librump/rumpvfs/rumpfs.c:1.134
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.133 Wed Jan 7 03:45:18 2015
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Wed Jan 7 04:05:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.133 2015/01/07 03:45:18 riastradh Exp $ */
+/* $NetBSD: rumpfs.c,v 1.134 2015/01/07 04:05:26 riastradh Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.133 2015/01/07 03:45:18 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.134 2015/01/07 04:05:26 riastradh Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -221,6 +221,7 @@ static kmutex_t reclock;
#define RUMPFS_DEFAULTMODE 0755
static void freedir(struct rumpfs_node *, struct componentname *);
static struct rumpfs_node *makeprivate(enum vtype, mode_t, dev_t, off_t, bool);
+static void freeprivate(struct rumpfs_node *);
/*
* Extra Terrestrial stuff. We map a given key (pathname) to a file on
@@ -406,7 +407,7 @@ etfsregister(const char *key, const char
rumpblk_deregister(hostpath);
if (et-et_rn-rn_hostpath != NULL)
free(et-et_rn-rn_hostpath, M_TEMP);
- kmem_free(et-et_rn, sizeof(*et-et_rn));
+ freeprivate(et-et_rn);
kmem_free(et, sizeof(*et));
return EEXIST;
}
@@ -492,7 +493,7 @@ etfsremove(const char *key)
if (et-et_rn-rn_hostpath != NULL)
free(et-et_rn-rn_hostpath, M_TEMP);
- kmem_free(et-et_rn, sizeof(*et-et_rn));
+ freeprivate(et-et_rn);
kmem_free(et, sizeof(*et));
return 0;
@@ -556,6 +557,13 @@ makeprivate(enum vtype vt, mode_t mode,
}
static void
+freeprivate(struct rumpfs_node *rn)
+{
+
+ kmem_free(rn, sizeof(*rn));
+}
+
+static void
makedir(struct rumpfs_node *rnd,
struct componentname *cnp, struct rumpfs_node *rn)
{
@@ -751,10 +759,11 @@ rump_vop_lookup(void *v)
rv = vcache_get(dvp-v_mount, rn, sizeof(rn), vpp);
if (rv) {
if (rnd-rn_flags RUMPNODE_DIR_ET)
- kmem_free(rn, sizeof(*rn));
+ freeprivate(rn);
+ return rv;
}
- return rv;
+ return 0;
}
static int
@@ -953,7 +962,7 @@ rump_vop_mkdir(void *v)
rn-rn_parent = rnd;
rv = vcache_get(dvp-v_mount, rn, sizeof(rn), vpp);
if (rv) {
- kmem_free(rn, sizeof(*rn));
+ freeprivate(rn);
return rv;
}
@@ -1051,7 +1060,7 @@ rump_vop_mknod(void *v)
rn-rn_va.va_flags |= UF_OPAQUE;
rv = vcache_get(dvp-v_mount, rn, sizeof(rn), vpp);
if (rv) {
- kmem_free(rn, sizeof(*rn));
+ freeprivate(rn);
return rv;
}
@@ -1084,7 +1093,7 @@ rump_vop_create(void *v)
rn-rn_va.va_flags |= UF_OPAQUE;
rv = vcache_get(dvp-v_mount, rn, sizeof(rn), vpp);
if (rv) {
- kmem_free(rn, sizeof(*rn));
+ freeprivate(rn);
return rv;
}
@@ -1119,7 +1128,7 @@ rump_vop_symlink(void *v)
rn-rn_va.va_flags |= UF_OPAQUE;
rv = vcache_get(dvp-v_mount, rn, sizeof(rn), vpp);
if (rv) {
- kmem_free(rn, sizeof(*rn));
+ freeprivate(rn);
return rv;
}
@@ -1619,7 +1628,7 @@ rump_vop_reclaim(void *v)
PNBUF_PUT(rn-rn_linktarg);
if (rn-rn_hostpath)
free(rn-rn_hostpath, M_TEMP);
- kmem_free(rn, sizeof(*rn));
+ freeprivate(rn);
}
return 0;
@@ -1712,7 +1721,7 @@ rumpfs_mountfs(struct mount *mp)
rn-rn_parent = rn;
if ((error = vcache_get(mp, rn, sizeof(rn), rfsmp-rfsmp_rvp))
!= 0) {
- kmem_free(rn, sizeof(*rn));
+ freeprivate(rn);
kmem_free(rfsmp, sizeof(*rfsmp));
return error;
}
CVS commit: src/sys/arch/powerpc/booke/dev
Module Name:src
Committed By: nonaka
Date: Wed Jan 7 01:11:47 UTC 2015
Modified Files:
src/sys/arch/powerpc/booke/dev: pq3etsec.c
Log Message:
Remove non-printable character.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/booke/dev/pq3etsec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.18 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.19
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.18 Sat Dec 20 18:03:17 2014
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c Wed Jan 7 01:11:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3etsec.c,v 1.18 2014/12/20 18:03:17 nonaka Exp $ */
+/* $NetBSD: pq3etsec.c,v 1.19 2015/01/07 01:11:47 nonaka Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -39,7 +39,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pq3etsec.c,v 1.18 2014/12/20 18:03:17 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: pq3etsec.c,v 1.19 2015/01/07 01:11:47 nonaka Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -684,7 +684,7 @@ pq3etsec_attach(device_t parent, device_
}
/*
- * If there was no MDIO
+ * If there was no MDIO
*/
if (mdio == CPUNODECF_MDIO_DEFAULT) {
aprint_normal(\n);
CVS commit: src/external/gpl3/gcc/lib/libbacktrace/arch/x86_64
Module Name:src Committed By: christos Date: Wed Jan 7 02:06:59 UTC 2015 Modified Files: src/external/gpl3/gcc/lib/libbacktrace/arch/x86_64: backtrace-supported.h config.h Log Message: regen; backtrace support is complete To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/lib/libbacktrace/arch/x86_64/backtrace-supported.h \ src/external/gpl3/gcc/lib/libbacktrace/arch/x86_64/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/lib/libbacktrace/arch/x86_64/backtrace-supported.h diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/x86_64/backtrace-supported.h:1.1 src/external/gpl3/gcc/lib/libbacktrace/arch/x86_64/backtrace-supported.h:1.2 --- src/external/gpl3/gcc/lib/libbacktrace/arch/x86_64/backtrace-supported.h:1.1 Sat Mar 1 05:00:33 2014 +++ src/external/gpl3/gcc/lib/libbacktrace/arch/x86_64/backtrace-supported.h Tue Jan 6 21:06:59 2015 @@ -1,6 +1,6 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.70 2013/05/05 07:11:34 skrll Exp */ -/* Generated from: NetBSD: mknative.common,v 1.8 2006/05/26 19:17:21 mrg Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp */ +/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp */ /* backtrace-supported.h.in -- Whether stack backtrace is supported. Copyright (C) 2012-2013 Free Software Foundation, Inc. @@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE. */ should work, 0 if it will not. Libraries may #include this to make other arrangements. */ -#define BACKTRACE_SUPPORTED 0 +#define BACKTRACE_SUPPORTED 1 /* BACKTRACE_USES_MALLOC will be #define'd as 1 if the backtrace library will call malloc as it works, 0 if it will call mmap Index: src/external/gpl3/gcc/lib/libbacktrace/arch/x86_64/config.h diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/x86_64/config.h:1.1 src/external/gpl3/gcc/lib/libbacktrace/arch/x86_64/config.h:1.2 --- src/external/gpl3/gcc/lib/libbacktrace/arch/x86_64/config.h:1.1 Sat Mar 1 05:00:33 2014 +++ src/external/gpl3/gcc/lib/libbacktrace/arch/x86_64/config.h Tue Jan 6 21:06:59 2015 @@ -1,6 +1,6 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.70 2013/05/05 07:11:34 skrll Exp */ -/* Generated from: NetBSD: mknative.common,v 1.8 2006/05/26 19:17:21 mrg Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp */ +/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp */ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ @@ -25,7 +25,7 @@ /* #undef HAVE_GETEXECNAME */ /* Define if _Unwind_GetIPInfo is available. */ -/* #undef HAVE_GETIPINFO */ +#define HAVE_GETIPINFO 1 /* Define to 1 if you have the inttypes.h header file. */ #define HAVE_INTTYPES_H 1
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Wed Jan 7 02:53:42 UTC 2015 Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: mi Log Message: add lto To generate a diff of this commit: cvs rdiff -u -r1.1936 -r1.1937 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/debug/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1936 src/distrib/sets/lists/comp/mi:1.1937 --- src/distrib/sets/lists/comp/mi:1.1936 Tue Jan 6 21:46:36 2015 +++ src/distrib/sets/lists/comp/mi Tue Jan 6 21:53:41 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1936 2015/01/07 02:46:36 mrg Exp $ +# $NetBSD: mi,v 1.1937 2015/01/07 02:53:41 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -4117,6 +4117,8 @@ ./usr/libexec/f771comp-obsolete gcc=4,obsolete ./usr/libexec/lint1comp-c-bin ./usr/libexec/lint2comp-c-bin +./usr/libexec/lto-wrapper comp-c-bin gcc=48 +./usr/libexec/lto1comp-c-bin gcc=48 ./usr/libexec/pcppcomp-c-bin pcc ./usr/sbin/configcomp-obsolete obsolete ./usr/sbin/config.newcomp-obsolete obsolete Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.100 src/distrib/sets/lists/debug/mi:1.101 --- src/distrib/sets/lists/debug/mi:1.100 Tue Jan 6 16:42:02 2015 +++ src/distrib/sets/lists/debug/mi Tue Jan 6 21:53:42 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.100 2015/01/06 21:42:02 mrg Exp $ +# $NetBSD: mi,v 1.101 2015/01/07 02:53:42 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -922,6 +922,8 @@ ./usr/libdata/debug/usr/libexec/locate.bigram.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/libexec/locate.code.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/libexec/lpr/lpf.debug comp-lpr-debug debug +./usr/libdata/debug/usr/libexec/lto-wrapper.debug comp-c-debug gcc=48,gcccmds,debug +./usr/libdata/debug/usr/libexec/lto1.debug comp-c-debug gcc=48,gcccmds,debug ./usr/libdata/debug/usr/libexec/mail.local.debug comp-mail-debug debug ./usr/libdata/debug/usr/libexec/makekey.debug comp-crypto-debug debug ./usr/libdata/debug/usr/libexec/makewhatis.debug comp-man-debug !makemandb,debug
CVS commit: src
Module Name:src
Committed By: bouyer
Date: Tue Jan 6 15:39:54 UTC 2015
Modified Files:
src/share/man/man9: sysmon_pswitch.9
src/sys/dev/pci: if_wpi.c if_wpivar.h
src/sys/dev/sysmon: sysmon_power.c
src/sys/sys: power.h
Log Message:
As proposed on tech-net@, introduce a new switch type, PSWITCH_TYPE_RADIO,
to be used to report to userland hardware radio switch changes.
powerd(8) will call a radio_button script to handle the event.
This script can e.g. start or stop wpa_supplicant.
Update wpi(4) to report PSWITCH_TYPE_RADIO events to sysmon.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/sysmon_pswitch.9
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/pci/if_wpi.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/if_wpivar.h
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/sysmon/sysmon_power.c
cvs rdiff -u -r1.19 -r1.20 src/sys/sys/power.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/sysmon_pswitch.9
diff -u src/share/man/man9/sysmon_pswitch.9:1.5 src/share/man/man9/sysmon_pswitch.9:1.6
--- src/share/man/man9/sysmon_pswitch.9:1.5 Tue Mar 18 18:20:40 2014
+++ src/share/man/man9/sysmon_pswitch.9 Tue Jan 6 15:39:54 2015
@@ -1,4 +1,4 @@
-.\ $NetBSD: sysmon_pswitch.9,v 1.5 2014/03/18 18:20:40 riastradh Exp $
+.\ $NetBSD: sysmon_pswitch.9,v 1.6 2015/01/06 15:39:54 bouyer Exp $
.\
.\ Copyright (c) 2010 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -27,7 +27,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd January 26, 2010
+.Dd January 6, 2015
.Dt SYSMON_PSWITCH 9
.Os
.Sh NAME
@@ -75,6 +75,7 @@ The following types are defined:
.It PSWITCH_TYPE_RESET
.It PSWITCH_TYPE_ACADAPTER
.It PSWITCH_TYPE_HOTKEY
+.It PSWITCH_TYPE_RADIO
.El
.Pp
If the type is
Index: src/sys/dev/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.69 src/sys/dev/pci/if_wpi.c:1.70
--- src/sys/dev/pci/if_wpi.c:1.69 Fri Dec 19 11:54:02 2014
+++ src/sys/dev/pci/if_wpi.c Tue Jan 6 15:39:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.69 2014/12/19 11:54:02 bouyer Exp $ */
+/* $NetBSD: if_wpi.c,v 1.70 2015/01/06 15:39:54 bouyer Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.69 2014/12/19 11:54:02 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.70 2015/01/06 15:39:54 bouyer Exp $);
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -39,6 +39,7 @@ __KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1
#include sys/kauth.h
#include sys/callout.h
#include sys/proc.h
+#include sys/kthread.h
#include sys/bus.h
#include machine/endian.h
@@ -48,6 +49,8 @@ __KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1
#include dev/pci/pcivar.h
#include dev/pci/pcidevs.h
+#include dev/sysmon/sysmonvar.h
+
#include net/bpf.h
#include net/if.h
#include net/if_arp.h
@@ -153,6 +156,7 @@ static void wpi_stop(struct ifnet *, int
static bool wpi_resume(device_t, const pmf_qual_t *);
static int wpi_getrfkill(struct wpi_softc *);
static void wpi_sysctlattach(struct wpi_softc *);
+static void wpi_rsw_thread(void *);
#ifdef WPI_DEBUG
#define DPRINTF(x) do { if (wpi_debug 0) printf x; } while (0)
@@ -214,6 +218,22 @@ wpi_attach(device_t parent __unused, dev
sc-sc_pct = pa-pa_pc;
sc-sc_pcitag = pa-pa_tag;
+ sc-sc_rsw_status = WPI_RSW_UNKNOWN;
+ sc-sc_rsw.smpsw_name = device_xname(self);
+ sc-sc_rsw.smpsw_type = PSWITCH_TYPE_RADIO;
+ error = sysmon_pswitch_register(sc-sc_rsw);
+ if (error) {
+ aprint_error_dev(self,
+ unable to register radio switch with sysmon\n);
+ return;
+ }
+ mutex_init(sc-sc_rsw_mtx, MUTEX_DEFAULT, IPL_NONE);
+ cv_init(sc-sc_rsw_cv, wpirsw);
+ if (kthread_create(PRI_NONE, 0, NULL,
+ wpi_rsw_thread, sc, sc-sc_rsw_lwp, %s, device_xname(self))) {
+ aprint_error_dev(self, couldn't create switch thread\n);
+ }
+
callout_init(sc-calib_to, 0);
callout_setfunc(sc-calib_to, wpi_calib_timeout, sc);
@@ -411,6 +431,13 @@ wpi_detach(device_t self, int flags __un
pci_intr_disestablish(sc-sc_pct, sc-sc_ih);
sc-sc_ih = NULL;
}
+ mutex_enter(sc-sc_rsw_mtx);
+ sc-sc_dying = 1;
+ cv_signal(sc-sc_rsw_cv);
+ while (sc-sc_rsw_lwp != NULL)
+ cv_wait(sc-sc_rsw_cv, sc-sc_rsw_mtx);
+ mutex_exit(sc-sc_rsw_mtx);
+ sysmon_pswitch_unregister(sc-sc_rsw);
bus_space_unmap(sc-sc_st, sc-sc_sh, sc-sc_sz);
@@ -418,7 +445,8 @@ wpi_detach(device_t self, int flags __un
sc-fw_used = false;
wpi_release_firmware();
}
-
+ cv_destroy(sc-sc_rsw_cv);
+ mutex_destroy(sc-sc_rsw_mtx);
return 0;
}
@@ -1688,6 +1716,8 @@ wpi_notif_intr(struct wpi_softc *sc)
if (le32toh(*status) 1) {
/* the radio button has to be pushed */
+/* wake up thread to signal powerd */
+cv_signal(sc-sc_rsw_cv);
aprint_error_dev(sc-sc_dev,
Radio transmitter is off\n);
/* turn the
CVS commit: [netbsd-5] src/dist/ntp
Module Name:src Committed By: msaitoh Date: Wed Jan 7 04:50:22 UTC 2015 Removed Files: src/dist/ntp [netbsd-5]: COPYRIGHT ChangeLog CommitLog CommitLog-4.1.0 INSTALL Makefile.am Makefile.in NEWS NOTES.y2kfixes README README.bk README.hackers README.patches README.refclocks README.versions TODO WHERE-TO-START aclocal.m4 bincheck.mf bootstrap build compile config.guess config.h.in config.sub configure configure.ac depcomp dot.emacs excludes flock-build install-sh ltmain.sh missing ntp-html2mdoc.pl ntp2netbsd packageinfo.sh readme.y2kfixes results.y2kfixes version version.m4 src/dist/ntp/ElectricFence [netbsd-5]: CHANGES COPYING Makefile.am Makefile.in README efence.c efence.h eftest.c libefence.3 page.c print.c tstheap.c src/dist/ntp/adjtimed [netbsd-5]: Makefile.am Makefile.in README adjtimed.c src/dist/ntp/arlib [netbsd-5]: COPYING INSTALL Makefile.am Makefile.in README UNSHAR.HDR aclocal.m4 arlib.3 arlib.c arlib.h arplib.h configure configure.in depcomp install-sh missing sample.c src/dist/ntp/clockstuff [netbsd-5]: Makefile.am Makefile.in README chutest.c clktest.c propdelay.c src/dist/ntp/conf [netbsd-5]: README baldwin.conf beauregard.conf grundoon.conf malarky.conf pogo.conf rackety.conf src/dist/ntp/html [netbsd-5]: accopt.html assoc.html audio.html authopt.html clockopt.html confopt.html copyright.html debug.html extern.html gadget.html groups.html howto.html index.html kern.html keygen.html ldisc.html manyopt.html measure.html miscopt.html monopt.html msyslog.html mx4200data.html notes.html ntp_conf.html ntpd.html ntpdate.html ntpdc.html ntpdsim.html ntpdsim_new.html ntpq.html ntptime.html ntptrace.html parsedata.html parsenew.html pps.html prefer.html rdebug.html refclock.html release.html sntp.html tickadj.html src/dist/ntp/html/build [netbsd-5]: build.html config.html hints.html patches.html porting.html quick.html src/dist/ntp/html/build/hints [netbsd-5]: a-ux aix bsdi changes decosf1 decosf2 freebsd hpux linux mpeix netbsd notes-xntp-v3 parse refclocks rs6000 sco.html sgi solaris-dosynctodr.html solaris.html solaris.xtra.4023118 solaris.xtra.4095849 solaris.xtra.S99ntpd solaris.xtra.patchfreq sun4 svr4-dell svr4_package todo vxworks.html winnt.html src/dist/ntp/html/build/scripts [netbsd-5]: footer.txt links10.txt links11.txt links12.txt links7.txt links8.txt links9.txt style.css src/dist/ntp/html/drivers [netbsd-5]: driver1.html driver10.html driver11.html driver12.html driver16.html driver18.html driver19.html driver2.html driver20.html driver22.html driver26.html driver27.html driver28.html driver29.html driver3.html driver30.html driver31.html driver32.html driver33.html driver34.html driver35.html driver36.html driver37.html driver38.html driver39.html driver4.html driver40.html driver42.html driver43.html driver44.html driver5.html driver6.html driver7.html driver8.html driver9.html oncore-shmem.html tf582_4.html src/dist/ntp/html/drivers/icons [netbsd-5]: home.gif mail2.gif src/dist/ntp/html/drivers/scripts [netbsd-5]: footer.txt style.css src/dist/ntp/html/icons [netbsd-5]: home.gif mail2.gif src/dist/ntp/html/scripts [netbsd-5]: footer.txt links10.txt links11.txt links12.txt links7.txt links8.txt links9.txt style.css src/dist/ntp/include [netbsd-5]: Makefile.am Makefile.in README adjtime.h ascii.h audio.h autogen-version.def binio.h copyright.def debug-opt.def global.h gps.h homerc.def hopf6039.h icom.h ieee754io.h iosignal.h l_stdlib.h mbg_gps166.h mx4200.h ntif.h ntp.h ntp_calendar.h ntp_cmdargs.h ntp_config.h ntp_control.h ntp_crypto.h ntp_datum.h ntp_debug.h ntp_filegen.h ntp_fp.h ntp_if.h ntp_io.h ntp_machine.h ntp_malloc.h ntp_md5.h ntp_proto.h ntp_random.h ntp_refclock.h ntp_request.h ntp_rfc2553.h ntp_select.h ntp_sprintf.h ntp_stdlib.h ntp_string.h ntp_syscall.h ntp_syslog.h ntp_tty.h ntp_types.h ntp_unixtime.h ntpd.h ntpsim.h parse.h parse_conf.h recvbuff.h rsa_md5.h timepps-SCO.h timepps-Solaris.h timepps-SunOS.h trimble.h version.def src/dist/ntp/include/isc [netbsd-5]: Makefile.am Makefile.in app.h assertions.h boolean.h buffer.h error.h formatcheck.h int.h interfaceiter.h ipv6.h lang.h lib.h list.h magic.h mem.h msgcat.h msgs.h mutex.h net.h netaddr.h netscope.h offset.h once.h
CVS commit: src/sys
Module Name:src Committed By: ozaki-r Date: Wed Jan 7 07:05:48 UTC 2015 Modified Files: src/sys/arch/x86/x86: cpu_ucode.c src/sys/arch/xen/xen: xen_ucode.c src/sys/dev/i2c: xc3028.c xc5k.c src/sys/dev/ic: bwi.c rt2661.c src/sys/dev/pci: if_ipw.c if_iwi.c if_iwivar.h src/sys/dev/usb: if_athn_usb.c if_rum.c if_urtwn.c if_zyd.c src/sys/kern: kern_cpu.c Log Message: Pass a correct firmware size (instead of 0) to firmware_free firmware_free now uses kmem_free(9) instead of free(9), so we need to pass a correct size to it. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/x86/cpu_ucode.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/xen/xen/xen_ucode.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/i2c/xc3028.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/i2c/xc5k.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/bwi.c cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/rt2661.c cvs rdiff -u -r1.57 -r1.58 src/sys/dev/pci/if_ipw.c cvs rdiff -u -r1.97 -r1.98 src/sys/dev/pci/if_iwi.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/if_iwivar.h cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/if_athn_usb.c cvs rdiff -u -r1.48 -r1.49 src/sys/dev/usb/if_rum.c cvs rdiff -u -r1.34 -r1.35 src/sys/dev/usb/if_urtwn.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/usb/if_zyd.c cvs rdiff -u -r1.66 -r1.67 src/sys/kern/kern_cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/x86/cpu_ucode.c diff -u src/sys/arch/x86/x86/cpu_ucode.c:1.4 src/sys/arch/x86/x86/cpu_ucode.c:1.5 --- src/sys/arch/x86/x86/cpu_ucode.c:1.4 Sat Jul 6 12:03:11 2013 +++ src/sys/arch/x86/x86/cpu_ucode.c Wed Jan 7 07:05:48 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_ucode.c,v 1.4 2013/07/06 12:03:11 gdt Exp $ */ +/* $NetBSD: cpu_ucode.c,v 1.5 2015/01/07 07:05:48 ozaki-r Exp $ */ /* * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu_ucode.c,v 1.4 2013/07/06 12:03:11 gdt Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu_ucode.c,v 1.5 2015/01/07 07:05:48 ozaki-r Exp $); #include opt_cpu_ucode.h #include opt_compat_netbsd.h @@ -116,7 +116,7 @@ cpu_ucode_apply(const struct cpu_ucode * } if (sc-sc_blob != NULL) - firmware_free(sc-sc_blob, 0); + firmware_free(sc-sc_blob, sc-sc_blobsize); sc-sc_blob = NULL; sc-sc_blobsize = 0; return error; @@ -140,7 +140,7 @@ compat6_cpu_ucode_apply(const struct com error = cpu_ucode_amd_apply(sc, CPU_UCODE_ALL_CPUS); if (sc-sc_blob != NULL) - firmware_free(sc-sc_blob, 0); + firmware_free(sc-sc_blob, sc-sc_blobsize); sc-sc_blob = NULL; sc-sc_blobsize = 0; return error; Index: src/sys/arch/xen/xen/xen_ucode.c diff -u src/sys/arch/xen/xen/xen_ucode.c:1.4 src/sys/arch/xen/xen/xen_ucode.c:1.5 --- src/sys/arch/xen/xen/xen_ucode.c:1.4 Sat Jul 6 12:06:24 2013 +++ src/sys/arch/xen/xen/xen_ucode.c Wed Jan 7 07:05:48 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: xen_ucode.c,v 1.4 2013/07/06 12:06:24 gdt Exp $ */ +/* $NetBSD: xen_ucode.c,v 1.5 2015/01/07 07:05:48 ozaki-r Exp $ */ /* * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xen_ucode.c,v 1.4 2013/07/06 12:06:24 gdt Exp $); +__KERNEL_RCSID(0, $NetBSD: xen_ucode.c,v 1.5 2015/01/07 07:05:48 ozaki-r Exp $); #include opt_cpu_ucode.h #include opt_compat_netbsd.h @@ -115,7 +115,7 @@ cpu_ucode_apply(const struct cpu_ucode * error = -HYPERVISOR_platform_op(op); if (sc-sc_blob) - firmware_free(sc-sc_blob, 0); + firmware_free(sc-sc_blob, sc-sc_blobsize); sc-sc_blob = NULL; sc-sc_blobsize = 0; return error; @@ -141,7 +141,7 @@ compat6_cpu_ucode_apply(const struct com error = -HYPERVISOR_platform_op(op); if (sc-sc_blob != NULL) - firmware_free(sc-sc_blob, 0); + firmware_free(sc-sc_blob, sc-sc_blobsize); sc-sc_blob = NULL; sc-sc_blobsize = 0; return error; Index: src/sys/dev/i2c/xc3028.c diff -u src/sys/dev/i2c/xc3028.c:1.5 src/sys/dev/i2c/xc3028.c:1.6 --- src/sys/dev/i2c/xc3028.c:1.5 Sun Oct 2 19:03:56 2011 +++ src/sys/dev/i2c/xc3028.c Wed Jan 7 07:05:48 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: xc3028.c,v 1.5 2011/10/02 19:03:56 jmcneill Exp $ */ +/* $NetBSD: xc3028.c,v 1.6 2015/01/07 07:05:48 ozaki-r Exp $ */ /*- * Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xc3028.c,v 1.5 2011/10/02 19:03:56 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: xc3028.c,v 1.6 2015/01/07 07:05:48 ozaki-r Exp $); #include sys/param.h #include sys/systm.h @@ -219,7 +219,7 @@ xc3028_firmware_open(struct xc3028 *xc) done: if (fw) - firmware_free(fw, 0); + firmware_free(fw, fwlen); mutex_exit(xc3028_firmware_lock); if (error) Index: src/sys/dev/i2c/xc5k.c diff -u src/sys/dev/i2c/xc5k.c:1.4 src/sys/dev/i2c/xc5k.c:1.5 ---
CVS commit: src/tests/net/in_cksum
Module Name:src
Committed By: christos
Date: Tue Jan 6 16:08:06 UTC 2015
Modified Files:
src/tests/net/in_cksum: Makefile
Log Message:
need immediate assignment
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/net/in_cksum/Makefile
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/in_cksum/Makefile
diff -u src/tests/net/in_cksum/Makefile:1.8 src/tests/net/in_cksum/Makefile:1.9
--- src/tests/net/in_cksum/Makefile:1.8 Tue Jan 6 11:04:58 2015
+++ src/tests/net/in_cksum/Makefile Tue Jan 6 11:08:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/01/06 16:04:58 christos Exp $
+# $NetBSD: Makefile,v 1.9 2015/01/06 16:08:06 christos Exp $
.include bsd.own.mk
@@ -11,7 +11,7 @@ CDIR=${NETBSDSRCDIR}/sys/netinet
.for i in ${MACHINE_CPU} ${MACHINE_ARCH} ${MACHINE}
ADIR:=${NETBSDSRCDIR}/sys/arch/${i}/${i}
.if exists(${ADIR}/cpu_in_cksum.S)
-CPU_IN_CKSUM_DIR=${ADIR}
+CPU_IN_CKSUM_DIR:=${ADIR}
.endif
.endfor
CVS commit: src/tests/net/in_cksum
Module Name:src
Committed By: christos
Date: Tue Jan 6 16:04:59 UTC 2015
Modified Files:
src/tests/net/in_cksum: Makefile
Log Message:
simplify.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/net/in_cksum/Makefile
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/in_cksum/Makefile
diff -u src/tests/net/in_cksum/Makefile:1.7 src/tests/net/in_cksum/Makefile:1.8
--- src/tests/net/in_cksum/Makefile:1.7 Mon Jan 5 22:41:42 2015
+++ src/tests/net/in_cksum/Makefile Tue Jan 6 11:04:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/01/06 03:41:42 christos Exp $
+# $NetBSD: Makefile,v 1.8 2015/01/06 16:04:58 christos Exp $
.include bsd.own.mk
@@ -11,12 +11,16 @@ CDIR=${NETBSDSRCDIR}/sys/netinet
.for i in ${MACHINE_CPU} ${MACHINE_ARCH} ${MACHINE}
ADIR:=${NETBSDSRCDIR}/sys/arch/${i}/${i}
.if exists(${ADIR}/cpu_in_cksum.S)
-.PATH.S: ${ADIR}
+CPU_IN_CKSUM_DIR=${ADIR}
+.endif
+.endfor
+
+.if defined(CPU_IN_CKSUM_DIR)
+.PATH.S: ${CPU_IN_CKSUM_DIR}
SRCS.in_cksum=cpu_in_cksum.S in_cksum.c
cpu_in_cksum.S: assym.h
CPPFLAGS+=-DHAVE_CPU_IN_CKSUM -I${.CURDIR}
.endif
-.endfor
PROGS=in_cksum
MAN.in_cksum=# empty
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: macallan
Date: Tue Jan 6 17:41:31 UTC 2015
Modified Files:
src/sys/dev/sbus: mgx.c
Log Message:
implement WSDISPLAYIO_*CMAP and WSDISPLAYIO_GET_FBINFO ioctl()s
now X with wsfb works properly
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/sbus/mgx.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/mgx.c
diff -u src/sys/dev/sbus/mgx.c:1.3 src/sys/dev/sbus/mgx.c:1.4
--- src/sys/dev/sbus/mgx.c:1.3 Tue Jan 6 13:54:18 2015
+++ src/sys/dev/sbus/mgx.c Tue Jan 6 17:41:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mgx.c,v 1.3 2015/01/06 13:54:18 macallan Exp $ */
+/* $NetBSD: mgx.c,v 1.4 2015/01/06 17:41:30 macallan Exp $ */
/*-
* Copyright (c) 2014 Michael Lorenz
@@ -29,7 +29,7 @@
/* a console driver for the SSB 4096V-MGX graphics card */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mgx.c,v 1.3 2015/01/06 13:54:18 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: mgx.c,v 1.4 2015/01/06 17:41:30 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -95,6 +95,8 @@ static void mgx_init_screen(void *, stru
static void mgx_write_dac(struct mgx_softc *, int, int, int, int);
static void mgx_setup(struct mgx_softc *, int);
static void mgx_init_palette(struct mgx_softc *);
+static int mgx_putcmap(struct mgx_softc *, struct wsdisplay_cmap *);
+static int mgx_getcmap(struct mgx_softc *, struct wsdisplay_cmap *);
static int mgx_wait_engine(struct mgx_softc *);
static int mgx_wait_fifo(struct mgx_softc *, unsigned int);
@@ -305,6 +307,67 @@ mgx_init_palette(struct mgx_softc *sc)
}
static int
+mgx_putcmap(struct mgx_softc *sc, struct wsdisplay_cmap *cm)
+{
+ u_char *r, *g, *b;
+ u_int index = cm-index;
+ u_int count = cm-count;
+ int i, error;
+ u_char rbuf[256], gbuf[256], bbuf[256];
+
+ if (cm-index = 256 || cm-count 256 ||
+ (cm-index + cm-count) 256)
+ return EINVAL;
+ error = copyin(cm-red, rbuf[index], count);
+ if (error)
+ return error;
+ error = copyin(cm-green, gbuf[index], count);
+ if (error)
+ return error;
+ error = copyin(cm-blue, bbuf[index], count);
+ if (error)
+ return error;
+
+ memcpy(sc-sc_cmap_red[index], rbuf[index], count);
+ memcpy(sc-sc_cmap_green[index], gbuf[index], count);
+ memcpy(sc-sc_cmap_blue[index], bbuf[index], count);
+
+ r = sc-sc_cmap_red[index];
+ g = sc-sc_cmap_green[index];
+ b = sc-sc_cmap_blue[index];
+
+ for (i = 0; i count; i++) {
+ mgx_write_dac(sc, index, *r, *g, *b);
+ index++;
+ r++, g++, b++;
+ }
+ return 0;
+}
+
+static int
+mgx_getcmap(struct mgx_softc *sc, struct wsdisplay_cmap *cm)
+{
+ u_int index = cm-index;
+ u_int count = cm-count;
+ int error;
+
+ if (index = 255 || count 256 || index + count 256)
+ return EINVAL;
+
+ error = copyout(sc-sc_cmap_red[index], cm-red, count);
+ if (error)
+ return error;
+ error = copyout(sc-sc_cmap_green[index], cm-green, count);
+ if (error)
+ return error;
+ error = copyout(sc-sc_cmap_blue[index], cm-blue, count);
+ if (error)
+ return error;
+
+ return 0;
+}
+
+static int
mgx_wait_engine(struct mgx_softc *sc)
{
unsigned int i;
@@ -471,6 +534,7 @@ mgx_putchar(void *cookie, int row, int c
mgx_wait_engine(sc);
sc-sc_putchar(cookie, row, col, c, attr ~1);
junk = *(uint32_t *)sc-sc_fbaddr;
+ __USE(junk);
if (rv == GC_ADD)
glyphcache_add(sc-sc_gc, c, x, y);
}
@@ -660,14 +724,32 @@ mgx_ioctl(void *v, void *vs, u_long cmd,
if (new_mode == WSDISPLAYIO_MODE_EMUL)
{
mgx_setup(sc, 8);
+ glyphcache_wipe(sc-sc_gc);
+ mgx_init_palette(sc);
vcons_redraw_screen(ms);
} else {
mgx_setup(sc, 32);
}
}
}
- }
+ return 0;
+
+ case WSDISPLAYIO_GETCMAP:
+ return mgx_getcmap(sc, (struct wsdisplay_cmap *)data);
+ case WSDISPLAYIO_PUTCMAP:
+ return mgx_putcmap(sc, (struct wsdisplay_cmap *)data);
+
+ case WSDISPLAYIO_GET_FBINFO:
+ {
+struct wsdisplayio_fbinfo *fbi = data;
+int ret;
+
+ret = wsdisplayio_get_fbinfo(ms-scr_ri, fbi);
+fbi-fbi_fbsize = 0x40;
+return ret;
+ }
+ }
return EPASSTHROUGH;
}
CVS commit: src/sys/arch/sh3/sh3
Module Name:src Committed By: christos Date: Tue Jan 6 17:43:16 UTC 2015 Modified Files: src/sys/arch/sh3/sh3: cpu_in_cksum.S Log Message: We never want the c definitions in sys/endian.h To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sh3/sh3/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/sh3/sh3/cpu_in_cksum.S diff -u src/sys/arch/sh3/sh3/cpu_in_cksum.S:1.4 src/sys/arch/sh3/sh3/cpu_in_cksum.S:1.5 --- src/sys/arch/sh3/sh3/cpu_in_cksum.S:1.4 Mon Sep 26 20:35:38 2011 +++ src/sys/arch/sh3/sh3/cpu_in_cksum.S Tue Jan 6 12:43:16 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_in_cksum.S,v 1.4 2011/09/27 00:35:38 christos Exp $ */ +/* $NetBSD: cpu_in_cksum.S,v 1.5 2015/01/06 17:43:16 christos Exp $ */ /*- * Copyright (c) 2000 SHIMIZU Ryo r...@misakimix.org @@ -27,11 +27,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef _LOCORE +#define _LOCORE +#endif #include machine/endian.h #include machine/asm.h #include assym.h -__KERNEL_RCSID(0, $NetBSD: cpu_in_cksum.S,v 1.4 2011/09/27 00:35:38 christos Exp $) +__KERNEL_RCSID(0, $NetBSD: cpu_in_cksum.S,v 1.5 2015/01/06 17:43:16 christos Exp $) #define reg_tmp0 r0
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: macallan Date: Tue Jan 6 17:51:57 UTC 2015 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: add mgx driver To generate a diff of this commit: cvs rdiff -u -r1.177 -r1.178 src/sys/arch/sparc64/conf/GENERIC 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/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.177 src/sys/arch/sparc64/conf/GENERIC:1.178 --- src/sys/arch/sparc64/conf/GENERIC:1.177 Sun Nov 16 16:01:43 2014 +++ src/sys/arch/sparc64/conf/GENERIC Tue Jan 6 17:51:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.177 2014/11/16 16:01:43 manu Exp $ +# $NetBSD: GENERIC,v 1.178 2015/01/06 17:51:57 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/sparc64/conf/std.sparc64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.177 $ +#ident GENERIC-$Revision: 1.178 $ maxusers 64 @@ -888,6 +888,9 @@ cgthree* at sbus? slot ? offset ? ## Sun cgsix accelerated color framebuffer. cgsix* at sbus? slot ? offset ? +## Southland Media Systems (now Quantum 3D) MGX +mgx* at sbus? slot ? offset ? + ## Sun FFB ffb* at mainbus0 upa* at mainbus?
CVS commit: src/sys/arch/alpha/conf
Module Name:src Committed By: macallan Date: Tue Jan 6 17:50:24 UTC 2015 Modified Files: src/sys/arch/alpha/conf: GENERIC Log Message: attach wsdisplay at wsemuldisplaydev instead of every single driver To generate a diff of this commit: cvs rdiff -u -r1.363 -r1.364 src/sys/arch/alpha/conf/GENERIC 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/alpha/conf/GENERIC diff -u src/sys/arch/alpha/conf/GENERIC:1.363 src/sys/arch/alpha/conf/GENERIC:1.364 --- src/sys/arch/alpha/conf/GENERIC:1.363 Wed Dec 17 16:53:43 2014 +++ src/sys/arch/alpha/conf/GENERIC Tue Jan 6 17:50:24 2015 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.363 2014/12/17 16:53:43 macallan Exp $ +# $NetBSD: GENERIC,v 1.364 2015/01/06 17:50:24 macallan Exp $ # # This machine description file is used to generate the default NetBSD # kernel. @@ -19,7 +19,7 @@ include arch/alpha/conf/std.alpha options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident GENERIC-$Revision: 1.363 $ +ident GENERIC-$Revision: 1.364 $ maxusers 32 @@ -704,16 +704,8 @@ midi* at pcppi? midi* at sb? # Workstation Console attachments -wsdisplay* at cfb? -wsdisplay* at mfb? -wsdisplay* at tfb? -wsdisplay* at sfb? -#wsdisplay* at sfbp? -wsdisplay* at px? -wsdisplay* at pxg? -wsdisplay* at radeonfb? -wsdisplay* at vga? -wsdisplay* at tga? +wsdisplay0 at wsemuldisplaydev? console 1 +wsdisplay* at wsemuldisplaydev? wskbd* at lkkbd? console ? wsmouse* at vsms? wskbd* at pckbd?
