CVS commit: src/sys/fs/cd9660
Module Name:src
Committed By: martin
Date: Sun Jun 1 11:01:18 UTC 2014
Modified Files:
src/sys/fs/cd9660: cd9660_util.c
Log Message:
PR kern/48815: do not skip ';' twice when comparing file versions.
Patch from Thomas Schmitt.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/fs/cd9660/cd9660_util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/cd9660/cd9660_util.c
diff -u src/sys/fs/cd9660/cd9660_util.c:1.10 src/sys/fs/cd9660/cd9660_util.c:1.11
--- src/sys/fs/cd9660/cd9660_util.c:1.10 Tue Sep 27 01:01:43 2011
+++ src/sys/fs/cd9660/cd9660_util.c Sun Jun 1 11:01:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_util.c,v 1.10 2011/09/27 01:01:43 christos Exp $ */
+/* $NetBSD: cd9660_util.c,v 1.11 2014/06/01 11:01:18 martin Exp $ */
/*-
* Copyright (c) 1994
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cd9660_util.c,v 1.10 2011/09/27 01:01:43 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: cd9660_util.c,v 1.11 2014/06/01 11:01:18 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -117,7 +117,6 @@ isofncmp(const u_char *fn, size_t fnlen,
case ';':
break;
}
- fn++;
for (i = 0; fnlen-- != 0; i = i * 10 + *fn++ - '0') {
if (*fn '0' || *fn '9') {
return -1;
CVS commit: src/sys/compat
Module Name:src
Committed By: njoly
Date: Sun Jun 1 13:42:12 UTC 2014
Modified Files:
src/sys/compat/linux/arch/alpha: linux_pipe.c
src/sys/compat/linux/common: linux_fcntl.h linux_file.c linux_pipe.c
src/sys/compat/linux32/common: linux32_unistd.c
Log Message:
Cleanup pipe(2) flags, now that native handle them.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/compat/linux/arch/alpha/linux_pipe.c
cvs rdiff -u -r1.15 -r1.16 src/sys/compat/linux/common/linux_fcntl.h
cvs rdiff -u -r1.111 -r1.112 src/sys/compat/linux/common/linux_file.c
cvs rdiff -u -r1.65 -r1.66 src/sys/compat/linux/common/linux_pipe.c
cvs rdiff -u -r1.38 -r1.39 src/sys/compat/linux32/common/linux32_unistd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/alpha/linux_pipe.c
diff -u src/sys/compat/linux/arch/alpha/linux_pipe.c:1.15 src/sys/compat/linux/arch/alpha/linux_pipe.c:1.16
--- src/sys/compat/linux/arch/alpha/linux_pipe.c:1.15 Thu Apr 14 11:17:47 2011
+++ src/sys/compat/linux/arch/alpha/linux_pipe.c Sun Jun 1 13:42:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_pipe.c,v 1.15 2011/04/14 11:17:47 he Exp $ */
+/* $NetBSD: linux_pipe.c,v 1.16 2014/06/01 13:42:12 njoly Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_pipe.c,v 1.15 2011/04/14 11:17:47 he Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_pipe.c,v 1.16 2014/06/01 13:42:12 njoly Exp $);
#include sys/param.h
#include sys/systm.h
@@ -80,28 +80,16 @@ linux_sys_pipe2(struct lwp *l, const str
syscallarg(int *) pfds;
syscallarg(int) flags;
} */
- int error;
- int flag = 0;
+ int error, flags;
- switch (SCARG(uap, flags)) {
- case LINUX_O_CLOEXEC:
- break;
- case LINUX_O_NONBLOCK:
- case LINUX_O_NONBLOCK|LINUX_O_CLOEXEC:
- flag = O_NONBLOCK;
- break;
- default:
+ flags = linux_to_bsd_ioflags(SCARG(uap, flags));
+ if ((flags ~(O_CLOEXEC|O_NONBLOCK)) != 0)
return EINVAL;
- }
- if ((error = pipe1(l, retval, flag)))
+ if ((error = pipe1(l, retval, flags)))
return error;
(l-l_md.md_tf)-tf_regs[FRAME_A4] = retval[1];
- if (SCARG(uap, flags) LINUX_O_CLOEXEC) {
- fd_set_exclose(l, retval[0], true);
- fd_set_exclose(l, retval[1], true);
- }
return 0;
}
Index: src/sys/compat/linux/common/linux_fcntl.h
diff -u src/sys/compat/linux/common/linux_fcntl.h:1.15 src/sys/compat/linux/common/linux_fcntl.h:1.16
--- src/sys/compat/linux/common/linux_fcntl.h:1.15 Tue Sep 24 13:27:50 2013
+++ src/sys/compat/linux/common/linux_fcntl.h Sun Jun 1 13:42:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_fcntl.h,v 1.15 2013/09/24 13:27:50 njoly Exp $ */
+/* $NetBSD: linux_fcntl.h,v 1.16 2014/06/01 13:42:12 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -50,6 +50,7 @@
#define LINUX_AT_NO_AUTOMOUNT 0x0800
#define LINUX_AT_EMPTY_PATH 0x1000
+int linux_to_bsd_ioflags(int);
int linux_to_bsd_atflags(int);
struct linux_flock {
Index: src/sys/compat/linux/common/linux_file.c
diff -u src/sys/compat/linux/common/linux_file.c:1.111 src/sys/compat/linux/common/linux_file.c:1.112
--- src/sys/compat/linux/common/linux_file.c:1.111 Sun May 18 09:30:00 2014
+++ src/sys/compat/linux/common/linux_file.c Sun Jun 1 13:42:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_file.c,v 1.111 2014/05/18 09:30:00 njoly Exp $ */
+/* $NetBSD: linux_file.c,v 1.112 2014/06/01 13:42:12 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_file.c,v 1.111 2014/05/18 09:30:00 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_file.c,v 1.112 2014/06/01 13:42:12 njoly Exp $);
#include sys/param.h
#include sys/systm.h
@@ -69,7 +69,6 @@ __KERNEL_RCSID(0, $NetBSD: linux_file.c
#include compat/linux/linux_syscallargs.h
-static int linux_to_bsd_ioflags(int);
static int bsd_to_linux_ioflags(int);
#ifndef __amd64__
static void bsd_to_linux_stat(struct stat *, struct linux_stat *);
@@ -86,7 +85,7 @@ conv_linux_flock(linux, flock)
* The next two functions convert between the Linux and NetBSD values
* of the flags used in open(2) and fcntl(2).
*/
-static int
+int
linux_to_bsd_ioflags(int lflags)
{
int res = 0;
Index: src/sys/compat/linux/common/linux_pipe.c
diff -u src/sys/compat/linux/common/linux_pipe.c:1.65 src/sys/compat/linux/common/linux_pipe.c:1.66
--- src/sys/compat/linux/common/linux_pipe.c:1.65 Thu Apr 14 00:59:06 2011
+++ src/sys/compat/linux/common/linux_pipe.c Sun Jun 1 13:42:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_pipe.c,v 1.65 2011/04/14 00:59:06 christos Exp $ */
+/* $NetBSD: linux_pipe.c,v 1.66 2014/06/01 13:42:12 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD:
CVS commit: src/sys/arch/bebox/stand/boot
Module Name:src
Committed By: phx
Date: Sun Jun 1 17:21:50 UTC 2014
Modified Files:
src/sys/arch/bebox/stand/boot: monitor.c
Log Message:
Use int32_t, int16_t, int8_t.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/bebox/stand/boot/monitor.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/bebox/stand/boot/monitor.c
diff -u src/sys/arch/bebox/stand/boot/monitor.c:1.9 src/sys/arch/bebox/stand/boot/monitor.c:1.10
--- src/sys/arch/bebox/stand/boot/monitor.c:1.9 Mon May 26 16:28:39 2008
+++ src/sys/arch/bebox/stand/boot/monitor.c Sun Jun 1 17:21:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: monitor.c,v 1.9 2008/05/26 16:28:39 kiyohara Exp $ */
+/* $NetBSD: monitor.c,v 1.10 2014/06/01 17:21:50 phx Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@ void db_cmd_mt(int, char **);
void db_cmd_put(int, char **);
void db_cmd_help(int, char **);
-int db_atob(char *);
+uint32_t db_atob(char *);
struct {
char *name;
@@ -105,10 +105,11 @@ db_monitor(void)
return 0;
}
-int
+uint32_t
db_atob(char *p)
{
- int b = 0, width, tmp, exp, x = 0;
+ uint32_t b = 0;
+ int width, tmp, exp, x = 0;
if (p[1] == 'x') {
p += 2;
@@ -134,7 +135,8 @@ void
db_cmd_dump(int argc, char **argv)
{
char *p, *r, *pp;
- int mode, add, size, i;
+ int mode, size, i;
+ uint32_t add;
switch (argc) {
case 4:
@@ -172,21 +174,21 @@ db_cmd_dump(int argc, char **argv)
printf(\n0x%x:, add);
switch (mode) {
case 1:
- printf( %x, *(unsigned char *)add);
+ printf( %x, *(uint8_t *)add);
add += 1;
size -= 1;
if (++i == 16)
i = 0;
break;
case 2:
- printf( %x, *(unsigned short *)add);
+ printf( %x, *(uint16_t *)add);
add += 2;
size -= 2;
if (++i == 8)
i = 0;
break;
case 4:
- printf( %x, *(unsigned int *)add);
+ printf( %x, *(uint32_t *)add);
add += 4;
size -= 4;
if (++i == 4)
@@ -206,7 +208,8 @@ void
db_cmd_get(int argc, char **argv)
{
char *p, *r;
- int mode, add;
+ uint32_t add;
+ int mode;
switch (argc) {
case 3:
@@ -238,13 +241,13 @@ db_cmd_get(int argc, char **argv)
printf(0x%x: , add);
switch (mode) {
case 1:
- printf(0x%x, *(char *)add);
+ printf(0x%x, *(uint8_t *)add);
break;
case 2:
- printf(0x%x, *(short *)add);
+ printf(0x%x, *(uint16_t *)add);
break;
case 4:
- printf(0x%x, *(int *)add);
+ printf(0x%x, *(uint32_t *)add);
break;
}
printf(\n);
@@ -259,7 +262,8 @@ void
db_cmd_put(int argc, char **argv)
{
char *p, *r, *pp;
- int mode, add, data;
+ uint32_t add, data;
+ int mode;
switch (argc) {
case 4:
@@ -294,13 +298,13 @@ db_cmd_put(int argc, char **argv)
printf(0x%x: 0x%x, add, data);
switch (mode) {
case 1:
- *(char *)add = data;
+ *(uint8_t *)add = data;
break;
case 2:
- *(short *)add = data;
+ *(uint16_t *)add = data;
break;
case 4:
- *(int *)add = data;
+ *(uint32_t *)add = data;
break;
}
printf(\n);
@@ -314,14 +318,14 @@ out:
#define STR(x) #x
#define FUNC(x) \
-unsigned int mf ## x(void); \
-void mt ## x(unsigned int); \
-unsigned int mf ## x() { \
- unsigned int tmp; \
+uint32_t mf ## x(void); \
+void mt ## x(uint32_t); \
+uint32_t mf ## x() { \
+ uint32_t tmp; \
__asm volatile (STR(mf ## x %0) : STR(=r)(tmp)); \
return (tmp); \
} \
-void mt ## x(unsigned int data) \
+void mt ## x(uint32_t data) \
{ \
__asm volatile (STR(mt ## x %0) :: STR(r)(data)); \
} \
@@ -333,8 +337,8 @@ FUNC(msr)
struct {
char *op;
- unsigned int (*mf)(void);
- void (*mt)(unsigned int);
+ uint32_t (*mf)(void);
+ void (*mt)(uint32_t);
} mreg [] = {
DEF(msr),
{ NULL, NULL, NULL },
@@ -377,7 +381,7 @@ db_cmd_mt(int argc, char **argv)
while (mreg[i].op != NULL) {
if (!strcmp(mreg[i].op, argv[1])) {
- (mreg[i].mt)((unsigned int)db_atob(argv[2]));
+ (mreg[i].mt)(db_atob(argv[2]));
printf( 0x%x\n, db_atob(argv[2]));
break;
}
CVS commit: src/bin/sh
Module Name:src
Committed By: christos
Date: Sun Jun 1 17:46:06 UTC 2014
Modified Files:
src/bin/sh: sh.1
Log Message:
PR/48843: Jarmo Jaakkola: Soften the language in the manual page,
making less promises about behavior not explicitly stated in the standard.
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/bin/sh/sh.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.113 src/bin/sh/sh.1:1.114
--- src/bin/sh/sh.1:1.113 Sat May 31 10:42:18 2014
+++ src/bin/sh/sh.1 Sun Jun 1 13:46:06 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: sh.1,v 1.113 2014/05/31 14:42:18 christos Exp $
+.\ $NetBSD: sh.1,v 1.114 2014/06/01 17:46:06 christos Exp $
.\ Copyright (c) 1991, 1993
.\ The Regents of the University of California. All rights reserved.
.\
@@ -31,7 +31,7 @@
.\
.\ @(#)sh.1 8.6 (Berkeley) 5/4/95
.\
-.Dd January 20, 2014
+.Dd June 1, 2014
.Dt SH 1
.Os
.Sh NAME
@@ -1206,9 +1206,10 @@ variable if it does not contain a direct
.Pq Sq / .
The return command can be used for a premature return from the sourced file.
.Pp
-A non-obvious consequence of the file executing in the current environment
-is that loop control keywords (continue and break) can be used in the file
-to control loops surrounding the dot command.
+The POSIX standard is unclear on how loop control keywords (break
+and continue) behave across a dot command boundary.
+This implementation allows them to control loops surrounding the dot command,
+but obviously such behavior should not be relied on.
.It alias Op Ar name Ns Op Ar =string ...
If
.Ar name=string
@@ -1653,11 +1654,13 @@ For portability,
.Ar n
should be in the range from 0 to 255.
.Pp
-The effects of using a return command outside a function or a dot command
-are not standardized.
-This implementation (currently) treats such a return as a no-op with
-a return value of 0 (success, true).
-Use the exit command if you want to return from a script or exit your shell.
+The POSIX standard says that the results of
+.Sq return
+outside a function or a dot command are unspecified.
+This implementation treats such a return as a no-op with a return value of 0
+(success, true).
+Use the exit command instead, if you want to return from a script or exit
+your shell.
.It set Oo { Fl options | Cm +options | Cm \-- } Oc Ar arg ...
The
.Ic set
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Sun Jun 1 19:51:02 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib: Makefile.inc
src/external/gpl3/gcc/lib/crtstuff: Makefile
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
src/external/gpl3/gcc/lib/libgcc/libgcc_eh: Makefile
src/external/gpl3/gcc/lib/libgcc/libgcc_s: Makefile
src/external/gpl3/gcc/lib/libgcc/libgcov: Makefile
src/external/gpl3/gcc/lib/libgomp: Makefile
src/external/gpl3/gcc/lib/libiberty: Makefile
src/external/gpl3/gcc/lib/libmudflap: Makefile
src/external/gpl3/gcc/lib/libmudflapth: Makefile
src/external/gpl3/gcc/lib/libobjc: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile Makefile.inc
src/external/gpl3/gcc/lib/libstdc++-v3/include: Makefile Makefile.inc
src/external/gpl3/gcc/lib/libstdc++-v3/include/backward: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/debug: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/ext: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl: Makefile
src/external/gpl3/gcc/lib/libsupc++: Makefile Makefile.common
src/external/gpl3/gcc/usr.bin: Makefile.inc
src/external/gpl3/gcc/usr.bin/libdecnumber: Makefile
Log Message:
port over 3 changes made here in the GCC 4.5 tree that we'll need
when GCC 4.8 becomes gcc.old eventually.
this tree still needs to be tested for more, but this should be the
bulk of the work.
Log Message:
prepare for moving GCC 4.5 into gcc.old:
- convert to using ${EXTERNAL_GCC_SUBDIR}
- define base-external-gpl3-gcc* subdir as GCC_SUBDIR
- use bsd.init.mk over bsd.own.mk for a bunch of places; mostly
because it arranges for ../Makefile.inc to be included earlier, and
don't bother including the latter if the former is already included.
- move all .PATH: settings after bsd.{own,lib}.mk so that all
valid variables are set before it is evaluated
- rename mknative-gcc* to match their subdir name.
XXX the relationship between the Makefile.inc/Makefile.gcc_path files
is kind of sketchy, it would be great if this was fixed.
Log Message:
oops, avoid re-setting DIST to something that might be wrong now.
Log Message:
fix another dated DIST.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/lib/crtstuff/Makefile
cvs rdiff -u -r1.27 -r1.28 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.21 -r1.22 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/lib/libgcc/libgcov/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/lib/libgomp/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/lib/libiberty/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libmudflap/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libmudflapth/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/lib/libobjc/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/lib/libsupc++/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/lib/libsupc++/Makefile.common
cvs rdiff -u -r1.23 -r1.24 src/external/gpl3/gcc/usr.bin/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile
Please note that diffs are not public domain; they
CVS commit: src/external/gpl3/gcc/lib
Module Name:src
Committed By: mrg
Date: Sun Jun 1 20:24:45 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libbacktrace: Makefile
src/external/gpl3/gcc/lib/liblto_plugin: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/pb: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/profile: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2: Makefile
Log Message:
catch up with GCC_SUBDIR changes for new-to-gcc 4.8 directories.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libbacktrace/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/liblto_plugin/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libbacktrace/Makefile
diff -u src/external/gpl3/gcc/lib/libbacktrace/Makefile:1.1 src/external/gpl3/gcc/lib/libbacktrace/Makefile:1.2
--- src/external/gpl3/gcc/lib/libbacktrace/Makefile:1.1 Sat Mar 1 10:00:31 2014
+++ src/external/gpl3/gcc/lib/libbacktrace/Makefile Sun Jun 1 20:24:45 2014
@@ -1,14 +1,14 @@
# $NetBSD
-DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
-GNUHOSTDIST=${DIST}
-
LIBISPRIVATE= yes
-.include bsd.own.mk
+.include bsd.init.mk
LIB= backtrace
+DIST= ${GCCDIST}
+GNUHOSTDIST=${DIST}
+
SRCS= dwarf.c elf.c fileline.c mmap.c mmapio.c nounwind.c \
posix.c print.c state.c
Index: src/external/gpl3/gcc/lib/liblto_plugin/Makefile
diff -u src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.1 src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.2
--- src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.1 Sat Mar 1 10:00:42 2014
+++ src/external/gpl3/gcc/lib/liblto_plugin/Makefile Sun Jun 1 20:24:45 2014
@@ -1,20 +1,22 @@
-# $NetBSD: Makefile,v 1.1 2014/03/01 10:00:42 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
-.include bsd.own.mk
+.include bsd.init.mk
.include bsd.shlib.mk
-NOLINT= # defined
+LIB= liblto_plugin
-LIBISMODULE= 1
-USE_SHLIBDIR= yes
-REQUIRETOOLS= yes
-DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST= ${GCCDIST}
GNUHOSTDIST= ${DIST}
-LIB= liblto_plugin
+
SRCS= lto-plugin.c
-.PATH: ${DIST}/lto-plugin
+
CPPFLAGS+= -DHAVE_CONFIG_H -I${DIST}/include -I.
+LIBISMODULE= 1
+USE_SHLIBDIR= yes
+REQUIRETOOLS= yes
+NOLINT= # defined
+
# make this /usr/lib/gcc?
LIBDIR= /usr/libexec
@@ -45,6 +47,8 @@ config.h: Makefile
.include bsd.lib.mk
+.PATH: ${DIST}/lto-plugin
+
.else
.include bsd.prog.mk # do nothing
.endif
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile:1.1 Sat Mar 1 10:00:48 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile Sun Jun 1 20:24:45 2014
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2014/03/01 10:00:48 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
-.include bsd.own.mk
.include bsd.init.mk
.include ${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk
.cc: # disable .cc-NULL transform
-DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST= ${GCCDIST}
+GNUHOSTDIST= ${DIST}
INCS= ${G_pb_headers1} ${G_pb_headers2} ${G_pb_headers3} ${G_pb_headers4}
INCS+= ${G_pb_headers5} ${G_pb_headers6} ${G_pb_headers7}
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile:1.1 Sat Mar 1 10:00:48 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile Sun Jun 1 20:24:45 2014
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2014/03/01 10:00:48 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
-.include bsd.own.mk
.include bsd.init.mk
.include ${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk
.cc: # disable .cc-NULL transform
-DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST= ${GCCDIST}
+GNUHOSTDIST= ${DIST}
INCS= ${G_profile_headers} ${G_profile_impl_headers}
INCSDIR= /usr/include/g++/profile
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile:1.1 Sat Mar 1 10:00:48 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile Sun Jun 1 20:24:45 2014
CVS commit: src/sys/arch
Module Name:src Committed By: dholland Date: Mon Jun 2 02:11:52 UTC 2014 Modified Files: src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL Log Message: add MPVERBOSE, noted missing in PR 48733. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.374 -r1.375 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.7 src/sys/arch/amd64/conf/ALL:1.8 --- src/sys/arch/amd64/conf/ALL:1.7 Fri Apr 25 18:25:52 2014 +++ src/sys/arch/amd64/conf/ALL Mon Jun 2 02:11:51 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.7 2014/04/25 18:25:52 riastradh Exp $ +# $NetBSD: ALL,v 1.8 2014/06/02 02:11:51 dholland Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include arch/amd64/conf/std.amd64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.7 $ +#ident ALL-$Revision: 1.8 $ maxusers 64 # estimated number of users @@ -251,6 +251,7 @@ options ALTQ_WFQ # Weighted Fair Queuei options ACPIVERBOSE # verbose ACPI device autoconfig messages options EISAVERBOSE # verbose EISA device autoconfig messages options MIIVERBOSE # verbose PHY autoconfig messages +options MPVERBOSE # verbose mpbios config messages options PCIVERBOSE # verbose PCI device autoconfig messages options PCI_CONFIG_DUMP # verbosely dump PCI config space options PCMCIAVERBOSE # verbose PCMCIA configuration messages Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.374 src/sys/arch/i386/conf/ALL:1.375 --- src/sys/arch/i386/conf/ALL:1.374 Fri Apr 25 18:25:52 2014 +++ src/sys/arch/i386/conf/ALL Mon Jun 2 02:11:52 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.374 2014/04/25 18:25:52 riastradh Exp $ +# $NetBSD: ALL,v 1.375 2014/06/02 02:11:52 dholland Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include arch/i386/conf/std.i386 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.374 $ +#ident ALL-$Revision: 1.375 $ maxusers 64 # estimated number of users @@ -251,6 +251,7 @@ options ALTQ_WFQ # Weighted Fair Queuei options ACPIVERBOSE # verbose ACPI device autoconfig messages options EISAVERBOSE # verbose EISA device autoconfig messages options MIIVERBOSE # verbose PHY autoconfig messages +options MPVERBOSE # verbose mpbios config messages options PCIVERBOSE # verbose PCI device autoconfig messages options PCI_CONFIG_DUMP # verbosely dump PCI config space options PCMCIAVERBOSE # verbose PCMCIA configuration messages
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: mrg
Date: Mon Jun 2 04:57:02 UTC 2014
Modified Files:
src/sys/arch/mips/mips: mips_machdep.c
Log Message:
apply __diagused.
To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 src/sys/arch/mips/mips/mips_machdep.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/mips/mips/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.259 src/sys/arch/mips/mips/mips_machdep.c:1.260
--- src/sys/arch/mips/mips/mips_machdep.c:1.259 Mon Mar 24 20:06:32 2014
+++ src/sys/arch/mips/mips/mips_machdep.c Mon Jun 2 04:57:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_machdep.c,v 1.259 2014/03/24 20:06:32 christos Exp $ */
+/* $NetBSD: mips_machdep.c,v 1.260 2014/06/02 04:57:02 mrg Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -111,7 +111,7 @@
*/
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: mips_machdep.c,v 1.259 2014/03/24 20:06:32 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: mips_machdep.c,v 1.260 2014/06/02 04:57:02 mrg Exp $);
#define __INTR_PRIVATE
#include opt_cputype.h
@@ -2191,7 +2191,7 @@ startlwp32(void *arg)
{
ucontext32_t * const uc = arg;
lwp_t * const l = curlwp;
- int error;
+ int error __diagused;
error = cpu_setmcontext32(l, uc-uc_mcontext, uc-uc_flags);
KASSERT(error == 0);
