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: 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
-__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
#include
@@ -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
-__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
-__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
#include
@@ -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
-__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.50 2013/11/27 17:24:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.51 2014/08/21 06:40:35 maxv Exp $");
#include
#include
CVS commit: src/sys/conf
Module Name:src
Committed By: joerg
Date: Wed Aug 20 22:02:20 UTC 2014
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Drop stray }
To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 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.170 src/sys/conf/Makefile.kern.inc:1.171
--- src/sys/conf/Makefile.kern.inc:1.170 Sun Aug 17 21:17:44 2014
+++ src/sys/conf/Makefile.kern.inc Wed Aug 20 22:02:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.170 2014/08/17 21:17:44 joerg Exp $
+# $NetBSD: Makefile.kern.inc,v 1.171 2014/08/20 22:02:20 joerg Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -265,7 +265,7 @@ LINKFLAGS+= ${LINKFLAGS_NORMAL}
SYSTEM_LD_HEAD+=${SYSTEM_LD_HEAD_EXTRA}
SYSTEM_LD_TAIL_STAGE1= ${SYSTEM_LD_TAIL}
SYSTEM_LD_TAIL_STAGE2= ${SYSTEM_LD_TAIL}
-.if defined(COPY_SYMTAB})
+.if defined(COPY_SYMTAB)
SYSTEM_LD_TAIL_STAGE2+= ; echo ${DBSYM} $@; ${DBSYM} $@
.endif
SYSTEM_LD_TAIL_STAGE2+= ${SYSTEM_LD_TAIL_EXTRA}
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: matt
Date: Wed Aug 20 20:15:55 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc
Log Message:
i386 doesn't use subint fast{8,16}
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/gpl3/gcc/dist/gcc/config.gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.27 src/external/gpl3/gcc/dist/gcc/config.gcc:1.28
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.27 Wed Aug 20 16:00:15 2014
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Wed Aug 20 20:15:55 2014
@@ -1280,7 +1280,6 @@ x86_64-*-freebsd*)
i[34567]86-*-netbsdelf*)
tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${nbsd_tm_file} i386/netbsd-elf.h"
tmake_file="${tmake_file} i386/t-crtstuff"
- tm_defines="${tm_defines} CHAR_FAST8=1 SHORT_FAST16=1"
extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
;;
i[34567]86-*-netbsd*)
CVS commit: src/sys/arch/sun3/dev
Module Name:src Committed By: tsutsui Date: Wed Aug 20 17:48:57 UTC 2014 Modified Files: src/sys/arch/sun3/dev: fd.c Log Message: Sync with sparc/dev/fd.c rev 1.155. > Fix panic() on opening fd(4), caused by a wrong pointer passed to memset(). Note sun3 still uses gcc 4.5.4 but also panicked by this old bug, so probably this problem was triggered by not gcc 4.8 but struct disk changes (struct disk_geom was added in rev 1.58), which increased sizeof(struct fd_softc) from 248 bytes to 296 bytes. (i.e. now struct fd_softc could be allocated in a different pool block, probably near the wrong pointer of the struct disklabel) Anyway, this fix should be pullued up to netbsd-7. (probably I'm the only user of floppy on sun3 though) To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/arch/sun3/dev/fd.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/sun3/dev/fd.c diff -u src/sys/arch/sun3/dev/fd.c:1.77 src/sys/arch/sun3/dev/fd.c:1.78 --- src/sys/arch/sun3/dev/fd.c:1.77 Fri Jul 25 08:10:35 2014 +++ src/sys/arch/sun3/dev/fd.c Wed Aug 20 17:48:57 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.77 2014/07/25 08:10:35 dholland Exp $ */ +/* $NetBSD: fd.c,v 1.78 2014/08/20 17:48:57 tsutsui Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -72,7 +72,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.77 2014/07/25 08:10:35 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.78 2014/08/20 17:48:57 tsutsui Exp $"); #include "opt_ddb.h" @@ -1875,7 +1875,7 @@ fdgetdisklabel(dev_t dev) struct cpu_disklabel *clp = fd->sc_dk.dk_cpulabel; memset(lp, 0, sizeof(struct disklabel)); - memset(lp, 0, sizeof(struct cpu_disklabel)); + memset(clp, 0, sizeof(struct cpu_disklabel)); lp->d_type = DTYPE_FLOPPY; lp->d_secsize = FDC_BSIZE;
CVS commit: src/share/misc
Module Name:src
Committed By: ginsbach
Date: Wed Aug 20 16:05:03 UTC 2014
Modified Files:
src/share/misc: acronyms.comp
Log Message:
Add one more RAS
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.142 src/share/misc/acronyms.comp:1.143
--- src/share/misc/acronyms.comp:1.142 Sat Jun 14 02:05:38 2014
+++ src/share/misc/acronyms.comp Wed Aug 20 16:05:03 2014
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.142 2014/06/14 02:05:38 jnemeth Exp $
+$NetBSD: acronyms.comp,v 1.143 2014/08/20 16:05:03 ginsbach Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -985,6 +985,7 @@ RA router advertisement
RAD rapid application development
RAID redundant array of {independent,inexpensive} disks
RAM random access memory
+RAS reliability, availability and serviceability
RAS remote access service
RAS restartable atomic sequence
RAS row address strobe
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: matt
Date: Wed Aug 20 16:00:15 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc
src/external/gpl3/gcc/dist/gcc/config: netbsd-stdint.h
Log Message:
Fix netbsd-stdint.h to allow char and short for int_fast8_t and int_fast16_t
and their corresponding unsigned variants.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.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.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.26 src/external/gpl3/gcc/dist/gcc/config.gcc:1.27
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.26 Thu Jul 31 22:58:40 2014
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Wed Aug 20 16:00:15 2014
@@ -1123,6 +1123,7 @@ hppa*-*-netbsd* | parisc*-*-netbsd*)
tm_file="${tm_file} dbxelf.h elfos.h ${nbsd_tm_file} \
pa/pa-netbsd.h pa/pa32-regs.h pa/pa32-netbsd.h"
tmake_file="${tmake_file} pa/t-netbsd"
+ tm_defines="${tm_defines} CHAR_FAST8=1 SHORT_FAST16=1"
extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
;;
hppa[12]*-*-hpux10*)
@@ -1279,6 +1280,7 @@ x86_64-*-freebsd*)
i[34567]86-*-netbsdelf*)
tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${nbsd_tm_file} i386/netbsd-elf.h"
tmake_file="${tmake_file} i386/t-crtstuff"
+ tm_defines="${tm_defines} CHAR_FAST8=1 SHORT_FAST16=1"
extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
;;
i[34567]86-*-netbsd*)
@@ -1752,6 +1754,7 @@ m68k-*-elf* | fido-*-elf*)
m68010-*-netbsdelf* | m68k-*-netbsdelf* | m5407-*-netbsdelf*)
tm_file="${tm_file} dbxelf.h elfos.h ${nbsd_tm_file} m68k/netbsd-elf.h"
tm_defines="${tm_defines} MOTOROLA=1 USE_GAS=1"
+ tm_defines="${tm_defines} CHAR_FAST8=1 SHORT_FAST16=1"
extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
default_cf_cpu=5475
default_m68k_cpu=68020
@@ -2745,6 +2748,7 @@ vax-*-linux*)
;;
vax-*-netbsdelf*)
tm_file="${tm_file} elfos.h ${nbsd_tm_file} vax/elf.h vax/netbsd-elf.h"
+ tm_defines="${tm_defines} CHAR_FAST8=1 SHORT_FAST16=1"
extra_options="${extra_options} netbsd.opt netbsd-elf.opt vax/elf.opt"
;;
vax-*-openbsd*)
Index: src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h
diff -u src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h:1.1 src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h:1.2
--- src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h:1.1 Sat Mar 1 09:26:00 2014
+++ src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h Wed Aug 20 16:00:15 2014
@@ -43,12 +43,28 @@ see the files COPYING3 and COPYING.RUNTI
#define UINT_LEAST32_TYPE "unsigned int"
#define UINT_LEAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
+#ifdef CHAR_FAST8
+#define INT_FAST8_TYPE (LONG_TYPE_SIZE == 64 ? "int" : "signed char")
+#else
#define INT_FAST8_TYPE"int"
+#endif
+#ifdef SHORT_FAST16
+#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "int" : "short int")
+#else
#define INT_FAST16_TYPE "int"
+#endif
#define INT_FAST32_TYPE "int"
#define INT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "long long int")
+#ifdef CHAR_FAST8
+#define UINT_FAST8_TYPE (LONG_TYPE_SIZE == 64 ? "unsigned int" : "unsigned char")
+#else
#define UINT_FAST8_TYPE "unsigned int"
+#endif
+#ifdef SHORT_FAST16
+#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "unsigned int" : "short unsigned int")
+#else
#define UINT_FAST16_TYPE "unsigned int"
+#endif
#define UINT_FAST32_TYPE "unsigned int"
#define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
CVS commit: src/sys/external/bsd/common/include/linux
Module Name:src
Committed By: riastradh
Date: Wed Aug 20 15:26:52 UTC 2014
Modified Files:
src/sys/external/bsd/common/include/linux: list.h
Log Message:
Add some Linux list routines.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/common/include/linux/list.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/external/bsd/common/include/linux/list.h
diff -u src/sys/external/bsd/common/include/linux/list.h:1.4 src/sys/external/bsd/common/include/linux/list.h:1.5
--- src/sys/external/bsd/common/include/linux/list.h:1.4 Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/common/include/linux/list.h Wed Aug 20 15:26:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: list.h,v 1.4 2014/07/16 20:59:57 riastradh Exp $ */
+/* $NetBSD: list.h,v 1.5 2014/08/20 15:26:52 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -74,6 +74,12 @@ list_first(const struct list_head *head)
}
static inline struct list_head *
+list_last(const struct list_head *head)
+{
+ return head->prev;
+}
+
+static inline struct list_head *
list_next(const struct list_head *node)
{
return node->next;
@@ -192,8 +198,12 @@ list_del_init(struct list_head *node)
#define list_entry(PTR, TYPE, FIELD) container_of(PTR, TYPE, FIELD)
#define list_first_entry(PTR, TYPE, FIELD)\
list_entry(list_first((PTR)), TYPE, FIELD)
+#define list_last_entry(PTR, TYPE, FIELD)\
+ list_entry(list_last((PTR)), TYPE, FIELD)
#define list_next_entry(ENTRY, FIELD) \
list_entry(list_next(&(ENTRY)->FIELD), typeof(*(ENTRY)), FIELD)
+#define list_prev_entry(ENTRY, FIELD) \
+ list_entry(list_prev(&(ENTRY)->FIELD), typeof(*(ENTRY)), FIELD)
#define list_for_each(VAR, HEAD) \
for ((VAR) = list_first((HEAD));\
@@ -211,6 +221,12 @@ list_del_init(struct list_head *node)
(VAR) = list_entry(list_next(&(VAR)->FIELD), typeof(*(VAR)), \
FIELD))
+#define list_for_each_entry_reverse(VAR, HEAD, FIELD) \
+ for ((VAR) = list_entry(list_last((HEAD)), typeof(*(VAR)), FIELD); \
+ &(VAR)->FIELD != (HEAD);\
+ (VAR) = list_entry(list_prev(&(VAR)->FIELD), typeof(*(VAR)), \
+ FIELD))
+
#define list_for_each_entry_safe(VAR, NEXT, HEAD, FIELD) \
for ((VAR) = list_entry(list_first((HEAD)), typeof(*(VAR)), FIELD); \
(&(VAR)->FIELD != (HEAD)) &&\
@@ -223,6 +239,11 @@ list_del_init(struct list_head *node)
&(VAR)->FIELD != (HEAD);\
(VAR) = list_next_entry((VAR), FIELD))
+#define list_for_each_entry_continue_reverse(VAR, HEAD, FIELD) \
+ for ((VAR) = list_prev_entry((VAR), FIELD); \
+ &(VAR)->FIELD != (HEAD);\
+ (VAR) = list_prev_entry((VAR), FIELD))
+
#define list_for_each_entry_safe_from(VAR, NEXT, HEAD, FIELD) \
for (;\
(&(VAR)->FIELD != (HEAD)) &&\
CVS commit: src/external/bsd/libc++/lib
Module Name:src
Committed By: joerg
Date: Wed Aug 20 15:19:39 UTC 2014
Modified Files:
src/external/bsd/libc++/lib: Makefile
Log Message:
Since GCC 4.5 doesn't support noexcept, don't pretend to support it by
using -std=c++0x. Just use the correct value for x.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libc++/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libc++/lib/Makefile
diff -u src/external/bsd/libc++/lib/Makefile:1.6 src/external/bsd/libc++/lib/Makefile:1.7
--- src/external/bsd/libc++/lib/Makefile:1.6 Sat Jul 5 20:45:49 2014
+++ src/external/bsd/libc++/lib/Makefile Wed Aug 20 15:19:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/07/05 20:45:49 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2014/08/20 15:19:39 joerg Exp $
LIB= c++
WARNS= 4
@@ -35,7 +35,7 @@ CLEANFILES+= rt_${src}
CPPFLAGS+= -nostdinc++ -cxx-isystem ${LIBCXX_SRCDIR}/include -I${LIBCXXRT_SRCDIR}/src
CPPFLAGS+= -DLIBCXXRT
-CXXFLAGS+= ${${ACTIVE_CC} == "clang":? -std=c++11 : -std=c++0x}
+CXXFLAGS+= -std=c++11
CWARNFLAGS.gcc+= -Wno-error
CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd
Module Name:xsrc
Committed By: macallan
Date: Wed Aug 20 14:24:50 UTC 2014
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c
Log Message:
more clang appeasement
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.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/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.6 Sun Aug 10 19:21:06 2014
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c Wed Aug 20 14:24:50 2014
@@ -157,9 +157,10 @@ Bool xf86EnableIO()
xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
if (ioBase == MAP_FAILED)
{
-ioBase=mmap(NULL, 0x1, PROT_READ|PROT_WRITE, MAP_SHARED, fd,
+ioBase = mmap(NULL, 0x1, PROT_READ|PROT_WRITE, MAP_SHARED, fd,
PCI_MAGIC_IO_RANGE);
-xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase);
+xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08lx\n",
+(unsigned long)ioBase);
if (ioBase == MAP_FAILED) {
xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n");
return FALSE;
CVS commit: [netbsd-7] src
Module Name:src
Committed By: martin
Date: Wed Aug 20 13:49:28 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/vax [netbsd-7]: builtins.md vax.c
src/lib/libc/compiler_rt [netbsd-7]: Makefile.inc
src/libexec/ld.elf_so/arch/vax [netbsd-7]: rtld_start.S
Log Message:
Pullup the following to netbsd-7 (requested by matt in ticket #37):
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
libexec/ld.elf_so/arch/vax/rtld_start.S 1.24
add a missing register prefix.
Add proper registers for register counts.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.4.1 \
src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md
cvs rdiff -u -r1.9 -r1.9.2.1 src/external/gpl3/gcc/dist/gcc/config/vax/vax.c
cvs rdiff -u -r1.24 -r1.24.2.1 src/lib/libc/compiler_rt/Makefile.inc
cvs rdiff -u -r1.22 -r1.22.4.1 src/libexec/ld.elf_so/arch/vax/rtld_start.S
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/vax/builtins.md
diff -u src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md:1.3 src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md:1.3.4.1
--- src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md:1.3 Sat Mar 1 08:58:33 2014
+++ src/external/gpl3/gcc/dist/gcc/config/vax/builtins.md Wed Aug 20 13:49:28 2014
@@ -37,17 +37,17 @@
"
{
rtx label = gen_label_rtx ();
- emit_insn (gen_ffssi2_internal (operands[0], operands[1]));
+ emit_insn (gen_ctzsi2 (operands[0], operands[1]));
emit_jump_insn (gen_condjump (gen_rtx_NE(VOIDmode, cc0_rtx, const0_rtx), label));
- emit_insn (gen_negsi2 (operands[0], const1_rtx));
+ emit_move_insn (operands[0], constm1_rtx);
emit_label (label);
emit_insn (gen_addsi3 (operands[0], operands[0], const1_rtx));
DONE;
}")
-(define_insn "ffssi2_internal"
+(define_insn "ctzsi2"
[(set (match_operand:SI 0 "nonimmediate_operand" "=rQ")
- (ffs:SI (match_operand:SI 1 "general_operand" "nrmT")))
+ (ctz:SI (match_operand:SI 1 "general_operand" "nrmT")))
(set (cc0) (match_dup 0))]
""
"ffs $0,$32,%1,%0")
Index: src/external/gpl3/gcc/dist/gcc/config/vax/vax.c
diff -u src/external/gpl3/gcc/dist/gcc/config/vax/vax.c:1.9 src/external/gpl3/gcc/dist/gcc/config/vax/vax.c:1.9.2.1
--- src/external/gpl3/gcc/dist/gcc/config/vax/vax.c:1.9 Wed Jun 4 16:11:32 2014
+++ src/external/gpl3/gcc/dist/gcc/config/vax/vax.c Wed Aug 20 13:49:28 2014
@@ -1117,6 +1117,7 @@ vax_notice_update_cc (rtx exp, rtx insn
case IOR:
case XOR:
case NOT:
+ case CTZ:
case MEM:
case REG:
cc_status.flags = CC_NO_OVERFLOW;
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.24 src/lib/libc/compiler_rt/Makefile.inc:1.24.2.1
--- src/lib/libc/compiler_rt/Makefile.inc:1.24 Sun Aug 10 23:39:08 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Wed Aug 20 13:49:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.24 2014/08/10 23:39:08 matt Exp $
+# $NetBSD: Makefile.inc,v 1.24.2.1 2014/08/20 13:49:28 martin Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -136,9 +136,15 @@ GENERIC_SRCS+= \
# These have h/w instructions which are always used.
.if ${LIBC_MACHINE_ARCH} != "alpha" && ${LIBC_MACHINE_CPU} != "powerpc" \
+&& ${LIBC_MACHINE_CPU} != "aarch64"
+GENERIC_SRCS+= \
+ clzsi2.c
+.endif
+
+# These have h/w instructions which are always used.
+.if ${LIBC_MACHINE_ARCH} != "alpha" && ${LIBC_MACHINE_CPU} != "powerpc" \
&& ${LIBC_MACHINE_CPU} != "aarch64" && ${LIBC_MACHINE_ARCH} != "vax"
GENERIC_SRCS+= \
- clzsi2.c \
ctzsi2.c \
divmodsi4.c \
divsi3.c \
Index: src/libexec/ld.elf_so/arch/vax/rtld_start.S
diff -u src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.22 src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.22.4.1
--- src/libexec/ld.elf_so/arch/vax/rtld_start.S:1.22 Sat Mar 22 15:13:10 2014
+++ src/libexec/ld.elf_so/arch/vax/rtld_start.S Wed Aug 20 13:49:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld_start.S,v 1.22 2014/03/22 15:13:10 matt Exp $ */
+/* $NetBSD: rtld_start.S,v 1.22.4.1 2014/08/20 13:49:28 martin Exp $ */
/*
* Copyright 1996 Matt Thomas
@@ -152,7 +152,7 @@ ALTENTRY(_rtld_bind_start)
extzv %r2,$4,%r3,%r5 /* extract count */
movq 4(%fp),%r2 /* fetch callframe status & saved AP */
insv %r1,$16,$12,%r2 /* update save mask */
- addl3 %r3,r4,%r1 /* add counts and discard them */
+ addl3 %r4,%r5,%r1 /* add counts and discard them */
movq 12(%fp),%r4 /* fetch callframe saved FP & PC */
moval 20(%fp)[%r1],%sp/* pop callframe */
extzv $16,$12,%r2,%r1 /* get save mask back */
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Wed Aug 20 13:48:08 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c
src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c
Log Message:
Drop take the {ttm,gem} vmobjlock in the fault handler.
- We don't need this lock.
- uvm does nothing between taking it and calling the fault handler.
- Now that the uvm_aobj shares vmobjlock with the {ttm,gem} uvm
object, we must not hold the lock when we call uvm_obj_wirepages on
the uvm_aobj.
XXX pullup to netbsd-7
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.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/external/bsd/drm2/dist/drm/i915/i915_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.14 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.15
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.14 Wed Jul 16 21:48:53 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Wed Aug 20 13:48:08 2014
@@ -1842,6 +1842,9 @@ i915_gem_fault(struct uvm_faultinfo *ufi
intel_runtime_pm_get(dev_priv);
+ /* Thanks, uvm, but we don't need this lock. */
+ mutex_exit(uobj->vmobjlock);
+
ret = i915_mutex_lock_interruptible(dev);
if (ret)
goto out;
@@ -1880,6 +1883,7 @@ unpin:
unlock:
mutex_unlock(&dev->struct_mutex);
out:
+ mutex_enter(uobj->vmobjlock);
uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj);
if (ret == -ERESTART)
uvm_wait("i915flt");
Index: src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.3 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.4
--- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.3 Mon Aug 18 01:17:34 2014
+++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Wed Aug 20 13:48:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_vm.c,v 1.3 2014/08/18 01:17:34 riastradh Exp $ */
+/* $NetBSD: ttm_bo_vm.c,v 1.4 2014/08/20 13:48:08 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.3 2014/08/18 01:17:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.4 2014/08/20 13:48:08 riastradh Exp $");
#include
@@ -92,6 +92,9 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u
unsigned mmapflags;
int ret;
+ /* Thanks, uvm, but we don't need this lock. */
+ mutex_exit(uobj->vmobjlock);
+
/* Copy-on-write mappings make no sense for the graphics aperture. */
if (UVM_ET_ISCOPYONWRITE(ufi->entry)) {
ret = -EIO;
@@ -199,7 +202,8 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u
out3: pmap_update(ufi->orig_map->pmap);
out2: ttm_mem_io_unlock(man);
out1: ttm_bo_unreserve(bo);
-out0: uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj);
+out0: mutex_enter(uobj->vmobjlock);
+ uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj);
/* XXX errno Linux->NetBSD */
return -ret;
}
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Wed Aug 20 13:46:17 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Note Ticket #35 To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 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.14 src/doc/CHANGES-7.0:1.1.2.15 --- src/doc/CHANGES-7.0:1.1.2.14 Mon Aug 18 12:42:27 2014 +++ src/doc/CHANGES-7.0 Wed Aug 20 13:46:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.14 2014/08/18 12:42:27 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.15 2014/08/20 13:46:17 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -274,3 +274,19 @@ sys/dev/ccdvar.h1.34 Don't print ccd_size with %zu; it no longer has type size_t. Instead, cast to uintmax_t and print with %ju. [sborrill, ticket #38] + +sys/rump/librump/rumpkern/hyperentropy.c 1.4 +sys/rump/librump/rumpkern/hyperentropy.c 1.5 +sys/rump/librump/rumpkern/hyperentropy.c 1.6 +sys/rump/librump/rumpkern/hyperentropy.c 1.7 + + Call rnd_add_data asynchronously for the rump hyperentropy callback. + + Avoids recursion rnd_getmore -> rnd_add_data -> rnd_getmore, which is + silly but I don't have time to fix it properly right now. + + add sys/atomic.h and order headers correctly + Fix header ordering + comes first, per /usr/share/misc/style. + [riastradh, ticket #35] +
CVS commit: src/external/gpl3/gcc/dist/libgcc
Module Name:src Committed By: christos Date: Wed Aug 20 13:29:07 UTC 2014 Modified Files: src/external/gpl3/gcc/dist/libgcc: unwind-dw2-fde.c Log Message: PR/45716: Anthony Mallet: emacs (various versions) dies on unwind stuff in gcc 4.8 Apply fix that got missed as this file got moved from dist/gcc to dist/libgcc: Somehow emacs tries to unregister frame info for a symbol it did not register. Don't abort for now. This worked before because the previous version of gcc did not bother unregistering. Adding debugging printfs makes emacs core dump, where other programs work fine. XXX: pullup 7 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/gcc/dist/libgcc/unwind-dw2-fde.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libgcc/unwind-dw2-fde.c diff -u src/external/gpl3/gcc/dist/libgcc/unwind-dw2-fde.c:1.1.1.1 src/external/gpl3/gcc/dist/libgcc/unwind-dw2-fde.c:1.2 --- src/external/gpl3/gcc/dist/libgcc/unwind-dw2-fde.c:1.1.1.1 Sat Mar 1 03:41:45 2014 +++ src/external/gpl3/gcc/dist/libgcc/unwind-dw2-fde.c Wed Aug 20 09:29:07 2014 @@ -213,7 +213,9 @@ __deregister_frame_info_bases (const voi out: __gthread_mutex_unlock (&object_mutex); +#if 0 gcc_assert (ob); +#endif return (void *) ob; }
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: justin
Date: Wed Aug 20 12:09:15 UTC 2014
Modified Files:
src/lib/librumpuser: rumpfiber_bio.c
Log Message:
Add missing include
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/librumpuser/rumpfiber_bio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpfiber_bio.c
diff -u src/lib/librumpuser/rumpfiber_bio.c:1.1 src/lib/librumpuser/rumpfiber_bio.c:1.2
--- src/lib/librumpuser/rumpfiber_bio.c:1.1 Fri Jul 11 20:26:31 2014
+++ src/lib/librumpuser/rumpfiber_bio.c Wed Aug 20 12:09:15 2014
@@ -26,11 +26,12 @@
#include "rumpuser_port.h"
#if !defined(lint)
-__RCSID("$NetBSD: rumpfiber_bio.c,v 1.1 2014/07/11 20:26:31 justin Exp $");
+__RCSID("$NetBSD: rumpfiber_bio.c,v 1.2 2014/08/20 12:09:15 justin Exp $");
#endif /* !lint */
#include
+#include
#include
#include
CVS commit: xsrc/external/mit/xf86-video-nv/dist/src
Module Name:xsrc
Committed By: macallan
Date: Wed Aug 20 09:54:04 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: g80_type.h
Log Message:
add -1 to enum ORNum to make clang happy
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h
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/g80_type.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h:1.1.1.3 xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h:1.1.1.3 Sun Jun 2 08:24:14 2013
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h Wed Aug 20 09:54:04 2014
@@ -27,7 +27,8 @@ typedef enum ORNum {
DAC1 = 1,
DAC2 = 2,
SOR0 = 0,
- SOR1 = 1
+ SOR1 = 1,
+ ORINVALID = -1
} ORNum;
typedef enum PanelType {
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: apb
Date: Wed Aug 20 08:39:14 UTC 2014
Modified Files:
src/usr.bin/make/unit-tests: Makefile test.exp
Added Files:
src/usr.bin/make/unit-tests: varshell
Log Message:
Add tests for VAR != command.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.43 -r1.44 src/usr.bin/make/unit-tests/test.exp
cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/varshell
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.38 src/usr.bin/make/unit-tests/Makefile:1.39
--- src/usr.bin/make/unit-tests/Makefile:1.38 Wed Aug 28 21:56:50 2013
+++ src/usr.bin/make/unit-tests/Makefile Wed Aug 20 08:39:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2013/08/28 21:56:50 sjg Exp $
+# $NetBSD: Makefile,v 1.39 2014/08/20 08:39:14 apb Exp $
#
# Unit tests for make(1)
# The main targets are:
@@ -46,7 +46,8 @@ SUBFILES= \
ternary \
unexport \
unexport-env \
- varcmd
+ varcmd \
+ varshell
all: ${SUBFILES}
Index: src/usr.bin/make/unit-tests/test.exp
diff -u src/usr.bin/make/unit-tests/test.exp:1.43 src/usr.bin/make/unit-tests/test.exp:1.44
--- src/usr.bin/make/unit-tests/test.exp:1.43 Wed Aug 28 21:56:50 2013
+++ src/usr.bin/make/unit-tests/test.exp Wed Aug 20 08:39:14 2014
@@ -379,5 +379,16 @@ five FU=bar FOO=goo VAR=
CVS commit: src/usr.bin/make
Module Name:src
Committed By: apb
Date: Wed Aug 20 08:37:25 UTC 2014
Modified Files:
src/usr.bin/make: main.c
Log Message:
It should not be an error to have VAR != command that prints no output
To generate a diff of this commit:
cvs rdiff -u -r1.227 -r1.228 src/usr.bin/make/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.227 src/usr.bin/make/main.c:1.228
--- src/usr.bin/make/main.c:1.227 Fri Aug 8 19:20:39 2014
+++ src/usr.bin/make/main.c Wed Aug 20 08:37:25 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.227 2014/08/08 19:20:39 gson Exp $ */
+/* $NetBSD: main.c,v 1.228 2014/08/20 08:37:25 apb Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.227 2014/08/08 19:20:39 gson Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.228 2014/08/20 08:37:25 apb Exp $";
#else
#include
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.227 2014/08/08 19:20:39 gson Exp $");
+__RCSID("$NetBSD: main.c,v 1.228 2014/08/20 08:37:25 apb Exp $");
#endif
#endif /* not lint */
#endif
@@ -1488,10 +1488,12 @@ Cmd_Exec(const char *cmd, const char **e
int status; /* command exit status */
Buffer buf; /* buffer to store the result */
char *cp;
-int cc;
+int cc; /* bytes read, or -1 */
+int savederr; /* saved errno */
*errnum = NULL;
+savederr = 0;
if (!shellName)
Shell_Init();
@@ -1554,6 +1556,8 @@ Cmd_Exec(const char *cmd, const char **e
Buf_AddBytes(&buf, cc, result);
}
while (cc > 0 || (cc == -1 && errno == EINTR));
+ if (cc == -1)
+ savederr = errno;
/*
* Close the input side of the pipe.
@@ -1570,7 +1574,7 @@ Cmd_Exec(const char *cmd, const char **e
cc = Buf_Size(&buf);
res = Buf_Destroy(&buf, FALSE);
- if (cc == 0)
+ if (savederr != 0)
*errnum = "Couldn't read shell's output for \"%s\"";
if (WIFSIGNALED(status))
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Wed Aug 20 08:00:40 UTC 2014 Modified Files: src/sys/dev/mii: miidevs.h miidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.124 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.111 -r1.112 src/sys/dev/mii/miidevs_data.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/mii/miidevs.h diff -u src/sys/dev/mii/miidevs.h:1.123 src/sys/dev/mii/miidevs.h:1.124 --- src/sys/dev/mii/miidevs.h:1.123 Wed Jul 2 22:33:39 2014 +++ src/sys/dev/mii/miidevs.h Wed Aug 20 08:00:39 2014 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs.h,v 1.123 2014/07/02 22:33:39 msaitoh Exp $ */ +/* $NetBSD: miidevs.h,v 1.124 2014/08/20 08:00:39 msaitoh Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.120 2014/07/02 22:33:18 msaitoh Exp + * NetBSD: miidevs,v 1.121 2014/08/20 08:00:18 msaitoh Exp */ /*- @@ -214,9 +214,9 @@ #define MII_MODEL_BROADCOM_BCM54K2 0x002e #define MII_STR_BROADCOM_BCM54K2 "BCM54K2 1000BASE-T media interface" #define MII_MODEL_BROADCOM_BCM5714 0x0034 -#define MII_STR_BROADCOM_BCM5714 "BCM5714 1000BASE-T media interface" +#define MII_STR_BROADCOM_BCM5714 "BCM5714 1000BASE-T/X media interface" #define MII_MODEL_BROADCOM_BCM5780 0x0035 -#define MII_STR_BROADCOM_BCM5780 "BCM5780 1000BASE-T media interface" +#define MII_STR_BROADCOM_BCM5780 "BCM5780 1000BASE-T/X media interface" #define MII_MODEL_BROADCOM_BCM5708C 0x0036 #define MII_STR_BROADCOM_BCM5708C "BCM5708C 1000BASE-T media interface" #define MII_MODEL_BROADCOM2_BCM5325 0x0003 Index: src/sys/dev/mii/miidevs_data.h diff -u src/sys/dev/mii/miidevs_data.h:1.111 src/sys/dev/mii/miidevs_data.h:1.112 --- src/sys/dev/mii/miidevs_data.h:1.111 Wed Jul 2 22:33:39 2014 +++ src/sys/dev/mii/miidevs_data.h Wed Aug 20 08:00:40 2014 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs_data.h,v 1.111 2014/07/02 22:33:39 msaitoh Exp $ */ +/* $NetBSD: miidevs_data.h,v 1.112 2014/08/20 08:00:40 msaitoh Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.120 2014/07/02 22:33:18 msaitoh Exp + * NetBSD: miidevs,v 1.121 2014/08/20 08:00:18 msaitoh Exp */ /*-
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Wed Aug 20 08:00:18 UTC 2014 Modified Files: src/sys/dev/mii: miidevs Log Message: BCM5714 and BCM5780 are used for both copper and fiber. To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.121 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.120 src/sys/dev/mii/miidevs:1.121 --- src/sys/dev/mii/miidevs:1.120 Wed Jul 2 22:33:18 2014 +++ src/sys/dev/mii/miidevs Wed Aug 20 08:00:18 2014 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.120 2014/07/02 22:33:18 msaitoh Exp $ +$NetBSD: miidevs,v 1.121 2014/08/20 08:00:18 msaitoh Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -167,8 +167,8 @@ model BROADCOM BCM5750 0x0018 BCM5750 1 model BROADCOM BCM5704 0x0019 BCM5704 1000BASE-T media interface model BROADCOM BCM5705 0x001a BCM5705 1000BASE-T media interface model BROADCOM BCM54K2 0x002e BCM54K2 1000BASE-T media interface -model BROADCOM BCM5714 0x0034 BCM5714 1000BASE-T media interface -model BROADCOM BCM5780 0x0035 BCM5780 1000BASE-T media interface +model BROADCOM BCM5714 0x0034 BCM5714 1000BASE-T/X media interface +model BROADCOM BCM5780 0x0035 BCM5780 1000BASE-T/X media interface model BROADCOM BCM5708C 0x0036 BCM5708C 1000BASE-T media interface model BROADCOM2 BCM5325 0x0003 BCM5325 10/100 5-port PHY switch model BROADCOM2 BCM5906 0x0004 BCM5906 10/100baseTX media interface
