CVS commit: src/sys
Module Name:src Committed By: maxv Date: Thu Aug 21 06:40:35 UTC 2014 Modified Files: src/sys/arch/arm/s3c2xx0: s3c24x0_lcd.c src/sys/compat/netbsd32: netbsd32_compat_50.c netbsd32_compat_60.c src/sys/compat/osf1: osf1_mount.c src/sys/fs/ptyfs: ptyfs_vnops.c Log Message: Remove dead returns: return VAR/func(XX); return VAR; The latter is never reached. Sent on tech-kern@, no disagreement. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c cvs rdiff -u -r1.24 -r1.25 src/sys/compat/netbsd32/netbsd32_compat_50.c cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_compat_60.c cvs rdiff -u -r1.50 -r1.51 src/sys/compat/osf1/osf1_mount.c cvs rdiff -u -r1.49 -r1.50 src/sys/fs/ptyfs/ptyfs_vnops.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/s3c2xx0/s3c24x0_lcd.c diff -u src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c:1.11 src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c:1.12 --- src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c:1.11 Mon Mar 10 04:25:51 2014 +++ src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c Thu Aug 21 06:40:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: s3c24x0_lcd.c,v 1.11 2014/03/10 04:25:51 htodd Exp $ */ +/* $NetBSD: s3c24x0_lcd.c,v 1.12 2014/08/21 06:40:35 maxv Exp $ */ /* * Copyright (c) 2004 Genetec Corporation. All rights reserved. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: s3c24x0_lcd.c,v 1.11 2014/03/10 04:25:51 htodd Exp $); +__KERNEL_RCSID(0, $NetBSD: s3c24x0_lcd.c,v 1.12 2014/08/21 06:40:35 maxv Exp $); #include sys/param.h #include sys/systm.h @@ -735,7 +735,6 @@ s3c24x0_lcd_mmap(void *v, void *vs, off_ offset, prot, BUS_DMA_WAITOK|BUS_DMA_COHERENT); /* printf(s3c24x0_lcd_mmap: ret: %lx\n, ret);*/ return ret; - return -1; } Index: src/sys/compat/netbsd32/netbsd32_compat_50.c diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.24 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.25 --- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.24 Tue Jun 24 14:33:57 2014 +++ src/sys/compat/netbsd32/netbsd32_compat_50.c Thu Aug 21 06:40:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_50.c,v 1.24 2014/06/24 14:33:57 maxv Exp $ */ +/* $NetBSD: netbsd32_compat_50.c,v 1.25 2014/08/21 06:40:35 maxv Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_compat_50.c,v 1.24 2014/06/24 14:33:57 maxv Exp $); +__KERNEL_RCSID(0, $NetBSD: netbsd32_compat_50.c,v 1.25 2014/08/21 06:40:35 maxv Exp $); #if defined(_KERNEL_OPT) #include opt_sysv.h @@ -139,7 +139,6 @@ compat_50_netbsd32_select(struct lwp *l, return selcommon(retval, SCARG(uap, nd), SCARG_P32(uap, in), SCARG_P32(uap, ou), SCARG_P32(uap, ex), ts, NULL); - return 0; } int @@ -563,7 +562,6 @@ compat_50_netbsd32__lwp_park(struct lwp return lwp_park(CLOCK_REALTIME, TIMER_ABSTIME, tsp, SCARG_P32(uap, hint)); - return 0; } static int @@ -681,7 +679,6 @@ compat_50_netbsd32_pselect(struct lwp *l return selcommon(retval, SCARG(uap, nd), SCARG_P32(uap, in), SCARG_P32(uap, ou), SCARG_P32(uap, ex), ts, mask); - return 0; } int Index: src/sys/compat/netbsd32/netbsd32_compat_60.c diff -u src/sys/compat/netbsd32/netbsd32_compat_60.c:1.1 src/sys/compat/netbsd32/netbsd32_compat_60.c:1.2 --- src/sys/compat/netbsd32/netbsd32_compat_60.c:1.1 Fri Mar 29 01:13:54 2013 +++ src/sys/compat/netbsd32/netbsd32_compat_60.c Thu Aug 21 06:40:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_60.c,v 1.1 2013/03/29 01:13:54 christos Exp $ */ +/* $NetBSD: netbsd32_compat_60.c,v 1.2 2014/08/21 06:40:35 maxv Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_compat_60.c,v 1.1 2013/03/29 01:13:54 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: netbsd32_compat_60.c,v 1.2 2014/08/21 06:40:35 maxv Exp $); #include sys/param.h #include sys/systm.h @@ -83,5 +83,4 @@ compat_60_netbsd32__lwp_park(struct lwp return lwp_park(CLOCK_REALTIME, TIMER_ABSTIME, tsp, SCARG_P32(uap, hint)); - return 0; } Index: src/sys/compat/osf1/osf1_mount.c diff -u src/sys/compat/osf1/osf1_mount.c:1.50 src/sys/compat/osf1/osf1_mount.c:1.51 --- src/sys/compat/osf1/osf1_mount.c:1.50 Wed Nov 27 17:24:44 2013 +++ src/sys/compat/osf1/osf1_mount.c Thu Aug 21 06:40:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_mount.c,v 1.50 2013/11/27 17:24:44 christos Exp $ */ +/* $NetBSD: osf1_mount.c,v 1.51 2014/08/21 06:40:35 maxv Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -58,7 +58,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: osf1_mount.c,v 1.50 2013/11/27 17:24:44 christos Exp $); +__KERNEL_RCSID(0, $NetBSD:
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: matt Date: Thu Aug 21 06:48:04 UTC 2014 Modified Files: src/sys/arch/vax/include: int_fmtio.h Log Message: Revert back to 1.7. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/include/int_fmtio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/vax/include/int_fmtio.h diff -u src/sys/arch/vax/include/int_fmtio.h:1.8 src/sys/arch/vax/include/int_fmtio.h:1.9 --- src/sys/arch/vax/include/int_fmtio.h:1.8 Thu Aug 14 14:21:03 2014 +++ src/sys/arch/vax/include/int_fmtio.h Thu Aug 21 06:48:04 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_fmtio.h,v 1.8 2014/08/14 14:21:03 matt Exp $ */ +/* $NetBSD: int_fmtio.h,v 1.9 2014/08/21 06:48:04 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -143,8 +143,8 @@ #define SCNdLEAST16 hd /* int_least16_t */ #define SCNdLEAST32 d /* int_least32_t */ #define SCNdLEAST64 lld /* int_least64_t */ -#define SCNdFAST8 d /* int_fast8_t */ -#define SCNdFAST16 d /* int_fast16_t */ +#define SCNdFAST8 hhd /* int_fast8_t */ +#define SCNdFAST16 hd /* int_fast16_t */ #define SCNdFAST32 d /* int_fast32_t */ #define SCNdFAST64 lld /* int_fast64_t */ #define SCNdMAX lld /* intmax_t */ @@ -158,8 +158,8 @@ #define SCNiLEAST16 hi /* int_least16_t */ #define SCNiLEAST32 i /* int_least32_t */ #define SCNiLEAST64 lli /* int_least64_t */ -#define SCNiFAST8 i /* int_fast8_t */ -#define SCNiFAST16 i /* int_fast16_t */ +#define SCNiFAST8 hhi /* int_fast8_t */ +#define SCNiFAST16 hi /* int_fast16_t */ #define SCNiFAST32 i /* int_fast32_t */ #define SCNiFAST64 lli /* int_fast64_t */ #define SCNiMAX lli /* intmax_t */ @@ -175,8 +175,8 @@ #define SCNoLEAST16 ho /* uint_least16_t */ #define SCNoLEAST32 o /* uint_least32_t */ #define SCNoLEAST64 llo /* uint_least64_t */ -#define SCNoFAST8 o /* uint_fast8_t */ -#define SCNoFAST16 o /* uint_fast16_t */ +#define SCNoFAST8 hho /* uint_fast8_t */ +#define SCNoFAST16 ho /* uint_fast16_t */ #define SCNoFAST32 o /* uint_fast32_t */ #define SCNoFAST64 llo /* uint_fast64_t */ #define SCNoMAX llo /* uintmax_t */ @@ -190,8 +190,8 @@ #define SCNuLEAST16 hu /* uint_least16_t */ #define SCNuLEAST32 u /* uint_least32_t */ #define SCNuLEAST64 llu /* uint_least64_t */ -#define SCNuFAST8 u /* uint_fast8_t */ -#define SCNuFAST16 u /* uint_fast16_t */ +#define SCNuFAST8 hhu /* uint_fast8_t */ +#define SCNuFAST16 hu /* uint_fast16_t */ #define SCNuFAST32 u /* uint_fast32_t */ #define SCNuFAST64 llu /* uint_fast64_t */ #define SCNuMAX llu /* uintmax_t */ @@ -205,8 +205,8 @@ #define SCNxLEAST16 hx /* uint_least16_t */ #define SCNxLEAST32 x /* uint_least32_t */ #define SCNxLEAST64 llx /* uint_least64_t */ -#define SCNxFAST8 x /* uint_fast8_t */ -#define SCNxFAST16 x /* uint_fast16_t */ +#define SCNxFAST8 hhx /* uint_fast8_t */ +#define SCNxFAST16 hx /* uint_fast16_t */ #define SCNxFAST32 x /* uint_fast32_t */ #define SCNxFAST64 llx /* uint_fast64_t */ #define SCNxMAX llx /* uintmax_t */
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Aug 21 07:37:36 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES Log Message: pullup rev 1.120 of CHANGES.prev (requested by apb in ticket #30): Formatting fixes, following the guidelines in the comments at the top of CHANGES. To generate a diff of this commit: cvs rdiff -u -r1.1967 -r1.1967.2.1 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1967 src/doc/CHANGES:1.1967.2.1 --- src/doc/CHANGES:1.1967 Mon Aug 11 03:43:25 2014 +++ src/doc/CHANGES Thu Aug 21 07:37:36 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1967 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1967.2.1 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -21,22 +21,22 @@ # # See htutils/changes/changes2html script for more details. # -# +LIST OF CHANGES FROM PREVIOUS RELEASES: $Revision: 1.1967.2.1 $ Changes from NetBSD 6.0 to NetBSD 7.0: window(1): Removed from the base system in favor of tmux(1). Use the pkgsrc/misc/window package from now on. [jmmv 20120215] - pkg_add(1): imported 20120221 version from pkgsrc [wiz 20120221] - file(1): upgraded to 5.11 [christos 20120222] + pkg_add(1): Imported 20120221 version from pkgsrc. [wiz 20120221] + file(1): Upgraded to 5.11. [christos 20120222] evbmips: Add support for Lemote Yeeloong Notebook. [nonaka 20120302] - dbsym(8): Add option -p [bsh 20120319] - dhcpcd(8): Import dhcpcd-5.5.5 [roy 20120323] - ipf: upgrade to 5.1.1 with new build framework, no module and - test support yet [christos 20120323] - pcc: upgrade to 1.1.0.DEVEL 20120325 [plunky 20120325] - openresolv(8): Import openresolv-3.5.1 [roy 20120327] - dhcpcd(8): Import dhcpcd-5.5.6 [roy 20120328] + dbsym(8): Add option -p. [bsh 20120319] + dhcpcd(8): Import dhcpcd-5.5.5. [roy 20120323] + ipf: Upgrade to 5.1.1 with new build framework, no module and + test support yet. [christos 20120323] + pcc: Upgrade to 1.1.0.DEVEL 20120325. [plunky 20120325] + openresolv(8): Import openresolv-3.5.1. [roy 20120327] + dhcpcd(8): Import dhcpcd-5.5.6. [roy 20120328] apple: Recognize the apple disk partitioning scheme, and auto-discover wedges. Fix iPod disk mounting, by adding quirk. [christos 20120306] @@ -48,11 +48,11 @@ Changes from NetBSD 6.0 to NetBSD 7.0: [christos 20120306] amiga: Add clockport(4) layer and a driver for A1200 on-board clockport a1k2cp(4). [rkujawa 20120417] - kernel: add mpii(4), a driver for LSI Logic Fusion-MPT Message Passing + kernel: Add mpii(4), a driver for LSI Logic Fusion-MPT Message Passing Interface II SAS controllers. [bouyer 20120419] kernel: Add support for 256 CPUs on amd64. [rmind 20120420] - OpenSSH: Imported 6.0 [christos 20120501] - bzip2(1): Imported 1.0.6 [wiz 20120507] + OpenSSH: Imported 6.0. [christos 20120501] + bzip2(1): Imported 1.0.6. [wiz 20120507] kernel: Add a genfs_rename abstraction to help file systems correctly implement rename, and use it for tmpfs, ffs, and ext2fs. [riastradh 20120508] @@ -63,7 +63,7 @@ Changes from NetBSD 6.0 to NetBSD 7.0: kernel: Add run(4), a driver for Ralink Technology RT2700U/RT2800U/RT3000U USB IEEE 802.11a/b/g/n wireless network devices, ported from OpenBSD. [nonaka 20120530] - bind: update to 9.9.1-P1 to fix the recent rdata exploit. + bind: Update to 9.9.1-P1 to fix the recent rdata exploit. [christos 20120604] empb(4): Add ELBOX Mediator PCI 1200 driver. [rkujawa 20120604] kernel: Add a new RLIMIT_NTHR limit to limit the number of processes @@ -71,18 +71,18 @@ Changes from NetBSD 6.0 to NetBSD 7.0: kern.uidinfo.* via sysctl. [christos 20120608] usb(9): Added support for SMP to the USB subsytem. By Jared D. McNeill and myself. [mrg 20120609] - kernel: Add sendmmsg and recvmmsg support [christos 20120621] + kernel: Add sendmmsg and recvmmsg support. [christos 20120621] kernel: Add sysctls to avoid ipv6 DoS attacks (from OpenBSD): net.inet6.ip6.neighborgcthresh = 2048 net.inet6.ip6.maxifprefixes = 16 net.inet6.ip6.maxifdefrouters = 16 net.inet6.ip6.maxdynroutes = 4096 [christos 20120622] - ata(4): added support for sata Port MultiPliers (PMP) + ata(4): Added support for sata Port MultiPliers (PMP) [bouyer 20120702] kernel, libc: Add MurmurHash2 function. [rmind 20120708] atf(7): Import 0.16. [jmmv 20120711] - dhcpcd(8): Import dhcpcd-5.6.1 [roy 20120712] + dhcpcd(8): Import dhcpcd-5.6.1. [roy 20120712] kernel: Add support for sensors to provide entropy to rnd(4) [pgoyette 20120715] tdvfb(4): Add 3Dfx Voodoo2 driver. [rkujawa 20120719] @@ -92,7 +92,7 @@ Changes from NetBSD 6.0 to NetBSD 7.0: device_t. [matt 20120722] pr(1): Add support for POSIX -f and -p options. [ginsbach 20120724]
CVS commit: [netbsd-7] src/share/man/man4
Module Name:src Committed By: martin Date: Thu Aug 21 07:43:04 UTC 2014 Modified Files: src/share/man/man4 [netbsd-7]: options.4 Log Message: Pull up following revision(s) (requested by apb in ticket #31): share/man/man4/options.4: revision 1.440 Document options COMPAT_40, COMPAT_50, and COMPAT_60. To generate a diff of this commit: cvs rdiff -u -r1.439 -r1.439.2.1 src/share/man/man4/options.4 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/man4/options.4 diff -u src/share/man/man4/options.4:1.439 src/share/man/man4/options.4:1.439.2.1 --- src/share/man/man4/options.4:1.439 Wed Jul 23 21:19:33 2014 +++ src/share/man/man4/options.4 Thu Aug 21 07:43:04 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: options.4,v 1.439 2014/07/23 21:19:33 wiz Exp $ +.\ $NetBSD: options.4,v 1.439.2.1 2014/08/21 07:43:04 martin Exp $ .\ .\ Copyright (c) 1996 .\ Perry E. Metzger. All rights reserved. @@ -30,7 +30,7 @@ .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ .\ -.Dd July 23, 2014 +.Dd August 16, 2014 .Dt OPTIONS 4 .Os .Sh NAME @@ -320,6 +320,9 @@ See for details about the changes made after the .Nx 3.0 release. +.It Cd options COMPAT_40 +Enable binary compatibility with +.Nx 4.0 . .It Cd options COMPAT_43 Enables compatibility with .Bx 4.3 . @@ -348,6 +351,12 @@ It also enables support for some older pre .Bx 4.4 socket calls. +.It Cd options COMPAT_50 +Enable binary compatibility with +.Nx 5.0 . +.It Cd options COMPAT_60 +Enable binary compatibility with +.Nx 6.0 . .It Cd options COMPAT_BSDPTY This option is currently on by default and enables the pty multiplexer .Xr ptm 4
CVS commit: src/share/man/man4
Module Name:src Committed By: apb Date: Thu Aug 21 07:51:32 UTC 2014 Modified Files: src/share/man/man4: options.4 Log Message: Document options COMPAT_70. To generate a diff of this commit: cvs rdiff -u -r1.440 -r1.441 src/share/man/man4/options.4 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/man4/options.4 diff -u src/share/man/man4/options.4:1.440 src/share/man/man4/options.4:1.441 --- src/share/man/man4/options.4:1.440 Sat Aug 16 15:34:33 2014 +++ src/share/man/man4/options.4 Thu Aug 21 07:51:32 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: options.4,v 1.440 2014/08/16 15:34:33 apb Exp $ +.\ $NetBSD: options.4,v 1.441 2014/08/21 07:51:32 apb Exp $ .\ .\ Copyright (c) 1996 .\ Perry E. Metzger. All rights reserved. @@ -357,6 +357,9 @@ Enable binary compatibility with .It Cd options COMPAT_60 Enable binary compatibility with .Nx 6.0 . +.It Cd options COMPAT_70 +Enable binary compatibility with +.Nx 7.0 . .It Cd options COMPAT_BSDPTY This option is currently on by default and enables the pty multiplexer .Xr ptm 4
CVS commit: src/sys/conf
Module Name:src
Committed By: skrll
Date: Thu Aug 21 07:57:26 UTC 2014
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
More tidyup after joerg's copypaste disaster. I have ddb symbols again.
To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.171 src/sys/conf/Makefile.kern.inc:1.172
--- src/sys/conf/Makefile.kern.inc:1.171 Wed Aug 20 22:02:20 2014
+++ src/sys/conf/Makefile.kern.inc Thu Aug 21 07:57:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.171 2014/08/20 22:02:20 joerg Exp $
+# $NetBSD: Makefile.kern.inc,v 1.172 2014/08/21 07:57:25 skrll Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -532,7 +532,7 @@ CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
locore.o machdep.o kern_ksyms.o: Makefile
-.if defined(COPY_SYMTAB})
+.if defined(COPY_SYMTAB)
CPPFLAGS.locore.S+= -DCOPY_SYMTAB
CPPFLAGS.machdep.c+= -DCOPY_SYMTAB
CPPFLAGS.kern_ksyms.c+= -DCOPY_SYMTAB
CVS commit: [netbsd-7] src/doc
Module Name:src
Committed By: sborrill
Date: Thu Aug 21 08:41:18 UTC 2014
Modified Files:
src/doc [netbsd-7]: CHANGES-7.0
Log Message:
Some formatting and grammatical changes
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/doc/CHANGES-7.0
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-7.0
diff -u src/doc/CHANGES-7.0:1.1.2.15 src/doc/CHANGES-7.0:1.1.2.16
--- src/doc/CHANGES-7.0:1.1.2.15 Wed Aug 20 13:46:17 2014
+++ src/doc/CHANGES-7.0 Thu Aug 21 08:41:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.15 2014/08/20 13:46:17 martin Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.16 2014/08/21 08:41:18 sborrill Exp $
A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
until the 7.0 release:
@@ -14,7 +14,6 @@ sys/sys/param.h patched by hand
sys/dev/usb/xhci.c1.24
PR/49091: xhci: wrong wMaxPacketSize value
-
While this is correct according to the specification only fixed sizes
are allowed, i.e. 512 for SS, etc. Maybe these should be used?
[skrll, ticket #3]
@@ -33,33 +32,25 @@ external/gpl3/binutils/dist/bfd/elflink.
Apply change from upstream to fix PR/48709 - port-alpha/48709: static
threaded programs crash.
-
With this fix the new weak symbol's st_other is not merged in, i.e. NOPV
is not copied from the libc __libc_thr_init.
-
* elflink.c (_bfd_elf_merge_symbol): If merging a new weak
symbol that will be skipped, we don't have a new definition.
[skrll, ticket #5]
-sys/dev/usb/motg.c1.7
-sys/dev/usb/motg.c1.8
+sys/dev/usb/motg.c1.7-1.8
Trailing whitespace.
-
Make this compile when DIAGNOSTIC isn't defined.
[skrll, ticket #6]
-usr.sbin/postinstall/postinstall 1.177
-usr.sbin/postinstall/postinstall 1.178
-usr.sbin/postinstall/postinstall 1.179
+usr.sbin/postinstall/postinstall 1.177-1.179
Check for and delete ${DEST_DIR}/@RUNDIR@, not /@RUNDIR@.
Also remove an unnecessary eval in do_dhcpcdrundir and
fix a typo in the description.
-
Quoting fixes in several eval commands.
-
In get_makevar, ask make to recursively expand the variable,
not just print the unexpanded value. This is done by
using make -V '${VAR}' instead of make -V 'VAR'.
@@ -108,10 +99,7 @@ sys/dev/usb/usb.h1.107
Define AXEN_DEBUG. From Takahiro HAYASHI.
[skrll, ticket #10]
-sys/crypto/cprng_fast/cprng_fast.c 1.10
-sys/crypto/cprng_fast/cprng_fast.c 1.7
-sys/crypto/cprng_fast/cprng_fast.c 1.8
-sys/crypto/cprng_fast/cprng_fast.c 1.9
+sys/crypto/cprng_fast/cprng_fast.c 1.7-1.10
Access to struct cprng_fast must be consistently at IPL_VM.
Use percpu_foreach instead of manual iteration.
@@ -163,12 +151,10 @@ sys/rump/librump/rumpkern/rump.c 1.310
sys/kern/subr_prf.c1.155
- avoid calling into time code when cold, and avoid calling nanotime()
+ Avoid calling into time code when cold, and avoid calling nanotime()
if we're not going to use the result anyway.
-
- XXX: not necessarily the best fix, but better than crashing *early*
+ Not necessarily the best fix, but better than crashing *early*
boot due to too-early nanotime() calls.
-
[mrg, ticket #24]
xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c 1.4
@@ -220,7 +206,7 @@ sys/fs/ptyfs/ptyfs_vnops.c 1.48-1.49
sys/kern/exec_elf.c1.70
- eliminate COMPAT_OLDNOTE and just always recognize the old notes.
+ Eliminate COMPAT_OLDNOTE and just always recognize the old notes.
[chs, ticket #32]
external/bsd/bind/Makefile.inc 1.22
@@ -241,27 +227,23 @@ sys/external/bsd/drm2/dist/drm/ttm/ttm_b
sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c 1.6
sys/external/bsd/drm2/ttm/ttm_bo_vm.c 1.3
- bus_space_mmap cookies are not paddrs, so don't pmap_enter them!
+ bus_space_mmap cookies are not paddrs, so don't pmap_enter them.
For gem and ttm objects backed by uvm_aobjs, share the vmobjlock.
Simplify previous.
[riastradh, ticket #36]
external/gpl3/gcc/dist/gcc/config/vax/builtins.md 1.4
external/gpl3/gcc/dist/gcc/config/vax/vax.c 1.10
- Rework so that the ctzsi builtin is supported.
-
lib/libc/compiler_rt/Makefile.inc 1.26
- VAX does need __clzsi2
+libexec/ld.elf_so/arch/vax/rtld_start.S 1.23-1.24
-libexec/ld.elf_so/arch/vax/rtld_start.S 1.23
-libexec/ld.elf_so/arch/vax/rtld_start.S 1.24
- add a missing register prefix.
+ Rework so that the ctzsi builtin is supported.
+ VAX does need __clzsi2.
+ Add a missing register prefix.
Add proper registers for register counts.
-
[matt, ticket #37]
-sbin/ccdconfig/ccdconfig.c 1.54
-sbin/ccdconfig/ccdconfig.c 1.55
+sbin/ccdconfig/ccdconfig.c 1.54-1.55
sys/dev/ccd.c 1.152
sys/dev/ccdvar.h1.34
@@ -271,22 +253,15 @@ sys/dev/ccdvar.h1.34
structures.
Make kernel print device information when a ccd configured.
Fix some typos in comments.
- Don't print ccd_size with %zu; it no longer has type size_t.
- Instead, cast to
CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-nv/dist/src
Module Name:xsrc
Committed By: martin
Date: Thu Aug 21 08:42:52 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src [netbsd-7]: nv_driver.c
Log Message:
Pull up following revision(s) (requested by macallan in ticket #40):
external/mit/xf86-video-nv/dist/src/nv_driver.c: revision 1.5
put pci_device_has_kernel_driver(dev) into #if NV_TEST_FOR_KERNEL_DRIVER
at least for now there is nothing that keeps the nv driver from running
if a kernel driver other than vga is attached
Now this works again on macppc ( and x86 if you use for example genfb )
mention NV_TEST_FOR_KERNEL_DRIVER and explain why it isn't enabled for now
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4.4.1
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4 Sun Jun 2 08:29:33 2013
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c Thu Aug 21 08:42:51 2014
@@ -911,15 +911,23 @@ NVPciProbe(DriverPtr drv, int entity, st
NVGetPCIXpressChip(dev) : dev-vendor_id 16 | dev-device_id;
const char *name = xf86TokenToString(NVKnownChipsets, id);
+/*
+ * XXX
+ * disable this test for now since it's bogus
+ * it will trigger whenever there's a driver other than vga attached to the
+ * device we're trying to probe, yet this works fine on top of gffb or genfb
+ * might need to revisit this when we have working DRM on non-x86
+ */
+#if NV_TEST_FOR_KERNEL_DRIVER
if (pci_device_has_kernel_driver(dev)) {
xf86DrvMsg(0, X_ERROR,
NV_NAME : The PCI device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n,
- (int)id, name, dev-bus, dev-domain, dev-dev, dev-func);
+ id, name, dev-bus, dev-domain, dev-dev, dev-func);
xf86DrvMsg(0, X_ERROR,
NV_NAME : This driver cannot operate until it has been unloaded.\n);
return FALSE;
}
-
+#endif
if(dev-vendor_id == PCI_VENDOR_NVIDIA !name
!NVIsSupported(id) !NVIsG80(id)) {
/* See if pci.ids knows what the heck this thing is */
@@ -927,11 +935,11 @@ NVPciProbe(DriverPtr drv, int entity, st
if(name)
xf86DrvMsg(0, X_WARNING,
NV_NAME : Ignoring unsupported device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d\n,
- (int)id, name, dev-bus, dev-domain, dev-dev, dev-func);
+ id, name, dev-bus, dev-domain, dev-dev, dev-func);
else
xf86DrvMsg(0, X_WARNING,
NV_NAME : Ignoring unsupported device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d\n,
- (int)id, dev-bus, dev-domain, dev-dev, dev-func);
+ id, dev-bus, dev-domain, dev-dev, dev-func);
return FALSE;
}
@@ -1212,7 +1220,7 @@ NVCloseScreen(CLOSE_SCREEN_ARGS_DECL)
NVLockUnlock(pNv, 1);
}
}
-
+
NVUnmapMem(pScrn);
#ifndef AVOID_VGAHW
vgaHWUnmapMem(pScrn);
@@ -1260,7 +1268,6 @@ NVFreeScreen(FREE_SCREEN_ARGS_DECL)
* This only gets called when a screen is being deleted. It does not
* get called routinely at the end of a server generation.
*/
-
if (xf86LoaderCheckSymbol(vgaHWFreeHWRec))
vgaHWFreeHWRec(pScrn);
NVFreeRec(pScrn);
CVS commit: [netbsd-7] src/external/mit/xorg/server/drivers/xf86-video-nv
Module Name:src
Committed By: martin
Date: Thu Aug 21 08:43:42 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nv [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by macallan in ticket #40):
external/mit/xorg/server/drivers/xf86-video-nv/Makefile: revision 1.7
put pci_device_has_kernel_driver(dev) into #if NV_TEST_FOR_KERNEL_DRIVER
at least for now there is nothing that keeps the nv driver from running
if a kernel driver other than vga is attached
Now this works again on macppc ( and x86 if you use for example genfb )
mention NV_TEST_FOR_KERNEL_DRIVER and explain why it isn't enabled for now
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.6.1 \
src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.6.6.1
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.6 Fri Jun 14 04:43:38 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Thu Aug 21 08:43:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/06/14 04:43:38 mrg Exp $
+# $NetBSD: Makefile,v 1.6.6.1 2014/08/21 08:43:42 martin Exp $
DRIVER= xf86-video-nv
DRIVER_NAME= nv_drv
@@ -15,6 +15,16 @@ MAN= nv.4
CPPFLAGS+= -DAVOID_VGAHW
.endif
+.if ${MACHINE} == i386 || ${MACHINE} == amd64
+# XXX
+# the test uses pci_device_has_kernel_driver() which, for now at least, only
+# makes sense on x86 ( it just checks if the kernel driver handling the
+# device is vga ) - and even there, genfb and the like don't do anything
+# that would prevent this driver from working. Might need to revisit this once
+# the new DRM2 code has nvidia support
+#CPPFLAGS+= -DNV_TEST_FOR_KERNEL_DRIVER
+.endif
+
CPPFLAGS+= -DHAVE_XAA_H
.include ../Makefile.xf86-driver
CVS commit: [netbsd-7] src/sys/arch/arm/omap
Module Name:src
Committed By: martin
Date: Thu Aug 21 08:50:55 UTC 2014
Modified Files:
src/sys/arch/arm/omap [netbsd-7]: omapfb.c
Log Message:
Pull up following revision(s) (requested by macallan in ticket #41):
sys/arch/arm/omap/omapfb.c: revision 1.27
Do not assume that PAGE_SIZE is 4kB always.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/arch/arm/omap/omapfb.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/omap/omapfb.c
diff -u src/sys/arch/arm/omap/omapfb.c:1.26 src/sys/arch/arm/omap/omapfb.c:1.26.2.1
--- src/sys/arch/arm/omap/omapfb.c:1.26 Thu Aug 7 19:05:18 2014
+++ src/sys/arch/arm/omap/omapfb.c Thu Aug 21 08:50:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: omapfb.c,v 1.26 2014/08/07 19:05:18 macallan Exp $ */
+/* $NetBSD: omapfb.c,v 1.26.2.1 2014/08/21 08:50:55 martin Exp $ */
/*
* Copyright (c) 2010 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: omapfb.c,v 1.26 2014/08/07 19:05:18 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: omapfb.c,v 1.26.2.1 2014/08/21 08:50:55 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -256,7 +256,7 @@ omapfb_attach(device_t parent, device_t
}
/* setup video DMA */
- sc-sc_vramsize = (12 20) + 0x1000; /* 12MB + CLUT */
+ sc-sc_vramsize = (12 20) + PAGE_SIZE; /* 12MB + CLUT */
if (bus_dmamem_alloc(sc-sc_dmat, sc-sc_vramsize, 0, 0,
sc-sc_dmamem, 1, segs, BUS_DMA_NOWAIT) != 0) {
@@ -271,7 +271,7 @@ omapfb_attach(device_t parent, device_t
aprint_error_dev(sc-sc_dev, failed to map video RAM\n);
return;
}
- sc-sc_fbaddr = (uint8_t *)sc-sc_vramaddr + 0x1000;
+ sc-sc_fbaddr = (uint8_t *)sc-sc_vramaddr + PAGE_SIZE;
sc-sc_clut = sc-sc_vramaddr;
if (bus_dmamap_create(sc-sc_dmat, sc-sc_vramsize, 1, sc-sc_vramsize,
@@ -321,7 +321,7 @@ omapfb_attach(device_t parent, device_t
/* we use overlay 1 for the console and X */
bus_space_write_4(sc-sc_iot, sc-sc_regh, OMAPFB_DISPC_GLOBAL_ALPHA,
0x00ff00ff);
- sc-sc_fbhwaddr = sc-sc_dmamem-ds_addr + 0x1000;
+ sc-sc_fbhwaddr = sc-sc_dmamem-ds_addr + PAGE_SIZE;
bus_space_write_4(sc-sc_iot, sc-sc_regh, OMAPFB_DISPC_VID1_BASE_0,
sc-sc_fbhwaddr);
bus_space_write_4(sc-sc_iot, sc-sc_regh,
@@ -626,7 +626,7 @@ omapfb_mmap(void *v, void *vs, off_t off
/* 'regular' framebuffer mmap()ing */
if (offset sc-sc_vramsize) {
pa = bus_dmamem_mmap(sc-sc_dmat, sc-sc_dmamem, 1,
- offset + 0x1000, prot, BUS_DMA_PREFETCHABLE);
+ offset + PAGE_SIZE, prot, BUS_DMA_PREFETCHABLE);
return pa;
}
return pa;
CVS commit: src/external/gpl3/gcc/lib/libgcc
Module Name:src
Committed By: christos
Date: Thu Aug 21 08:52:24 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
Log Message:
PR/49087: Jarmo Jaakkola: Make sure that the first dependency is the C source
file so ${.IMPSRC} gets set correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.28 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.29
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.28 Sun Jun 1 15:51:01 2014
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Thu Aug 21 04:52:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.28 2014/06/01 19:51:01 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.29 2014/08/21 08:52:23 christos Exp $
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
@@ -149,19 +149,22 @@ ${LIB1ASMFUNCS}: ${.CURDIR}/Makefile
printf '#define L${.PREFIX}\n#include ${G_LIB1ASMSRC}\n' ${.TARGET}
.endif
-${LIB2_EH:.c=.o}:
+# Use dynamic sources to arrange for the C file to be the first dependency
+# so ${.IMPSRC} will work.
+
+${LIB2_EH:.c=.o}: $(.PREFIX).c
${_MKTARGET_COMPILE}
${COMPILE.c} -fexceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
-${LIB2_EH:.c=.pico}:
+${LIB2_EH:.c=.pico}: $(.PREFIX).c
${_MKTARGET_COMPILE}
${COMPILE.c} ${CPICFLAGS} -fexceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
-${G_LIB2_DIVMOD_FUNCS:=.o}:
+${G_LIB2_DIVMOD_FUNCS:=.o}: $(.PREFIX).c
${_MKTARGET_COMPILE}
${COMPILE.c} -fexceptions -fnon-call-exceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
-${G_LIB2_DIVMOD_FUNCS:=.pico}:
+${G_LIB2_DIVMOD_FUNCS:=.pico}: $(.PREFIX).c
${_MKTARGET_COMPILE}
${COMPILE.c} ${CPICFLAGS} -fexceptions -fnon-call-exceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
CVS commit: [netbsd-7] src/share/man/man8/man8.x86
Module Name:src Committed By: martin Date: Thu Aug 21 09:00:12 UTC 2014 Modified Files: src/share/man/man8/man8.x86 [netbsd-7]: boot.8 Log Message: Pull up following revision(s) (requested by apb in ticket #42): share/man/man8/man8.x86/boot.8: revisions 1.3, 1,4 Document fs, menu, rndseed, and splash commands. Add rescue(8) to SEE ALSO. Document supported subsets of image formats. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.6.1 src/share/man/man8/man8.x86/boot.8 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/man8/man8.x86/boot.8 diff -u src/share/man/man8/man8.x86/boot.8:1.1 src/share/man/man8/man8.x86/boot.8:1.1.6.1 --- src/share/man/man8/man8.x86/boot.8:1.1 Wed Jul 31 21:01:13 2013 +++ src/share/man/man8/man8.x86/boot.8 Thu Aug 21 09:00:12 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: boot.8,v 1.1 2013/07/31 21:01:13 soren Exp $ +.\ $NetBSD: boot.8,v 1.1.6.1 2014/08/21 09:00:12 martin Exp $ .\ .\ Copyright (c) 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -48,7 +48,9 @@ the and its clones .Pc that can run -.Nx Ns /x86 +.Nx Ns /i386 +or +.Nx Ns /amd64 can use any of the following boot procedures, depending on what the hardware and .Tn BIOS support: @@ -137,7 +139,7 @@ setting the timeout, choosing a console text and displaying a menu allowing boot commands to be easily chosen. See .Xr boot.cfg 5 . -.Pp +.Ss Boot Protocol The .Nx Ns /x86 boot loader can boot a kernel using either the native @@ -347,6 +349,13 @@ Without an argument, print the current s .Va device is of the form specified in .Cm boot . +.It Ic fs Va file +Load a file system image from the specified +.Ar file , +and request the kernel to use it as the root file system. +The +.Xr makefs 8 +utility may be used to create suitable file system images. .It Ic help Print an overview about commands and arguments. .It Ic load Va module Op Ar arguments @@ -380,7 +389,9 @@ for examples. .Pp In addition to the .Cm boot -options specified above, the DOM0 kernel accepts +options specified above, the +.Tn Xen +DOM0 kernel accepts .Po Ar arguments being separated with spaces .Pc : @@ -458,6 +469,10 @@ Print a directory listing of containing inode number, filename, and file type. .Pa path can contain a device specification. +.It Ic menu +Display the boot menu and initiate a countdown, +similarly to what would have happened if interactive mode +had not been entered. .It Ic modules Bro Ar on | off | enabled | disabled Brc The values .Ar enabled , on @@ -538,6 +553,32 @@ See the foreign operating system's docum .El .It Ic quit Reboot the system. +.It Ic rndseed Ar file +Load the specified +.Ar file +and request the kernel to use it as a seed for the +.Xr rnd 4 +random number generator. +The +.Ar file +should be in the private format used by +.Xr rndctl 8 , +and should have been saved by +.Ql rndctl -S +shortly before the previous shutdown. +See the +.Va random_seed +and +.Va random_file +variables in +.Xr rc.conf 5 , +and the +.Pa /etc/rc.d/random_seed +script, for a way to manage the seed file. +Using the same seed file on more then one host, +or for more than one boot on the same host, +will reduce the quality of random numbers +and may impact system security. .It Ic userconf Va command Pass command .Va command @@ -547,6 +588,21 @@ at boot time. These commands are processed before the interactive .Xr userconf 4 shell is executed, if requested. +.It Ic splash Ar file +Load a graphical image from the specified +.Ar file +and request the kernel to use it as a splash screen. +The +.Ar file +should contain an image in one of these formats: +JPEG (baseline only, not progressive), +PNG (8-bit only), +TGA, +BMP (non-1bpp, non-RLE), +GIF, +PSD (composited view only), +or +PIC. .It Ic vesa Bro Va modenum | Ar on | off | enabled | disabled | list Brc Initialise the video card to the specified resolution and bit depth. The @@ -600,6 +656,7 @@ partition by .Xr multiboot 8 , .Xr pxeboot 8 , .Xr reboot 8 , +.Xr rescue 8 , .Xr shutdown 8 , .Xr boothowto 9 .Sh BUGS
CVS commit: [netbsd-7] src/sys/miscfs/umapfs
Module Name:src
Committed By: martin
Date: Thu Aug 21 09:05:45 UTC 2014
Modified Files:
src/sys/miscfs/umapfs [netbsd-7]: umap_vfsops.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #43):
sys/miscfs/umapfs/umap_vfsops.c: revision 1.94
1) 'error' is returned while it does not even hold an error code. Which
means that zero is returned, and the kernel keeps mounting (and it
probably ends up in a deadlock/memory corruption somewhere).
2) 'nentries' and 'gnentries' are int and user-controlled, and there's no
check to ensure they are greater than zero. Since they are used to
compute the size of two copyin's, a user can control the copied size
by giving a negative value (like 128-2^29), and thus overwrite kernel
memory.
Both triggerable from root only.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.93.2.1 src/sys/miscfs/umapfs/umap_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/miscfs/umapfs/umap_vfsops.c
diff -u src/sys/miscfs/umapfs/umap_vfsops.c:1.93 src/sys/miscfs/umapfs/umap_vfsops.c:1.93.2.1
--- src/sys/miscfs/umapfs/umap_vfsops.c:1.93 Sun May 25 13:51:25 2014
+++ src/sys/miscfs/umapfs/umap_vfsops.c Thu Aug 21 09:05:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umap_vfsops.c,v 1.93 2014/05/25 13:51:25 hannken Exp $ */
+/* $NetBSD: umap_vfsops.c,v 1.93.2.1 2014/08/21 09:05:45 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: umap_vfsops.c,v 1.93 2014/05/25 13:51:25 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: umap_vfsops.c,v 1.93.2.1 2014/08/21 09:05:45 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -153,9 +153,10 @@ umapfs_mount(struct mount *mp, const cha
/*
* Now copy in the number of entries and maps for umap mapping.
*/
- if (args-nentries MAPFILEENTRIES || args-gnentries GMAPFILEENTRIES) {
+ if (args-nentries 0 || args-nentries MAPFILEENTRIES ||
+ args-gnentries 0 || args-gnentries GMAPFILEENTRIES) {
vput(lowerrootvp);
- return (error);
+ return (EINVAL);
}
amp-info_nentries = args-nentries;
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Aug 21 09:12:27 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets 30, 31, 40, 41, 42 and 43. To generate a diff of this commit: cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.16 src/doc/CHANGES-7.0:1.1.2.17 --- src/doc/CHANGES-7.0:1.1.2.16 Thu Aug 21 08:41:18 2014 +++ src/doc/CHANGES-7.0 Thu Aug 21 09:12:26 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.16 2014/08/21 08:41:18 sborrill Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.17 2014/08/21 09:12:26 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -265,3 +265,36 @@ sys/rump/librump/rumpkern/hyperentropy.c sys/param.h comes first, per /usr/share/misc/style. [riastradh, ticket #35] +doc/CHANGES 1.120 (CHANGES.prev) + Formatting fixes, following the guidelines in the comments + at the top of CHANGES. + [apb, ticket #30] + +share/man/man4/options.4 1.440 + Document options COMPAT_40, COMPAT_50, and COMPAT_60. + [apb, ticket #31] + +xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c 1.5 +external/mit/xorg/server/drivers/xf86-video-nv/Makefile 1.7 + Put pci_device_has_kernel_driver(dev) into + #if NV_TEST_FOR_KERNEL_DRIVER to make it work on non-x86 again. + Mention NV_TEST_FOR_KERNEL_DRIVER and explain why it isn't enabled + for now. + [macallan, ticket #40] + +sys/arch/arm/omap/omapfb.c 1.27 + Do not assume that PAGE_SIZE is 4kB always. + [macallan, ticket #41] + +share/man/man8/man8.x86/boot.8 1.3, 1.5 + Document fs, menu, rndseed, and splash commands. + Add rescue(8) to SEE ALSO. + Document supported subsets of image formats. + [apb, ticket #42] + +sys/miscfs/umapfs/umap_vfsops.c 1.94 + Fix error return in mount with value not holding an error code. + Bounds check a user controllable copyin size. + Both triggerable from root only. + [maxv, ticket #43] +
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: christos
Date: Thu Aug 21 12:25:01 UTC 2014
Modified Files:
src/sys/dev/ic: mfi.c
Log Message:
revert previous; code checking tool is incorrect. Variables are not being
used in the non tbolt case.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/ic/mfi.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/ic/mfi.c
diff -u src/sys/dev/ic/mfi.c:1.53 src/sys/dev/ic/mfi.c:1.54
--- src/sys/dev/ic/mfi.c:1.53 Fri Jul 25 04:10:37 2014
+++ src/sys/dev/ic/mfi.c Thu Aug 21 08:25:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.53 2014/07/25 08:10:37 dholland Exp $ */
+/* $NetBSD: mfi.c,v 1.54 2014/08/21 12:25:01 christos Exp $ */
/* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
/*
@@ -73,7 +73,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mfi.c,v 1.53 2014/07/25 08:10:37 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: mfi.c,v 1.54 2014/08/21 12:25:01 christos Exp $);
#include bio.h
@@ -380,15 +380,15 @@ mfi_init_ccb(struct mfi_softc *sc)
sc-sc_ccb = malloc(sizeof(struct mfi_ccb) * sc-sc_max_cmds,
M_DEVBUF, M_WAITOK|M_ZERO);
- io_req_base = (uint8_t *)MFIMEM_KVA(sc-sc_tbolt_reqmsgpool);
- io_req_base_phys = MFIMEM_DVA(sc-sc_tbolt_reqmsgpool);
if (sc-sc_ioptype == MFI_IOP_TBOLT) {
/*
* The first 256 bytes (SMID 0) is not used.
* Don't add to the cmd list.
*/
- io_req_base += MEGASAS_THUNDERBOLT_NEW_MSG_SIZE;
- io_req_base_phys += MEGASAS_THUNDERBOLT_NEW_MSG_SIZE;
+ io_req_base = (uint8_t *)MFIMEM_KVA(sc-sc_tbolt_reqmsgpool) +
+ MEGASAS_THUNDERBOLT_NEW_MSG_SIZE;
+ io_req_base_phys = MFIMEM_DVA(sc-sc_tbolt_reqmsgpool) +
+ MEGASAS_THUNDERBOLT_NEW_MSG_SIZE;
}
for (i = 0; i sc-sc_max_cmds; i++) {
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: apb
Date: Thu Aug 21 12:42:03 UTC 2014
Modified Files:
src/usr.bin/make/unit-tests: Makefile
Log Message:
When sanitising test output, replace ${TEST_MAKE} with make.
This string may appear in error messages that end up in the output.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/make/unit-tests/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.39 src/usr.bin/make/unit-tests/Makefile:1.40
--- src/usr.bin/make/unit-tests/Makefile:1.39 Wed Aug 20 08:39:14 2014
+++ src/usr.bin/make/unit-tests/Makefile Thu Aug 21 12:42:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2014/08/20 08:39:14 apb Exp $
+# $NetBSD: Makefile,v 1.40 2014/08/21 12:42:03 apb Exp $
#
# Unit tests for make(1)
# The main targets are:
@@ -82,6 +82,7 @@ test:
@echo ${TEST_MAKE} -f ${MAKEFILE} ${.TARGET}.out 21
@cd ${.OBJDIR} ${TEST_MAKE} -f ${MAKEFILE} 21 | \
${TOOL_SED} -e 's,^${TEST_MAKE:T:C/\./\\\./g}[^:]*:,make:,' \
+ -e 's,${TEST_MAKE:C/\./\\\./g},make,' \
-e '/stopped/s, /.*, unit-tests,' \
-e 's,${.CURDIR:C/\./\\\./g}/,,g' \
-e 's,${UNIT_TESTS:C/\./\\\./g}/,,g' ${.TARGET}.out || { \
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: apb
Date: Thu Aug 21 13:31:52 UTC 2014
Modified Files:
src/usr.bin/make/unit-tests: Makefile
Log Message:
Stricter sed expression for matching an optional PID in square brackets.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/usr.bin/make/unit-tests/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.40 src/usr.bin/make/unit-tests/Makefile:1.41
--- src/usr.bin/make/unit-tests/Makefile:1.40 Thu Aug 21 12:42:03 2014
+++ src/usr.bin/make/unit-tests/Makefile Thu Aug 21 13:31:52 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2014/08/21 12:42:03 apb Exp $
+# $NetBSD: Makefile,v 1.41 2014/08/21 13:31:52 apb Exp $
#
# Unit tests for make(1)
# The main targets are:
@@ -80,8 +80,8 @@ LANG= C
# so the results can be compared.
test:
@echo ${TEST_MAKE} -f ${MAKEFILE} ${.TARGET}.out 21
- @cd ${.OBJDIR} ${TEST_MAKE} -f ${MAKEFILE} 21 | \
- ${TOOL_SED} -e 's,^${TEST_MAKE:T:C/\./\\\./g}[^:]*:,make:,' \
+ cd ${.OBJDIR} ${TEST_MAKE} -f ${MAKEFILE} 21 | \
+ ${TOOL_SED} -e 's,^${TEST_MAKE:T:C/\./\\\./g}[][0-9]*:,make:,' \
-e 's,${TEST_MAKE:C/\./\\\./g},make,' \
-e '/stopped/s, /.*, unit-tests,' \
-e 's,${.CURDIR:C/\./\\\./g}/,,g' \
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: apb Date: Thu Aug 21 13:44:52 UTC 2014 Modified Files: src/usr.bin/make/unit-tests: Makefile Added Files: src/usr.bin/make/unit-tests: comment.exp comment.mk cond1.exp cond1.mk doterror.exp doterror.mk dotwait.exp dotwait.mk error.exp error.mk export-all.exp export-all.mk export-env.exp export-env.mk export.exp export.mk forloop.exp forloop.mk forsubst.exp forsubst.mk hash.exp hash.mk misc.exp misc.mk moderrs.exp moderrs.mk modmatch.exp modmatch.mk modmisc.exp modmisc.mk modorder.exp modorder.mk modts.exp modts.mk modword.exp modword.mk order.exp order.mk phony-end.exp phony-end.mk posix.exp posix.mk qequals.exp qequals.mk sunshcmd.exp sunshcmd.mk sysv.exp sysv.mk ternary.exp ternary.mk unexport-env.exp unexport-env.mk unexport.exp unexport.mk varcmd.exp varcmd.mk varshell.exp varshell.mk Removed Files: src/usr.bin/make/unit-tests: comment cond1 doterror dotwait error export export-all export-env forloop forsubst hash misc moderrs modmatch modmisc modorder modts modword order phony-end posix qequals sunshcmd sysv ternary test.exp unexport unexport-env varcmd varshell Log Message: Give each group of tests its own output file. * Rename each sub-makefile to *.mk; * Add a *.exp file of expected output for each sub-makefile; * Remove test.exp, which is replaced by all the other *.exp files. * Use suffix rules to generate *.rawout and *.out files for each test case. * Rewrite the test and accept targets to adapt to the new way. The old (now removed) test.exp file is almost identical to the concatenation (in the correct order) of all the new *.exp files. There are expected differences in makefile names embedded in the output, and the new exit status lines. Some old *** Error code 1 (ignored) lines are also removed (replaced by new exit status 1 lines). To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/usr.bin/make/unit-tests/Makefile cvs rdiff -u -r1.3 -r0 src/usr.bin/make/unit-tests/comment \ src/usr.bin/make/unit-tests/varcmd cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/comment.exp \ src/usr.bin/make/unit-tests/comment.mk \ src/usr.bin/make/unit-tests/cond1.exp \ src/usr.bin/make/unit-tests/cond1.mk \ src/usr.bin/make/unit-tests/doterror.exp \ src/usr.bin/make/unit-tests/doterror.mk \ src/usr.bin/make/unit-tests/dotwait.exp \ src/usr.bin/make/unit-tests/dotwait.mk \ src/usr.bin/make/unit-tests/error.exp \ src/usr.bin/make/unit-tests/error.mk \ src/usr.bin/make/unit-tests/export-all.exp \ src/usr.bin/make/unit-tests/export-all.mk \ src/usr.bin/make/unit-tests/export-env.exp \ src/usr.bin/make/unit-tests/export-env.mk \ src/usr.bin/make/unit-tests/export.exp \ src/usr.bin/make/unit-tests/export.mk \ src/usr.bin/make/unit-tests/forloop.exp \ src/usr.bin/make/unit-tests/forloop.mk \ src/usr.bin/make/unit-tests/forsubst.exp \ src/usr.bin/make/unit-tests/forsubst.mk \ src/usr.bin/make/unit-tests/hash.exp src/usr.bin/make/unit-tests/hash.mk \ src/usr.bin/make/unit-tests/misc.exp src/usr.bin/make/unit-tests/misc.mk \ src/usr.bin/make/unit-tests/moderrs.exp \ src/usr.bin/make/unit-tests/moderrs.mk \ src/usr.bin/make/unit-tests/modmatch.exp \ src/usr.bin/make/unit-tests/modmatch.mk \ src/usr.bin/make/unit-tests/modmisc.exp \ src/usr.bin/make/unit-tests/modmisc.mk \ src/usr.bin/make/unit-tests/modorder.exp \ src/usr.bin/make/unit-tests/modorder.mk \ src/usr.bin/make/unit-tests/modts.exp \ src/usr.bin/make/unit-tests/modts.mk \ src/usr.bin/make/unit-tests/modword.exp \ src/usr.bin/make/unit-tests/modword.mk \ src/usr.bin/make/unit-tests/order.exp \ src/usr.bin/make/unit-tests/order.mk \ src/usr.bin/make/unit-tests/phony-end.exp \ src/usr.bin/make/unit-tests/phony-end.mk \ src/usr.bin/make/unit-tests/posix.exp \ src/usr.bin/make/unit-tests/posix.mk \ src/usr.bin/make/unit-tests/qequals.exp \ src/usr.bin/make/unit-tests/qequals.mk \ src/usr.bin/make/unit-tests/sunshcmd.exp \ src/usr.bin/make/unit-tests/sunshcmd.mk \ src/usr.bin/make/unit-tests/sysv.exp src/usr.bin/make/unit-tests/sysv.mk \ src/usr.bin/make/unit-tests/ternary.exp \ src/usr.bin/make/unit-tests/ternary.mk \ src/usr.bin/make/unit-tests/unexport-env.exp \ src/usr.bin/make/unit-tests/unexport-env.mk \ src/usr.bin/make/unit-tests/unexport.exp \ src/usr.bin/make/unit-tests/unexport.mk \ src/usr.bin/make/unit-tests/varcmd.exp \ src/usr.bin/make/unit-tests/varcmd.mk \ src/usr.bin/make/unit-tests/varshell.exp \ src/usr.bin/make/unit-tests/varshell.mk cvs rdiff -u -r1.5 -r0 src/usr.bin/make/unit-tests/cond1 cvs rdiff -u -r1.1 -r0 src/usr.bin/make/unit-tests/doterror \
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: macallan
Date: Thu Aug 21 13:52:22 UTC 2014
Modified Files:
src/sys/dev/ic: vga.c vga_raster.c vgavar.h
Log Message:
#if 0 code to map the VGA BIOS
I've been unable to find any code that actually uses the mapping and we may
want to read the ROM from drm2.
If no users show up within a week or so I'll delete it.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/dev/ic/vga.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/ic/vga_raster.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/vgavar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/vga.c
diff -u src/sys/dev/ic/vga.c:1.112 src/sys/dev/ic/vga.c:1.113
--- src/sys/dev/ic/vga.c:1.112 Sat Jul 12 05:30:33 2014
+++ src/sys/dev/ic/vga.c Thu Aug 21 13:52:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.112 2014/07/12 05:30:33 mlelstv Exp $ */
+/* $NetBSD: vga.c,v 1.113 2014/08/21 13:52:22 macallan Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vga.c,v 1.112 2014/07/12 05:30:33 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: vga.c,v 1.113 2014/08/21 13:52:22 macallan Exp $);
#include opt_vga.h
/* for WSCONS_SUPPORT_PCVTFONTS */
@@ -555,13 +555,14 @@ vga_init(struct vga_config *vc, bus_spac
(vh-vh_mono ? 0x1 : 0x18000), 0x8000, vh-vh_memh))
panic(vga_init: mem subrange failed);
+#if 0
/* should only reserve the space (no need to map - save KVM) */
vc-vc_biostag = memt;
if (bus_space_map(vc-vc_biostag, 0xc, 0x8000, 0, vc-vc_bioshdl))
vc-vc_biosmapped = 0;
else
vc-vc_biosmapped = 1;
-
+#endif
vc-nscreens = 0;
LIST_INIT(vc-screens);
vc-active = NULL;
Index: src/sys/dev/ic/vga_raster.c
diff -u src/sys/dev/ic/vga_raster.c:1.41 src/sys/dev/ic/vga_raster.c:1.42
--- src/sys/dev/ic/vga_raster.c:1.41 Sat Jul 12 05:30:33 2014
+++ src/sys/dev/ic/vga_raster.c Thu Aug 21 13:52:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_raster.c,v 1.41 2014/07/12 05:30:33 mlelstv Exp $ */
+/* $NetBSD: vga_raster.c,v 1.42 2014/08/21 13:52:22 macallan Exp $ */
/*
* Copyright (c) 2001, 2002 Bang Jun-Young
@@ -56,7 +56,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vga_raster.c,v 1.41 2014/07/12 05:30:33 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: vga_raster.c,v 1.42 2014/08/21 13:52:22 macallan Exp $);
#include opt_vga.h
#include opt_wsmsgattrs.h /* for WSDISPLAY_CUSTOM_OUTPUT */
@@ -402,13 +402,14 @@ vga_raster_init(struct vga_config *vc, b
vh-vh_memh))
panic(vga_raster_init: mem subrange failed);
+#if 0
/* should only reserve the space (no need to map - save KVM) */
vc-vc_biostag = memt;
if (bus_space_map(vc-vc_biostag, 0xc, 0x8000, 0, vc-vc_bioshdl))
vc-vc_biosmapped = 0;
else
vc-vc_biosmapped = 1;
-
+#endif
vc-nscreens = 0;
LIST_INIT(vc-screens);
vc-active = NULL;
Index: src/sys/dev/ic/vgavar.h
diff -u src/sys/dev/ic/vgavar.h:1.30 src/sys/dev/ic/vgavar.h:1.31
--- src/sys/dev/ic/vgavar.h:1.30 Mon Jan 21 19:49:15 2013
+++ src/sys/dev/ic/vgavar.h Thu Aug 21 13:52:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vgavar.h,v 1.30 2013/01/21 19:49:15 mlelstv Exp $ */
+/* $NetBSD: vgavar.h,v 1.31 2014/08/21 13:52:22 macallan Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -55,10 +55,11 @@ struct vga_config {
struct vgascreen *active; /* current display */
const struct wsscreen_descr *currenttype;
+#if 0
int vc_biosmapped;
bus_space_tag_t vc_biostag;
bus_space_handle_t vc_bioshdl;
-
+#endif
struct vgascreen *wantedscreen;
void (*switchcb)(void *, int, int);
void *switchcbarg;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: reinoud Date: Thu Aug 21 14:02:10 UTC 2014 Modified Files: src/sys/dev/usb: if_smscreg.h Log Message: Correct minor TX_CTRL_0_ guess and document the INTR interrupt control register bits from the lan9730 docs. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/if_smscreg.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/usb/if_smscreg.h diff -u src/sys/dev/usb/if_smscreg.h:1.4 src/sys/dev/usb/if_smscreg.h:1.5 --- src/sys/dev/usb/if_smscreg.h:1.4 Mon Jun 9 14:18:28 2014 +++ src/sys/dev/usb/if_smscreg.h Thu Aug 21 14:02:10 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_smscreg.h,v 1.4 2014/06/09 14:18:28 mlelstv Exp $ */ +/* $NetBSD: if_smscreg.h,v 1.5 2014/08/21 14:02:10 reinoud Exp $ */ /* $OpenBSD: if_smscreg.h,v 1.2 2012/09/27 12:38:11 jsg Exp $ */ /*- @@ -52,18 +52,19 @@ * * Where the headers have the following fields: * - * TX_CTRL_0 20:16 Data offset + * TX_CTRL_0 31:18 Reserved + * TX_CTRL_0 17:16 Data offset (alignment padding 0-3) * TX_CTRL_0 13 First segment of frame indicator * TX_CTRL_0 12 Last segment of frame indicator - * TX_CTRL_0 10:0 Buffer size (?) + * TX_CTRL_0 10:0 Buffer size (payload size) * * TX_CTRL_1 14 Perform H/W checksuming on IP packets * TX_CTRL_1 13 Disable automatic ethernet CRC generation - * TX_CTRL_1 12 Disable padding (?) + * TX_CTRL_1 12 Disable ethernet frame padding upto 64 bytes * TX_CTRL_1 10:0 Packet byte length * */ -#define SMSC_TX_CTRL_0_OFFSET(x) (((x) 0x1FUL) 16) +#define SMSC_TX_CTRL_0_OFFSET(x) (((x) 0x3UL) 16) #define SMSC_TX_CTRL_0_FIRST_SEG (0x1UL 13) #define SMSC_TX_CTRL_0_LAST_SEG (0x1UL 12) #define SMSC_TX_CTRL_0_BUF_SIZE(x) ((x) 0x07FFUL) @@ -208,14 +209,14 @@ /* Interrupt control register */ #define SMSC_INTR_NTEP (0x1UL 31) -#define SMSC_INTR_MACRTO (0x1UL 19) -#define SMSC_INTR_TX_STOP (0x1UL 17) -#define SMSC_INTR_RX_STOP (0x1UL 16) -#define SMSC_INTR_PHY_INT (0x1UL 15) -#define SMSC_INTR_TXE (0x1UL 14) -#define SMSC_INTR_TDFU (0x1UL 13) -#define SMSC_INTR_TDFO (0x1UL 12) -#define SMSC_INTR_RXDF (0x1UL 11) +#define SMSC_INTR_MACRTO (0x1UL 19) /* MAC reset timeout */ +#define SMSC_INTR_TX_STOP (0x1UL 17) /* Transmittor halted */ +#define SMSC_INTR_RX_STOP (0x1UL 16) /* Receiver halted */ +#define SMSC_INTR_PHY_INT (0x1UL 15) /* PHY interrupt event */ +#define SMSC_INTR_TXE (0x1UL 14) /* Transmittor error */ +#define SMSC_INTR_TDFU (0x1UL 13) /* TX FIFO underrun */ +#define SMSC_INTR_TDFO (0x1UL 12) /* TX FIFO overrun */ +#define SMSC_INTR_RXDF (0x1UL 11) /* RX dropped frame */ #define SMSC_INTR_GPIOS 0x07FFUL /* Phy MII interface register */
CVS commit: src/sys/arch/arm/samsung
Module Name:src Committed By: reinoud Date: Thu Aug 21 14:06:39 UTC 2014 Modified Files: src/sys/arch/arm/samsung: exynos5_reg.h Log Message: Fix I2C naming for HDMI To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/samsung/exynos5_reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/samsung/exynos5_reg.h diff -u src/sys/arch/arm/samsung/exynos5_reg.h:1.11 src/sys/arch/arm/samsung/exynos5_reg.h:1.12 --- src/sys/arch/arm/samsung/exynos5_reg.h:1.11 Thu Aug 14 15:41:07 2014 +++ src/sys/arch/arm/samsung/exynos5_reg.h Thu Aug 21 14:06:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: exynos5_reg.h,v 1.11 2014/08/14 15:41:07 reinoud Exp $ */ +/* $NetBSD: exynos5_reg.h,v 1.12 2014/08/21 14:06:39 reinoud Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -180,7 +180,7 @@ #define EXYNOS5_I2C5_OFFSET 0x02CB #define EXYNOS5_I2C6_OFFSET 0x02CC #define EXYNOS5_I2C7_OFFSET 0x02CD -#define EXYNOS5_I2C_HDMI_OFFSET 0x02CE +#define EXYNOS5_I2CHDMI_OFFSET 0x02CE #define EXYNOS5_USI_OFFSET 0x02D0 #define EXYNOS5_TSADC_OFFSET 0x02D1 #define EXYNOS5_SPI0_OFFSET 0x02D2
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Aug 21 15:21:16 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Fix typo in entry for ticket 42 To generate a diff of this commit: cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.17 src/doc/CHANGES-7.0:1.1.2.18 --- src/doc/CHANGES-7.0:1.1.2.17 Thu Aug 21 09:12:26 2014 +++ src/doc/CHANGES-7.0 Thu Aug 21 15:21:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.17 2014/08/21 09:12:26 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.18 2014/08/21 15:21:16 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -286,7 +286,7 @@ sys/arch/arm/omap/omapfb.c 1.27 Do not assume that PAGE_SIZE is 4kB always. [macallan, ticket #41] -share/man/man8/man8.x86/boot.8 1.3, 1.5 +share/man/man8/man8.x86/boot.8 1.3-1.4 Document fs, menu, rndseed, and splash commands. Add rescue(8) to SEE ALSO. Document supported subsets of image formats.
CVS commit: src/external/gpl3/gcc/dist/gcc/config/sparc
Module Name:src
Committed By: martin
Date: Thu Aug 21 15:25:41 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/sparc: netbsd-elf.h
Log Message:
Restore ABI for fast_{u,}int_*_t to what we have used for thirteen years.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.8 src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.9
--- src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.8 Fri Aug 15 09:25:25 2014
+++ src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h Thu Aug 21 15:25:41 2014
@@ -53,6 +53,30 @@ along with GCC; see the file COPYING3.
#undef UINTPTR_TYPE
#define UINTPTR_TYPE SIZE_TYPE
+#undef INT_FAST8_TYPE
+#define INT_FAST8_TYPE (LONG_TYPE_SIZE == 64 ? long int : int)
+
+#undef UINT_FAST8_TYPE
+#define UINT_FAST8_TYPE (LONG_TYPE_SIZE == 64 ? unsigned char : unsigned int)
+
+#undef INT_FAST16_TYPE
+#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? long int : int)
+
+#undef UINT_FAST16_TYPE
+#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? short unsigned int : unsigned int)
+
+#undef INT_FAST32_TYPE
+#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? long int : int)
+
+#undef UINT_FAST32_TYPE
+#define UINT_FAST32_TYPE unsigned int
+
+#undef INT_FAST64_TYPE
+#define INT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? long int : long long int)
+
+#undef UINT_FAST64_TYPE
+#define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? long unsigned int : long long unsigned int)
+
/* This is the char to use for continuation (in case we need to turn
continuation back on). */
#undef DBX_CONTIN_CHAR
CVS commit: src/sys/arch/sparc/include
Module Name:src
Committed By: martin
Date: Thu Aug 21 15:27:37 UTC 2014
Modified Files:
src/sys/arch/sparc/include: int_fmtio.h
Log Message:
Revert previous, we have restores ABI for {u,}int_fast_*_t.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc/include/int_fmtio.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/include/int_fmtio.h
diff -u src/sys/arch/sparc/include/int_fmtio.h:1.6 src/sys/arch/sparc/include/int_fmtio.h:1.7
--- src/sys/arch/sparc/include/int_fmtio.h:1.6 Fri Aug 15 07:45:31 2014
+++ src/sys/arch/sparc/include/int_fmtio.h Thu Aug 21 15:27:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.6 2014/08/15 07:45:31 martin Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.7 2014/08/21 15:27:37 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -57,12 +57,15 @@
#else
#define PRIdLEAST64 lld /* int_least64_t */
#endif
-#define PRIdFAST8 d /* int_fast8_t */
-#define PRIdFAST16 d /* int_fast16_t */
-#define PRIdFAST32 d /* int_fast32_t */
#ifdef __arch64__
+#define PRIdFAST8 ld /* int_fast8_t */
+#define PRIdFAST16 ld /* int_fast16_t */
+#define PRIdFAST32 ld /* int_fast32_t */
#define PRIdFAST64 ld /* int_fast64_t */
#else
+#define PRIdFAST8 d /* int_fast8_t */
+#define PRIdFAST16 d /* int_fast16_t */
+#define PRIdFAST32 d /* int_fast32_t */
#define PRIdFAST64 lld /* int_fast64_t */
#endif
#ifdef __arch64__
@@ -88,12 +91,15 @@
#else
#define PRIiLEAST64 lli /* int_least64_t */
#endif
-#define PRIiFAST8 i /* int_fast8_t */
-#define PRIiFAST16 i /* int_fast16_t */
-#define PRIiFAST32 i /* int_fast32_t */
#ifdef __arch64__
+#define PRIiFAST8 li /* int_fast8_t */
+#define PRIiFAST16 li /* int_fast16_t */
+#define PRIiFAST32 li /* int_fast32_t */
#define PRIiFAST64 li /* int_fast64_t */
#else
+#define PRIiFAST8 i /* int_fast8_t */
+#define PRIiFAST16 i /* int_fast16_t */
+#define PRIiFAST32 i /* int_fast32_t */
#define PRIiFAST64 lli /* int_fast64_t */
#endif
#ifdef __arch64__
@@ -247,12 +253,15 @@
#else
#define SCNdLEAST64 lld /* int_least64_t */
#endif
-#define SCNdFAST8 d /* int_fast8_t */
-#define SCNdFAST16 d /* int_fast16_t */
-#define SCNdFAST32 d /* int_fast32_t */
#ifdef __arch64__
+#define SCNdFAST8 ld /* int_fast8_t */
+#define SCNdFAST16 ld /* int_fast16_t */
+#define SCNdFAST32 ld /* int_fast32_t */
#define SCNdFAST64 ld /* int_fast64_t */
#else
+#define SCNdFAST8 d /* int_fast8_t */
+#define SCNdFAST16 d /* int_fast16_t */
+#define SCNdFAST32 d /* int_fast32_t */
#define SCNdFAST64 lld /* int_fast64_t */
#endif
#ifdef __arch64__
@@ -278,12 +287,15 @@
#else
#define SCNiLEAST64 lli /* int_least64_t */
#endif
-#define SCNiFAST8 i /* int_fast8_t */
-#define SCNiFAST16 i /* int_fast16_t */
-#define SCNiFAST32 i /* int_fast32_t */
#ifdef __arch64__
+#define SCNiFAST8 li /* int_fast8_t */
+#define SCNiFAST16 li /* int_fast16_t */
+#define SCNiFAST32 li /* int_fast32_t */
#define SCNiFAST64 li /* int_fast64_t */
#else
+#define SCNiFAST8 i /* int_fast8_t */
+#define SCNiFAST16 i /* int_fast16_t */
+#define SCNiFAST32 i /* int_fast32_t */
#define SCNiFAST64 lli /* int_fast64_t */
#endif
#ifdef __arch64__
@@ -311,12 +323,15 @@
#else
#define SCNoLEAST64 llo /* uint_least64_t */
#endif
-#define SCNoFAST8 o /* uint_fast8_t */
-#define SCNoFAST16 o /* uint_fast16_t */
-#define SCNoFAST32 o /* uint_fast32_t */
#ifdef __arch64__
+#define SCNoFAST8 hho /* uint_fast8_t */
+#define SCNoFAST16 ho /* uint_fast16_t */
+#define SCNoFAST32 o /* uint_fast32_t */
#define SCNoFAST64 lo /* uint_fast64_t */
#else
+#define SCNoFAST8 o /* uint_fast8_t */
+#define SCNoFAST16 o /* uint_fast16_t */
+#define SCNoFAST32 o /* uint_fast32_t */
#define SCNoFAST64 llo /* uint_fast64_t */
#endif
#ifdef __arch64__
@@ -342,12 +357,15 @@
#else
#define SCNuLEAST64 llu /* uint_least64_t */
#endif
-#define SCNuFAST8 u /* uint_fast8_t */
-#define SCNuFAST16 u /* uint_fast16_t */
-#define SCNuFAST32 u /* uint_fast32_t */
#ifdef __arch64__
+#define SCNuFAST8 hhu /* uint_fast8_t */
+#define SCNuFAST16 hu /* uint_fast16_t */
+#define SCNuFAST32 u /* uint_fast32_t */
#define SCNuFAST64 lu /* uint_fast64_t */
#else
+#define SCNuFAST8 u /* uint_fast8_t */
+#define SCNuFAST16 u /* uint_fast16_t */
+#define SCNuFAST32 u /* uint_fast32_t */
#define SCNuFAST64 llu /* uint_fast64_t */
#endif
#ifdef __arch64__
@@ -373,12 +391,15 @@
#else
#define SCNxLEAST64 llx /* uint_least64_t */
#endif
-#define SCNxFAST8 x /* uint_fast8_t */
-#define SCNxFAST16 x /* uint_fast16_t */
-#define SCNxFAST32 x /* uint_fast32_t */
#ifdef __arch64__
+#define SCNxFAST8 hhx /* uint_fast8_t */
+#define SCNxFAST16 hx /* uint_fast16_t */
+#define SCNxFAST32 x /* uint_fast32_t */
#define SCNxFAST64 lx /* uint_fast64_t */
#else
+#define SCNxFAST8 x /* uint_fast8_t */
+#define SCNxFAST16
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: apb Date: Thu Aug 21 15:37:13 UTC 2014 Modified Files: src/usr.bin/make/unit-tests: Makefile Added Files: src/usr.bin/make/unit-tests: varmisc.exp varmisc.mk Log Message: Add varmisc.mk, for miscellaneous variable tests. For now, the only test is copied from src/tests/usr.bin/make/d_unmatchedvarparen.mk. This was the only test in src/tests/usr.bin/make that was not also in src/usr.bin/make/unit-tests. XXX: src/tests/usr.bin/mk should be changed to reach over to src/usr.bin/make/unit-tests, instead of keeping out of date copies of the tests. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/usr.bin/make/unit-tests/Makefile cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/varmisc.exp \ src/usr.bin/make/unit-tests/varmisc.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/unit-tests/Makefile diff -u src/usr.bin/make/unit-tests/Makefile:1.42 src/usr.bin/make/unit-tests/Makefile:1.43 --- src/usr.bin/make/unit-tests/Makefile:1.42 Thu Aug 21 13:44:51 2014 +++ src/usr.bin/make/unit-tests/Makefile Thu Aug 21 15:37:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2014/08/21 13:44:51 apb Exp $ +# $NetBSD: Makefile,v 1.43 2014/08/21 15:37:13 apb Exp $ # # Unit tests for make(1) # The main targets are: @@ -48,6 +48,7 @@ TESTNAMES= \ unexport \ unexport-env \ varcmd \ + varmisc \ varshell # Override make flags for certain tests Added files: Index: src/usr.bin/make/unit-tests/varmisc.exp diff -u /dev/null src/usr.bin/make/unit-tests/varmisc.exp:1.1 --- /dev/null Thu Aug 21 15:37:13 2014 +++ src/usr.bin/make/unit-tests/varmisc.exp Thu Aug 21 15:37:13 2014 @@ -0,0 +1,2 @@ + +exit status 0 Index: src/usr.bin/make/unit-tests/varmisc.mk diff -u /dev/null src/usr.bin/make/unit-tests/varmisc.mk:1.1 --- /dev/null Thu Aug 21 15:37:13 2014 +++ src/usr.bin/make/unit-tests/varmisc.mk Thu Aug 21 15:37:13 2014 @@ -0,0 +1,8 @@ +# $Id: varmisc.mk,v 1.1 2014/08/21 15:37:13 apb Exp $ +# +# Miscellaneous variable tests. + +all: unmatched_var_paren + +unmatched_var_paren: + @echo $(foo::=foo-text)
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: christos
Date: Thu Aug 21 15:43:35 UTC 2014
Modified Files:
src/sys/dev/ic: mfi.c
Log Message:
over-initialize for the benefit of gcc
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/ic/mfi.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/ic/mfi.c
diff -u src/sys/dev/ic/mfi.c:1.54 src/sys/dev/ic/mfi.c:1.55
--- src/sys/dev/ic/mfi.c:1.54 Thu Aug 21 08:25:01 2014
+++ src/sys/dev/ic/mfi.c Thu Aug 21 11:43:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.54 2014/08/21 12:25:01 christos Exp $ */
+/* $NetBSD: mfi.c,v 1.55 2014/08/21 15:43:35 christos Exp $ */
/* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
/*
@@ -73,7 +73,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mfi.c,v 1.54 2014/08/21 12:25:01 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: mfi.c,v 1.55 2014/08/21 15:43:35 christos Exp $);
#include bio.h
@@ -389,6 +389,9 @@ mfi_init_ccb(struct mfi_softc *sc)
MEGASAS_THUNDERBOLT_NEW_MSG_SIZE;
io_req_base_phys = MFIMEM_DVA(sc-sc_tbolt_reqmsgpool) +
MEGASAS_THUNDERBOLT_NEW_MSG_SIZE;
+ } else {
+ io_req_base = NULL; /* XXX: gcc */
+ io_req_base_phys = 0; /* XXX: gcc */
}
for (i = 0; i sc-sc_max_cmds; i++) {
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: apb
Date: Thu Aug 21 22:00:30 UTC 2014
Modified Files:
src/usr.bin/make/unit-tests: Makefile
Log Message:
Add a .PATH, so you can be in any other directory and run
make -f /path/to/this/Makefile sometest.out
and have it create sometest.out in your current directory.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/usr.bin/make/unit-tests/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.43 src/usr.bin/make/unit-tests/Makefile:1.44
--- src/usr.bin/make/unit-tests/Makefile:1.43 Thu Aug 21 15:37:13 2014
+++ src/usr.bin/make/unit-tests/Makefile Thu Aug 21 22:00:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2014/08/21 15:37:13 apb Exp $
+# $NetBSD: Makefile,v 1.44 2014/08/21 22:00:30 apb Exp $
#
# Unit tests for make(1)
# The main targets are:
@@ -16,6 +16,7 @@
.MAIN: all
UNIT_TESTS:= ${.PARSEDIR}
+.PATH: ${UNIT_TESTS}
# Each test is in a sub-makefile.
# Keep the list sorted.
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Fri Aug 22 05:39:21 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/crtstuff/arch: hppa.mk m68k.mk vax.mk
src/external/gpl3/gcc/lib/libiberty: defs.mk
src/external/gpl3/gcc/lib/libiberty/arch/hppa: config.h
src/external/gpl3/gcc/lib/libiberty/arch/m68k: config.h
src/external/gpl3/gcc/lib/libiberty/arch/sparc: config.h
src/external/gpl3/gcc/lib/libiberty/arch/sparc64: config.h
src/external/gpl3/gcc/lib/libiberty/arch/vax: config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa: c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k: c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc: c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64: c++config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax: c++config.h
src/external/gpl3/gcc/usr.bin/gcc/arch/hppa: configargs.h defs.mk tm.h
src/external/gpl3/gcc/usr.bin/gcc/arch/m68k: configargs.h defs.mk tm.h
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc: configargs.h
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64: configargs.h
src/external/gpl3/gcc/usr.bin/gcc/arch/vax: configargs.h defs.mk tm.h
Log Message:
rerun mknative for hppa, m68k, sparc*, and vax.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/crtstuff/arch/hppa.mk
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/crtstuff/arch/m68k.mk \
src/external/gpl3/gcc/lib/crtstuff/arch/vax.mk
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/libiberty/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libiberty/arch/hppa/config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libiberty/arch/m68k/config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libiberty/arch/sparc/config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libiberty/arch/sparc64/config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libiberty/arch/vax/config.h
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/c++config.h
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/c++config.h
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/c++config.h
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/c++config.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax/c++config.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/configargs.h
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/defs.mk
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/tm.h
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/usr.bin/gcc/arch/m68k/configargs.h
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/gcc/arch/m68k/defs.mk
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/gcc/arch/m68k/tm.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/configargs.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/configargs.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gcc/usr.bin/gcc/arch/vax/configargs.h
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/gcc/arch/vax/defs.mk
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/gcc/arch/vax/tm.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/crtstuff/arch/hppa.mk
diff -u src/external/gpl3/gcc/lib/crtstuff/arch/hppa.mk:1.4 src/external/gpl3/gcc/lib/crtstuff/arch/hppa.mk:1.5
--- src/external/gpl3/gcc/lib/crtstuff/arch/hppa.mk:1.4 Sat Mar 1 10:00:31 2014
+++ src/external/gpl3/gcc/lib/crtstuff/arch/hppa.mk Fri Aug 22 05:39:20 2014
@@ -1,11 +1,11 @@
# 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
#
G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I${GNUHOSTDIST}/gcc/../libbacktrace
G_CRTSTUFF_CFLAGS=
G_CRTSTUFF_T_CFLAGS=
G_CRTSTUFF_T_CFLAGS_S=
-G_tm_defines=LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 NETBSD_ENABLE_PTHREADS
+G_tm_defines=LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 NETBSD_ENABLE_PTHREADS CHAR_FAST8=1 SHORT_FAST16=1
G_xm_file=
G_xm_defines=
Index: src/external/gpl3/gcc/lib/crtstuff/arch/m68k.mk
diff -u src/external/gpl3/gcc/lib/crtstuff/arch/m68k.mk:1.5
