CVS commit: src/sbin/fsck_lfs
Module Name:src Committed By: dholland Date: Sun Mar 20 04:24:46 UTC 2016 Modified Files: src/sbin/fsck_lfs: lfs.c Log Message: Comment out unused logic. PR 50973 To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sbin/fsck_lfs/lfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fsck_lfs/lfs.c diff -u src/sbin/fsck_lfs/lfs.c:1.70 src/sbin/fsck_lfs/lfs.c:1.71 --- src/sbin/fsck_lfs/lfs.c:1.70 Fri Feb 19 03:53:46 2016 +++ src/sbin/fsck_lfs/lfs.c Sun Mar 20 04:24:46 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs.c,v 1.70 2016/02/19 03:53:46 riastradh Exp $ */ +/* $NetBSD: lfs.c,v 1.71 2016/03/20 04:24:46 dholland Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. * All rights reserved. @@ -288,7 +288,7 @@ ulfs_getlbns(struct lfs * fs, struct uvn break; lbc -= lognindir; - blockcnt = (int64_t) 1 << lbc; + /*blockcnt = (int64_t) 1 << lbc;*/ off = (bn >> lbc) & (lfs_sb_getnindir(fs) - 1); ++numlevels;
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: wiz Date: Thu Mar 17 09:43:38 UTC 2016 Modified Files: src/lib/libc/stdlib: strtod.3 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/lib/libc/stdlib/strtod.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/stdlib/strtod.3 diff -u src/lib/libc/stdlib/strtod.3:1.21 src/lib/libc/stdlib/strtod.3:1.22 --- src/lib/libc/stdlib/strtod.3:1.21 Thu Mar 17 03:26:15 2016 +++ src/lib/libc/stdlib/strtod.3 Thu Mar 17 09:43:38 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: strtod.3,v 1.21 2016/03/17 03:26:15 riastradh Exp $ +.\" $NetBSD: strtod.3,v 1.22 2016/03/17 09:43:38 wiz Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -33,7 +33,7 @@ .\" .\" from: @(#)strtod.3 8.1 (Berkeley) 6/4/93 .\" -.Dd March 12, 2006 +.Dd March 17, 2016 .Dt STRTOD 3 .Os .Sh NAME
CVS commit: src/bin/sh/bltin
Module Name:src
Committed By: christos
Date: Wed Mar 16 22:36:21 UTC 2016
Modified Files:
src/bin/sh/bltin: bltin.h
Log Message:
Avoid warning by using gcc'ism
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/bin/sh/bltin/bltin.h
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/bltin/bltin.h
diff -u src/bin/sh/bltin/bltin.h:1.13 src/bin/sh/bltin/bltin.h:1.14
--- src/bin/sh/bltin/bltin.h:1.13 Sat Oct 11 21:40:37 2008
+++ src/bin/sh/bltin/bltin.h Wed Mar 16 18:36:21 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bltin.h,v 1.13 2008/10/12 01:40:37 dholland Exp $ */
+/* $NetBSD: bltin.h,v 1.14 2016/03/16 22:36:21 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -60,7 +60,11 @@
#define FILE struct output
#define stdout out1
#define stderr out2
+#ifdef __GNUC__
+#define _RETURN_INT(x) ({(x); 0;}) /* map from void foo() to int bar() */
+#else
#define _RETURN_INT(x) ((x), 0) /* map from void foo() to int bar() */
+#endif
#define fprintf(...) _RETURN_INT(outfmt(__VA_ARGS__))
#define printf(...) _RETURN_INT(out1fmt(__VA_ARGS__))
#define putc(c, file) _RETURN_INT(outc(c, file))
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src
Committed By: khorben
Date: Thu Mar 17 04:07:42 UTC 2016
Modified Files:
src/sys/external/bsd/ipf/netinet: ip_nat.c
Log Message:
Fix matching of ICMP queries when NAT'd through IPF
This notably fixes MTU updates for hosts issueing ICMP queries through a
NAT performed by NetBSD with IPF.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/ipf/netinet/ip_nat.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/ipf/netinet/ip_nat.c
diff -u src/sys/external/bsd/ipf/netinet/ip_nat.c:1.15 src/sys/external/bsd/ipf/netinet/ip_nat.c:1.16
--- src/sys/external/bsd/ipf/netinet/ip_nat.c:1.15 Tue Oct 6 10:21:08 2015
+++ src/sys/external/bsd/ipf/netinet/ip_nat.c Thu Mar 17 04:07:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_nat.c,v 1.15 2015/10/06 10:21:08 prlw1 Exp $ */
+/* $NetBSD: ip_nat.c,v 1.16 2016/03/17 04:07:41 khorben Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -113,7 +113,7 @@ extern struct ifnet vpnif;
#if !defined(lint)
#if defined(__NetBSD__)
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.15 2015/10/06 10:21:08 prlw1 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.16 2016/03/17 04:07:41 khorben Exp $");
#else
static const char sccsid[] = "@(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_nat.c,v 1.1.1.2 2012/07/22 13:45:27 darrenr Exp";
@@ -4032,13 +4032,8 @@ ipf_nat_inlookup(fr_info_t *fin, u_int f
dport = htons(fin->fin_data[1]);
break;
case IPPROTO_ICMP :
- if (flags & IPN_ICMPERR) {
- sport = fin->fin_data[1];
- dport = 0;
- } else {
- dport = fin->fin_data[1];
- sport = 0;
- }
+ sport = 0;
+ dport = fin->fin_data[1];
break;
default :
sport = 0;
@@ -4353,8 +4348,6 @@ ipf_nat_outlookup(fr_info_t *fin, u_int
u_int hv;
ifp = fin->fin_ifp;
- sport = 0;
- dport = 0;
switch (p)
{
@@ -4364,12 +4357,12 @@ ipf_nat_outlookup(fr_info_t *fin, u_int
dport = htons(fin->fin_data[1]);
break;
case IPPROTO_ICMP :
- if (flags & IPN_ICMPERR)
- sport = fin->fin_data[1];
- else
- dport = fin->fin_data[1];
+ sport = 0;
+ dport = fin->fin_data[1];
break;
default :
+ sport = 0;
+ dport = 0;
break;
}
CVS commit: src/libexec/lfs_cleanerd
Module Name:src Committed By: mrg Date: Wed Mar 16 18:58:34 UTC 2016 Modified Files: src/libexec/lfs_cleanerd: lfs_cleanerd.c Log Message: make the GCC 4.8 specific hack for ci.clean being set GCC >= 4.8. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/libexec/lfs_cleanerd/lfs_cleanerd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/lfs_cleanerd/lfs_cleanerd.c diff -u src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.56 src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.57 --- src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.56 Fri Feb 19 03:54:37 2016 +++ src/libexec/lfs_cleanerd/lfs_cleanerd.c Wed Mar 16 18:58:34 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_cleanerd.c,v 1.56 2016/02/19 03:54:37 riastradh Exp $ */ +/* $NetBSD: lfs_cleanerd.c,v 1.57 2016/03/16 18:58:34 mrg Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -1453,10 +1453,11 @@ lfs_cleaner_main(int argc, char **argv) char *cp, *pidname; #endif -#if defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ == 8 && \ +#if defined(__GNUC__) && \ +(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && \ defined(__OPTIMIZE_SIZE__) /* - * XXX: Work around apparent bug with gcc 4.8 and -Os: it + * XXX: Work around apparent bug with GCC >= 4.8 and -Os: it * claims that ci.clean is uninitialized in clean_fs (at one * of the several uses of it, which is neither the first nor * last use) -- this doesn't happen with plain -O2.
CVS commit: src/sys/net/npf
Module Name:src
Committed By: mrg
Date: Fri Mar 18 10:09:46 UTC 2016
Modified Files:
src/sys/net/npf: npf_inet.c npf_mbuf.c npf_nat.c
Log Message:
minimal changes necessary to link into an INET6-less kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/net/npf/npf_inet.c
cvs rdiff -u -r1.15 -r1.16 src/sys/net/npf/npf_mbuf.c
cvs rdiff -u -r1.39 -r1.40 src/sys/net/npf/npf_nat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_inet.c
diff -u src/sys/net/npf/npf_inet.c:1.33 src/sys/net/npf/npf_inet.c:1.34
--- src/sys/net/npf/npf_inet.c:1.33 Thu Dec 17 12:17:13 2015
+++ src/sys/net/npf/npf_inet.c Fri Mar 18 10:09:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_inet.c,v 1.33 2015/12/17 12:17:13 mlelstv Exp $ */
+/* $NetBSD: npf_inet.c,v 1.34 2016/03/18 10:09:46 mrg Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.33 2015/12/17 12:17:13 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.34 2016/03/18 10:09:46 mrg Exp $");
#include
#include
@@ -655,10 +655,12 @@ npf_napt_rwr(const npf_cache_t *npc, u_i
}
break;
case IPPROTO_ICMP:
+#ifdef INET6
case IPPROTO_ICMPV6:
KASSERT(npf_iscached(npc, NPC_ICMP));
/* Nothing. */
break;
+#endif
default:
return ENOTSUP;
}
@@ -669,6 +671,7 @@ npf_napt_rwr(const npf_cache_t *npc, u_i
* IPv6-to-IPv6 Network Prefix Translation (NPTv6), as per RFC 6296.
*/
+#ifdef INET6
int
npf_npt66_rwr(const npf_cache_t *npc, u_int which, const npf_addr_t *pref,
npf_netmask_t len, uint16_t adj)
@@ -737,18 +740,25 @@ npf_npt66_rwr(const npf_cache_t *npc, u_
addr->s6_addr16[word] = sum;
return 0;
}
+#endif
#if defined(DDB) || defined(_NPF_TESTING)
const char *
npf_addr_dump(const npf_addr_t *addr, int alen)
{
+#ifdef INET6
if (alen == sizeof(struct in_addr)) {
+#else
+ KASSERT(alen == sizeof(struct in_addr));
+#endif
struct in_addr ip;
memcpy(, addr, alen);
return inet_ntoa(ip);
+#ifdef INET6
}
return ip6_sprintf(addr);
+#endif
}
#endif
Index: src/sys/net/npf/npf_mbuf.c
diff -u src/sys/net/npf/npf_mbuf.c:1.15 src/sys/net/npf/npf_mbuf.c:1.16
--- src/sys/net/npf/npf_mbuf.c:1.15 Thu Dec 17 12:16:21 2015
+++ src/sys/net/npf/npf_mbuf.c Fri Mar 18 10:09:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_mbuf.c,v 1.15 2015/12/17 12:16:21 mlelstv Exp $ */
+/* $NetBSD: npf_mbuf.c,v 1.16 2016/03/18 10:09:46 mrg Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_mbuf.c,v 1.15 2015/12/17 12:16:21 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_mbuf.c,v 1.16 2016/03/18 10:09:46 mrg Exp $");
#include
#include
@@ -258,11 +258,13 @@ nbuf_cksum_barrier(nbuf_t *nbuf, int di)
m->m_pkthdr.csum_flags &= ~(M_CSUM_TCPv4 | M_CSUM_UDPv4);
return true;
}
+#ifdef INET6
if (m->m_pkthdr.csum_flags & (M_CSUM_TCPv6 | M_CSUM_UDPv6)) {
in6_delayed_cksum(m);
m->m_pkthdr.csum_flags &= ~(M_CSUM_TCPv6 | M_CSUM_UDPv6);
return true;
}
+#endif
return false;
}
Index: src/sys/net/npf/npf_nat.c
diff -u src/sys/net/npf/npf_nat.c:1.39 src/sys/net/npf/npf_nat.c:1.40
--- src/sys/net/npf/npf_nat.c:1.39 Tue Dec 30 19:11:44 2014
+++ src/sys/net/npf/npf_nat.c Fri Mar 18 10:09:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_nat.c,v 1.39 2014/12/30 19:11:44 christos Exp $ */
+/* $NetBSD: npf_nat.c,v 1.40 2016/03/18 10:09:46 mrg Exp $ */
/*-
* Copyright (c) 2014 Mindaugas Rasiukevicius
@@ -71,7 +71,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_nat.c,v 1.39 2014/12/30 19:11:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_nat.c,v 1.40 2016/03/18 10:09:46 mrg Exp $");
#include
#include
@@ -657,10 +657,12 @@ npf_nat_algo(npf_cache_t *npc, const npf
int error;
switch (np->n_algo) {
+#ifdef INET6
case NPF_ALGO_NPT66:
error = npf_npt66_rwr(npc, which, >n_taddr,
np->n_tmask, np->n_npt66_adj);
break;
+#endif
default:
error = npf_napt_rwr(npc, which, >n_taddr, np->n_tport);
break;
CVS commit: src/external/cddl/osnet/dist/tools/ctf/cvt
Module Name:src Committed By: christos Date: Fri Mar 18 17:08:45 UTC 2016 Modified Files: src/external/cddl/osnet/dist/tools/ctf/cvt: ctf.c Log Message: treat class line struct and union To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.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/cddl/osnet/dist/tools/ctf/cvt/ctf.c diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c:1.11 src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c:1.12 --- src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c:1.11 Fri Mar 18 09:23:00 2016 +++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c Fri Mar 18 13:08:45 2016 @@ -383,6 +383,7 @@ write_type(void *arg1, void *arg2) case STRUCT: case UNION: + case CLASS: for (i = 0, mp = tp->t_members; mp != NULL; mp = mp->ml_next) i++; /* count up struct or union members */
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: christos Date: Thu Mar 17 00:56:05 UTC 2016 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64: c++config.h src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64: auto-host.h configargs.h src/external/gpl3/gcc/usr.bin/libcpp/arch/x86_64: config.h Added Files: src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64: insn-modes.h Log Message: regen amd64 To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/c++config.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/auto-host.h cvs rdiff -u -r1.23 -r1.24 \ src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/insn-modes.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/usr.bin/libcpp/arch/x86_64/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/c++config.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/c++config.h:1.18 src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/c++config.h:1.19 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/c++config.h:1.18 Wed Mar 16 05:30:43 2016 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/c++config.h Wed Mar 16 20:56:05 2016 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.85 2016/03/15 21:38:32 mrg Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.86 2016/03/16 11:16:05 mrg Exp */ /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp */ // Predefined symbols and macros -*- C++ -*- @@ -527,31 +527,31 @@ namespace std /* config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if you have the `acosf' function. */ -#define _GLIBCXX_HAVE_ACOSF 1 +/* #undef _GLIBCXX_HAVE_ACOSF */ /* Define to 1 if you have the `acosl' function. */ -#define _GLIBCXX_HAVE_ACOSL 1 +/* #undef _GLIBCXX_HAVE_ACOSL */ /* Define to 1 if you have the `asinf' function. */ -#define _GLIBCXX_HAVE_ASINF 1 +/* #undef _GLIBCXX_HAVE_ASINF */ /* Define to 1 if you have the `asinl' function. */ -#define _GLIBCXX_HAVE_ASINL 1 +/* #undef _GLIBCXX_HAVE_ASINL */ /* Define to 1 if the target assembler supports .symver directive. */ #define _GLIBCXX_HAVE_AS_SYMVER_DIRECTIVE 1 /* Define to 1 if you have the `atan2f' function. */ -#define _GLIBCXX_HAVE_ATAN2F 1 +/* #undef _GLIBCXX_HAVE_ATAN2F */ /* Define to 1 if you have the `atan2l' function. */ -#define _GLIBCXX_HAVE_ATAN2L 1 +/* #undef _GLIBCXX_HAVE_ATAN2L */ /* Define to 1 if you have the `atanf' function. */ -#define _GLIBCXX_HAVE_ATANF 1 +/* #undef _GLIBCXX_HAVE_ATANF */ /* Define to 1 if you have the `atanl' function. */ -#define _GLIBCXX_HAVE_ATANL 1 +/* #undef _GLIBCXX_HAVE_ATANL */ /* Define to 1 if you have the `at_quick_exit' function. */ #define _GLIBCXX_HAVE_AT_QUICK_EXIT 1 @@ -560,25 +560,25 @@ namespace std /* #undef _GLIBCXX_HAVE_CC_TLS */ /* Define to 1 if you have the `ceilf' function. */ -#define _GLIBCXX_HAVE_CEILF 1 +/* #undef _GLIBCXX_HAVE_CEILF */ /* Define to 1 if you have the `ceill' function. */ -#define _GLIBCXX_HAVE_CEILL 1 +/* #undef _GLIBCXX_HAVE_CEILL */ /* Define to 1 if you have the header file. */ #define _GLIBCXX_HAVE_COMPLEX_H 1 /* Define to 1 if you have the `cosf' function. */ -#define _GLIBCXX_HAVE_COSF 1 +/* #undef _GLIBCXX_HAVE_COSF */ /* Define to 1 if you have the `coshf' function. */ -#define _GLIBCXX_HAVE_COSHF 1 +/* #undef _GLIBCXX_HAVE_COSHF */ /* Define to 1 if you have the `coshl' function. */ -#define _GLIBCXX_HAVE_COSHL 1 +/* #undef _GLIBCXX_HAVE_COSHL */ /* Define to 1 if you have the `cosl' function. */ -#define _GLIBCXX_HAVE_COSL 1 +/* #undef _GLIBCXX_HAVE_COSL */ /* Define to 1 if you have the header file. */ #define _GLIBCXX_HAVE_DIRENT_H 1 @@ -650,16 +650,16 @@ namespace std #define _GLIBCXX_HAVE_EXECINFO_H 1 /* Define to 1 if you have the `expf' function. */ -#define _GLIBCXX_HAVE_EXPF 1 +/* #undef _GLIBCXX_HAVE_EXPF */ /* Define to 1 if you have the `expl' function. */ -#define _GLIBCXX_HAVE_EXPL 1 +/* #undef _GLIBCXX_HAVE_EXPL */ /* Define to 1 if you have the `fabsf' function. */ -#define _GLIBCXX_HAVE_FABSF 1 +/* #undef _GLIBCXX_HAVE_FABSF */ /* Define to 1 if you have the `fabsl' function. */ -#define _GLIBCXX_HAVE_FABSL 1 +/* #undef _GLIBCXX_HAVE_FABSL */ /* Define to 1 if you have the header file. */ #define _GLIBCXX_HAVE_FCNTL_H 1 @@ -668,10 +668,10 @@ namespace std #define _GLIBCXX_HAVE_FENV_H 1 /* Define to 1 if you have the `finite' function. */ -#define _GLIBCXX_HAVE_FINITE 1 +/* #undef _GLIBCXX_HAVE_FINITE */ /* Define to 1 if you have the `finitef' function. */ -#define _GLIBCXX_HAVE_FINITEF 1 +/* #undef
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Wed Mar 16 21:06:06 UTC 2016
Modified Files:
src/crypto/external/bsd/openssh/dist: kex.c
Log Message:
CID 1356388: Prevent DoS from Tainted scalar
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/kex.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/kex.c
diff -u src/crypto/external/bsd/openssh/dist/kex.c:1.14 src/crypto/external/bsd/openssh/dist/kex.c:1.15
--- src/crypto/external/bsd/openssh/dist/kex.c:1.14 Thu Mar 10 20:55:00 2016
+++ src/crypto/external/bsd/openssh/dist/kex.c Wed Mar 16 17:06:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kex.c,v 1.14 2016/03/11 01:55:00 christos Exp $ */
+/* $NetBSD: kex.c,v 1.15 2016/03/16 21:06:06 christos Exp $ */
/* $OpenBSD: kex.c,v 1.117 2016/02/08 10:57:07 djm Exp $ */
/*
@@ -26,7 +26,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: kex.c,v 1.14 2016/03/11 01:55:00 christos Exp $");
+__RCSID("$NetBSD: kex.c,v 1.15 2016/03/16 21:06:06 christos Exp $");
#include /* MAX roundup */
#include
@@ -364,6 +364,10 @@ kex_input_ext_info(int type, u_int32_t s
ssh_dispatch_set(ssh, SSH2_MSG_EXT_INFO, _protocol_error);
if ((r = sshpkt_get_u32(ssh, )) != 0)
return r;
+ if (ninfo > 1024) {
+ fatal("%s: too many %u fields", __func__, ninfo);
+ return SSH_ERR_INTERNAL_ERROR;
+ }
for (i = 0; i < ninfo; i++) {
if ((r = sshpkt_get_cstring(ssh, , NULL)) != 0)
return r;
CVS commit: src/external/cddl/osnet/dist/tools/ctf/cvt
Module Name:src
Committed By: christos
Date: Fri Mar 18 16:37:09 UTC 2016
Modified Files:
src/external/cddl/osnet/dist/tools/ctf/cvt: tdata.c
Log Message:
spell restrict
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/dist/tools/ctf/cvt/tdata.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/cddl/osnet/dist/tools/ctf/cvt/tdata.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/tdata.c:1.6 src/external/cddl/osnet/dist/tools/ctf/cvt/tdata.c:1.7
--- src/external/cddl/osnet/dist/tools/ctf/cvt/tdata.c:1.6 Fri Mar 18 12:24:26 2016
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/tdata.c Fri Mar 18 12:37:09 2016
@@ -249,7 +249,7 @@ static void (*free_cbs[])(tdesc_t *) = {
NULL, /* typedef_unres */
NULL, /* volatile */
NULL, /* const */
- NULL /* restric */
+ NULL /* restrict */
};
/*ARGSUSED1*/
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Thu Mar 17 21:46:08 UTC 2016 Added Files: src/external/gpl3/gcc: README.gcc53 Log Message: document the state of gcc 5.3 in src. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/README.gcc53 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/gpl3/gcc/README.gcc53 diff -u /dev/null src/external/gpl3/gcc/README.gcc53:1.1 --- /dev/null Thu Mar 17 21:46:08 2016 +++ src/external/gpl3/gcc/README.gcc53 Thu Mar 17 21:46:08 2016 @@ -0,0 +1,65 @@ +$NetBSD: README.gcc53,v 1.1 2016/03/17 21:46:08 mrg Exp $ + +lib: + libasan is disabled currently (haven't tried yet) + +new stuff: + cc1objcplus + collect2 -- need to re-introduce? + libcc1 + libcilkrts + libmpx + liboffloadmic + libquadmath + libvtv + libitm + +other changes to look at: + +Index: gcc/targhooks.c + vs new binutils + ++ doc/gcov-tool.1 + + +arch/feature list. anything not here has been switched already: + +architecture tools kernels libgcc native-gcc make release runs atf + - --- -- -- --- +alpha +arm y ? y y +armeb y ? y y +earm y ? y y +earmeb y ? y y +earmhf y ? y y +earmhfeb y ? y y +earmv4 y ? y y +earmv4eb y ? y y +earmv6 y ? y +earmv6eb y ? y +earmv6hf y ? y +earmv6hfeb y ? y +earmv7 y ? y +earmv7eb y ? y +earmv7hf y ? y +earmv7hfeb y ? y +hppa +i386 y y y y y y +m68000 +m68k +mips64eb +mips64el +mipseb +mipsel +powerpc +sh3eb +sh3el +sparc y y y y y y[1] +sparc64 y y y builds y n[2] +vax +x86_64 y y y y y y + + +[1] - world built without -fno-delete-null-pointer-checks does not have a + working sshd +[2] - -O2 and -Os kernels hang, -O1 SIR reset
CVS commit: src/bin/sh
Module Name:src
Committed By: christos
Date: Wed Mar 16 15:44:35 UTC 2016
Modified Files:
src/bin/sh: expand.c
Log Message:
PR/19832, PR/35423: Fix handling 0x81 and 0x82 characters in expansions
($VAR etc) that are used to generate filenames for redirections. (from kre)
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/bin/sh/expand.c
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/expand.c
diff -u src/bin/sh/expand.c:1.96 src/bin/sh/expand.c:1.97
--- src/bin/sh/expand.c:1.96 Tue Mar 8 09:09:07 2016
+++ src/bin/sh/expand.c Wed Mar 16 11:44:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.c,v 1.96 2016/03/08 14:09:07 christos Exp $ */
+/* $NetBSD: expand.c,v 1.97 2016/03/16 15:44:35 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)expand.c 8.5 (Berkeley) 5/15/95";
#else
-__RCSID("$NetBSD: expand.c,v 1.96 2016/03/08 14:09:07 christos Exp $");
+__RCSID("$NetBSD: expand.c,v 1.97 2016/03/16 15:44:35 christos Exp $");
#endif
#endif /* not lint */
@@ -187,7 +187,7 @@ STATIC void
argstr(char *p, int flag)
{
char c;
- int quotes = flag & (EXP_FULL | EXP_CASE); /* do CTLESC */
+ int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); /* do CTLESC */
int firsteq = 1;
const char *ifs = NULL;
int ifs_split = EXP_IFS_SPLIT;
@@ -641,7 +641,7 @@ evalvar(char *p, int flag)
int startloc;
int varlen;
int apply_ifs;
- int quotes = flag & (EXP_FULL | EXP_CASE);
+ int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR);
varflags = (unsigned char)*p++;
subtype = varflags & VSTYPE;
CVS commit: src/lib/libc/time
Module Name:src
Committed By: ginsbach
Date: Fri Mar 18 12:41:25 UTC 2016
Modified Files:
src/lib/libc/time: localtime.c
Log Message:
Use the correct upper bounds for the types array. The correct upper
bound is typecnt not timecnt. Now perpetual 'standard' time zones
will work correctly as they have a typecnt of 1 but a timecnt of 0.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/lib/libc/time/localtime.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/libc/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.102 src/lib/libc/time/localtime.c:1.103
--- src/lib/libc/time/localtime.c:1.102 Tue Mar 15 15:16:01 2016
+++ src/lib/libc/time/localtime.c Fri Mar 18 12:41:25 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: localtime.c,v 1.102 2016/03/15 15:16:01 christos Exp $ */
+/* $NetBSD: localtime.c,v 1.103 2016/03/18 12:41:25 ginsbach Exp $ */
/*
** This file is in the public domain, so clarified as of
@@ -10,7 +10,7 @@
#if 0
static char elsieid[] = "@(#)localtime.c 8.17";
#else
-__RCSID("$NetBSD: localtime.c,v 1.102 2016/03/15 15:16:01 christos Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.103 2016/03/18 12:41:25 ginsbach Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -282,7 +282,7 @@ const char *
tzgetname(const timezone_t sp, int isdst)
{
int i;
- for (i = 0; i < sp->timecnt; ++i) {
+ for (i = 0; i < sp->typecnt; ++i) {
const struct ttinfo *const ttisp = >ttis[sp->types[i]];
if (ttisp->tt_isdst == isdst)
@@ -297,7 +297,7 @@ tzgetgmtoff(const timezone_t sp, int isd
{
int i;
long l = -1;
- for (i = 0; i < sp->timecnt; ++i) {
+ for (i = 0; i < sp->typecnt; ++i) {
const struct ttinfo *const ttisp = >ttis[sp->types[i]];
if (ttisp->tt_isdst == isdst) {
CVS commit: src/lib/libc/locale
Module Name:src
Committed By: christos
Date: Thu Mar 17 17:38:14 UTC 2016
Modified Files:
src/lib/libc/locale: global_locale.c
Log Message:
undo the dso protected for clang
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/lib/libc/locale/global_locale.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/libc/locale/global_locale.c
diff -u src/lib/libc/locale/global_locale.c:1.23 src/lib/libc/locale/global_locale.c:1.24
--- src/lib/libc/locale/global_locale.c:1.23 Mon Mar 7 23:00:11 2016
+++ src/lib/libc/locale/global_locale.c Thu Mar 17 13:38:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: global_locale.c,v 1.23 2016/03/08 04:00:11 christos Exp $ */
+/* $NetBSD: global_locale.c,v 1.24 2016/03/17 17:38:14 christos Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: global_locale.c,v 1.23 2016/03/08 04:00:11 christos Exp $");
+__RCSID("$NetBSD: global_locale.c,v 1.24 2016/03/17 17:38:14 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include
@@ -143,7 +143,10 @@ __dso_hidden const struct _locale_cache_
.numeric_name = _lc_C_locale_name,
};
-__dso_protected struct _locale _lc_global_locale = {
+#ifndef __clang__
+__dso_protected
+#endif
+struct _locale _lc_global_locale = {
.cache = &_C_cache,
.query = { _C_LOCALE },
.part_name = {
@@ -171,7 +174,10 @@ __dso_protected struct _locale _lc_globa
},
};
-__dso_protected const struct _locale _lc_C_locale = {
+#ifndef __clang__
+__dso_protected
+#endif
+const struct _locale _lc_C_locale = {
.cache = &_C_cache,
.query = { _C_LOCALE },
.part_name = {
CVS commit: src/sbin/resize_ffs
Module Name:src
Committed By: christos
Date: Thu Mar 17 00:54:53 UTC 2016
Modified Files:
src/sbin/resize_ffs: resize_ffs.c
Log Message:
Appease gcc-5 from phone@
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sbin/resize_ffs/resize_ffs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/resize_ffs/resize_ffs.c
diff -u src/sbin/resize_ffs/resize_ffs.c:1.44 src/sbin/resize_ffs/resize_ffs.c:1.45
--- src/sbin/resize_ffs/resize_ffs.c:1.44 Mon Apr 6 18:44:04 2015
+++ src/sbin/resize_ffs/resize_ffs.c Wed Mar 16 20:54:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: resize_ffs.c,v 1.44 2015/04/06 22:44:04 jmcneill Exp $ */
+/* $NetBSD: resize_ffs.c,v 1.45 2016/03/17 00:54:53 christos Exp $ */
/* From sources sent on February 17, 2003 */
/*-
* As its sole author, I explicitly place this code in the public
@@ -36,7 +36,7 @@
*/
#include
-__RCSID("$NetBSD: resize_ffs.c,v 1.44 2015/04/06 22:44:04 jmcneill Exp $");
+__RCSID("$NetBSD: resize_ffs.c,v 1.45 2016/03/17 00:54:53 christos Exp $");
#include
#include
@@ -1262,18 +1262,24 @@ loadinodes(void)
if (is_ufs2) {
if (needswap) {
ffs_dinode2_swap(&(dp2[i]), &(dp2[i]));
- for (j = 0; j < UFS_NDADDR + UFS_NIADDR; j++)
+ for (j = 0; j < UFS_NDADDR; j++)
dp2[i].di_db[j] =
bswap32(dp2[i].di_db[j]);
+ for (j = 0; j < UFS_NIADDR; j++)
+ dp2[i].di_ib[j] =
+ bswap32(dp2[i].di_ib[j]);
}
memcpy([ino].dp2, [i],
sizeof(inodes[ino].dp2));
} else {
if (needswap) {
ffs_dinode1_swap(&(dp1[i]), &(dp1[i]));
- for (j = 0; j < UFS_NDADDR + UFS_NIADDR; j++)
+ for (j = 0; j < UFS_NIADDR; j++)
dp1[i].di_db[j] =
bswap32(dp1[i].di_db[j]);
+ for (j = 0; j < UFS_NIADDR; j++)
+ dp1[i].di_ib[j] =
+ bswap32(dp1[i].di_ib[j]);
}
memcpy([ino].dp1, [i],
sizeof(inodes[ino].dp1));
@@ -1555,11 +1561,10 @@ inomove_init(void)
static void
flush_inodes(void)
{
- int i, j, k, na, ni, m;
+ int i, j, k, ni, m;
struct ufs1_dinode *dp1 = NULL;
struct ufs2_dinode *dp2 = NULL;
- na = UFS_NDADDR + UFS_NIADDR;
ni = newsb->fs_ipg * newsb->fs_ncg;
m = FFS_INOPB(newsb) - 1;
for (i = 0; i < ni; i++) {
@@ -1575,33 +1580,39 @@ flush_inodes(void)
dp1 = (struct ufs1_dinode *)ibuf;
for (i = 0; i < ni; i += m) {
- if (iflags[i] & IF_BDIRTY) {
- if (is_ufs2)
-for (j = 0; j < m; j++) {
- dp2[j] = inodes[i + j].dp2;
- if (needswap) {
- for (k = 0; k < na; k++)
- dp2[j].di_db[k]=
- bswap32(dp2[j].di_db[k]);
- ffs_dinode2_swap([j],
- [j]);
- }
+ if ((iflags[i] & IF_BDIRTY) == 0)
+ continue;
+ if (is_ufs2)
+ for (j = 0; j < m; j++) {
+dp2[j] = inodes[i + j].dp2;
+if (needswap) {
+ for (k = 0; k < UFS_NDADDR; k++)
+ dp2[j].di_db[k] =
+ bswap32(dp2[j].di_db[k]);
+ for (k = 0; k < UFS_NIADDR; k++)
+ dp2[j].di_ib[k] =
+ bswap32(dp2[j].di_ib[k]);
+ ffs_dinode2_swap([j],
+ [j]);
}
- else
-for (j = 0; j < m; j++) {
- dp1[j] = inodes[i + j].dp1;
- if (needswap) {
- for (k = 0; k < na; k++)
- dp1[j].di_db[k]=
- bswap32(dp1[j].di_db[k]);
- ffs_dinode1_swap([j],
- [j]);
- }
+ }
+ else
+ for (j = 0; j < m; j++) {
+dp1[j] = inodes[i + j].dp1;
+if (needswap) {
+ for (k = 0; k < UFS_NDADDR; k++)
+ dp1[j].di_db[k]=
+ bswap32(dp1[j].di_db[k]);
+ for (k = 0; k < UFS_NIADDR; k++)
+ dp1[j].di_ib[k]=
+ bswap32(dp1[j].di_ib[k]);
+ ffs_dinode1_swap([j],
+ [j]);
}
+ }
- writeat(FFS_FSBTODB(newsb, ino_to_fsba(newsb, i)),
- ibuf, newsb->fs_bsize);
- }
+ writeat(FFS_FSBTODB(newsb, ino_to_fsba(newsb, i)),
+ ibuf, newsb->fs_bsize);
}
}
/*
CVS commit: src/sbin/fsck_lfs
Module Name:src
Committed By: christos
Date: Thu Mar 17 18:56:14 UTC 2016
Modified Files:
src/sbin/fsck_lfs: setup.c
Log Message:
PR/50974: David Binderman: Remove unused code.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sbin/fsck_lfs/setup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_lfs/setup.c
diff -u src/sbin/fsck_lfs/setup.c:1.60 src/sbin/fsck_lfs/setup.c:1.61
--- src/sbin/fsck_lfs/setup.c:1.60 Sat Oct 3 04:29:21 2015
+++ src/sbin/fsck_lfs/setup.c Thu Mar 17 14:56:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.60 2015/10/03 08:29:21 dholland Exp $ */
+/* $NetBSD: setup.c,v 1.61 2016/03/17 18:56:14 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -163,7 +163,9 @@ extern time_t write_time;
int
setup(const char *dev)
{
+#ifndef VERBOSE_BLOCKMAP
long bmapsize;
+#endif
struct stat statb;
int doskipclean;
u_int64_t maxfilesize;
@@ -444,7 +446,6 @@ setup(const char *dev)
bmapsize = roundup(howmany(maxfsblock, NBBY), sizeof(int16_t));
blockmap = ecalloc(bmapsize, sizeof(char));
#else
- bmapsize = maxfsblock * sizeof(ino_t);
blockmap = ecalloc(maxfsblock, sizeof(ino_t));
#endif
statemap = ecalloc(maxino, sizeof(char));
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Wed Mar 16 23:52:53 UTC 2016 Modified Files: src/doc: 3RDPARTY Log Message: Mention to update MDATE in src/external/gpl2/groff/Makefile.inc on next groff import, if any. To generate a diff of this commit: cvs rdiff -u -r1.1316 -r1.1317 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1316 src/doc/3RDPARTY:1.1317 --- src/doc/3RDPARTY:1.1316 Wed Mar 16 20:17:42 2016 +++ src/doc/3RDPARTY Wed Mar 16 23:52:53 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1316 2016/03/16 20:17:42 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1317 2016/03/16 23:52:53 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -528,6 +528,7 @@ Location: external/gpl2/groff Notes: Use groff2netbsd from external/gpl2/groff/groff2netbsd to prepare the distribution for import. +Update MDATE in src/external/gpl2/groff/Makefile.inc. Package: heimdal Version: 1.5.3
CVS commit: src/libexec/ftpd
Module Name:src
Committed By: christos
Date: Thu Mar 17 00:17:58 UTC 2016
Modified Files:
src/libexec/ftpd: popen.c
Log Message:
volatile for gcc 5
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/libexec/ftpd/popen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ftpd/popen.c
diff -u src/libexec/ftpd/popen.c:1.37 src/libexec/ftpd/popen.c:1.38
--- src/libexec/ftpd/popen.c:1.37 Sat Mar 20 14:23:30 2010
+++ src/libexec/ftpd/popen.c Wed Mar 16 20:17:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: popen.c,v 1.37 2010/03/20 18:23:30 christos Exp $ */
+/* $NetBSD: popen.c,v 1.38 2016/03/17 00:17:58 christos Exp $ */
/*-
* Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#if 0
static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94";
#else
-__RCSID("$NetBSD: popen.c,v 1.37 2010/03/20 18:23:30 christos Exp $");
+__RCSID("$NetBSD: popen.c,v 1.38 2016/03/17 00:17:58 christos Exp $");
#endif
#endif /* not lint */
@@ -107,7 +107,7 @@ extern int ls_main(int, char *[]);
FILE *
ftpd_popen(const char *argv[], const char *ptype, int stderrfd)
{
- FILE *iop;
+ FILE * volatile iop;
int argc, pdes[2], pid;
volatile int isls;
char **pop;
CVS commit: src/libexec/getty
Module Name:src
Committed By: christos
Date: Thu Mar 17 00:21:04 UTC 2016
Modified Files:
src/libexec/getty: main.c
Log Message:
Add volatile for gcc 5
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/libexec/getty/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/libexec/getty/main.c
diff -u src/libexec/getty/main.c:1.64 src/libexec/getty/main.c:1.65
--- src/libexec/getty/main.c:1.64 Mon Aug 12 09:54:33 2013
+++ src/libexec/getty/main.c Wed Mar 16 20:21:04 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.64 2013/08/12 13:54:33 joerg Exp $ */
+/* $NetBSD: main.c,v 1.65 2016/03/17 00:21:04 christos Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "from: @(#)main.c 8.1 (Berkeley) 6/20/93";
#else
-__RCSID("$NetBSD: main.c,v 1.64 2013/08/12 13:54:33 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.65 2016/03/17 00:21:04 christos Exp $");
#endif
#endif /* not lint */
@@ -183,7 +183,8 @@ int
main(int argc, char *argv[], char *envp[])
{
const char *progname;
- int repcnt = 0, failopenlogged = 0, first_time = 1;
+ int repcnt = 0, failopenlogged = 0;
+ volatile int first_time = 1;
struct rlimit limit;
struct passwd *pw;
int rval;
CVS commit: src/sys/arch/alpha/alpha
Module Name:src Committed By: mrg Date: Sat Mar 19 20:57:48 UTC 2016 Modified Files: src/sys/arch/alpha/alpha: compat_16_machdep.c Log Message: remove some dead code. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/alpha/alpha/compat_16_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/alpha/alpha/compat_16_machdep.c diff -u src/sys/arch/alpha/alpha/compat_16_machdep.c:1.19 src/sys/arch/alpha/alpha/compat_16_machdep.c:1.20 --- src/sys/arch/alpha/alpha/compat_16_machdep.c:1.19 Fri May 16 19:18:21 2014 +++ src/sys/arch/alpha/alpha/compat_16_machdep.c Sat Mar 19 20:57:48 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_16_machdep.c,v 1.19 2014/05/16 19:18:21 matt Exp $ */ +/* $NetBSD: compat_16_machdep.c,v 1.20 2016/03/19 20:57:48 mrg Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -86,7 +86,7 @@ #include #include -__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.19 2014/05/16 19:18:21 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.20 2016/03/19 20:57:48 mrg Exp $"); #ifdef DEBUG @@ -113,7 +113,7 @@ sendsig_sigcontext(const ksiginfo_t *ksi sig_t catcher = SIGACTION(p, sig).sa_handler; tf = l->l_md.md_tf; - fp = getframe(l, sig, ), frame; + fp = getframe(l, sig, ); fp--; #ifdef DEBUG
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src Committed By: mrg Date: Sat Mar 19 20:54:49 UTC 2016 Modified Files: src/external/gpl3/gcc/dist/gcc: common.opt Log Message: disable -fdelete-null-pointer-checks by default for now. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/common.opt 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/common.opt diff -u src/external/gpl3/gcc/dist/gcc/common.opt:1.3 src/external/gpl3/gcc/dist/gcc/common.opt:1.4 --- src/external/gpl3/gcc/dist/gcc/common.opt:1.3 Sun Jan 24 09:43:31 2016 +++ src/external/gpl3/gcc/dist/gcc/common.opt Sat Mar 19 20:54:49 2016 @@ -1072,7 +1072,7 @@ Common Report Var(flag_delete_dead_excep Delete dead instructions that may throw exceptions fdelete-null-pointer-checks -Common Report Var(flag_delete_null_pointer_checks) Init(1) Optimization +Common Report Var(flag_delete_null_pointer_checks) Init(0) Optimization Delete useless null pointer checks fdevirtualize-at-ltrans
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Sat Mar 19 20:53:46 UTC 2016 Modified Files: src/external/gpl3/gcc: README.gcc53 Log Message: note alpha mostly works (sshd problem as well) add that sparc64 test results are about 60 additional failures To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/README.gcc53 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/README.gcc53 diff -u src/external/gpl3/gcc/README.gcc53:1.4 src/external/gpl3/gcc/README.gcc53:1.5 --- src/external/gpl3/gcc/README.gcc53:1.4 Fri Mar 18 10:14:39 2016 +++ src/external/gpl3/gcc/README.gcc53 Sat Mar 19 20:53:46 2016 @@ -1,4 +1,4 @@ -$NetBSD: README.gcc53,v 1.4 2016/03/18 10:14:39 mrg Exp $ +$NetBSD: README.gcc53,v 1.5 2016/03/19 20:53:46 mrg Exp $ lib: libasan is disabled currently (haven't tried yet) @@ -26,14 +26,14 @@ arch/feature list. anything not here ha architecture tools kernels libgcc native-gcc make release runs atf - --- -- -- --- -alpha y ? ? y +alpha y y y y y y ?[10] arm y ? y y armeb y ? y y earm y ? y y earmeb y ? y y earmhf y ? y y earmhfeb y ? y y -earmv4 y ? y y y[3,4] y +earmv4 y y y y y[3,4] y earmv4eb y ? y y earmv6 y ? y y earmv6eb y ? y y @@ -51,13 +51,13 @@ mipseb y ? n[5] mipsel y ? n[5] mips64eb y ? n[5] mips64el y ? n[5] -powerpc y ? ? y y[4] y[1?] +powerpc y y y y y[4] y[1?] sh3eb y ? y y sh3el y ? y y sparc y y y y y[4] y[1] -sparc64 y y y builds y[4] n[1?,2] +sparc64 y y y y y[4] n[1?,2] y[9] vax n[7] -x86_64 y y y y y[4] y +x86_64 y y y y y y [1] - world built without -fno-delete-null-pointer-checks does not have a @@ -72,3 +72,6 @@ x86_64 y y y y y[4] y [6] - libc fenv.c fails to build [7] - GCC fails to build [8] - GCC fails with eg: error: stack protector not protecting local variables: variable length buffer [-Werror=stack-protector] +[9] - with a 4.8 base.tgz and 5.3 everythingelse.tgz, about 60 additional failures out of ~3800 +[10] - atf-run crashed kernel about 85% mark with GCC 4.8 kernel, but the + to then results were mostly ok
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Wed Mar 16 11:24:16 UTC 2016
Modified Files:
src/external/gpl3/gcc/lib/crtstuff/arch: sparc.mk
src/external/gpl3/gcc/lib/libbacktrace/arch/sparc:
backtrace-supported.h config.h
src/external/gpl3/gcc/lib/libgcc/arch/sparc: auto-target.h defs.mk
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/sparc: defs.mk gcov-iov.h
src/external/gpl3/gcc/lib/libgomp/arch/sparc: config.h libgomp.spec
libgomp_f.h omp.h
src/external/gpl3/gcc/lib/libiberty/arch/sparc: config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc: c++config.h
cxxabi_tweaks.h defs.mk gstdint.h gthr-posix.h gthr-single.h gthr.h
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc: auto-host.h bversion.h
configargs.h defs.mk gtyp-input.list plugin-version.h tm.h
src/external/gpl3/gcc/usr.bin/libcpp/arch/sparc: config.h
Log Message:
mknative-gcc for GCC 5.3 and sparc
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/crtstuff/arch/sparc.mk
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libbacktrace/arch/sparc/backtrace-supported.h \
src/external/gpl3/gcc/lib/libbacktrace/arch/sparc/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libgcc/arch/sparc/auto-target.h \
src/external/gpl3/gcc/lib/libgcc/arch/sparc/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/sparc/defs.mk
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/sparc/gcov-iov.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libgomp/arch/sparc/config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libgomp/arch/sparc/libgomp.spec \
src/external/gpl3/gcc/lib/libgomp/arch/sparc/libgomp_f.h \
src/external/gpl3/gcc/lib/libgomp/arch/sparc/omp.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libiberty/arch/sparc/config.h
cvs rdiff -u -r1.15 -r1.16 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/c++config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/cxxabi_tweaks.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/defs.mk \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/gthr-posix.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/gthr-single.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/gthr.h
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/gstdint.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/auto-host.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/bversion.h
cvs rdiff -u -r1.17 -r1.18 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/configargs.h
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/defs.mk \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/plugin-version.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/gtyp-input.list \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/tm.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/usr.bin/libcpp/arch/sparc/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/crtstuff/arch/sparc.mk
diff -u src/external/gpl3/gcc/lib/crtstuff/arch/sparc.mk:1.5 src/external/gpl3/gcc/lib/crtstuff/arch/sparc.mk:1.6
--- src/external/gpl3/gcc/lib/crtstuff/arch/sparc.mk:1.5 Sat Mar 1 10:00:31 2014
+++ src/external/gpl3/gcc/lib/crtstuff/arch/sparc.mk Wed Mar 16 11:24:16 2016
@@ -1,8 +1,8 @@
# 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.85 2016/03/15 21:38:32 mrg 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_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=
Index: src/external/gpl3/gcc/lib/libbacktrace/arch/sparc/backtrace-supported.h
diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/sparc/backtrace-supported.h:1.3 src/external/gpl3/gcc/lib/libbacktrace/arch/sparc/backtrace-supported.h:1.4
--- src/external/gpl3/gcc/lib/libbacktrace/arch/sparc/backtrace-supported.h:1.3 Sat Jan 10 22:59:35 2015
CVS commit: src/external/cddl/osnet/dist/tools/ctf/cvt
Module Name:src
Committed By: christos
Date: Thu Mar 17 03:05:55 UTC 2016
Modified Files:
src/external/cddl/osnet/dist/tools/ctf/cvt: st_parse.c
Log Message:
Avoid longjmp clobbering
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.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/cddl/osnet/dist/tools/ctf/cvt/st_parse.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c:1.6 src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c:1.7
--- src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c:1.6 Thu Feb 4 12:40:55 2016
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c Wed Mar 16 23:05:55 2016
@@ -403,7 +403,7 @@ parse_sou(char *cp, iidesc_t *idp)
}
int
-parse_stab(stab_t *stab, char *cp, iidesc_t **iidescp)
+parse_stab(stab_t *stab, char * volatile cp, iidesc_t **iidescp)
{
iidesc_t *ii = NULL;
iitype_t (*parse)(char *, iidesc_t *);
CVS commit: src/external/gpl3/gcc/lib
Module Name:src
Committed By: mrg
Date: Thu Mar 17 08:02:38 UTC 2016
Modified Files:
src/external/gpl3/gcc/lib: Makefile.hacks
Log Message:
don't build a fake insn-modes.h for arm.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/Makefile.hacks
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/Makefile.hacks
diff -u src/external/gpl3/gcc/lib/Makefile.hacks:1.4 src/external/gpl3/gcc/lib/Makefile.hacks:1.5
--- src/external/gpl3/gcc/lib/Makefile.hacks:1.4 Sat Mar 1 10:00:31 2014
+++ src/external/gpl3/gcc/lib/Makefile.hacks Thu Mar 17 08:02:38 2016
@@ -1,22 +1,7 @@
-# $NetBSD: Makefile.hacks,v 1.4 2014/03/01 10:00:31 mrg Exp $
+# $NetBSD: Makefile.hacks,v 1.5 2016/03/17 08:02:38 mrg Exp $
# some random crap we need in a few places
-# arm.h wants MACHMODE aka "enum machine_mode" so we provide a hackful
-# one here to help build libs before gcc itself is built.
-
-# XXX arm hack
-.if ${MACHINE_CPU} == "arm"
-${OBJS}: insn-modes.h
-# XXX XXX
-${__DPSRCS.d}: insn-modes.h
-insn-modes.h:
- ${_MKTARGET_CREATE}
- echo "enum machine_mode { X };" > ${.TARGET}
-DPSRCS+= insn-modes.h
-CLEANFILES+= insn-modes.h
-.endif
-
.if ${MACHINE_CPU} == "mips"
insn-constants.h:
${_MKTARGET_CREATE}
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Wed Mar 16 21:41:25 UTC 2016
Modified Files:
src/crypto/external/bsd/openssh/dist: ssh-keygen.c
Log Message:
remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/ssh-keygen.c
diff -u src/crypto/external/bsd/openssh/dist/ssh-keygen.c:1.22 src/crypto/external/bsd/openssh/dist/ssh-keygen.c:1.23
--- src/crypto/external/bsd/openssh/dist/ssh-keygen.c:1.22 Wed Mar 16 17:07:59 2016
+++ src/crypto/external/bsd/openssh/dist/ssh-keygen.c Wed Mar 16 17:41:25 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ssh-keygen.c,v 1.22 2016/03/16 21:07:59 christos Exp $ */
+/* $NetBSD: ssh-keygen.c,v 1.23 2016/03/16 21:41:25 christos Exp $ */
/* $OpenBSD: ssh-keygen.c,v 1.288 2016/02/15 09:47:49 dtucker Exp $ */
/*
@@ -15,7 +15,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: ssh-keygen.c,v 1.22 2016/03/16 21:07:59 christos Exp $");
+__RCSID("$NetBSD: ssh-keygen.c,v 1.23 2016/03/16 21:41:25 christos Exp $");
#include
#include
#include
@@ -1906,7 +1906,6 @@ __dead static void
do_show_cert(struct passwd *pw)
{
struct sshkey *key = NULL;
- struct stat st;
int r, is_stdin = 0, ok = 0;
FILE *f;
char *cp, line[SSH_MAX_PUBKEY_BYTES];
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src Committed By: christos Date: Wed Mar 16 21:09:39 UTC 2016 Modified Files: src/crypto/dist/ipsec-tools/src/racoon: isakmp_ident.c Log Message: CID 1356385: Add fallthrough comment To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 \ src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c:1.14 src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c:1.15 --- src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c:1.14 Wed Mar 9 17:27:17 2016 +++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c Wed Mar 16 17:09:39 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: isakmp_ident.c,v 1.14 2016/03/09 22:27:17 christos Exp $ */ +/* $NetBSD: isakmp_ident.c,v 1.15 2016/03/16 21:09:39 christos Exp $ */ /* Id: isakmp_ident.c,v 1.21 2006/04/06 16:46:08 manubsd Exp */ @@ -171,7 +171,7 @@ ident_i1send(iph1, msg) else plist = isakmp_plist_append(plist, vid_xauth, ISAKMP_NPTYPE_VID); - + /*FALLTHROUGH*/ case OAKLEY_ATTR_AUTH_METHOD_RSASIG: if ((vid_unity = set_vendorid(VENDORID_UNITY)) == NULL) plog(LLV_ERROR, LOCATION, NULL,
CVS commit: xsrc/external/mit/xf86-video-intel-old/dist/src
Module Name:xsrc
Committed By: christos
Date: Thu Mar 17 02:48:09 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-intel-old/dist/src: i830.h i965_render.c
Log Message:
fix const issues (Q+D)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel-old/dist/src/i830.h \
xsrc/external/mit/xf86-video-intel-old/dist/src/i965_render.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-intel-old/dist/src/i830.h
diff -u xsrc/external/mit/xf86-video-intel-old/dist/src/i830.h:1.1.1.1 xsrc/external/mit/xf86-video-intel-old/dist/src/i830.h:1.2
--- xsrc/external/mit/xf86-video-intel-old/dist/src/i830.h:1.1.1.1 Mon May 18 18:11:09 2015
+++ xsrc/external/mit/xf86-video-intel-old/dist/src/i830.h Wed Mar 16 22:48:09 2016
@@ -900,7 +900,7 @@ intel_emit_reloc(drm_intel_bo *bo, uint3
}
static inline drm_intel_bo *
-intel_bo_alloc_for_data(ScrnInfoPtr scrn, void *data, unsigned int size,
+intel_bo_alloc_for_data(ScrnInfoPtr scrn, const void *data, unsigned int size,
char *name)
{
I830Ptr pI830 = I830PTR(scrn);
Index: xsrc/external/mit/xf86-video-intel-old/dist/src/i965_render.c
diff -u xsrc/external/mit/xf86-video-intel-old/dist/src/i965_render.c:1.1.1.1 xsrc/external/mit/xf86-video-intel-old/dist/src/i965_render.c:1.2
--- xsrc/external/mit/xf86-video-intel-old/dist/src/i965_render.c:1.1.1.1 Mon May 18 18:11:11 2015
+++ xsrc/external/mit/xf86-video-intel-old/dist/src/i965_render.c Wed Mar 16 22:48:09 2016
@@ -513,7 +513,7 @@ typedef enum {
} wm_kernel_t;
#define KERNEL(kernel_enum, kernel, masked) \
-[kernel_enum] = {, sizeof(kernel), masked}
+[kernel_enum] = {__UNCONST(), sizeof(kernel), masked}
struct wm_kernel_info {
void *data;
unsigned int size;
CVS commit: src/bin/csh
Module Name:src
Committed By: christos
Date: Wed Mar 16 22:25:05 UTC 2016
Modified Files:
src/bin/csh: exec.c
Log Message:
Avoid gcc-5 conversion warning (|= expands to int)
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/bin/csh/exec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/exec.c
diff -u src/bin/csh/exec.c:1.29 src/bin/csh/exec.c:1.30
--- src/bin/csh/exec.c:1.29 Tue Jul 16 13:47:43 2013
+++ src/bin/csh/exec.c Wed Mar 16 18:25:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.29 2013/07/16 17:47:43 christos Exp $ */
+/* $NetBSD: exec.c,v 1.30 2016/03/16 22:25:05 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95";
#else
-__RCSID("$NetBSD: exec.c,v 1.29 2013/07/16 17:47:43 christos Exp $");
+__RCSID("$NetBSD: exec.c,v 1.30 2016/03/16 22:25:05 christos Exp $");
#endif
#endif /* not lint */
@@ -91,7 +91,8 @@ static unsigned char xhash[HSHSIZ / 8];
#define hash(a, b) (((a) * HSHMUL + (b)) & HSHMASK)
#define bit(h, b) ((h)[(b) >> 3] & 1 << ((b) & 7)) /* bit test */
-#define bis(h, b) ((h)[(b) >> 3] |= (unsigned char)(1 << ((b) & 7))) /* bit set */
+#define bis(h, b) ((h)[(b) >> 3] = \
+(unsigned char)((1 << ((b) & 7)) | (h)[(b) >> 3]))/* bit set */
static int hits, misses;
/* Dummy search path for just absolute search when no path */
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Sat Mar 19 18:50:25 UTC 2016 Modified Files: src/sys/arch/sparc64/conf: Makefile.sparc64 Log Message: Default kernel builds to USE_SSP=yes. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/arch/sparc64/conf/Makefile.sparc64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/conf/Makefile.sparc64 diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.81 src/sys/arch/sparc64/conf/Makefile.sparc64:1.82 --- src/sys/arch/sparc64/conf/Makefile.sparc64:1.81 Sat Feb 27 19:26:14 2016 +++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sat Mar 19 18:50:25 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.sparc64,v 1.81 2016/02/27 19:26:14 joerg Exp $ +# $NetBSD: Makefile.sparc64,v 1.82 2016/03/19 18:50:25 martin Exp $ #= # @@ -43,6 +43,8 @@ USETOOLS?= no NEED_OWN_INSTALL_TARGET?=no .include +USE_SSP?= yes + ## ## (1) port identification ##
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Sat Mar 19 18:56:37 UTC 2016
Modified Files:
src/sys/kern: exec_elf.c kern_pax.c
src/sys/sys: pax.h
Log Message:
Allow enabling and disabling PaX ASLR debug
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/kern/exec_elf.c
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/kern_pax.c
cvs rdiff -u -r1.16 -r1.17 src/sys/sys/pax.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/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.81 src/sys/kern/exec_elf.c:1.82
--- src/sys/kern/exec_elf.c:1.81 Thu Nov 26 08:15:34 2015
+++ src/sys/kern/exec_elf.c Sat Mar 19 14:56:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.81 2015/11/26 13:15:34 martin Exp $ */
+/* $NetBSD: exec_elf.c,v 1.82 2016/03/19 18:56:37 christos Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005, 2015 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.81 2015/11/26 13:15:34 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.82 2016/03/19 18:56:37 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -140,11 +140,12 @@ elf_placedynexec(struct exec_package *ep
delta = PAX_ASLR_DELTA(r, l2, PAX_ASLR_DELTA_EXEC_LEN);
offset = ELF_TRUNC(delta, pax_align) + PAGE_SIZE;
#ifdef PAX_ASLR_DEBUG
- uprintf("r=0x%x l2=0x%zx PGSHIFT=0x%x Delta=0x%zx\n", r, l2,
- PGSHIFT, delta);
- uprintf("pax offset=0x%llx entry=0x%llx\n",
- (unsigned long long)offset,
- (unsigned long long)eh->e_entry);
+ if (pax_aslr_debug) {
+ uprintf("%s: r=%#x l2=%#zx pax_align=%#zx delta=%#zx\n",
+ __func__, r, l2, pax_align, delta);
+ uprintf("%s: pax offset=%#jx entry=%#jx\n", __func__,
+ (uintmax_t)offset, (uintmax_t)eh->e_entry);
+ }
#endif /* PAX_ASLR_DEBUG */
} else
#endif /* PAX_ASLR */
Index: src/sys/kern/kern_pax.c
diff -u src/sys/kern/kern_pax.c:1.33 src/sys/kern/kern_pax.c:1.34
--- src/sys/kern/kern_pax.c:1.33 Thu Oct 8 22:00:59 2015
+++ src/sys/kern/kern_pax.c Sat Mar 19 14:56:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_pax.c,v 1.33 2015/10/09 02:00:59 christos Exp $ */
+/* $NetBSD: kern_pax.c,v 1.34 2016/03/19 18:56:37 christos Exp $ */
/*
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.33 2015/10/09 02:00:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.34 2016/03/19 18:56:37 christos Exp $");
#include "opt_pax.h"
@@ -68,6 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v
#include
#include
#include
+#include
#include
#include
#include
@@ -76,7 +77,9 @@ __KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v
#include
#ifdef PAX_ASLR_DEBUG
-#define PAX_DPRINTF(_fmt, args...) uprintf("%s: " _fmt "\n", __func__, ##args)
+#define PAX_DPRINTF(_fmt, args...) \
+ do if (pax_aslr_debug) uprintf("%s: " _fmt "\n", __func__, ##args); \
+ while (/*CONSTCOND*/0)
#else
#define PAX_DPRINTF(_fmt, args...) do {} while (/*CONSTCOND*/0)
#endif
@@ -120,6 +123,10 @@ static bool pax_mprotect_elf_flags_activ
#define PAX_SEGVGUARD_MAXCRASHES 5
#endif
+#ifdef PAX_ASLR_DEBUG
+int pax_aslr_debug;
+#endif
+
static int pax_segvguard_enabled = 1;
static int pax_segvguard_global = PAX_SEGVGUARD;
static int pax_segvguard_expiry = PAX_SEGVGUARD_EXPIRY;
@@ -242,6 +249,14 @@ SYSCTL_SETUP(sysctl_security_pax_setup,
"specified, apply to all processes."),
NULL, 0, _aslr_global, 0,
CTL_CREATE, CTL_EOL);
+#ifdef PAX_ASLR_DEBUG
+ sysctl_createv(clog, 0, , NULL,
+ CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
+ CTLTYPE_INT, "debug",
+ SYSCTL_DESCR("Pring ASLR selected addresses."),
+ NULL, 0, _aslr_debug, 0,
+ CTL_CREATE, CTL_EOL);
+#endif
sysctl_createv(clog, 0, , NULL,
CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
CTLTYPE_INT, "mmap_len",
@@ -391,6 +406,7 @@ pax_aslr_init_vm(struct lwp *l, struct v
vm->vm_aslr_delta_mmap = PAX_ASLR_DELTA(cprng_fast32(),
PAX_ASLR_DELTA_MMAP_LSB, PAX_ASLR_DELTA_MMAP_LEN);
+ PAX_DPRINTF("delta_mmap=%#jx", vm->vm_aslr_delta_mmap);
}
void
@@ -398,18 +414,25 @@ pax_aslr_mmap(struct lwp *l, vaddr_t *ad
{
if (!pax_aslr_active(l))
return;
+#ifdef PAX_ASLR_DEBUG
+ char buf[256];
+ if (pax_aslr_debug)
+ snprintb(buf, sizeof(buf), MAP_FMT, f);
+ else
+ buf[0] = '\0';
+#endif
if (!(f & MAP_FIXED) && ((orig_addr == 0) || !(f & MAP_ANON))) {
- PAX_DPRINTF("applying to 0x%lx orig_addr=0x%lx f=%x",
- (unsigned long)*addr, (unsigned long)orig_addr, f);
+ PAX_DPRINTF("applying to %#jx orig_addr=%#jx f=%s",
+ (uintmax_t)*addr, (uintmax_t)orig_addr, buf);
if (!(l->l_proc->p_vmspace->vm_map.flags & VM_MAP_TOPDOWN))
*addr += l->l_proc->p_vmspace->vm_aslr_delta_mmap;
else
*addr -= l->l_proc->p_vmspace->vm_aslr_delta_mmap;
- PAX_DPRINTF("result 0x%lx",
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Sat Mar 19 18:44:10 UTC 2016 Modified Files: src/sys/sys: mman.h Log Message: Add MAP_FMT To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/sys/mman.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/sys/mman.h diff -u src/sys/sys/mman.h:1.48 src/sys/sys/mman.h:1.49 --- src/sys/sys/mman.h:1.48 Sun Aug 3 15:14:24 2014 +++ src/sys/sys/mman.h Sat Mar 19 14:44:10 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: mman.h,v 1.48 2014/08/03 19:14:24 wiz Exp $ */ +/* $NetBSD: mman.h,v 1.49 2016/03/19 18:44:10 christos Exp $ */ /*- * Copyright (c) 1982, 1986, 1993 @@ -112,6 +112,32 @@ typedef __off_t off_t; /* file offset #define MAP_ALIGNMENT_256TB MAP_ALIGNED(48) /* 2^48 */ #define MAP_ALIGNMENT_64PB MAP_ALIGNED(56) /* 2^56 */ +#ifdef _NETBSD_SOURCE +#define MAP_FMT "\177\020\ +b\0SHARED\0\ +b\1PRIVATE\0\ +b\2COPY\0\ +b\4FIXED\0\ +b\5RENAME\0\ +b\6NORESERVE\0\ +b\7INHERIT\0\ +b\11HASSEMAPHORE\0\ +b\12TRYFIXED\0\ +b\13WIRED\0\ +F\14\1\ +:\0FILE\0\ +:\1ANONYMOUS\0\ +b\15STACK\0\ +F\30\010\ +:\020ALIGN=64KB\0\ +:\030ALIGN=16MB\0\ +:\040ALIGN=4GB\0\ +:\050ALIGN=1TB\0\ +:\060ALIGN=256TB\0\ +:\070ALIGN=64PB\0\ +" +#endif + /* * Error indicator returned by mmap(2) */
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Wed Mar 16 20:55:54 UTC 2016
Modified Files:
src/crypto/external/bsd/openssh/dist: packet.c
Log Message:
CID 1018734: Unitialized variable
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/packet.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/packet.c
diff -u src/crypto/external/bsd/openssh/dist/packet.c:1.23 src/crypto/external/bsd/openssh/dist/packet.c:1.24
--- src/crypto/external/bsd/openssh/dist/packet.c:1.23 Thu Mar 10 20:55:00 2016
+++ src/crypto/external/bsd/openssh/dist/packet.c Wed Mar 16 16:55:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: packet.c,v 1.23 2016/03/11 01:55:00 christos Exp $ */
+/* $NetBSD: packet.c,v 1.24 2016/03/16 20:55:54 christos Exp $ */
/* $OpenBSD: packet.c,v 1.229 2016/02/17 22:20:14 djm Exp $ */
/*
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: packet.c,v 1.23 2016/03/11 01:55:00 christos Exp $");
+__RCSID("$NetBSD: packet.c,v 1.24 2016/03/16 20:55:54 christos Exp $");
#include /* MIN roundup */
#include
#include
@@ -1387,7 +1387,7 @@ int
ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
{
struct session_state *state = ssh->state;
- int len, r, ms_remain;
+ int len, r, ms_remain = 0;
fd_set *setp;
char buf[8192];
struct timeval timeout, start, *timeoutp = NULL;
CVS commit: src/usr.sbin/nfsd
Module Name:src
Committed By: christos
Date: Thu Mar 17 15:25:46 UTC 2016
Modified Files:
src/usr.sbin/nfsd: nfsd.8 nfsd.c
Log Message:
Expose debugging
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/nfsd/nfsd.8
cvs rdiff -u -r1.65 -r1.66 src/usr.sbin/nfsd/nfsd.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.sbin/nfsd/nfsd.8
diff -u src/usr.sbin/nfsd/nfsd.8:1.23 src/usr.sbin/nfsd/nfsd.8:1.24
--- src/usr.sbin/nfsd/nfsd.8:1.23 Mon Aug 13 04:39:28 2012
+++ src/usr.sbin/nfsd/nfsd.8 Thu Mar 17 11:25:46 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: nfsd.8,v 1.23 2012/08/13 08:39:28 wiz Exp $
+.\" $NetBSD: nfsd.8,v 1.24 2016/03/17 15:25:46 christos Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)nfsd.8 8.4 (Berkeley) 3/29/95
.\"
-.Dd August 12, 2012
+.Dd March 17, 2016
.Dt NFSD 8
.Os
.Sh NAME
@@ -39,7 +39,7 @@
server
.Sh SYNOPSIS
.Nm
-.Op Fl 46rut
+.Op Fl 46drut
.Op Fl n Ar num_threads
.Sh DESCRIPTION
.Nm
@@ -56,6 +56,8 @@ transport are started.
.Pp
The following options are available:
.Bl -tag -width Ds
+.It Fl d
+Turn on debugging, don't fork and log to stderr.
.It Fl r
Register the
.Tn NFS
Index: src/usr.sbin/nfsd/nfsd.c
diff -u src/usr.sbin/nfsd/nfsd.c:1.65 src/usr.sbin/nfsd/nfsd.c:1.66
--- src/usr.sbin/nfsd/nfsd.c:1.65 Wed Dec 23 13:41:54 2015
+++ src/usr.sbin/nfsd/nfsd.c Thu Mar 17 11:25:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nfsd.c,v 1.65 2015/12/23 18:41:54 christos Exp $ */
+/* $NetBSD: nfsd.c,v 1.66 2016/03/17 15:25:46 christos Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)nfsd.c 8.9 (Berkeley) 3/29/95";
#else
-__RCSID("$NetBSD: nfsd.c,v 1.65 2015/12/23 18:41:54 christos Exp $");
+__RCSID("$NetBSD: nfsd.c,v 1.66 2016/03/17 15:25:46 christos Exp $");
#endif
#endif /* not lint */
@@ -100,16 +100,21 @@ int nfsd_main(int, char *[]);
/* Global defs */
#if defined(DEBUG) || defined(NFSD_RUMP)
-#define syslog(e, s, args...) \
-do { \
-fprintf(stderr,(s), ## args); \
-fprintf(stderr, "\n"); \
-} while (/*CONSTCOND*/0)
static int debug = 1;
#else
static int debug = 0;
#endif
+#define logit(e, s, args...) \
+do { \
+ if (debug) { \
+ fprintf(stderr,(s), ## args);\
+ fprintf(stderr, "\n"); \
+ } else { \
+ syslog(e, s, ## args); \
+ }\
+} while (/*CONSTCOND*/0)
+
static void nonfs(int);
__dead static void usage(void);
@@ -124,7 +129,7 @@ worker(void *dummy)
memset(, 0, sizeof(nsd));
while (nfssvc(nfssvc_flag, ) < 0) {
if (errno != ENEEDAUTH) {
- syslog(LOG_ERR, "nfssvc: %s", strerror(errno));
+ logit(LOG_ERR, "nfssvc: %s", strerror(errno));
exit(1);
}
nfssvc_flag = NFSSVC_NFSD | NFSSVC_AUTHINFAIL;
@@ -166,7 +171,7 @@ tryconf(struct conf *cfg, int t, int rer
ecode = getaddrinfo(NULL, "nfs", , >ai);
if (ecode != 0) {
- syslog(LOG_ERR, "getaddrinfo %s: %s", cfg_netconf[t],
+ logit(LOG_ERR, "getaddrinfo %s: %s", cfg_netconf[t],
gai_strerror(ecode));
return -1;
}
@@ -174,7 +179,7 @@ tryconf(struct conf *cfg, int t, int rer
cfg->nc = getnetconfigent(cfg_netconf[t]);
if (cfg->nc == NULL) {
- syslog(LOG_ERR, "getnetconfigent %s failed: %s",
+ logit(LOG_ERR, "getnetconfigent %s failed: %s",
cfg_netconf[t], strerror(errno));
goto out;
}
@@ -183,7 +188,7 @@ tryconf(struct conf *cfg, int t, int rer
cfg->nb.len = cfg->nb.maxlen = cfg->ai->ai_addrlen;
if (reregister)
if (!rpcb_set(RPCPROG_NFS, 2, cfg->nc, >nb)) {
- syslog(LOG_ERR, "rpcb_set %s failed", cfg_netconf[t]);
+ logit(LOG_ERR, "rpcb_set %s failed", cfg_netconf[t]);
goto out1;
}
return 0;
@@ -207,14 +212,14 @@ setupsock(struct conf *cfg, struct pollf
sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
if (sock == -1) {
- syslog(LOG_ERR, "can't create %s socket: %s", cfg_netconf[p],
+ logit(LOG_ERR, "can't create %s socket: %s", cfg_netconf[p],
strerror(errno));
return -1;
}
if (cfg_family[p] == PF_INET6) {
if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, ,
sizeof(on)) == -1) {
- syslog(LOG_ERR, "can't set v6-only binding for %s "
+ logit(LOG_ERR, "can't set v6-only binding for %s "
"socket: %s", cfg_netconf[p], strerror(errno));
goto out;
}
@@ -223,28 +228,28 @@ setupsock(struct conf *cfg, struct pollf
if (cfg_protocol[p] == IPPROTO_TCP) {
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, ,
sizeof(on)) == -1) {
- syslog(LOG_ERR, "setsockopt SO_REUSEADDR for %s: %s",
+ logit(LOG_ERR, "setsockopt SO_REUSEADDR for %s: %s",
cfg_netconf[p], strerror(errno));
goto out;
}
}
if (bind(sock, ai->ai_addr, ai->ai_addrlen) == -1) {
- syslog(LOG_ERR,
CVS commit: src/include
Module Name:src Committed By: christos Date: Thu Mar 17 17:36:32 UTC 2016 Modified Files: src/include: locale.h Log Message: disable dso protected for clang now, so that packages can be built. (again this is the binutils warning about copy relocations on protected objects) To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/include/locale.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/locale.h diff -u src/include/locale.h:1.26 src/include/locale.h:1.27 --- src/include/locale.h:1.26 Mon Mar 7 22:58:31 2016 +++ src/include/locale.h Thu Mar 17 13:36:32 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: locale.h,v 1.26 2016/03/08 03:58:31 christos Exp $ */ +/* $NetBSD: locale.h,v 1.27 2016/03/17 17:36:32 christos Exp $ */ /* * Copyright (c) 1991, 1993 @@ -106,12 +106,20 @@ void freelocale(locale_t); struct lconv *localeconv_l(locale_t); locale_t newlocale(int, const char *, locale_t); +#ifdef __clang__ +extern struct _locale _lc_global_locale; +#else extern __dso_protected struct _locale _lc_global_locale; +#endif #define LC_GLOBAL_LOCALE (&_lc_global_locale) #endif /* _POSIX_SOURCE >= 200809 || _NETBSD_SOURCE */ #if defined(_NETBSD_SOURCE) +#ifdef __clang__ +extern const struct _locale _lc_C_locale; +#else extern __dso_protected const struct _locale _lc_C_locale; +#endif #define LC_C_LOCALE ((locale_t)__UNCONST(&_lc_C_locale)) #endif __END_DECLS
CVS commit: src/bin/sh
Module Name:src Committed By: christos Date: Wed Mar 16 19:02:26 UTC 2016 Modified Files: src/bin/sh: syntax.h Log Message: parenthesize for safety. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/bin/sh/syntax.h 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/syntax.h diff -u src/bin/sh/syntax.h:1.5 src/bin/sh/syntax.h:1.6 --- src/bin/sh/syntax.h:1.5 Wed Mar 16 13:01:39 2016 +++ src/bin/sh/syntax.h Wed Mar 16 15:02:26 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: syntax.h,v 1.5 2016/03/16 17:01:39 christos Exp $ */ +/* $NetBSD: syntax.h,v 1.6 2016/03/16 19:02:26 christos Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -68,7 +68,7 @@ /* These defines assume that the digits are contiguous (which is guaranteed) */ #define is_digit(c) ((unsigned)((c) - '0') <= 9) -#define sh_ctype(c) (is_type+SYNBASE)[(int)c] +#define sh_ctype(c) (is_type+SYNBASE)[(int)(c)] #define is_alpha(c) (sh_ctype(c) & (ISUPPER|ISLOWER)) #define is_name(c) (sh_ctype(c) & (ISUPPER|ISLOWER|ISUNDER)) #define is_in_name(c) (sh_ctype(c) & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT))
CVS commit: src/bin/sh
Module Name:src
Committed By: christos
Date: Wed Mar 16 22:36:40 UTC 2016
Modified Files:
src/bin/sh: histedit.c
Log Message:
Sprinkle volatile for gcc 5!
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/bin/sh/histedit.c
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/histedit.c
diff -u src/bin/sh/histedit.c:1.47 src/bin/sh/histedit.c:1.48
--- src/bin/sh/histedit.c:1.47 Wed Jun 18 14:17:30 2014
+++ src/bin/sh/histedit.c Wed Mar 16 18:36:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: histedit.c,v 1.47 2014/06/18 18:17:30 christos Exp $ */
+/* $NetBSD: histedit.c,v 1.48 2016/03/16 22:36:40 christos Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)histedit.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: histedit.c,v 1.47 2014/06/18 18:17:30 christos Exp $");
+__RCSID("$NetBSD: histedit.c,v 1.48 2016/03/16 22:36:40 christos Exp $");
#endif
#endif /* not lint */
@@ -224,22 +224,21 @@ inputrc(int argc, char **argv)
* the Korn shell fc command. Oh well...
*/
int
-histcmd(int argc, char **argv)
+histcmd(volatile int argc, char ** volatile argv)
{
int ch;
const char * volatile editor = NULL;
HistEvent he;
- int lflg = 0;
- volatile int nflg = 0, rflg = 0, sflg = 0;
+ volatile int lflg = 0, nflg = 0, rflg = 0, sflg = 0;
int i, retval;
const char *firststr, *laststr;
int first, last, direction;
- char *pat = NULL, *repl; /* ksh "fc old=new" crap */
+ char * volatile pat = NULL, * volatile repl; /* ksh "fc old=new" crap */
static int active = 0;
struct jmploc jmploc;
struct jmploc *volatile savehandler;
char editfile[MAXPATHLEN + 1];
- FILE *efp;
+ FILE * volatile efp;
#ifdef __GNUC__
repl = NULL; /* XXX gcc4 */
efp = NULL; /* XXX gcc4 */
CVS commit: src
Module Name:src Committed By: nros Date: Thu Mar 17 00:00:44 UTC 2016 Modified Files: src/distrib/sets/lists/comp: mi src/lib/libm: Makefile src/lib/libm/man: fabs.3 Log Message: Add fabsl to the manpage describing the fabs functions. To generate a diff of this commit: cvs rdiff -u -r1.2021 -r1.2022 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.174 -r1.175 src/lib/libm/Makefile cvs rdiff -u -r1.15 -r1.16 src/lib/libm/man/fabs.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2021 src/distrib/sets/lists/comp/mi:1.2022 --- src/distrib/sets/lists/comp/mi:1.2021 Wed Mar 16 05:32:09 2016 +++ src/distrib/sets/lists/comp/mi Thu Mar 17 00:00:44 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2021 2016/03/16 05:32:09 mrg Exp $ +# $NetBSD: mi,v 1.2022 2016/03/17 00:00:44 nros Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -6195,6 +6195,7 @@ ./usr/share/man/cat3/extattr_string_to_namespace.0 comp-c-catman .cat ./usr/share/man/cat3/fabs.0 comp-c-catman .cat ./usr/share/man/cat3/fabsf.0 comp-c-catman .cat +./usr/share/man/cat3/fabsl.0 comp-c-catman .cat ./usr/share/man/cat3/fast_divide32.0 comp-c-catman .cat ./usr/share/man/cat3/fast_divide32_prepare.0 comp-c-catman .cat ./usr/share/man/cat3/fast_remainder32.0 comp-c-catman .cat @@ -13196,6 +13197,7 @@ ./usr/share/man/html3/extattr_string_to_namespace.html comp-c-htmlman html ./usr/share/man/html3/fabs.html comp-c-htmlman html ./usr/share/man/html3/fabsf.html comp-c-htmlman html +./usr/share/man/html3/fabsl.html comp-c-htmlman html ./usr/share/man/html3/fast_divide32.html comp-c-htmlman html ./usr/share/man/html3/fast_divide32_prepare.html comp-c-htmlman html ./usr/share/man/html3/fast_remainder32.html comp-c-htmlman html @@ -20106,6 +20108,7 @@ ./usr/share/man/man3/extattr_string_to_namespace.3 comp-c-man .man ./usr/share/man/man3/fabs.3 comp-c-man .man ./usr/share/man/man3/fabsf.3 comp-c-man .man +./usr/share/man/man3/fabsl.3 comp-c-man .man ./usr/share/man/man3/fast_divide32.3 comp-c-man .man ./usr/share/man/man3/fast_divide32_prepare.3 comp-c-man .man ./usr/share/man/man3/fast_remainder32.3 comp-c-man .man Index: src/lib/libm/Makefile diff -u src/lib/libm/Makefile:1.174 src/lib/libm/Makefile:1.175 --- src/lib/libm/Makefile:1.174 Tue Dec 29 16:57:35 2015 +++ src/lib/libm/Makefile Thu Mar 17 00:00:44 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.174 2015/12/29 16:57:35 christos Exp $ +# $NetBSD: Makefile,v 1.175 2016/03/17 00:00:44 nros Exp $ # # @(#)Makefile 5.1beta 93/09/24 # @@ -339,7 +339,8 @@ MLINKS+=log.3 logf.3 \ log.3 log2.3 \ log.3 log2f.3 MLINKS+=pow.3 powf.3 -MLINKS+=fabs.3 fabsf.3 +MLINKS+=fabs.3 fabsf.3 \ + fabs.3 fabsl.3 MLINKS+=finite.3 finitef.3 MLINKS+=fmod.3 fmodf.3 \ fmod.3 fmodl.3 Index: src/lib/libm/man/fabs.3 diff -u src/lib/libm/man/fabs.3:1.15 src/lib/libm/man/fabs.3:1.16 --- src/lib/libm/man/fabs.3:1.15 Tue Sep 13 07:11:43 2011 +++ src/lib/libm/man/fabs.3 Thu Mar 17 00:00:44 2016 @@ -26,15 +26,16 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)fabs.3 5.1 (Berkeley) 5/2/91 -.\" $NetBSD: fabs.3,v 1.15 2011/09/13 07:11:43 njoly Exp $ +.\" $NetBSD: fabs.3,v 1.16 2016/03/17 00:00:44 nros Exp $ .\" .Dd May 2, 1991 .Dt FABS 3 .Os .Sh NAME .Nm fabs , -.Nm fabsf -.Nd floating-point absolute value function +.Nm fabsf, +.Nm fabsl +.Nd floating-point absolute value functions .Sh LIBRARY .Lb libm .Sh SYNOPSIS @@ -43,17 +44,20 @@ .Fn fabs "double x" .Ft float .Fn fabsf "float x" +.Ft long double +.Fn fabs "long double x" .Sh DESCRIPTION The -.Fn fabs -and +.Fn fabs , .Fn fabsf +and +.Fn fabsl functions compute the absolute value of a floating-point number .Fa x . .Sh RETURN VALUES -The +Functions of the .Fn fabs -function returns the absolute value of +family return the absolute value of .Fa x . .Sh SEE ALSO .Xr abs 3 , @@ -66,3 +70,9 @@ The .Fn fabs function conforms to .St -ansiC . +The +.Fn fabsf +and +.Fn fabsl +functions conform to +.St -isoC-99 .
CVS commit: src/lib/libwrap
Module Name:src
Committed By: christos
Date: Wed Mar 16 21:38:22 UTC 2016
Modified Files:
src/lib/libwrap: rfc931.c
Log Message:
Avoid setjmp clobbering.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libwrap/rfc931.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/libwrap/rfc931.c
diff -u src/lib/libwrap/rfc931.c:1.10 src/lib/libwrap/rfc931.c:1.11
--- src/lib/libwrap/rfc931.c:1.10 Thu Mar 22 18:59:43 2012
+++ src/lib/libwrap/rfc931.c Wed Mar 16 17:38:22 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rfc931.c,v 1.10 2012/03/22 22:59:43 joerg Exp $ */
+/* $NetBSD: rfc931.c,v 1.11 2016/03/16 21:38:22 christos Exp $ */
/*
* rfc931() speaks a common subset of the RFC 931, AUTH, TAP, IDENT and RFC
@@ -16,7 +16,7 @@
#if 0
static char sccsid[] = "@(#) rfc931.c 1.10 95/01/02 16:11:34";
#else
-__RCSID("$NetBSD: rfc931.c,v 1.10 2012/03/22 22:59:43 joerg Exp $");
+__RCSID("$NetBSD: rfc931.c,v 1.11 2016/03/16 21:38:22 christos Exp $");
#endif
#endif
@@ -87,7 +87,7 @@ rfc931(struct sockaddr *rmt_sin, struct
charuser[256]; /* XXX */
charbuffer[512]; /* XXX */
char *cp;
-char *result = unknown;
+static char *result = unknown;
FILE *fp;
volatile int salen;
u_short * volatile rmt_portp;
@@ -95,7 +95,7 @@ rfc931(struct sockaddr *rmt_sin, struct
/* address family must be the same */
if (rmt_sin->sa_family != our_sin->sa_family) {
- strlcpy(dest, result, STRING_LENGTH);
+ strlcpy(dest, unknown, STRING_LENGTH);
return;
}
switch (rmt_sin->sa_family) {
@@ -110,7 +110,7 @@ rfc931(struct sockaddr *rmt_sin, struct
break;
#endif
default:
- strlcpy(dest, result, STRING_LENGTH);
+ strlcpy(dest, unknown, STRING_LENGTH);
return;
}
switch (our_sin->sa_family) {
@@ -123,15 +123,10 @@ rfc931(struct sockaddr *rmt_sin, struct
break;
#endif
default:
- strlcpy(dest, result, STRING_LENGTH);
+ strlcpy(dest, unknown, STRING_LENGTH);
return;
}
-#ifdef __GNUC__
-(void) /* Avoid longjmp clobbering */
-(void) /* XXX gcc */
-#endif
-
/*
* Use one unbuffered stdio stream for writing to and for reading from
* the RFC931 etc. server. This is done because of a bug in the SunOS
CVS commit: src/external/bsd/elftoolchain/dist/libdwarf
Module Name:src
Committed By: christos
Date: Thu Mar 17 18:52:26 UTC 2016
Modified Files:
src/external/bsd/elftoolchain/dist/libdwarf: dwarf_attrval.c
Log Message:
Handle DW_AT_specification better; also don't core-dump if at == NULL.
XXX: Is that right?
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/elftoolchain/dist/libdwarf/dwarf_attrval.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/bsd/elftoolchain/dist/libdwarf/dwarf_attrval.c
diff -u src/external/bsd/elftoolchain/dist/libdwarf/dwarf_attrval.c:1.4 src/external/bsd/elftoolchain/dist/libdwarf/dwarf_attrval.c:1.5
--- src/external/bsd/elftoolchain/dist/libdwarf/dwarf_attrval.c:1.4 Fri Feb 19 21:43:41 2016
+++ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_attrval.c Thu Mar 17 14:52:26 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_attrval.c,v 1.4 2016/02/20 02:43:41 christos Exp $ */
+/* $NetBSD: dwarf_attrval.c,v 1.5 2016/03/17 18:52:26 christos Exp $ */
/*-
* Copyright (c) 2007 John Birrell (j...@freebsd.org)
@@ -28,7 +28,7 @@
#include "_libdwarf.h"
-__RCSID("$NetBSD: dwarf_attrval.c,v 1.4 2016/02/20 02:43:41 christos Exp $");
+__RCSID("$NetBSD: dwarf_attrval.c,v 1.5 2016/03/17 18:52:26 christos Exp $");
ELFTC_VCSID("Id: dwarf_attrval.c 3159 2015-02-15 21:43:27Z emaste ");
int
@@ -141,12 +141,25 @@ dwarf_attrval_signed(Dwarf_Die die, Dwar
return (DW_DLV_OK);
}
+static Dwarf_Attribute
+dwarf_indirect_find(Dwarf_Debug dbg, Dwarf_Die die, Dwarf_Half attr,
+Dwarf_Unsigned val)
+{
+ Dwarf_Die die1;
+ Dwarf_Attribute at;
+
+ if ((die1 = _dwarf_die_find(die, val)) == NULL)
+ return NULL;
+
+ at = _dwarf_attr_find(die1, attr);
+ dwarf_dealloc(dbg, die1, DW_DLA_DIE);
+ return at;
+}
+
int
dwarf_attrval_unsigned(Dwarf_Die die, Dwarf_Half attr, Dwarf_Unsigned *valp, Dwarf_Error *err)
{
Dwarf_Attribute at;
- Dwarf_Die die1;
- Dwarf_Unsigned val;
Dwarf_Debug dbg;
dbg = die != NULL ? die->die_dbg : NULL;
@@ -163,7 +176,6 @@ dwarf_attrval_unsigned(Dwarf_Die die, Dw
return (DW_DLV_NO_ENTRY);
}
- die1 = NULL;
if (at == NULL &&
(at = _dwarf_attr_find(die, DW_AT_abstract_origin)) != NULL) {
switch (at->at_form) {
@@ -172,14 +184,7 @@ dwarf_attrval_unsigned(Dwarf_Die die, Dw
case DW_FORM_ref4:
case DW_FORM_ref8:
case DW_FORM_ref_udata:
- val = at->u[0].u64;
- if ((die1 = _dwarf_die_find(die, val)) == NULL ||
- (at = _dwarf_attr_find(die1, attr)) == NULL) {
-if (die1 != NULL)
- dwarf_dealloc(dbg, die1, DW_DLA_DIE);
-DWARF_SET_ERROR(dbg, err, DW_DLE_NO_ENTRY);
-return (DW_DLV_NO_ENTRY);
- }
+ at = dwarf_indirect_find(dbg, die, attr, at->u[0].u64);
break;
default:
DWARF_SET_ERROR(dbg, err, DW_DLE_ATTR_FORM_BAD);
@@ -187,6 +192,16 @@ dwarf_attrval_unsigned(Dwarf_Die die, Dw
}
}
+ if (at == NULL &&
+ (at = _dwarf_attr_find(die, DW_AT_specification)) != NULL) {
+ at = dwarf_indirect_find(dbg, die, attr, at->u[0].u64);
+ }
+
+ if (at == NULL) {
+ DWARF_SET_ERROR(dbg, err, DW_DLE_NO_ENTRY);
+ return (DW_DLV_NO_ENTRY);
+ }
+
switch (at->at_form) {
case DW_FORM_addr:
case DW_FORM_data1:
@@ -202,14 +217,10 @@ dwarf_attrval_unsigned(Dwarf_Die die, Dw
*valp = at->u[0].u64;
break;
default:
- if (die1 != NULL)
- dwarf_dealloc(dbg, die1, DW_DLA_DIE);
+ out:
DWARF_SET_ERROR(dbg, err, DW_DLE_ATTR_FORM_BAD);
return (DW_DLV_ERROR);
}
- if (die1 != NULL)
- dwarf_dealloc(dbg, die1, DW_DLA_DIE);
-
return (DW_DLV_OK);
}
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Fri Mar 18 10:14:39 UTC 2016 Modified Files: src/external/gpl3/gcc: README.gcc53 Log Message: update info for: hppa: libc build failes in fenv.c m68*: libc fails with stack protector issues mips*: libgcc fails sh*: initial stuff works sparc*: sshd is broken for both, perhaps kernels are SMP problematic vax: tools/gcc failes To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/README.gcc53 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/README.gcc53 diff -u src/external/gpl3/gcc/README.gcc53:1.3 src/external/gpl3/gcc/README.gcc53:1.4 --- src/external/gpl3/gcc/README.gcc53:1.3 Fri Mar 18 07:30:47 2016 +++ src/external/gpl3/gcc/README.gcc53 Fri Mar 18 10:14:39 2016 @@ -1,4 +1,4 @@ -$NetBSD: README.gcc53,v 1.3 2016/03/18 07:30:47 mrg Exp $ +$NetBSD: README.gcc53,v 1.4 2016/03/18 10:14:39 mrg Exp $ lib: libasan is disabled currently (haven't tried yet) @@ -43,25 +43,32 @@ earmv7 y ? y y earmv7eb y ? y y earmv7hf y ? y y earmv7hfeb y ? y y -hppa +hppa y ? y n[6] i386 y y y y y[4] y -m68000 -m68k -mipseb -mipsel -mips64eb -mips64el -powerpc y ? ? y x -sh3eb -sh3el +m68000 y ? y n[8] +m68k y ? y n[8] +mipseb y ? n[5] +mipsel y ? n[5] +mips64eb y ? n[5] +mips64el y ? n[5] +powerpc y ? ? y y[4] y[1?] +sh3eb y ? y y +sh3el y ? y y sparc y y y y y[4] y[1] -sparc64 y y y builds y[4] n[2] -vax +sparc64 y y y builds y[4] n[1?,2] +vax n[7] x86_64 y y y y y[4] y [1] - world built without -fno-delete-null-pointer-checks does not have a working sshd [2] - -O2 and -Os kernels hang, -O1 SIR reset + -- may be a SMP issue; ultra10 works, ultra45 SMP does not + -- try sb2000 (particularly with UP kernel. u45 UP is shitty.) [3] - MKCOMPAT=no enabled currently [4] - really, this is 'distribution sets' and a kernel +[5] - libgcc fails to build, multiply defined symbols. probably some libgcc + makefile change needing re-doing. +[6] - libc fenv.c fails to build +[7] - GCC fails to build +[8] - GCC fails with eg: error: stack protector not protecting local variables: variable length buffer [-Werror=stack-protector]
CVS commit: src/lib/libc/sys
Module Name:src
Committed By: dholland
Date: Sat Mar 19 17:15:13 UTC 2016
Modified Files:
src/lib/libc/sys: ktrace.2
Log Message:
Sync documentation of struct ktr_header with reality:
- there is a ktr_version field
- the ordering of ktr_type and ktr_version is byte-order dependent
- ktr_time is now a timespec, not a timeval
- there's now a ktr_lid field
- there is no such thing as a ktr_buf field and it's certainly not
a caddr_t.
XXX: I would appreciate it if someone who knows how this stuff works
XXX: could review this file in case it's still lying in some more
XXX: subtle way.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/sys/ktrace.2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/sys/ktrace.2
diff -u src/lib/libc/sys/ktrace.2:1.19 src/lib/libc/sys/ktrace.2:1.20
--- src/lib/libc/sys/ktrace.2:1.19 Sat Mar 19 17:05:36 2016
+++ src/lib/libc/sys/ktrace.2 Sat Mar 19 17:15:13 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: ktrace.2,v 1.19 2016/03/19 17:05:36 dholland Exp $
+.\" $NetBSD: ktrace.2,v 1.20 2016/03/19 17:15:13 dholland Exp $
.\"
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@@ -104,36 +104,40 @@ The generic header is:
struct ktr_header {
int ktr_len; /* length of buf */
short ktr_type; /* trace record type */
+ short ktr_version; /* trace record version */
pid_t ktr_pid; /* process id */
char ktr_comm[MAXCOMLEN+1]; /* command name */
- struct timeval ktr_time; /* timestamp */
- caddr_t ktr_buf;
+ struct timespec ktr_time; /* timestamp */
+ lwpid_t ktr_lid;
};
.Ed
.Pp
The
.Nm ktr_len
-field specifies the length of the
+field specifies the length of the data that follows this header.
+The
.Nm ktr_type
-data that follows this header.
+and
+.Nm ktr_version
+fields (whose ordering in the structure depends on byte order)
+specify the format of this data.
The
-.Nm ktr_pid
+.Nm ktr_pid ,
+.Nm ktr_lid ,
and
.Nm ktr_comm
fields specify the process and command generating the record.
The
.Nm ktr_time
-field gives the time (with microsecond resolution)
+field gives the time (with nanosecond resolution)
that the record was generated.
-The
-.Nm ktr_buf
-is an internal kernel pointer and is not useful.
.Pp
The generic header is followed by
.Nm ktr_len
bytes of a
.Nm ktr_type
-record.
+record of version
+.Nm ktr_version .
The type specific records are defined in the
.Pa \*[Lt]sys/ktrace.h\*[Gt]
include file.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: dholland Date: Sat Mar 19 17:05:36 UTC 2016 Modified Files: src/lib/libc/sys: ktrace.2 Log Message: Update documented prerequisite includes. PR 50633 and PR 50634. Remove sys/uio.h, and swap sys/param.h for sys/types.h as sys/ktrace.h depends on MAXCOMLEN. Bump date; first time since 1993. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/lib/libc/sys/ktrace.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/ktrace.2 diff -u src/lib/libc/sys/ktrace.2:1.18 src/lib/libc/sys/ktrace.2:1.19 --- src/lib/libc/sys/ktrace.2:1.18 Tue Nov 11 08:10:02 2014 +++ src/lib/libc/sys/ktrace.2 Sat Mar 19 17:05:36 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: ktrace.2,v 1.18 2014/11/11 08:10:02 njoly Exp $ +.\" $NetBSD: ktrace.2,v 1.19 2016/03/19 17:05:36 dholland Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)ktrace.2 8.1 (Berkeley) 6/4/93 .\" -.Dd June 4, 1993 +.Dd March 19, 2016 .Dt KTRACE 2 .Os .Sh NAME @@ -38,8 +38,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h -.In sys/uio.h +.In sys/param.h .In sys/ktrace.h .Ft int .Fn ktrace "const char *tracefile" "int ops" "int trpoints" "pid_t pid"
CVS commit: src/sys/sys
Module Name:src Committed By: dholland Date: Sat Mar 19 17:04:12 UTC 2016 Modified Files: src/sys/sys: ktrace.h Log Message: PR 50633 and PR 50634 from Brad Harder: add missing includes: sys/signal.h and sys/time.h. Also add sys/uio.h which is needed and for some probably historical/obsolete reason has been documented as a prerequisite instead of included directly. This also requires sys/param.h for MAXCOMLEN (blah) but for now at least shift that to the documentation instead of including it directly as it's a sewer. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/sys/ktrace.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/sys/ktrace.h diff -u src/sys/sys/ktrace.h:1.62 src/sys/sys/ktrace.h:1.63 --- src/sys/sys/ktrace.h:1.62 Sat Jan 23 21:19:24 2016 +++ src/sys/sys/ktrace.h Sat Mar 19 17:04:12 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ktrace.h,v 1.62 2016/01/23 21:19:24 christos Exp $ */ +/* $NetBSD: ktrace.h,v 1.63 2016/03/19 17:04:12 dholland Exp $ */ /* * Copyright (c) 1988, 1993 @@ -36,6 +36,9 @@ #include #include +#include +#include +#include /* * operations to ktrace system call (KTROP(op))
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Wed Mar 16 20:17:42 UTC 2016 Modified Files: src/doc: 3RDPARTY Log Message: expat-2.1.1 out. To generate a diff of this commit: cvs rdiff -u -r1.1315 -r1.1316 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1315 src/doc/3RDPARTY:1.1316 --- src/doc/3RDPARTY:1.1315 Tue Mar 15 17:30:26 2016 +++ src/doc/3RDPARTY Wed Mar 16 20:17:42 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1315 2016/03/15 17:30:26 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1316 2016/03/16 20:17:42 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -383,7 +383,7 @@ Notes: Package: expat Version: 2.1.0 -Current Vers: 2.1.0 +Current Vers: 2.1.1 Maintainer: mrg Archive Site: http://sourceforge.net/projects/expat/files/expat/ Home Page: http://www.libexpat.org/
CVS commit: src/external/gpl3/gcc/lib/libgcc
Module Name:src
Committed By: mrg
Date: Fri Mar 18 10:08:43 UTC 2016
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
Log Message:
find all libgcc sources
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 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.31 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.32
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.31 Wed Mar 16 05:44:16 2016
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Fri Mar 18 10:08:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.31 2016/03/16 05:44:16 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.32 2016/03/18 10:08:43 mrg Exp $
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
@@ -22,6 +22,7 @@ CPPFLAGS+= -I${GCCARCH} ${GCPPFLAGS:M-D*
CPPFLAGS+= ${GCPPFLAGS:M-m*} ${GCPPFLAGS:M-f*}
CPPFLAGS+= ${G_EXTRA_HEADERS:M/*:H:u:S/^/-I/g}
CPPFLAGS+= -I${DIST}/libgcc -I${DIST}/libgcc/config
+CPPFLAGS+= -I${DIST}/libgcc/config/${MACHINE_CPU}
CPPFLAGS+= -I${DIST}/gcc -I${DIST}/include -I.
.if ${LIBGCC_MACHINE_ARCH} == "powerpc" || \
@@ -104,7 +105,7 @@ LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T}
# from the list of files we create.
.if !empty(G_LIB1ASMFUNCS)
. for f in ${G_LIB1ASMFUNCS:=.S}
-. if !exists(${DIST}/libgcc/config/${MACHINE_GNU_ARCH}/${f})
+. if !exists(${DIST}/libgcc/config/${MACHINE_CPU}/${f})
LIB1ASMFUNCS+= ${f}
. endif
. endfor
@@ -177,6 +178,7 @@ dp-bit.c: ${.CURDIR}/Makefile
#
.PATH: ${DIST}/gcc ${DIST}/gcc/cp ${DIST}/gcc/cp/inc ${DIST}/gcc/config \
+ ${DIST}/libgcc/config ${DIST}/libgcc/config/${MACHINE_CPU} \
${G_LIB2ADD:H:O:u} ${G_LIB2ADDEH:H:O:u} ${GCCARCHLIBGCC}
.include "../Makefile.tconfigh"
CVS commit: src/external/bsd/nvi/dist/ex
Module Name:src
Committed By: christos
Date: Thu Mar 17 00:19:36 UTC 2016
Modified Files:
src/external/bsd/nvi/dist/ex: ex_map.c
Log Message:
add default: to appease gcc.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/dist/ex/ex_map.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/bsd/nvi/dist/ex/ex_map.c
diff -u src/external/bsd/nvi/dist/ex/ex_map.c:1.3 src/external/bsd/nvi/dist/ex/ex_map.c:1.4
--- src/external/bsd/nvi/dist/ex/ex_map.c:1.3 Sun Jan 26 16:43:45 2014
+++ src/external/bsd/nvi/dist/ex/ex_map.c Wed Mar 16 20:19:36 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_map.c,v 1.3 2014/01/26 21:43:45 christos Exp $ */
+/* $NetBSD: ex_map.c,v 1.4 2016/03/17 00:19:36 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -16,7 +16,7 @@
static const char sccsid[] = "Id: ex_map.c,v 10.11 2001/06/25 15:19:17 skimo Exp (Berkeley) Date: 2001/06/25 15:19:17 ";
#endif /* not lint */
#else
-__RCSID("$NetBSD: ex_map.c,v 1.3 2014/01/26 21:43:45 christos Exp $");
+__RCSID("$NetBSD: ex_map.c,v 1.4 2016/03/17 00:19:36 christos Exp $");
#endif
#include
@@ -99,6 +99,8 @@ nofunc: if (stype == SEQ_COMMAND && inpu
"134|The %s character may not be remapped",
KEY_NAME(sp, input[0]));
return (1);
+ default:
+ break;
}
return (seq_set(sp, NULL, 0, input, cmdp->argv[0]->len,
cmdp->argv[1]->bp, cmdp->argv[1]->len, stype, SEQ_USERDEF));
CVS commit: src/bin/sh
Module Name:src Committed By: christos Date: Wed Mar 16 17:01:40 UTC 2016 Modified Files: src/bin/sh: syntax.h Log Message: Remove wrong unsigned cast, index can be negative. Cast char to int so that gcc does not warn. Probably better to do the offset at runtime, but that would cost more. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/bin/sh/syntax.h 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/syntax.h diff -u src/bin/sh/syntax.h:1.4 src/bin/sh/syntax.h:1.5 --- src/bin/sh/syntax.h:1.4 Wed Mar 16 11:48:01 2016 +++ src/bin/sh/syntax.h Wed Mar 16 13:01:39 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: syntax.h,v 1.4 2016/03/16 15:48:01 christos Exp $ */ +/* $NetBSD: syntax.h,v 1.5 2016/03/16 17:01:39 christos Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -68,7 +68,7 @@ /* These defines assume that the digits are contiguous (which is guaranteed) */ #define is_digit(c) ((unsigned)((c) - '0') <= 9) -#define sh_ctype(c) (is_type+SYNBASE)[(unsigned char)c] +#define sh_ctype(c) (is_type+SYNBASE)[(int)c] #define is_alpha(c) (sh_ctype(c) & (ISUPPER|ISLOWER)) #define is_name(c) (sh_ctype(c) & (ISUPPER|ISLOWER|ISUNDER)) #define is_in_name(c) (sh_ctype(c) & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT))
CVS commit: src/bin/sh
Module Name:src
Committed By: christos
Date: Wed Mar 16 15:41:55 UTC 2016
Modified Files:
src/bin/sh: arith_lex.l
Log Message:
PR bin/50959 - allow consistent use of 0X hex constants (not just 0x)
(from kre)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/bin/sh/arith_lex.l
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/arith_lex.l
diff -u src/bin/sh/arith_lex.l:1.16 src/bin/sh/arith_lex.l:1.17
--- src/bin/sh/arith_lex.l:1.16 Tue Mar 20 14:42:29 2012
+++ src/bin/sh/arith_lex.l Wed Mar 16 11:41:55 2016
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: arith_lex.l,v 1.16 2012/03/20 18:42:29 matt Exp $ */
+/* $NetBSD: arith_lex.l,v 1.17 2016/03/16 15:41:55 christos Exp $ */
/*-
* Copyright (c) 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)arith_lex.l 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: arith_lex.l,v 1.16 2012/03/20 18:42:29 matt Exp $");
+__RCSID("$NetBSD: arith_lex.l,v 1.17 2016/03/16 15:41:55 christos Exp $");
#endif
#endif /* not lint */
@@ -59,7 +59,7 @@ extern const char *arith_buf, *arith_sta
%%
[ \t\n] { ; }
-0x[0-9a-fA-F]+ { yylval = strtoimax(yytext, 0, 0); return(ARITH_NUM); }
+0[xX][0-9a-fA-F]+ { yylval = strtoimax(yytext, 0, 0); return(ARITH_NUM); }
0[0-7]* { yylval = strtoimax(yytext, 0, 0); return(ARITH_NUM); }
[1-9][0-9]* { yylval = strtoimax(yytext, 0, 0); return(ARITH_NUM); }
[A-Za-z_][A-Za-z_0-9]* { char *v = lookupvar(yytext);
CVS commit: [nick-nhusb] src/sys/arch/mips/ingenic
Module Name:src Committed By: skrll Date: Sat Mar 19 16:08:15 UTC 2016 Modified Files: src/sys/arch/mips/ingenic [nick-nhusb]: ingenic_ehci.c Log Message: Adapt to branch To generate a diff of this commit: cvs rdiff -u -r1.3.2.3 -r1.3.2.4 src/sys/arch/mips/ingenic/ingenic_ehci.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/ingenic/ingenic_ehci.c diff -u src/sys/arch/mips/ingenic/ingenic_ehci.c:1.3.2.3 src/sys/arch/mips/ingenic/ingenic_ehci.c:1.3.2.4 --- src/sys/arch/mips/ingenic/ingenic_ehci.c:1.3.2.3 Sat Mar 19 11:30:02 2016 +++ src/sys/arch/mips/ingenic/ingenic_ehci.c Sat Mar 19 16:08:15 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ingenic_ehci.c,v 1.3.2.3 2016/03/19 11:30:02 skrll Exp $ */ +/* $NetBSD: ingenic_ehci.c,v 1.3.2.4 2016/03/19 16:08:15 skrll Exp $ */ /*- * Copyright (c) 2015 Michael Lorenz @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ingenic_ehci.c,v 1.3.2.3 2016/03/19 11:30:02 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ingenic_ehci.c,v 1.3.2.4 2016/03/19 16:08:15 skrll Exp $"); #include #include @@ -160,10 +160,10 @@ ingenic_ehci_attach(device_t parent, dev sc->sc_dev = self; sc->iot = aa->aa_bst; - sc->sc_bus.dmatag = aa->aa_dmat; - sc->sc_bus.hci_private = sc; + sc->sc_bus.ub_dmatag = aa->aa_dmat; + sc->sc_bus.ub_hcpriv = sc; sc->sc_size = 0x1000; - sc->sc_bus.usbrev = USBREV_2_0; + sc->sc_bus.ub_revision = USBREV_2_0; if (aa->aa_addr == 0) aa->aa_addr = JZ_EHCI_BASE;
CVS commit: src/lib/libm/man
Module Name:src Committed By: wiz Date: Thu Mar 17 09:44:56 UTC 2016 Modified Files: src/lib/libm/man: fabs.3 Log Message: Fix typo, add whitespace for better formatting, bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/lib/libm/man/fabs.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/man/fabs.3 diff -u src/lib/libm/man/fabs.3:1.16 src/lib/libm/man/fabs.3:1.17 --- src/lib/libm/man/fabs.3:1.16 Thu Mar 17 00:00:44 2016 +++ src/lib/libm/man/fabs.3 Thu Mar 17 09:44:56 2016 @@ -26,14 +26,14 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)fabs.3 5.1 (Berkeley) 5/2/91 -.\" $NetBSD: fabs.3,v 1.16 2016/03/17 00:00:44 nros Exp $ +.\" $NetBSD: fabs.3,v 1.17 2016/03/17 09:44:56 wiz Exp $ .\" -.Dd May 2, 1991 +.Dd March 17, 2016 .Dt FABS 3 .Os .Sh NAME .Nm fabs , -.Nm fabsf, +.Nm fabsf , .Nm fabsl .Nd floating-point absolute value functions .Sh LIBRARY @@ -45,7 +45,7 @@ .Ft float .Fn fabsf "float x" .Ft long double -.Fn fabs "long double x" +.Fn fabsl "long double x" .Sh DESCRIPTION The .Fn fabs ,
CVS commit: src
Module Name:src Committed By: nros Date: Thu Mar 17 18:29:59 UTC 2016 Modified Files: src/distrib/sets/lists/comp: mi src/lib/libm: Makefile src/lib/libm/man: ldexp.3 Log Message: Added ldexpl to ldexp manpage since it is missing. Also added ldexpf manpage link since it is missing. To generate a diff of this commit: cvs rdiff -u -r1.2022 -r1.2023 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.175 -r1.176 src/lib/libm/Makefile cvs rdiff -u -r1.4 -r1.5 src/lib/libm/man/ldexp.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2022 src/distrib/sets/lists/comp/mi:1.2023 --- src/distrib/sets/lists/comp/mi:1.2022 Thu Mar 17 00:00:44 2016 +++ src/distrib/sets/lists/comp/mi Thu Mar 17 18:29:58 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2022 2016/03/17 00:00:44 nros Exp $ +# $NetBSD: mi,v 1.2023 2016/03/17 18:29:58 nros Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -7532,6 +7532,8 @@ ./usr/share/man/cat3/ldap_value_free.0 comp-ldap-catman ldap,.cat ./usr/share/man/cat3/ldap_value_free_len.0 comp-ldap-catman ldap,.cat ./usr/share/man/cat3/ldexp.0 comp-c-catman .cat +./usr/share/man/cat3/ldexpf.0 comp-c-catman .cat +./usr/share/man/cat3/ldexpl.0 comp-c-catman .cat ./usr/share/man/cat3/ldiv.0 comp-c-catman .cat ./usr/share/man/cat3/leaveok.0 comp-c-catman .cat ./usr/share/man/cat3/lfind.0 comp-c-catman .cat @@ -14511,6 +14513,8 @@ ./usr/share/man/html3/ldap_value_free.html comp-ldap-htmlman ldap,html ./usr/share/man/html3/ldap_value_free_len.html comp-ldap-htmlman ldap,html ./usr/share/man/html3/ldexp.html comp-c-htmlman html +./usr/share/man/html3/ldexpf.html comp-c-htmlman html +./usr/share/man/html3/ldexpl.html comp-c-htmlman html ./usr/share/man/html3/ldiv.html comp-c-htmlman html ./usr/share/man/html3/leaveok.html comp-c-htmlman html ./usr/share/man/html3/lfind.html comp-c-htmlman html @@ -21445,6 +21449,8 @@ ./usr/share/man/man3/ldap_value_free.3 comp-ldap-man ldap,.man ./usr/share/man/man3/ldap_value_free_len.3 comp-ldap-man ldap,.man ./usr/share/man/man3/ldexp.3 comp-c-man .man +./usr/share/man/man3/ldexpf.3 comp-c-man .man +./usr/share/man/man3/ldexpl.3 comp-c-man .man ./usr/share/man/man3/ldiv.3 comp-c-man .man ./usr/share/man/man3/leaveok.3 comp-c-man .man ./usr/share/man/man3/lfind.3 comp-c-man .man Index: src/lib/libm/Makefile diff -u src/lib/libm/Makefile:1.175 src/lib/libm/Makefile:1.176 --- src/lib/libm/Makefile:1.175 Thu Mar 17 00:00:44 2016 +++ src/lib/libm/Makefile Thu Mar 17 18:29:59 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.175 2016/03/17 00:00:44 nros Exp $ +# $NetBSD: Makefile,v 1.176 2016/03/17 18:29:59 nros Exp $ # # @(#)Makefile 5.1beta 93/09/24 # @@ -352,6 +352,8 @@ MLINKS+=ilogb.3 ilogbf.3 ilogb.3 ilogbl. MLINKS+=isinff.3 isnanf.3 MLINKS+=j0.3 j0f.3 j0.3 j1.3 j0.3 j1f.3 j0.3 jn.3 j0.3 jnf.3 \ j0.3 y0.3 j0.3 y0f.3 j0.3 y1.3 j0.3 y1f.3 j0.3 yn.3 j0.3 ynf.3 +MLINKS+=ldexp.3 ldexpf.3 \ + ldexp.3 ldexpl.3 MLINKS+=lgamma.3 lgammaf.3 lgamma.3 lgamma_r.3 lgamma.3 lgammaf_r.3 \ lgamma.3 gamma.3 lgamma.3 gammaf.3 lgamma.3 gamma_r.3 \ lgamma.3 gammaf_r.3 lgamma.3 tgamma.3 lgamma.3 tgammaf.3 Index: src/lib/libm/man/ldexp.3 diff -u src/lib/libm/man/ldexp.3:1.4 src/lib/libm/man/ldexp.3:1.5 --- src/lib/libm/man/ldexp.3:1.4 Sun Sep 18 05:33:13 2011 +++ src/lib/libm/man/ldexp.3 Thu Mar 17 18:29:59 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: ldexp.3,v 1.4 2011/09/18 05:33:13 jruoho Exp $ +.\" $NetBSD: ldexp.3,v 1.5 2016/03/17 18:29:59 nros Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -33,12 +33,13 @@ .\" .\" @(#)ldexp.3 8.2 (Berkeley) 4/19/94 .\" -.Dd September 18, 2011 +.Dd March 17, 2016 .Dt LDEXP 3 .Os .Sh NAME .Nm ldexp , -.Nm ldexpf +.Nm ldexpf , +.Nm ldexpl .Nd multiply floating-point number by integral power of 2 .Sh LIBRARY .Lb libm @@ -48,6 +49,8 @@ .Fn ldexp "double x" "int exp" .Ft float .Fn ldexpf "float x" "int exp" +.Ft long double +.Fn ldexpl "long double x" "int exp" .Sh DESCRIPTION The .Fn ldexp
CVS commit: src/external/bsd/flex/dist/src
Module Name:src
Committed By: nakayama
Date: Thu Mar 17 15:28:00 UTC 2016
Modified Files:
src/external/bsd/flex/dist/src: initparse.c initscan.c
Log Message:
Regen without #line directives.
- nbyacc -l -d -o initparse.c parse.y
- nblex -L -t -p scan.l > initscan.c
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/flex/dist/src/initparse.c \
src/external/bsd/flex/dist/src/initscan.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/bsd/flex/dist/src/initparse.c
diff -u src/external/bsd/flex/dist/src/initparse.c:1.1 src/external/bsd/flex/dist/src/initparse.c:1.2
--- src/external/bsd/flex/dist/src/initparse.c:1.1 Sat Jan 9 17:39:52 2016
+++ src/external/bsd/flex/dist/src/initparse.c Thu Mar 17 15:28:00 2016
@@ -19,7 +19,6 @@
#define YYPURE 0
-#line 37 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
/* Copyright (c) 1990 The Regents of the University of California. */
/* All rights reserved. */
@@ -51,7 +50,7 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
#include "flexdef.h"
-__RCSID("$NetBSD: initparse.c,v 1.1 2016/01/09 17:39:52 christos Exp $");
+__RCSID("$NetBSD: initparse.c,v 1.2 2016/03/17 15:28:00 nakayama Exp $");
#include "tables.h"
@@ -101,7 +100,6 @@ int previous_continued_action; /* whethe
*/
#define YYSTYPE int
-#line 105 "parse.c"
#if ! defined(YYSTYPE) && ! defined(YYSTYPE_IS_DECLARED)
/* Default: YYSTYPE is the semantic value type. */
@@ -606,7 +604,6 @@ typedef struct {
} YYSTACKDATA;
/* variables for the parser stack */
static YYSTACKDATA yystack;
-#line 951 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
/* build_eof_action - build the "<>" action for the active start
@@ -750,7 +747,6 @@ const char *msg;
{
(void)msg;
}
-#line 754 "parse.c"
#if YYDEBUG
#include /* needed for printf */
@@ -953,7 +949,6 @@ yyreduce:
switch (yyn)
{
case 1:
-#line 122 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ /* add default rule */
int def_rule;
@@ -982,7 +977,6 @@ case 1:
}
break;
case 2:
-#line 151 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ /* initialize for processing rules */
/* Create default DFA start condition. */
@@ -990,11 +984,9 @@ case 2:
}
break;
case 6:
-#line 162 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ synerr( _("unknown error processing section 1") ); }
break;
case 7:
-#line 166 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{
check_options();
scon_stk = allocate_integer_array( lastsc + 1 );
@@ -1002,62 +994,48 @@ case 7:
}
break;
case 8:
-#line 174 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ xcluflg = false; }
break;
case 9:
-#line 177 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ xcluflg = true; }
break;
case 10:
-#line 181 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ scinstal( nmstr, xcluflg ); }
break;
case 11:
-#line 184 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ scinstal( nmstr, xcluflg ); }
break;
case 12:
-#line 187 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ synerr( _("bad start condition list") ); }
break;
case 16:
-#line 198 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{
outfilename = copy_string( nmstr );
did_outfilename = 1;
}
break;
case 17:
-#line 203 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ extra_type = copy_string( nmstr ); }
break;
case 18:
-#line 205 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ prefix = copy_string( nmstr ); }
break;
case 19:
-#line 207 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ yyclass = copy_string( nmstr ); }
break;
case 20:
-#line 209 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ headerfilename = copy_string( nmstr ); }
break;
case 21:
-#line 211 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ tablesext = true; tablesfilename = copy_string( nmstr ); }
break;
case 22:
-#line 215 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ scon_stk_ptr = yystack.l_mark[-3]; }
break;
case 23:
-#line 217 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{ scon_stk_ptr = yystack.l_mark[-3]; }
break;
case 25:
-#line 222 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{
/* Initialize for a parse of one rule. */
trlcontxt = variable_trail_rule = varlength = false;
@@ -1070,7 +1048,6 @@ case 25:
}
break;
case 26:
-#line 235 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{
pat = yystack.l_mark[0];
finish_rule( pat, variable_trail_rule,
@@ -1107,7 +1084,6 @@ case 26:
}
break;
case 27:
-#line 271 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
{
pat =
CVS commit: src/external/cddl/osnet/dist/tools/ctf/cvt
Module Name:src Committed By: christos Date: Fri Mar 18 16:32:04 UTC 2016 Modified Files: src/external/cddl/osnet/dist/tools/ctf/cvt: dwarf.c Log Message: fix printf format To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.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/cddl/osnet/dist/tools/ctf/cvt/dwarf.c diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.20 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.21 --- src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.20 Fri Mar 18 10:55:34 2016 +++ src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c Fri Mar 18 12:32:03 2016 @@ -800,7 +800,7 @@ die_array_resolve(tdesc_t *tdp, tdesc_t if (tdp->t_flags & TDESC_F_RESOLVED) return (1); - debug(3, "trying to resolve array %#x (cont %#x/%zu)\n", tdp->t_id, + debug(3, "trying to resolve array %#x (cont %#x/%d)\n", tdp->t_id, tdp->t_ardef->ad_contents->t_id, tdp->t_ardef->ad_contents->t_size);
CVS commit: src/external/cddl/osnet/dist/tools/ctf/cvt
Module Name:src
Committed By: christos
Date: Fri Mar 18 14:55:34 UTC 2016
Modified Files:
src/external/cddl/osnet/dist/tools/ctf/cvt: ctftools.h dwarf.c merge.c
traverse.c
Log Message:
- Add processing for c++ references.
- Make sure we load the DIE that contains the types of array elements so
we can resolve them later.
- Print t_id (die offsets) in hex.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h
cvs rdiff -u -r1.19 -r1.20 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/traverse.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/cddl/osnet/dist/tools/ctf/cvt/ctftools.h
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h:1.5 src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h:1.6
--- src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h:1.5 Thu Feb 4 12:40:55 2016
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h Fri Mar 18 10:55:34 2016
@@ -137,6 +137,7 @@ typedef enum stabtype {
STABTYPE_FIRST, /* do not use */
INTRINSIC,
POINTER,
+ REFERENCE,
ARRAY,
FUNCTION,
STRUCT,
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.19 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.20
--- src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.19 Tue Mar 1 09:52:14 2016
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c Fri Mar 18 10:55:34 2016
@@ -181,6 +181,7 @@ tdesc_size(tdesc_t *tdp)
switch (tdp->t_type) {
case INTRINSIC:
case POINTER:
+ case REFERENCE:
case ARRAY:
case FUNCTION:
case STRUCT:
@@ -189,6 +190,7 @@ tdesc_size(tdesc_t *tdp)
return (tdp->t_size);
case FORWARD:
+ debug(3, "type is forward for %#x\n", tdp->t_id);
return (0);
case TYPEDEF:
@@ -199,10 +201,11 @@ tdesc_size(tdesc_t *tdp)
continue;
case 0: /* not yet defined */
+ debug(3, "type is undefined for %#x\n", tdp->t_id);
return (0);
default:
- terminate("tdp %u: tdesc_size on unknown type %d\n",
+ terminate("tdp %u: tdesc_size on unknown type %#x\n",
tdp->t_id, tdp->t_type);
}
}
@@ -222,9 +225,11 @@ tdesc_bitsize(tdesc_t *tdp)
case UNION:
case ENUM:
case POINTER:
+ case REFERENCE:
return (tdp->t_size * NBBY);
case FORWARD:
+ debug(3, "bitsize is forward for %d\n", tdp->t_id);
return (0);
case TYPEDEF:
@@ -235,6 +240,7 @@ tdesc_bitsize(tdesc_t *tdp)
continue;
case 0: /* not yet defined */
+ debug(3, "bitsize is undefined for %d\n", tdp->t_id);
return (0);
default:
@@ -664,10 +670,12 @@ tdesc_array_create(dwarf_t *dw, Dwarf_Di
if ((dim2 = die_sibling(dw, dim)) == NULL) {
ctdp = arrtdp;
+ debug(3, "die %ju: sibling type %#x for dimension\n",
+ (uintmax_t)die_off(dw, dim), ctdp->t_id);
} else if (die_tag(dw, dim2) == DW_TAG_subrange_type) {
ctdp = xcalloc(sizeof (tdesc_t));
ctdp->t_id = mfgtid_next(dw);
- debug(3, "die %ju: creating new type %u for sub-dimension\n",
+ debug(3, "die %ju: creating new type %#x for sub-dimension\n",
(uintmax_t)die_off(dw, dim2), ctdp->t_id);
tdesc_array_create(dw, dim2, arrtdp, ctdp);
} else {
@@ -706,6 +714,8 @@ tdesc_array_create(dwarf_t *dw, Dwarf_Di
*/
ar->ad_idxtype = tdesc_intr_long(dw);
ar->ad_contents = ctdp;
+ debug(3, "die %ju: hi mom sibling type %#x for dimension\n",
+ (uintmax_t)die_off(dw, dim), ctdp->t_id);
if (ar->ad_contents->t_size != 0) {
dimtdp->t_size = ar->ad_contents->t_size * ar->ad_nelems;
@@ -733,6 +743,17 @@ die_array_create(dwarf_t *dw, Dwarf_Die
terminate("die %ju: failed to retrieve array bounds\n",
(uintmax_t)off);
+ if (arrtdp->t_type == 0) {
+ /*
+ * Add the die that contains the type of the array elements
+ * to the the ones we process; XXX: no public API for that?
+ */
+ extern Dwarf_Die _dwarf_die_find(Dwarf_Die, Dwarf_Unsigned);
+ Dwarf_Die elem = _dwarf_die_find(arr, arrtdp->t_id);
+ if (elem != NULL)
+ die_create_one(dw, elem);
+ }
+
tdesc_array_create(dw, dim, arrtdp, tdp);
if (die_unsigned(dw, arr, DW_AT_byte_size, , 0)) {
@@ -779,12 +800,13 @@ die_array_resolve(tdesc_t *tdp, tdesc_t
if (tdp->t_flags & TDESC_F_RESOLVED)
return (1);
- debug(3, "trying to resolve array %d (cont %d)\n", tdp->t_id,
- tdp->t_ardef->ad_contents->t_id);
+ debug(3, "trying to resolve array %#x (cont %#x/%zu)\n", tdp->t_id,
+ tdp->t_ardef->ad_contents->t_id,
+ tdp->t_ardef->ad_contents->t_size);
if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0 &&
(tdp->t_ardef->ad_contents->t_flags & TDESC_F_RESOLVED) == 0) {
- debug(3, "unable to resolve array %s (%d) contents %d\n",
+ debug(3, "unable to resolve array %s (%#x)
CVS commit: src/include
Module Name:src Committed By: christos Date: Thu Mar 17 00:15:28 UTC 2016 Modified Files: src/include: bitstring.h Log Message: appease gcc-5 |= #$@#% To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/include/bitstring.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/bitstring.h diff -u src/include/bitstring.h:1.12 src/include/bitstring.h:1.13 --- src/include/bitstring.h:1.12 Fri Nov 20 15:37:08 2015 +++ src/include/bitstring.h Wed Mar 16 20:15:27 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: bitstring.h,v 1.12 2015/11/20 20:37:08 christos Exp $ */ +/* $NetBSD: bitstring.h,v 1.13 2016/03/17 00:15:27 christos Exp $ */ /* * Copyright (c) 1989, 1993 @@ -81,7 +81,8 @@ typedef unsigned char bitstr_t; /* set bit N of bitstring name */ #define bit_set(name, bit) \ - /*LINTED bitwise on signed*/((name)[_bit_byte(bit)] |= _bit_mask(bit)) + /*LINTED bitwise on signed*/ \ + ((name)[_bit_byte(bit)] = _bit_mask(bit) | (name)[bit_byte(bit)) /* clear bit N of bitstring name */ #define bit_clear(name, bit) \
CVS commit: src/sbin/resize_ffs
Module Name:src
Committed By: christos
Date: Thu Mar 17 01:41:54 UTC 2016
Modified Files:
src/sbin/resize_ffs: resize_ffs.c
Log Message:
fix pasto
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sbin/resize_ffs/resize_ffs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/resize_ffs/resize_ffs.c
diff -u src/sbin/resize_ffs/resize_ffs.c:1.45 src/sbin/resize_ffs/resize_ffs.c:1.46
--- src/sbin/resize_ffs/resize_ffs.c:1.45 Wed Mar 16 20:54:53 2016
+++ src/sbin/resize_ffs/resize_ffs.c Wed Mar 16 21:41:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: resize_ffs.c,v 1.45 2016/03/17 00:54:53 christos Exp $ */
+/* $NetBSD: resize_ffs.c,v 1.46 2016/03/17 01:41:54 christos Exp $ */
/* From sources sent on February 17, 2003 */
/*-
* As its sole author, I explicitly place this code in the public
@@ -36,7 +36,7 @@
*/
#include
-__RCSID("$NetBSD: resize_ffs.c,v 1.45 2016/03/17 00:54:53 christos Exp $");
+__RCSID("$NetBSD: resize_ffs.c,v 1.46 2016/03/17 01:41:54 christos Exp $");
#include
#include
@@ -1274,7 +1274,7 @@ loadinodes(void)
} else {
if (needswap) {
ffs_dinode1_swap(&(dp1[i]), &(dp1[i]));
- for (j = 0; j < UFS_NIADDR; j++)
+ for (j = 0; j < UFS_NDADDR; j++)
dp1[i].di_db[j] =
bswap32(dp1[i].di_db[j]);
for (j = 0; j < UFS_NIADDR; j++)
CVS commit: [nick-nhusb] src/sys/arch/arm/samsung
Module Name:src
Committed By: skrll
Date: Sat Mar 19 14:16:46 UTC 2016
Modified Files:
src/sys/arch/arm/samsung [nick-nhusb]: exynos_ehci.c exynos_ohci.c
Log Message:
Adapt to the branch.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/arm/samsung/exynos_ehci.c \
src/sys/arch/arm/samsung/exynos_ohci.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/samsung/exynos_ehci.c
diff -u src/sys/arch/arm/samsung/exynos_ehci.c:1.1.2.2 src/sys/arch/arm/samsung/exynos_ehci.c:1.1.2.3
--- src/sys/arch/arm/samsung/exynos_ehci.c:1.1.2.2 Sat Mar 19 11:29:57 2016
+++ src/sys/arch/arm/samsung/exynos_ehci.c Sat Mar 19 14:16:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_ehci.c,v 1.1.2.2 2016/03/19 11:29:57 skrll Exp $ */
+/* $NetBSD: exynos_ehci.c,v 1.1.2.3 2016/03/19 14:16:46 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: exynos_ehci.c,v 1.1.2.2 2016/03/19 11:29:57 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_ehci.c,v 1.1.2.3 2016/03/19 14:16:46 skrll Exp $");
#include
#include
@@ -95,9 +95,9 @@ exynos_ehci_attach(device_t parent, devi
sc->sc_dev = self;
sc->iot = faa->faa_bst;
sc->sc_size = size;
- sc->sc_bus.dmatag = faa->faa_dmat;
- sc->sc_bus.hci_private = sc;
- sc->sc_bus.usbrev = USBREV_2_0;
+ sc->sc_bus.ub_dmatag = faa->faa_dmat;
+ sc->sc_bus.ub_hcpriv = sc;
+ sc->sc_bus.ub_revision = USBREV_2_0;
sc->sc_ncomp = 0;
strlcpy(sc->sc_vendor, "exynos", sizeof(sc->sc_vendor));
Index: src/sys/arch/arm/samsung/exynos_ohci.c
diff -u src/sys/arch/arm/samsung/exynos_ohci.c:1.1.2.2 src/sys/arch/arm/samsung/exynos_ohci.c:1.1.2.3
--- src/sys/arch/arm/samsung/exynos_ohci.c:1.1.2.2 Sat Mar 19 11:29:57 2016
+++ src/sys/arch/arm/samsung/exynos_ohci.c Sat Mar 19 14:16:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_ohci.c,v 1.1.2.2 2016/03/19 11:29:57 skrll Exp $ */
+/* $NetBSD: exynos_ohci.c,v 1.1.2.3 2016/03/19 14:16:46 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: exynos_ohci.c,v 1.1.2.2 2016/03/19 11:29:57 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_ohci.c,v 1.1.2.3 2016/03/19 14:16:46 skrll Exp $");
#include
#include
@@ -95,8 +95,8 @@ exynos_ohci_attach(device_t parent, devi
sc->sc_dev = self;
sc->iot = faa->faa_bst;
sc->sc_size = size;
- sc->sc_bus.dmatag = faa->faa_dmat;
- sc->sc_bus.hci_private = sc;
+ sc->sc_bus.ub_dmatag = faa->faa_dmat;
+ sc->sc_bus.ub_hcpriv = sc;
error = bus_space_map(sc->iot, addr, size, 0, >ioh);
if (error) {
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Wed Mar 16 18:10:00 UTC 2016 Modified Files: src/distrib/sets/lists/comp: md.sparc md.sparc64 Log Message: updates sparc* sets for GCC 5.3. To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/lists/comp/md.sparc cvs rdiff -u -r1.195 -r1.196 src/distrib/sets/lists/comp/md.sparc64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.sparc diff -u src/distrib/sets/lists/comp/md.sparc:1.88 src/distrib/sets/lists/comp/md.sparc:1.89 --- src/distrib/sets/lists/comp/md.sparc:1.88 Wed Aug 12 21:56:27 2015 +++ src/distrib/sets/lists/comp/md.sparc Wed Mar 16 18:10:00 2016 @@ -1,7 +1,9 @@ -# $NetBSD: md.sparc,v 1.88 2015/08/12 21:56:27 nakayama Exp $ +# $NetBSD: md.sparc,v 1.89 2016/03/16 18:10:00 mrg Exp $ ./usr/include/gcc-4.5/tgmath.h comp-c-include obsolete -./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc -./usr/include/gcc-4.8/visintrin.h comp-c-include gcccmds,gcc +./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc=48 +./usr/include/gcc-4.8/visintrin.h comp-c-include gcccmds,gcc=48 +./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=53 +./usr/include/gcc-5/visintrin.h comp-c-include gcccmds,gcc=53 ./usr/include/ieeefp.hcomp-c-include ./usr/include/sparccomp-c-include ./usr/include/sparc/_G_config.h comp-obsolete obsolete Index: src/distrib/sets/lists/comp/md.sparc64 diff -u src/distrib/sets/lists/comp/md.sparc64:1.195 src/distrib/sets/lists/comp/md.sparc64:1.196 --- src/distrib/sets/lists/comp/md.sparc64:1.195 Wed Aug 12 21:56:27 2015 +++ src/distrib/sets/lists/comp/md.sparc64 Wed Mar 16 18:10:00 2016 @@ -1,11 +1,13 @@ -# $NetBSD: md.sparc64,v 1.195 2015/08/12 21:56:27 nakayama Exp $ +# $NetBSD: md.sparc64,v 1.196 2016/03/16 18:10:00 mrg Exp $ ./usr/include/g++/bits/sparc comp-c-include compat ./usr/include/g++/bits/sparc/c++config.h comp-c-include gcc,compat ./usr/include/g++/bits/sparc64 comp-c-include compat ./usr/include/g++/bits/sparc64/c++config.h comp-c-include gcc,compat ./usr/include/gcc-4.5/tgmath.h comp-c-include obsolete -./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc -./usr/include/gcc-4.8/visintrin.h comp-c-include gcccmds,gcc +./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc=48 +./usr/include/gcc-4.8/visintrin.h comp-c-include gcccmds,gcc=48 +./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=53 +./usr/include/gcc-5/visintrin.h comp-c-include gcccmds,gcc=53 ./usr/include/ieeefp.hcomp-c-include ./usr/include/sparccomp-c-include ./usr/include/sparc/_G_config.h comp-obsolete obsolete
CVS commit: src/lib
Module Name:src
Committed By: mrg
Date: Thu Mar 17 00:09:47 UTC 2016
Modified Files:
src/lib: Makefile
Log Message:
don't build libmudflap* for GCC 5.3.
also, disable libasan here as well (for now).
To generate a diff of this commit:
cvs rdiff -u -r1.240 -r1.241 src/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/lib/Makefile
diff -u src/lib/Makefile:1.240 src/lib/Makefile:1.241
--- src/lib/Makefile:1.240 Mon Feb 29 20:59:35 2016
+++ src/lib/Makefile Thu Mar 17 00:09:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.240 2016/02/29 20:59:35 riastradh Exp $
+# $NetBSD: Makefile,v 1.241 2016/03/17 00:09:47 mrg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include
@@ -80,8 +80,10 @@ SUBDIR+= ../external/gpl2/libmalloc
.if (${MKGCC} != "no")
SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libobjc
SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libgomp
+. if ${HAVE_GCC} == 48
SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libmudflap
SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libmudflapth
+. endif
# Should probably move GMP, MPFR and MPC builds into the GCC >= 4.5
# specific build area, but we get better parallelism this way.
# We don't build compat versions of these.
@@ -171,9 +173,11 @@ SUBDIR+= ../external/gpl3/${EXTERNAL_GCC
SUBDIR+= .WAIT
SANITIZER_DIR=../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libasan
+.if !defined(HAVE_GCC) || ${HAVE_GCC} != 53
.if exists(${SANITIZER_DIR})
SUBDIR+= ${SANITIZER_DIR}
.endif
+.endif
SUBDIR+= ../external/bsd/libarchive/lib # depends on libxz
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Wed Mar 16 21:07:59 UTC 2016
Modified Files:
src/crypto/external/bsd/openssh/dist: ssh-keygen.c
Log Message:
CID 1356389: Remove TOCTOU.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/ssh-keygen.c
diff -u src/crypto/external/bsd/openssh/dist/ssh-keygen.c:1.21 src/crypto/external/bsd/openssh/dist/ssh-keygen.c:1.22
--- src/crypto/external/bsd/openssh/dist/ssh-keygen.c:1.21 Fri Mar 11 08:15:02 2016
+++ src/crypto/external/bsd/openssh/dist/ssh-keygen.c Wed Mar 16 17:07:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ssh-keygen.c,v 1.21 2016/03/11 13:15:02 christos Exp $ */
+/* $NetBSD: ssh-keygen.c,v 1.22 2016/03/16 21:07:59 christos Exp $ */
/* $OpenBSD: ssh-keygen.c,v 1.288 2016/02/15 09:47:49 dtucker Exp $ */
/*
@@ -15,7 +15,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: ssh-keygen.c,v 1.21 2016/03/11 13:15:02 christos Exp $");
+__RCSID("$NetBSD: ssh-keygen.c,v 1.22 2016/03/16 21:07:59 christos Exp $");
#include
#include
#include
@@ -1915,8 +1915,6 @@ do_show_cert(struct passwd *pw)
if (!have_identity)
ask_filename(pw, "Enter file in which the key is");
- if (strcmp(identity_file, "-") != 0 && stat(identity_file, ) < 0)
- fatal("%s: %s: %s", __progname, identity_file, strerror(errno));
path = identity_file;
if (strcmp(path, "-") == 0) {
CVS commit: src/tools/ctfconvert
Module Name:src
Committed By: christos
Date: Thu Mar 17 18:43:29 UTC 2016
Modified Files:
src/tools/ctfconvert: Makefile
Log Message:
Add DPADD's
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tools/ctfconvert/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/ctfconvert/Makefile
diff -u src/tools/ctfconvert/Makefile:1.5 src/tools/ctfconvert/Makefile:1.6
--- src/tools/ctfconvert/Makefile:1.5 Sun Mar 9 13:12:03 2014
+++ src/tools/ctfconvert/Makefile Thu Mar 17 14:43:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/03/09 17:12:03 christos Exp $
+# $NetBSD: Makefile,v 1.6 2016/03/17 18:43:29 christos Exp $
NOMAN= # defined
@@ -50,8 +50,11 @@ CTFOBJ!= cd ${.CURDIR}/../libctf && ${PR
DWARFOBJ!= cd ${.CURDIR}/../libdwarf && ${PRINTOBJDIR}
ELFOBJ!= cd ${.CURDIR}/../libelf && ${PRINTOBJDIR}
LDADD+= -L${CTFOBJ} -lctf
+DPADD+= ${CTFOBJ}/libctf.a
LDADD+= -L${DWARFOBJ} -ldwarf
+DPADD+= ${DWARFOBJ}/libdwarf.a
LDADD+= -L${ELFOBJ} -lelf
+DPADD+= ${ELFOBJ}/libelf.a
.PATH: ${OPENSOLARIS_DISTDIR}/tools/ctf/common
.PATH: ${OPENSOLARIS_DISTDIR}/tools/ctf/cvt
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: christos Date: Wed Mar 16 21:14:35 UTC 2016 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add the shift test To generate a diff of this commit: cvs rdiff -u -r1.667 -r1.668 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.667 src/distrib/sets/lists/tests/mi:1.668 --- src/distrib/sets/lists/tests/mi:1.667 Wed Mar 16 11:51:15 2016 +++ src/distrib/sets/lists/tests/mi Wed Mar 16 17:14:35 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.667 2016/03/16 15:51:15 christos Exp $ +# $NetBSD: mi,v 1.668 2016/03/16 21:14:35 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1265,6 +1265,7 @@ ./usr/tests/bin/sh/t_redir tests-bin-tests compattestfile,atf ./usr/tests/bin/sh/t_redircloexec tests-bin-tests compattestfile,atf ./usr/tests/bin/sh/t_set_e tests-bin-tests compattestfile,atf +./usr/tests/bin/sh/t_shift tests-bin-tests compattestfile,atf ./usr/tests/bin/sh/t_ulimit tests-bin-tests compattestfile,atf ./usr/tests/bin/sh/t_varquote tests-bin-tests compattestfile,atf ./usr/tests/bin/sh/t_varval tests-bin-tests compattestfile,atf
CVS commit: src/bin/ksh
Module Name:src
Committed By: christos
Date: Thu Mar 17 13:54:32 UTC 2016
Modified Files:
src/bin/ksh: siglist.sh
Log Message:
put back the complex sed/awk since the code can't handle unsorted or repeated
entries (Rin Okuyama)
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/bin/ksh/siglist.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ksh/siglist.sh
diff -u src/bin/ksh/siglist.sh:1.10 src/bin/ksh/siglist.sh:1.11
--- src/bin/ksh/siglist.sh:1.10 Wed Mar 16 19:01:33 2016
+++ src/bin/ksh/siglist.sh Thu Mar 17 09:54:31 2016
@@ -1,14 +1,46 @@
#!/bin/sh
-# $NetBSD: siglist.sh,v 1.10 2016/03/16 23:01:33 christos Exp $
+# $NetBSD: siglist.sh,v 1.11 2016/03/17 13:54:31 christos Exp $
#
# Script to generate a sorted, complete list of signals, suitable
# for inclusion in trap.c as array initializer.
#
+set -e
+
+: ${AWK:=awk}
: ${SED:=sed}
-# The trap here to make up for a bug in bash (1.14.3(1)) that calls the trap
+in=tmpi$$.c
+out=tmpo$$.c
+ecode=1
+trapsigs='0 1 2 13 15'
+trap 'rm -f $in $out; trap 0; exit $ecode' $trapsigs
-${SED} -e '/^[ ]*#/d' -e 's/^[ ]*\([^ ][^ ]*\)[ ][ ]*\(.*[^ ]\)[ ]*$/#ifdef SIG\1\
- { .signal = SIG\1 , .name = "\1", .mess = "\2" },\
-#endif/'
+CPP="${1-cc -E}"
+
+# The trap here to make up for a bug in bash (1.14.3(1)) that calls the trap
+(trap $trapsigs;
+ echo '#include "sh.h"';
+ echo ' { QwErTy SIGNALS , "DUMMY" , "hook for number of signals" },';
+ ${SED} -e '/^[ ]*#/d' -e 's/^[ ]*\([^ ][^ ]*\)[ ][ ]*\(.*[^ ]\)[ ]*$/#ifdef SIG\1\
+ { QwErTy .signal = SIG\1 , .name = "\1", .mess = "\2" },\
+#endif/') > $in
+# work around for gcc 5
+$CPP $in | grep -v '^#' | tr -d '\n' | sed 's/},/},\
+/g' > $out
+${SED} -n 's/{ QwErTy/{/p' < $out | ${AWK} '{print NR, $0}' | sort -k 5n -k 1n |
+${SED} 's/^[0-9]* //' |
+${AWK} 'BEGIN { last=0; nsigs=0; }
+ {
+ if ($4 ~ /^[0-9][0-9]*$/ && $5 == ",") {
+ n = $4;
+ if (n > 0 && n != last) {
+ while (++last < n) {
+ printf "\t{ .signal = %d , .name = NULL, .mess = `Signal %d` } ,\n", last, last;
+ }
+ print;
+ }
+ }
+ }' |
+tr '`' '"' | grep -v '"DUMMY"'
+ecode=0
CVS commit: src/include
Module Name:src Committed By: christos Date: Thu Mar 17 00:42:49 UTC 2016 Modified Files: src/include: stdio.h Log Message: gcc 5, my patience is waning. To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/include/stdio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/stdio.h diff -u src/include/stdio.h:1.96 src/include/stdio.h:1.97 --- src/include/stdio.h:1.96 Tue Mar 24 03:44:52 2015 +++ src/include/stdio.h Wed Mar 16 20:42:49 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: stdio.h,v 1.96 2015/03/24 07:44:52 wiz Exp $ */ +/* $NetBSD: stdio.h,v 1.97 2016/03/17 00:42:49 christos Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -483,7 +483,7 @@ static __inline int __sputc(int _c, FILE #define __sfeof(p) (((p)->_flags & __SEOF) != 0) #define __sferror(p) (((p)->_flags & __SERR) != 0) -#define __sclearerr(p) ((void)((p)->_flags &= ~(__SERR|__SEOF))) +#define __sclearerr(p) ((void)((p)->_flags &= (unsigned short)~(__SERR|__SEOF))) #define __sfileno(p) \ ((p)->_file == -1 ? -1 : (int)(unsigned short)(p)->_file)
CVS commit: src/usr.bin/infocmp
Module Name:src
Committed By: christos
Date: Wed Mar 16 21:01:28 UTC 2016
Modified Files:
src/usr.bin/infocmp: infocmp.c
Log Message:
CID 1356387: Wrong sizeof
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/infocmp/infocmp.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/infocmp/infocmp.c
diff -u src/usr.bin/infocmp/infocmp.c:1.10 src/usr.bin/infocmp/infocmp.c:1.11
--- src/usr.bin/infocmp/infocmp.c:1.10 Wed Mar 9 15:02:33 2016
+++ src/usr.bin/infocmp/infocmp.c Wed Mar 16 17:01:28 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: infocmp.c,v 1.10 2016/03/09 20:02:33 christos Exp $ */
+/* $NetBSD: infocmp.c,v 1.11 2016/03/16 21:01:28 christos Exp $ */
/*
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include
-__RCSID("$NetBSD: infocmp.c,v 1.10 2016/03/09 20:02:33 christos Exp $");
+__RCSID("$NetBSD: infocmp.c,v 1.11 2016/03/16 21:01:28 christos Exp $");
#include
@@ -506,7 +506,7 @@ use_terms(TERMINAL *term, size_t nuse, c
TERMUSERDEF *ud, *tud;
size_t i, j, agree, absent, data;
- terms = ecalloc(nuse, sizeof(**terms));
+ terms = ecalloc(nuse, sizeof(*terms));
for (i = 0; i < nuse; i++) {
if (strcmp(term->name, *uterms) == 0)
errx(EXIT_FAILURE, "cannot use same terminal");
CVS commit: src/bin/ksh
Module Name:src
Committed By: christos
Date: Wed Mar 16 23:01:34 UTC 2016
Modified Files:
src/bin/ksh: Makefile siglist.sh
Log Message:
We don't need all this magic to build the signals lists. Do the work at
compile time.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/bin/ksh/Makefile
cvs rdiff -u -r1.9 -r1.10 src/bin/ksh/siglist.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ksh/Makefile
diff -u src/bin/ksh/Makefile:1.31 src/bin/ksh/Makefile:1.32
--- src/bin/ksh/Makefile:1.31 Thu Jan 29 15:46:31 2015
+++ src/bin/ksh/Makefile Wed Mar 16 19:01:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2015/01/29 20:46:31 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2016/03/16 23:01:33 christos Exp $
WARNS=3
CWARNFLAGS.clang+= -Wno-error=cast-qual
@@ -22,7 +22,6 @@ USETBL=
# Environment for scripts executed during build.
SCRIPT_ENV= \
- AWK=${TOOL_AWK:Q} \
SED=${TOOL_SED:Q}
CLEANFILES+= siglist.out siglist.out.tmp
Index: src/bin/ksh/siglist.sh
diff -u src/bin/ksh/siglist.sh:1.9 src/bin/ksh/siglist.sh:1.10
--- src/bin/ksh/siglist.sh:1.9 Sun Jan 23 12:11:55 2011
+++ src/bin/ksh/siglist.sh Wed Mar 16 19:01:33 2016
@@ -1,44 +1,14 @@
#!/bin/sh
-# $NetBSD: siglist.sh,v 1.9 2011/01/23 17:11:55 hauke Exp $
+# $NetBSD: siglist.sh,v 1.10 2016/03/16 23:01:33 christos Exp $
#
# Script to generate a sorted, complete list of signals, suitable
# for inclusion in trap.c as array initializer.
#
-set -e
-
-: ${AWK:=awk}
: ${SED:=sed}
-in=tmpi$$.c
-out=tmpo$$.c
-ecode=1
-trapsigs='0 1 2 13 15'
-trap 'rm -f $in $out; trap 0; exit $ecode' $trapsigs
-
-CPP="${1-cc -E}"
-
# The trap here to make up for a bug in bash (1.14.3(1)) that calls the trap
-(trap $trapsigs;
- echo '#include "sh.h"';
- echo ' { QwErTy SIGNALS , "DUMMY" , "hook for number of signals" },';
- ${SED} -e '/^[ ]*#/d' -e 's/^[ ]*\([^ ][^ ]*\)[ ][ ]*\(.*[^ ]\)[ ]*$/#ifdef SIG\1\
- { QwErTy .signal = SIG\1 , .name = "\1", .mess = "\2" },\
-#endif/') > $in
-$CPP $in > $out
-${SED} -n 's/{ QwErTy/{/p' < $out | ${AWK} '{print NR, $0}' | sort -k 5n -k 1n |
-${SED} 's/^[0-9]* //' |
-${AWK} 'BEGIN { last=0; nsigs=0; }
- {
- if ($4 ~ /^[0-9][0-9]*$/ && $5 == ",") {
- n = $4;
- if (n > 0 && n != last) {
- while (++last < n) {
- printf "\t{ .signal = %d , .name = NULL, .mess = `Signal %d` } ,\n", last, last;
- }
- print;
- }
- }
- }' |
-tr '`' '"' | grep -v '"DUMMY"'
-ecode=0
+
+${SED} -e '/^[ ]*#/d' -e 's/^[ ]*\([^ ][^ ]*\)[ ][ ]*\(.*[^ ]\)[ ]*$/#ifdef SIG\1\
+ { .signal = SIG\1 , .name = "\1", .mess = "\2" },\
+#endif/'
CVS commit: src/bin/csh
Module Name:src
Committed By: christos
Date: Wed Mar 16 22:35:45 UTC 2016
Modified Files:
src/bin/csh: exec.c
Log Message:
add Will Robinson comment.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/bin/csh/exec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/exec.c
diff -u src/bin/csh/exec.c:1.30 src/bin/csh/exec.c:1.31
--- src/bin/csh/exec.c:1.30 Wed Mar 16 18:25:05 2016
+++ src/bin/csh/exec.c Wed Mar 16 18:35:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.30 2016/03/16 22:25:05 christos Exp $ */
+/* $NetBSD: exec.c,v 1.31 2016/03/16 22:35:44 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95";
#else
-__RCSID("$NetBSD: exec.c,v 1.30 2016/03/16 22:25:05 christos Exp $");
+__RCSID("$NetBSD: exec.c,v 1.31 2016/03/16 22:35:44 christos Exp $");
#endif
#endif /* not lint */
@@ -90,6 +90,7 @@ static Char *expath; /* Path for exerr
static unsigned char xhash[HSHSIZ / 8];
#define hash(a, b) (((a) * HSHMUL + (b)) & HSHMASK)
+/* these macros eval their arguments multiple times, so be careful */
#define bit(h, b) ((h)[(b) >> 3] & 1 << ((b) & 7)) /* bit test */
#define bis(h, b) ((h)[(b) >> 3] = \
(unsigned char)((1 << ((b) & 7)) | (h)[(b) >> 3]))/* bit set */
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Wed Mar 16 21:00:37 UTC 2016
Modified Files:
src/crypto/external/bsd/openssh/dist: sshconnect.c
Log Message:
CID 1356386: Don't leak sock
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/sshconnect.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/sshconnect.c
diff -u src/crypto/external/bsd/openssh/dist/sshconnect.c:1.16 src/crypto/external/bsd/openssh/dist/sshconnect.c:1.17
--- src/crypto/external/bsd/openssh/dist/sshconnect.c:1.16 Thu Mar 10 20:55:00 2016
+++ src/crypto/external/bsd/openssh/dist/sshconnect.c Wed Mar 16 17:00:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sshconnect.c,v 1.16 2016/03/11 01:55:00 christos Exp $ */
+/* $NetBSD: sshconnect.c,v 1.17 2016/03/16 21:00:37 christos Exp $ */
/* $OpenBSD: sshconnect.c,v 1.271 2016/01/14 22:56:56 markus Exp $ */
/*
@@ -16,7 +16,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: sshconnect.c,v 1.16 2016/03/11 01:55:00 christos Exp $");
+__RCSID("$NetBSD: sshconnect.c,v 1.17 2016/03/16 21:00:37 christos Exp $");
#include /* roundup */
#include
#include
@@ -1552,4 +1552,6 @@ maybe_add_key_to_agent(char *authfile, K
debug("identity added to agent: %s", authfile);
else
debug("could not add identity to agent: %s (%d)", authfile, r);
+
+ close(auth_sock);
}
CVS commit: src/tests/bin/sh
Module Name:src
Committed By: christos
Date: Wed Mar 16 17:39:12 UTC 2016
Modified Files:
src/tests/bin/sh: t_arith.sh
Log Message:
remove binary test and other cleanups (from kre)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/sh/t_arith.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/bin/sh/t_arith.sh
diff -u src/tests/bin/sh/t_arith.sh:1.1 src/tests/bin/sh/t_arith.sh:1.2
--- src/tests/bin/sh/t_arith.sh:1.1 Wed Mar 16 11:49:19 2016
+++ src/tests/bin/sh/t_arith.sh Wed Mar 16 13:39:12 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_arith.sh,v 1.1 2016/03/16 15:49:19 christos Exp $
+# $NetBSD: t_arith.sh,v 1.2 2016/03/16 17:39:12 christos Exp $
#
# Copyright (c) 2016 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -28,10 +28,10 @@
: ${TEST_SH:="/bin/sh"}
# Requirement is to support at least "signed long" whatever that means
-# (number of bits in "long" is not specified - but should be at lease 32).
+# (number of bits in "long" is not specified - but should be at least 32).
# These tests use -o inline:"..." rather than -o match:'...' as we have
-# only digits to examine, and it is good to be sure that 1 + 2 really gives 2
+# only digits to examine, and it is good to be sure that 1 + 1 really gives 2
# and that 42 or 123 don't look like success because there is a 2 in them.
ARITH_BITS='?'
@@ -64,7 +64,6 @@ discover_range()
if ! ${TEST_SH} -c ': $(( 0xC000 ))' 2>/dev/null
then
# proobably shell detected overflow and complained
- # (if it does not support hex, we will discover that later)
ARITH_BITS=32
return
fi
@@ -170,31 +169,6 @@ constants_body()
# ${TEST_SH} -c 'echo $(( UNDEFINED_VAR ))'
}
-atf_test_case constants_binary
-constants_binary_head()
-{
-atf_set "descr" "Optional tests that binary constants work as expected"
-}
-constants_binary_body()
-{
- if ! ${TEST_SH} -c '[ $(( 0b0101 )) = 5 ]' 2>/dev/null
- then
- atf_skip "Binary constants (0b0101) not implemented"
- fi
-
- atf_check -s exit:0 -o inline:'0\n' -e empty ${TEST_SH} -c \
- 'echo $((0b0))'
- atf_check -s exit:0 -o inline:'1\n' -e empty ${TEST_SH} -c \
- 'echo $((0b01))'
- atf_check -s exit:0 -o inline:'3\n' -e empty ${TEST_SH} -c \
- 'echo $((0b11))'
- atf_check -s exit:0 -o inline:'7\n' -e empty ${TEST_SH} -c \
- 'echo $((0b111))'
- atf_check -s exit:0 -o inline:'1398101\n' -e empty ${TEST_SH} -c \
- 'echo $(( 0b101010101010101010101 ))'
- atf_check -s exit:0 -o inline:'119097103\n' -e empty ${TEST_SH} -c \
- 'echo $(( 0b1110001100101000111 ))'
-}
atf_test_case do_unary_plus
do_unary_plus_head()
@@ -453,7 +427,7 @@ elementary_rem_body()
atf_test_case elementary_shl
elementary_shl_head()
{
-atf_set "descr" "Tests that simple modulus works as expected"
+atf_set "descr" "Tests that simple shift left works as expected"
}
elementary_shl_body()
{
@@ -487,7 +461,7 @@ elementary_shl_body()
atf_test_case elementary_shr
elementary_shr_head()
{
-atf_set "descr" "Tests that simple modulus works as expected"
+atf_set "descr" "Tests that simple shift right works as expected"
}
elementary_shr_body()
{
@@ -798,7 +772,7 @@ fiddle_bits_xor_body()
atf_test_case logical_and
logical_and_head()
{
- atf_set "descr" "Test bitwise and operations in arithmetic expressions"
+ atf_set "descr" "Test logical and operations in arithmetic expressions"
}
logical_and_body()
{
@@ -822,7 +796,7 @@ logical_and_body()
atf_test_case logical_or
logical_or_head()
{
- atf_set "descr" "Test bitwise or operations in arithmetic expressions"
+ atf_set "descr" "Test logical or operations in arithmetic expressions"
}
logical_or_body()
{
@@ -1021,7 +995,6 @@ atf_init_test_cases() {
# odd names are to get atf's sort order semi-rational
atf_add_test_case constants
- atf_add_test_case constants_binary
atf_add_test_case do_unary_plus
atf_add_test_case do_unary_minus
atf_add_test_case do_unary_not
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Fri Mar 18 07:30:47 UTC 2016 Modified Files: src/external/gpl3/gcc: README.gcc53 Log Message: update info for alpha, powerpc, earmv4, i386, and sparc* To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/README.gcc53 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/README.gcc53 diff -u src/external/gpl3/gcc/README.gcc53:1.2 src/external/gpl3/gcc/README.gcc53:1.3 --- src/external/gpl3/gcc/README.gcc53:1.2 Thu Mar 17 23:44:12 2016 +++ src/external/gpl3/gcc/README.gcc53 Fri Mar 18 07:30:47 2016 @@ -1,4 +1,4 @@ -$NetBSD: README.gcc53,v 1.2 2016/03/17 23:44:12 mrg Exp $ +$NetBSD: README.gcc53,v 1.3 2016/03/18 07:30:47 mrg Exp $ lib: libasan is disabled currently (haven't tried yet) @@ -26,14 +26,14 @@ arch/feature list. anything not here ha architecture tools kernels libgcc native-gcc make release runs atf - --- -- -- --- -alpha +alpha y ? ? y arm y ? y y armeb y ? y y earm y ? y y earmeb y ? y y earmhf y ? y y earmhfeb y ? y y -earmv4 y ? y y +earmv4 y ? y y y[3,4] y earmv4eb y ? y y earmv6 y ? y y earmv6eb y ? y y @@ -44,22 +44,24 @@ earmv7eb y ? y y earmv7hf y ? y y earmv7hfeb y ? y y hppa -i386 y y y y y y +i386 y y y y y[4] y m68000 m68k -mips64eb -mips64el mipseb mipsel -powerpc +mips64eb +mips64el +powerpc y ? ? y x sh3eb sh3el -sparc y y y y y y[1] -sparc64 y y y builds y n[2] +sparc y y y y y[4] y[1] +sparc64 y y y builds y[4] n[2] vax -x86_64 y y y y y y +x86_64 y y y y y[4] y [1] - world built without -fno-delete-null-pointer-checks does not have a working sshd [2] - -O2 and -Os kernels hang, -O1 SIR reset +[3] - MKCOMPAT=no enabled currently +[4] - really, this is 'distribution sets' and a kernel
CVS commit: src/include
Module Name:src
Committed By: mrg
Date: Thu Mar 17 00:03:38 UTC 2016
Modified Files:
src/include: stddef.h
Log Message:
add max_align_t. C11 defines this and GCC 5.3 really wants it.
XXX: language laywers, please feel free to fix this as necessary.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/include/stddef.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/stddef.h
diff -u src/include/stddef.h:1.17 src/include/stddef.h:1.18
--- src/include/stddef.h:1.17 Thu Dec 12 17:53:03 2013
+++ src/include/stddef.h Thu Mar 17 00:03:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: stddef.h,v 1.17 2013/12/12 17:53:03 matt Exp $ */
+/* $NetBSD: stddef.h,v 1.18 2016/03/17 00:03:38 mrg Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -66,5 +66,11 @@ typedef _BSD_WCHAR_T_ wchar_t;
#define offsetof(type, member) __offsetof__((reinterpret_cast \
(_cast(static_cast(0)->member
#endif
+
+typedef union {
+ char *_c;
+ long double _ld;
+ long long int _ll;
+} max_align_t;
#endif /* _STDDEF_H_ */
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Wed Mar 16 16:13:16 UTC 2016 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add PAX_SEGVGUARD disabled. To generate a diff of this commit: cvs rdiff -u -r1.425 -r1.426 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.425 src/sys/arch/amd64/conf/GENERIC:1.426 --- src/sys/arch/amd64/conf/GENERIC:1.425 Sat Mar 5 12:08:49 2016 +++ src/sys/arch/amd64/conf/GENERIC Wed Mar 16 12:13:16 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.425 2016/03/05 17:08:49 riastradh Exp $ +# $NetBSD: GENERIC,v 1.426 2016/03/16 16:13:16 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.425 $" +#ident "GENERIC-$Revision: 1.426 $" maxusers 64 # estimated number of users @@ -1312,5 +1312,6 @@ options VERIFIED_EXEC_FP_SHA512 options VERIFIED_EXEC_FP_SHA1 options VERIFIED_EXEC_FP_MD5 +options PAX_SEGVGUARD=0 # PaX Segmentation fault guard options PAX_MPROTECT=0 # PaX mprotect(2) restrictions options PAX_ASLR=0 # PaX Address Space Layout Randomization
CVS commit: [nick-nhusb] src/sys
Module Name:src
Committed By: skrll
Date: Thu Mar 17 09:04:53 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c ehcivar.h ohci.c uhci.c uhcivar.h
usbdi.c usbdivar.h
src/sys/external/bsd/dwc2 [nick-nhusb]: dwc2.c
Log Message:
All HCDs were fighting the seriaisation of transfers in usbdi.c for isoc
transfers. Instead allow the HCDs to specify which pipes can handle
removing this serialisation and apply it appropriately.
dwctwo(4) can handle this for all transfer types, but only enable
bulk/isoc for now.
To generate a diff of this commit:
cvs rdiff -u -r1.234.2.91 -r1.234.2.92 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.42.14.22 -r1.42.14.23 src/sys/dev/usb/ehcivar.h
cvs rdiff -u -r1.254.2.58 -r1.254.2.59 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.264.4.67 -r1.264.4.68 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.52.14.16 -r1.52.14.17 src/sys/dev/usb/uhcivar.h
cvs rdiff -u -r1.162.2.43 -r1.162.2.44 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.109.2.24 -r1.109.2.25 src/sys/dev/usb/usbdivar.h
cvs rdiff -u -r1.32.2.23 -r1.32.2.24 src/sys/external/bsd/dwc2/dwc2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.234.2.91 src/sys/dev/usb/ehci.c:1.234.2.92
--- src/sys/dev/usb/ehci.c:1.234.2.91 Sun Feb 28 09:16:20 2016
+++ src/sys/dev/usb/ehci.c Thu Mar 17 09:04:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.234.2.91 2016/02/28 09:16:20 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.234.2.92 2016/03/17 09:04:53 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.91 2016/02/28 09:16:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.92 2016/03/17 09:04:53 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -209,7 +209,6 @@ Static void ehci_device_intr_done(struc
Static int ehci_device_isoc_init(struct usbd_xfer *);
Static void ehci_device_isoc_fini(struct usbd_xfer *);
Static usbd_status ehci_device_isoc_transfer(struct usbd_xfer *);
-Static usbd_status ehci_device_isoc_start(struct usbd_xfer *);
Static void ehci_device_isoc_abort(struct usbd_xfer *);
Static void ehci_device_isoc_close(struct usbd_pipe *);
Static void ehci_device_isoc_done(struct usbd_xfer *);
@@ -217,7 +216,6 @@ Static void ehci_device_isoc_done(struc
Static int ehci_device_fs_isoc_init(struct usbd_xfer *);
Static void ehci_device_fs_isoc_fini(struct usbd_xfer *);
Static usbd_status ehci_device_fs_isoc_transfer(struct usbd_xfer *);
-Static usbd_status ehci_device_fs_isoc_start(struct usbd_xfer *);
Static void ehci_device_fs_isoc_abort(struct usbd_xfer *);
Static void ehci_device_fs_isoc_close(struct usbd_pipe *);
Static void ehci_device_fs_isoc_done(struct usbd_xfer *);
@@ -366,7 +364,6 @@ Static const struct usbd_pipe_methods eh
.upm_init = ehci_device_isoc_init,
.upm_fini = ehci_device_isoc_fini,
.upm_transfer = ehci_device_isoc_transfer,
- .upm_start = ehci_device_isoc_start,
.upm_abort = ehci_device_isoc_abort,
.upm_close = ehci_device_isoc_close,
.upm_cleartoggle = ehci_noop,
@@ -377,7 +374,6 @@ Static const struct usbd_pipe_methods eh
.upm_init = ehci_device_fs_isoc_init,
.upm_fini = ehci_device_fs_isoc_fini,
.upm_transfer = ehci_device_fs_isoc_transfer,
- .upm_start = ehci_device_fs_isoc_start,
.upm_abort = ehci_device_fs_isoc_abort,
.upm_close = ehci_device_fs_isoc_close,
.upm_cleartoggle = ehci_noop,
@@ -2066,6 +2062,7 @@ ehci_open(struct usbd_pipe *pipe)
goto bad;
break;
case UE_ISOCHRONOUS:
+ pipe->up_serialise = false;
if (speed == EHCI_QH_SPEED_HIGH)
pipe->up_methods = _device_isoc_methods;
else
@@ -4368,22 +4365,14 @@ Static usbd_status
ehci_device_fs_isoc_transfer(struct usbd_xfer *xfer)
{
ehci_softc_t *sc = EHCI_XFER2SC(xfer);
- usbd_status err;
+ usbd_status __diagused err;
mutex_enter(>sc_lock);
err = usb_insert_transfer(xfer);
mutex_exit(>sc_lock);
- if (err && err != USBD_IN_PROGRESS)
- return err;
-
- return ehci_device_fs_isoc_start(xfer);
-}
+ KASSERT(err == USBD_NORMAL_COMPLETION);
-Static usbd_status
-ehci_device_fs_isoc_start(struct usbd_xfer *xfer)
-{
- ehci_softc_t *sc = EHCI_XFER2SC(xfer);
struct ehci_pipe *epipe = EHCI_XFER2EPIPE(xfer);;
struct usbd_device *dev = xfer->ux_pipe->up_dev;;
struct ehci_xfer *exfer = EHCI_XFER2EXFER(xfer);
@@ -4399,16 +4388,6 @@ ehci_device_fs_isoc_start(struct usbd_xf
sitd = NULL;
total_length = 0;
- /*
- * To allow continuous transfers, above we start all transfers
- * immediately. However, we're still going to get usbd_start_next call
- * this when another xfer completes. So, check if this is already
- * in progress or not
- */
-
- if (exfer->ex_isrunning) {
- return USBD_IN_PROGRESS;
- }
USBHIST_LOG(ehcidebug, "xfer %p len %d flags %d",
xfer, xfer->ux_length,
CVS commit: src/bin/sh
Module Name:src
Committed By: christos
Date: Fri Mar 18 18:07:28 UTC 2016
Modified Files:
src/bin/sh: parser.c
Log Message:
sprinkle more volatile (needed for the rescue build with gcc-5.3)
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/bin/sh/parser.c
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/parser.c
diff -u src/bin/sh/parser.c:1.104 src/bin/sh/parser.c:1.105
--- src/bin/sh/parser.c:1.104 Tue Mar 8 09:11:56 2016
+++ src/bin/sh/parser.c Fri Mar 18 14:07:28 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: parser.c,v 1.104 2016/03/08 14:11:56 christos Exp $ */
+/* $NetBSD: parser.c,v 1.105 2016/03/18 18:07:28 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95";
#else
-__RCSID("$NetBSD: parser.c,v 1.104 2016/03/08 14:11:56 christos Exp $");
+__RCSID("$NetBSD: parser.c,v 1.105 2016/03/18 18:07:28 christos Exp $");
#endif
#endif /* not lint */
@@ -1094,8 +1094,8 @@ readtoken1(int firstc, char const *syn,
volatile int quotef;
volatile int oldstyle;
VSS static_stack;
- VSS *stack = _stack;
- VVSS *vstack = stack;
+ VSS * volatile stack = _stack;
+ VVSS * volatile vstack = stack;
stack->prev = NULL;
stack->cur = 0;
@@ -1558,7 +1558,7 @@ parsebackq: {
struct nodelist **nlpp;
int savepbq;
union node *n;
- char *str = NULL;
+ char * volatile str = NULL;
struct jmploc jmploc;
struct jmploc *volatile savehandler = NULL;
int savelen;
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Wed Mar 16 18:07:17 UTC 2016
Modified Files:
src/external/gpl3/gcc/lib/crtstuff/arch: sparc64.mk
src/external/gpl3/gcc/lib/libbacktrace/arch/sparc64:
backtrace-supported.h config.h
src/external/gpl3/gcc/lib/libgcc/arch/sparc64: auto-target.h defs.mk
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/sparc64: defs.mk
gcov-iov.h
src/external/gpl3/gcc/lib/libgomp/arch/sparc64: config.h libgomp.spec
libgomp_f.h omp.h
src/external/gpl3/gcc/lib/libiberty/arch/sparc64: config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64: c++config.h
cxxabi_tweaks.h defs.mk gstdint.h gthr-posix.h gthr-single.h gthr.h
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64: auto-host.h bversion.h
configargs.h defs.mk gtyp-input.list plugin-version.h tm.h
src/external/gpl3/gcc/usr.bin/libcpp/arch/sparc64: config.h
Log Message:
mknative-gcc for GCC 5.3 and sparc64.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/crtstuff/arch/sparc64.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libbacktrace/arch/sparc64/backtrace-supported.h \
src/external/gpl3/gcc/lib/libbacktrace/arch/sparc64/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libgcc/arch/sparc64/auto-target.h \
src/external/gpl3/gcc/lib/libgcc/arch/sparc64/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/sparc64/defs.mk
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/sparc64/gcov-iov.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libgomp/arch/sparc64/config.h \
src/external/gpl3/gcc/lib/libgomp/arch/sparc64/libgomp.spec \
src/external/gpl3/gcc/lib/libgomp/arch/sparc64/libgomp_f.h \
src/external/gpl3/gcc/lib/libgomp/arch/sparc64/omp.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libiberty/arch/sparc64/config.h
cvs rdiff -u -r1.15 -r1.16 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/c++config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/cxxabi_tweaks.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/gthr-posix.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/gthr-single.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/gthr.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/defs.mk
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/gstdint.h
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/auto-host.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/bversion.h
cvs rdiff -u -r1.18 -r1.19 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/configargs.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/defs.mk \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/plugin-version.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/gtyp-input.list \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/tm.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/usr.bin/libcpp/arch/sparc64/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/crtstuff/arch/sparc64.mk
diff -u src/external/gpl3/gcc/lib/crtstuff/arch/sparc64.mk:1.5 src/external/gpl3/gcc/lib/crtstuff/arch/sparc64.mk:1.6
--- src/external/gpl3/gcc/lib/crtstuff/arch/sparc64.mk:1.5 Sat Mar 1 10:00:31 2014
+++ src/external/gpl3/gcc/lib/crtstuff/arch/sparc64.mk Wed Mar 16 18:07:16 2016
@@ -1,8 +1,8 @@
# 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.86 2016/03/16 11:16:05 mrg 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_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=
Index: src/external/gpl3/gcc/lib/libbacktrace/arch/sparc64/backtrace-supported.h
diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/sparc64/backtrace-supported.h:1.2
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3
Module Name:src Committed By: christos Date: Thu Mar 17 00:55:54 UTC 2016 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3: Makefile Log Message: Need more no stack protector To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/external/gpl3/gcc/lib/libstdc++-v3/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/libstdc++-v3/Makefile diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.22 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.23 --- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.22 Tue Mar 15 17:42:59 2016 +++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Wed Mar 16 20:55:54 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2016/03/15 21:42:59 mrg Exp $ +# $NetBSD: Makefile,v 1.23 2016/03/17 00:55:54 christos Exp $ REQUIRETOOLS= yes NOLINT= # defined @@ -53,8 +53,10 @@ COPTS.fstream-inst.cc = -Wno-stack-prote COPTS.locale-inst.cc = -Wno-stack-protector COPTS.misc-inst.cc = -Wno-stack-protector COPTS.ostream-inst.cc = -Wno-stack-protector +COPTS.functexcept.cc = -Wno-stack-protector COPTS.valarray-inst.cc = -Wno-stack-protector COPTS.wlocale-inst.cc = -Wno-stack-protector +COPTS.snprintf_lite.cc = -Wno-stack-protector COPTS.concept-inst.cc= -fimplicit-templates COPTS.hashtable_c++0x.cc= -fimplicit-templates COPTS.bitmap_allocator.cc = -fimplicit-templates
CVS commit: src/bin/sh
Module Name:src
Committed By: christos
Date: Wed Mar 16 15:43:38 UTC 2016
Modified Files:
src/bin/sh: arith.y
Log Message:
PR/50960: The || and && operators in $(( )) should always have a 0 or 1
result, never anything different. (from kre)
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/bin/sh/arith.y
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/arith.y
diff -u src/bin/sh/arith.y:1.23 src/bin/sh/arith.y:1.24
--- src/bin/sh/arith.y:1.23 Wed Mar 16 11:42:33 2016
+++ src/bin/sh/arith.y Wed Mar 16 11:43:38 2016
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: arith.y,v 1.23 2016/03/16 15:42:33 christos Exp $ */
+/* $NetBSD: arith.y,v 1.24 2016/03/16 15:43:38 christos Exp $ */
/*-
* Copyright (c) 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)arith.y 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: arith.y,v 1.23 2016/03/16 15:42:33 christos Exp $");
+__RCSID("$NetBSD: arith.y,v 1.24 2016/03/16 15:43:38 christos Exp $");
#endif
#endif /* not lint */
@@ -91,8 +91,8 @@ exp: expr {
expr: ARITH_LPAREN expr ARITH_RPAREN { $$ = $2; }
| expr ARITH_QM expr ARITH_COLON expr { $$ = $1 ? $3 : $5; }
- | expr ARITH_OR expr { $$ = $1 ? $1 : $3 ? $3 : 0; }
- | expr ARITH_AND expr { $$ = $1 ? ( $3 ? $3 : 0 ) : 0; }
+ | expr ARITH_OR expr { $$ = ($1 ? 1 : $3 ? 1 : 0); }
+ | expr ARITH_AND expr { $$ = ($1 ? ( $3 ? 1 : 0 ) : 0); }
| expr ARITH_BOR expr { $$ = $1 | $3; }
| expr ARITH_BXOR expr { $$ = $1 ^ $3; }
| expr ARITH_BAND expr { $$ = $1 & $3; }
CVS commit: src/libexec/lfs_cleanerd
Module Name:src
Committed By: mrg
Date: Fri Mar 18 10:10:21 UTC 2016
Modified Files:
src/libexec/lfs_cleanerd: lfs_cleanerd.c
Log Message:
move the compiler hack closer to the source of the fail
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/libexec/lfs_cleanerd/lfs_cleanerd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/lfs_cleanerd/lfs_cleanerd.c
diff -u src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.57 src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.58
--- src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.57 Wed Mar 16 18:58:34 2016
+++ src/libexec/lfs_cleanerd/lfs_cleanerd.c Fri Mar 18 10:10:21 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_cleanerd.c,v 1.57 2016/03/16 18:58:34 mrg Exp $ */
+/* $NetBSD: lfs_cleanerd.c,v 1.58 2016/03/18 10:10:21 mrg Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -1284,8 +1284,23 @@ needs_cleaning(struct clfs *fs, CLEANERI
double loadavg;
/* If this fs is "on hold", don't clean it. */
- if (fs->clfs_onhold)
+ if (fs->clfs_onhold) {
+#if defined(__GNUC__) && \
+(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && \
+defined(__OPTIMIZE_SIZE__)
+ /*
+ * XXX: Work around apparent bug with GCC >= 4.8 and -Os: it
+ * claims that ci.clean is uninitialized in clean_fs (at one
+ * of the several uses of it, which is neither the first nor
+ * last use) -- this doesn't happen with plain -O2.
+ *
+ * Hopefully in the future further rearrangements will allow
+ * removing this hack.
+ */
+ cip->clean = 0;
+#endif
return 0;
+ }
/*
* Read the cleanerinfo block from the Ifile. We don't want
@@ -1453,21 +1468,6 @@ lfs_cleaner_main(int argc, char **argv)
char *cp, *pidname;
#endif
-#if defined(__GNUC__) && \
-(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && \
-defined(__OPTIMIZE_SIZE__)
- /*
- * XXX: Work around apparent bug with GCC >= 4.8 and -Os: it
- * claims that ci.clean is uninitialized in clean_fs (at one
- * of the several uses of it, which is neither the first nor
- * last use) -- this doesn't happen with plain -O2.
- *
- * Hopefully in the future further rearrangements will allow
- * removing this hack.
- */
- ci.clean = 0;
-#endif
-
/*
* Set up defaults
*/
CVS commit: src/include
Module Name:src
Committed By: christos
Date: Thu Mar 17 02:25:32 UTC 2016
Modified Files:
src/include: bitstring.h
Log Message:
more casting fixes
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/include/bitstring.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/bitstring.h
diff -u src/include/bitstring.h:1.13 src/include/bitstring.h:1.14
--- src/include/bitstring.h:1.13 Wed Mar 16 20:15:27 2016
+++ src/include/bitstring.h Wed Mar 16 22:25:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bitstring.h,v 1.13 2016/03/17 00:15:27 christos Exp $ */
+/* $NetBSD: bitstring.h,v 1.14 2016/03/17 02:25:32 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -82,11 +82,13 @@ typedef unsigned char bitstr_t;
/* set bit N of bitstring name */
#define bit_set(name, bit) \
/*LINTED bitwise on signed*/ \
- ((name)[_bit_byte(bit)] = _bit_mask(bit) | (name)[bit_byte(bit))
+ ((name)[_bit_byte(bit)] = \
+ (unsigned char)(_bit_mask(bit) | (name)[_bit_byte(bit)]))
/* clear bit N of bitstring name */
#define bit_clear(name, bit) \
- /*LINTED bitwise on signed*/((name)[_bit_byte(bit)] &= ~_bit_mask(bit))
+ /*LINTED bitwise on signed*/ \
+ ((name)[_bit_byte(bit)] &= (unsigned char)~_bit_mask(bit))
/* clear bits start ... stop in bitstring */
#define bit_nclear(name, start, stop) do { \
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Fri Mar 18 03:08:25 UTC 2016 Modified Files: src/distrib/sets/lists/comp: ad.arm ad.hppa ad.m68k ad.mips ad.powerpc ad.riscv ad.sh3 md.alpha md.hppa md.or1k md.vax Log Message: set fixes for GCC 5.3. (only arm is tested so far, but there's a pattern i can see :-) To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/comp/ad.arm cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/comp/ad.hppa cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/comp/ad.m68k cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/comp/ad.powerpc cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/comp/ad.riscv cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/comp/ad.sh3 cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/comp/md.alpha cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/comp/md.hppa cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/comp/md.or1k cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/comp/md.vax Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/ad.arm diff -u src/distrib/sets/lists/comp/ad.arm:1.71 src/distrib/sets/lists/comp/ad.arm:1.72 --- src/distrib/sets/lists/comp/ad.arm:1.71 Sat Feb 27 21:47:36 2016 +++ src/distrib/sets/lists/comp/ad.arm Fri Mar 18 03:08:25 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.71 2016/02/27 21:47:36 joerg Exp $ +# $NetBSD: ad.arm,v 1.72 2016/03/18 03:08:25 mrg Exp $ ./usr/include/acorn26comp-c-include ./usr/include/acorn26/ansi.h comp-obsolete obsolete ./usr/include/acorn26/aout_machdep.h comp-obsolete obsolete @@ -393,10 +393,15 @@ ./usr/include/evbarm/varargs.h comp-obsolete obsolete ./usr/include/evbarm/vmparam.h comp-obsolete obsolete ./usr/include/evbarm/wchar_limits.h comp-obsolete obsolete -./usr/include/gcc-4.8/arm_neon.h comp-c-include gcccmds,gcc -./usr/include/gcc-4.8/mmintrin.h comp-c-include gcccmds,gcc -./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc -./usr/include/gcc-4.8/unwind-arm-common.h comp-c-include gcccmds,gcc,eabi +./usr/include/gcc-4.8/arm_neon.h comp-c-include gcccmds,gcc=48 +./usr/include/gcc-4.8/mmintrin.h comp-c-include gcccmds,gcc=48 +./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc=48 +./usr/include/gcc-4.8/unwind-arm-common.h comp-c-include gcccmds,gcc=48,eabi +./usr/include/gcc-5/arm_acle.h comp-c-include gcccmds,gcc=53 +./usr/include/gcc-5/arm_neon.h comp-c-include gcccmds,gcc=53 +./usr/include/gcc-5/mmintrin.h comp-c-include gcccmds,gcc=53 +./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=53 +./usr/include/gcc-5/unwind-arm-common.h comp-c-include gcccmds,gcc=53,eabi ./usr/include/hpcarmcomp-c-include ./usr/include/hpcarm/ansi.h comp-obsolete obsolete ./usr/include/hpcarm/aout_machdep.h comp-obsolete obsolete Index: src/distrib/sets/lists/comp/ad.hppa diff -u src/distrib/sets/lists/comp/ad.hppa:1.9 src/distrib/sets/lists/comp/ad.hppa:1.10 --- src/distrib/sets/lists/comp/ad.hppa:1.9 Mon Aug 10 03:21:44 2015 +++ src/distrib/sets/lists/comp/ad.hppa Fri Mar 18 03:08:25 2016 @@ -1,5 +1,6 @@ -# $NetBSD: ad.hppa,v 1.9 2015/08/10 03:21:44 mrg Exp $ -./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc +# $NetBSD: ad.hppa,v 1.10 2016/03/18 03:08:25 mrg Exp $ +./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc=48 +./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=53 ./usr/include/hppacomp-c-include ./usr/include/hppa/ansi.h comp-c-include ./usr/include/hppa/aout_machdep.h comp-c-include Index: src/distrib/sets/lists/comp/ad.m68k diff -u src/distrib/sets/lists/comp/ad.m68k:1.52 src/distrib/sets/lists/comp/ad.m68k:1.53 --- src/distrib/sets/lists/comp/ad.m68k:1.52 Sat Dec 26 01:00:04 2015 +++ src/distrib/sets/lists/comp/ad.m68k Fri Mar 18 03:08:25 2016 @@ -1,7 +1,9 @@ -# $NetBSD: ad.m68k,v 1.52 2015/12/26 01:00:04 christos Exp $ +# $NetBSD: ad.m68k,v 1.53 2016/03/18 03:08:25 mrg Exp $ ./usr/bin/elf2aoutcomp-sysutil-bin -./usr/include/gcc-4.8/math-68881.h comp-c-include gcccmds,gcc -./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc +./usr/include/gcc-4.8/math-68881.h comp-c-include gcccmds,gcc=48 +./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc=48 +./usr/include/gcc-5/math-68881.h comp-c-include gcccmds,gcc=53 +./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=53 ./usr/include/m68kcomp-c-include ./usr/include/m68k/ansi.h comp-c-include ./usr/include/m68k/aout_machdep.h comp-c-include Index: src/distrib/sets/lists/comp/ad.mips diff -u src/distrib/sets/lists/comp/ad.mips:1.60 src/distrib/sets/lists/comp/ad.mips:1.61 --- src/distrib/sets/lists/comp/ad.mips:1.60 Mon Dec 21 16:49:37 2015 +++ src/distrib/sets/lists/comp/ad.mips Fri Mar 18 03:08:25 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.60 2015/12/21
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Thu Mar 17 00:48:50 UTC 2016
Modified Files:
src/sys/sys: types.h
Log Message:
Appease gcc-5 (devmajor_t and devminor_t are signed, so using them to
compose dev_t causes sign warnings).
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/sys/types.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/sys/types.h
diff -u src/sys/sys/types.h:1.95 src/sys/sys/types.h:1.96
--- src/sys/sys/types.h:1.95 Thu Aug 27 08:30:51 2015
+++ src/sys/sys/types.h Wed Mar 16 20:48:49 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.95 2015/08/27 12:30:51 pooka Exp $ */
+/* $NetBSD: types.h,v 1.96 2016/03/17 00:48:49 christos Exp $ */
/*-
* Copyright (c) 1982, 1986, 1991, 1993, 1994
@@ -260,9 +260,9 @@ typedef int32_t __devmajor_t, __devminor
#define major(x) ((devmajor_t)(((uint32_t)(x) & 0x000fff00) >> 8))
#define minor(x) ((devminor_t)uint32_t)(x) & 0xfff0) >> 12) | \
(((uint32_t)(x) & 0x00ff) >> 0)))
-#define makedev(x,y) ((dev_t)x) << 8) & 0x000fff00) | \
- (((y) << 12) & 0xfff0) | \
- (((y) << 0) & 0x00ff)))
+#define makedev(x,y) ((dev_t)dev_t)(x) << 8) & 0x000fff00U) | \
+ (((dev_t)(y) << 12) & 0xfff0U) | \
+ (((dev_t)(y) << 0) & 0x00ffU)))
#endif
#ifdef _BSD_CLOCK_T_
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Thu Mar 17 23:41:21 UTC 2016
Modified Files:
src/tools/gcc: gcc-version.mk mknative-gcc
Log Message:
set NETBSD_GCC_VERSION for GCC 5.3 separately.
don't collect crtstuff anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tools/gcc/gcc-version.mk
cvs rdiff -u -r1.86 -r1.87 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.4 src/tools/gcc/gcc-version.mk:1.5
--- src/tools/gcc/gcc-version.mk:1.4 Fri Oct 16 00:41:07 2015
+++ src/tools/gcc/gcc-version.mk Thu Mar 17 23:41:21 2016
@@ -1,5 +1,9 @@
-# $NetBSD: gcc-version.mk,v 1.4 2015/10/16 00:41:07 christos Exp $
+# $NetBSD: gcc-version.mk,v 1.5 2016/03/17 23:41:21 mrg Exp $
# common location for tools and native build
+.if ${HAVE_GCC} == 48
NETBSD_GCC_VERSION=nb3 20151015
+.else
+NETBSD_GCC_VERSION=nb1 20160317
+.endif
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.86 src/tools/gcc/mknative-gcc:1.87
--- src/tools/gcc/mknative-gcc:1.86 Wed Mar 16 11:16:05 2016
+++ src/tools/gcc/mknative-gcc Thu Mar 17 23:41:21 2016
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.86 2016/03/16 11:16:05 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.87 2016/03/17 23:41:21 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -37,19 +37,6 @@ sanitise_includes () {
-e "s,-I/usr/include/[^ ]*,,"
}
-# lib/crtstuff #
-
-get_crtstuff () {
- _subdir="$1"
- mkdir -p $_OUTDIR/lib/$_subdir/arch
-
- getvars gcc/Makefile \
- INCLUDES CRTSTUFF_CFLAGS CRTSTUFF_T_CFLAGS CRTSTUFF_T_CFLAGS_S \
- tm_defines xm_file xm_defines \
- | sanitise_includes \
- | write_mk $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH.mk
-}
-
# lib/libg2c #
get_libg2c () {
@@ -414,7 +401,6 @@ case "$1" in
libgcc*-bootstrap)
get_libgcc gcc
get_libgcov gcc $_PLATFORM/libgcc/Makefile
- get_crtstuff crtstuff
get_gcc_bootstrap gcc
exit 0
;;
@@ -428,7 +414,6 @@ gcc*)
get_gcc gcc
get_libgcc gcc
get_libgcov gcc $_PLATFORM/libgcc/Makefile
- get_crtstuff crtstuff
get_gcc_bootstrap gcc
get_gcc_libiberty gcc
get_libobjc libobjc
CVS commit: xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen
Module Name:xsrc
Committed By: christos
Date: Thu Mar 17 02:58:34 UTC 2016
Modified Files:
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen:
nv50_ir_util.h
Log Message:
s/auto_ptr/unique_ptr/
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_util.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/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_util.h
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_util.h:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_util.h:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_util.h:1.1.1.1 Thu Dec 18 01:02:07 2014
+++ xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_util.h Wed Mar 16 22:58:34 2016
@@ -94,7 +94,7 @@ public:
virtual void reset() { assert(0); } // only for graph iterators
};
-typedef std::auto_ptr IteratorRef;
+typedef std::unique_ptr IteratorRef;
class ManipIterator : public Iterator
{
CVS commit: src/usr.bin/make
Module Name:src
Committed By: matthias
Date: Wed Mar 16 16:04:44 UTC 2016
Modified Files:
src/usr.bin/make: main.c
Log Message:
honor setting .MAKE.JOBS from the makefile. That way one can e.g. do:
CPUS!=sysctl -n hw.ncpuonline
.MAKE.JOBS?=$(CPUS)
To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 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.242 src/usr.bin/make/main.c:1.243
--- src/usr.bin/make/main.c:1.242 Mon Mar 7 21:45:43 2016
+++ src/usr.bin/make/main.c Wed Mar 16 16:04:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.242 2016/03/07 21:45:43 christos Exp $ */
+/* $NetBSD: main.c,v 1.243 2016/03/16 16:04:44 matthias Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.242 2016/03/07 21:45:43 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.243 2016/03/16 16:04:44 matthias 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.242 2016/03/07 21:45:43 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.243 2016/03/16 16:04:44 matthias Exp $");
#endif
#endif /* not lint */
#endif
@@ -1117,14 +1117,6 @@ main(int argc, char **argv)
}
/*
- * Be compatible if user did not specify -j and did not explicitly
- * turned compatibility on
- */
- if (!compatMake && !forceJobs) {
- compatMake = TRUE;
- }
-
- /*
* Initialize archive, target and suffix modules in preparation for
* parsing the makefile(s)
*/
@@ -1240,6 +1232,35 @@ main(int argc, char **argv)
Var_Append("MFLAGS", Var_Value(MAKEFLAGS, VAR_GLOBAL, ), VAR_GLOBAL);
free(p1);
+ if (Var_Exists(".MAKE.JOBS", VAR_GLOBAL)) {
+ char *value;
+ int n;
+
+ value = Var_Subst(NULL, "${.MAKE.JOBS}", VAR_GLOBAL, VARF_WANTRES);
+ n = strtol(value, NULL, 0);
+ if (n < 1) {
+ (void)fprintf(stderr, "%s: illegal value for .MAKE.JOBS -- must be positive integer!\n",
+ progname);
+ exit(1);
+ }
+ if (n != maxJobs) {
+ Var_Append(MAKEFLAGS, "-j", VAR_GLOBAL);
+ Var_Append(MAKEFLAGS, value, VAR_GLOBAL);
+ }
+ maxJobs = n;
+ maxJobTokens = maxJobs;
+ forceJobs = TRUE;
+ free(value);
+ }
+
+ /*
+ * Be compatible if user did not specify -j and did not explicitly
+ * turned compatibility on
+ */
+ if (!compatMake && !forceJobs) {
+ compatMake = TRUE;
+ }
+
if (!compatMake)
Job_ServerStart(maxJobTokens, jp_0, jp_1);
if (DEBUG(JOB))
CVS commit: src/bin/sh
Module Name:src Committed By: christos Date: Wed Mar 16 15:45:40 UTC 2016 Modified Files: src/bin/sh: syntax.h Log Message: Revert (kind of) the change in 1.12 of the ancient mksyntax.sh script (undoing the effect of that commit on syntax.h when it was being dynamically generated) from 1996. This means that the shell parser is now locale independent, so scripts that work anywhere will work consistently everywhere. Inspired by a similar change in FreeBSD's sh (from 2010) - the original change in the other direction came from FreeBSD as well Note that this does not in any way add any kind of support for locales to sh (which is a whole different problem.) (from kre) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/bin/sh/syntax.h 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/syntax.h diff -u src/bin/sh/syntax.h:1.2 src/bin/sh/syntax.h:1.3 --- src/bin/sh/syntax.h:1.2 Sat Jan 17 12:38:12 2004 +++ src/bin/sh/syntax.h Wed Mar 16 11:45:40 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: syntax.h,v 1.2 2004/01/17 17:38:12 dsl Exp $ */ +/* $NetBSD: syntax.h,v 1.3 2016/03/16 15:45:40 christos Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -59,8 +59,6 @@ #define PEOF (CHAR_MIN - 1) #define SYNBASE (-PEOF) -/* XXX UPEOF is CHAR_MAX, so is a valid 'char' value... */ -#define UPEOF ((char)PEOF) #define BASESYNTAX (basesyntax + SYNBASE) @@ -68,11 +66,11 @@ #define SQSYNTAX (sqsyntax + SYNBASE) #define ARISYNTAX (arisyntax + SYNBASE) -/* These defines assume that the digits are contiguous */ -#define is_digit(c) ((unsigned)((c) - '0') <= 9) -#define is_alpha(c) (((char)(c)) != UPEOF && ((c) < CTL_FIRST || (c) > CTL_LAST) && isalpha((unsigned char)(c))) -#define is_name(c) (((char)(c)) != UPEOF && ((c) < CTL_FIRST || (c) > CTL_LAST) && ((c) == '_' || isalpha((unsigned char)(c -#define is_in_name(c) (((char)(c)) != UPEOF && ((c) < CTL_FIRST || (c) > CTL_LAST) && ((c) == '_' || isalnum((unsigned char)(c +/* These defines assume that the digits are contiguous (which is guaranteed) */ +#define is_digit(c) ((unsigned)((c) - '0') <= 9) +#define is_alpha(c) ((is_type+SYNBASE)[c] & (ISUPPER|ISLOWER)) +#define is_name(c) ((is_type+SYNBASE)[c] & (ISUPPER|ISLOWER|ISUNDER)) +#define is_in_name(c) ((is_type+SYNBASE)[c] & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT)) #define is_special(c) ((is_type+SYNBASE)[c] & (ISSPECL|ISDIGIT)) #define digit_val(c) ((c) - '0')
CVS commit: src/external/bsd/elftoolchain/dist/libdwarf
Module Name:src
Committed By: christos
Date: Thu Mar 17 19:02:38 UTC 2016
Modified Files:
src/external/bsd/elftoolchain/dist/libdwarf: dwarf_attrval.c
Log Message:
remove unused label.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/elftoolchain/dist/libdwarf/dwarf_attrval.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/bsd/elftoolchain/dist/libdwarf/dwarf_attrval.c
diff -u src/external/bsd/elftoolchain/dist/libdwarf/dwarf_attrval.c:1.5 src/external/bsd/elftoolchain/dist/libdwarf/dwarf_attrval.c:1.6
--- src/external/bsd/elftoolchain/dist/libdwarf/dwarf_attrval.c:1.5 Thu Mar 17 14:52:26 2016
+++ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_attrval.c Thu Mar 17 15:02:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: dwarf_attrval.c,v 1.5 2016/03/17 18:52:26 christos Exp $ */
+/* $NetBSD: dwarf_attrval.c,v 1.6 2016/03/17 19:02:38 christos Exp $ */
/*-
* Copyright (c) 2007 John Birrell (j...@freebsd.org)
@@ -28,7 +28,7 @@
#include "_libdwarf.h"
-__RCSID("$NetBSD: dwarf_attrval.c,v 1.5 2016/03/17 18:52:26 christos Exp $");
+__RCSID("$NetBSD: dwarf_attrval.c,v 1.6 2016/03/17 19:02:38 christos Exp $");
ELFTC_VCSID("Id: dwarf_attrval.c 3159 2015-02-15 21:43:27Z emaste ");
int
@@ -217,7 +217,6 @@ dwarf_attrval_unsigned(Dwarf_Die die, Dw
*valp = at->u[0].u64;
break;
default:
- out:
DWARF_SET_ERROR(dbg, err, DW_DLE_ATTR_FORM_BAD);
return (DW_DLV_ERROR);
}
CVS commit: src/bin/ksh
Module Name:src
Committed By: christos
Date: Wed Mar 16 23:02:23 UTC 2016
Modified Files:
src/bin/ksh: Makefile
Log Message:
Put back awk, other scripts need it.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/bin/ksh/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ksh/Makefile
diff -u src/bin/ksh/Makefile:1.32 src/bin/ksh/Makefile:1.33
--- src/bin/ksh/Makefile:1.32 Wed Mar 16 19:01:33 2016
+++ src/bin/ksh/Makefile Wed Mar 16 19:02:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2016/03/16 23:01:33 christos Exp $
+# $NetBSD: Makefile,v 1.33 2016/03/16 23:02:23 christos Exp $
WARNS=3
CWARNFLAGS.clang+= -Wno-error=cast-qual
@@ -22,6 +22,7 @@ USETBL=
# Environment for scripts executed during build.
SCRIPT_ENV= \
+ AWK=${TOOL_AWK:Q} \
SED=${TOOL_SED:Q}
CLEANFILES+= siglist.out siglist.out.tmp
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Thu Mar 17 23:40:19 UTC 2016 Modified Files: src/external/gpl3/gcc/lib/crtstuff/arch: earm.mk src/external/gpl3/gcc/lib/libbacktrace/arch/earm: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libbacktrace/arch/earmeb: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libbacktrace/arch/earmhf: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libbacktrace/arch/earmhfeb: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libbacktrace/arch/earmv4: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libbacktrace/arch/earmv4eb: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libbacktrace/arch/earmv6: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libbacktrace/arch/earmv6eb: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libbacktrace/arch/earmv6hf: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libbacktrace/arch/earmv6hfeb: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libbacktrace/arch/earmv7: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libbacktrace/arch/earmv7eb: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libbacktrace/arch/earmv7hf: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libbacktrace/arch/earmv7hfeb: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libgcc/arch/earm: defs.mk src/external/gpl3/gcc/lib/libgcc/arch/earmeb: defs.mk src/external/gpl3/gcc/lib/libgcc/arch/earmhf: defs.mk src/external/gpl3/gcc/lib/libgcc/arch/earmhfeb: defs.mk src/external/gpl3/gcc/lib/libgcc/arch/earmv4: defs.mk src/external/gpl3/gcc/lib/libgcc/arch/earmv4eb: defs.mk src/external/gpl3/gcc/lib/libgcc/arch/earmv6: defs.mk src/external/gpl3/gcc/lib/libgcc/arch/earmv6eb: defs.mk src/external/gpl3/gcc/lib/libgcc/arch/earmv6hf: defs.mk src/external/gpl3/gcc/lib/libgcc/arch/earmv6hfeb: defs.mk src/external/gpl3/gcc/lib/libgcc/arch/earmv7: defs.mk src/external/gpl3/gcc/lib/libgcc/arch/earmv7eb: defs.mk src/external/gpl3/gcc/lib/libgcc/arch/earmv7hf: defs.mk src/external/gpl3/gcc/lib/libgcc/arch/earmv7hfeb: defs.mk src/external/gpl3/gcc/lib/libgomp/arch/earm: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libgomp/arch/earmeb: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libgomp/arch/earmhf: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libgomp/arch/earmhfeb: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libgomp/arch/earmv4: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libgomp/arch/earmv4eb: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libgomp/arch/earmv6: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libgomp/arch/earmv6eb: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libgomp/arch/earmv6hf: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libgomp/arch/earmv6hfeb: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libgomp/arch/earmv7: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libgomp/arch/earmv7eb: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libgomp/arch/earmv7hf: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libgomp/arch/earmv7hfeb: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libiberty/arch/earm: config.h src/external/gpl3/gcc/lib/libiberty/arch/earmeb: config.h src/external/gpl3/gcc/lib/libiberty/arch/earmhf: config.h src/external/gpl3/gcc/lib/libiberty/arch/earmhfeb: config.h src/external/gpl3/gcc/lib/libiberty/arch/earmv4: config.h src/external/gpl3/gcc/lib/libiberty/arch/earmv4eb: config.h src/external/gpl3/gcc/lib/libiberty/arch/earmv6: config.h src/external/gpl3/gcc/lib/libiberty/arch/earmv6eb: config.h src/external/gpl3/gcc/lib/libiberty/arch/earmv6hf: config.h src/external/gpl3/gcc/lib/libiberty/arch/earmv6hfeb: config.h src/external/gpl3/gcc/lib/libiberty/arch/earmv7: config.h src/external/gpl3/gcc/lib/libiberty/arch/earmv7eb: config.h src/external/gpl3/gcc/lib/libiberty/arch/earmv7hf: config.h src/external/gpl3/gcc/lib/libiberty/arch/earmv7hfeb: config.h
CVS commit: src/bin/sh
Module Name:src Committed By: christos Date: Wed Mar 16 15:48:01 UTC 2016 Modified Files: src/bin/sh: syntax.h Log Message: factor out common code in macro. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/bin/sh/syntax.h 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/syntax.h diff -u src/bin/sh/syntax.h:1.3 src/bin/sh/syntax.h:1.4 --- src/bin/sh/syntax.h:1.3 Wed Mar 16 11:45:40 2016 +++ src/bin/sh/syntax.h Wed Mar 16 11:48:01 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: syntax.h,v 1.3 2016/03/16 15:45:40 christos Exp $ */ +/* $NetBSD: syntax.h,v 1.4 2016/03/16 15:48:01 christos Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -68,10 +68,11 @@ /* These defines assume that the digits are contiguous (which is guaranteed) */ #define is_digit(c) ((unsigned)((c) - '0') <= 9) -#define is_alpha(c) ((is_type+SYNBASE)[c] & (ISUPPER|ISLOWER)) -#define is_name(c) ((is_type+SYNBASE)[c] & (ISUPPER|ISLOWER|ISUNDER)) -#define is_in_name(c) ((is_type+SYNBASE)[c] & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT)) -#define is_special(c) ((is_type+SYNBASE)[c] & (ISSPECL|ISDIGIT)) +#define sh_ctype(c) (is_type+SYNBASE)[(unsigned char)c] +#define is_alpha(c) (sh_ctype(c) & (ISUPPER|ISLOWER)) +#define is_name(c) (sh_ctype(c) & (ISUPPER|ISLOWER|ISUNDER)) +#define is_in_name(c) (sh_ctype(c) & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT)) +#define is_special(c) (sh_ctype(c) & (ISSPECL|ISDIGIT)) #define digit_val(c) ((c) - '0') extern const char basesyntax[];
CVS commit: src/lib/libwrap
Module Name:src
Committed By: christos
Date: Wed Mar 16 22:32:32 UTC 2016
Modified Files:
src/lib/libwrap: rfc931.c
Log Message:
change static to volatile.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/libwrap/rfc931.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/libwrap/rfc931.c
diff -u src/lib/libwrap/rfc931.c:1.11 src/lib/libwrap/rfc931.c:1.12
--- src/lib/libwrap/rfc931.c:1.11 Wed Mar 16 17:38:22 2016
+++ src/lib/libwrap/rfc931.c Wed Mar 16 18:32:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rfc931.c,v 1.11 2016/03/16 21:38:22 christos Exp $ */
+/* $NetBSD: rfc931.c,v 1.12 2016/03/16 22:32:32 christos Exp $ */
/*
* rfc931() speaks a common subset of the RFC 931, AUTH, TAP, IDENT and RFC
@@ -16,7 +16,7 @@
#if 0
static char sccsid[] = "@(#) rfc931.c 1.10 95/01/02 16:11:34";
#else
-__RCSID("$NetBSD: rfc931.c,v 1.11 2016/03/16 21:38:22 christos Exp $");
+__RCSID("$NetBSD: rfc931.c,v 1.12 2016/03/16 22:32:32 christos Exp $");
#endif
#endif
@@ -87,7 +87,7 @@ rfc931(struct sockaddr *rmt_sin, struct
charuser[256]; /* XXX */
charbuffer[512]; /* XXX */
char *cp;
-static char *result = unknown;
+char * volatile result = unknown;
FILE *fp;
volatile int salen;
u_short * volatile rmt_portp;
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sat Mar 19 07:12:21 UTC 2016 Modified Files: src/sys/dev/usb [nick-nhusb]: usb_subr.c Log Message: Initialise up_serialise to true and add a KASSERT. To generate a diff of this commit: cvs rdiff -u -r1.198.2.25 -r1.198.2.26 src/sys/dev/usb/usb_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usb_subr.c diff -u src/sys/dev/usb/usb_subr.c:1.198.2.25 src/sys/dev/usb/usb_subr.c:1.198.2.26 --- src/sys/dev/usb/usb_subr.c:1.198.2.25 Tue Mar 8 21:16:27 2016 +++ src/sys/dev/usb/usb_subr.c Sat Mar 19 07:12:21 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: usb_subr.c,v 1.198.2.25 2016/03/08 21:16:27 skrll Exp $ */ +/* $NetBSD: usb_subr.c,v 1.198.2.26 2016/03/19 07:12:21 skrll Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */ /* @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.25 2016/03/08 21:16:27 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.26 2016/03/19 07:12:21 skrll Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -789,6 +789,7 @@ usbd_setup_pipe_flags(struct usbd_device p->up_intrxfer = NULL; p->up_running = 0; p->up_aborting = 0; + p->up_serialise = true; p->up_repeat = 0; p->up_interval = ival; p->up_flags = flags; @@ -800,6 +801,9 @@ usbd_setup_pipe_flags(struct usbd_device kmem_intr_free(p, dev->ud_bus->ub_pipesize); return err; } + + KASSERT(p->up_methods->upm_start || p->up_serialise == false); + usb_init_task(>up_async_task, usbd_clear_endpoint_stall_task, p, USB_TASKQ_MPSAFE); DPRINTFN(1, "pipe=%p", p, 0, 0, 0);
