CVS commit: src
Module Name:src Committed By: rin Date: Thu Apr 18 03:50:13 UTC 2019 Modified Files: src/distrib/sets/lists/base: mi src/etc/mtree: NetBSD.dist.base Log Message: Add missing ./var/db/dhcpcd To generate a diff of this commit: cvs rdiff -u -r1.1202 -r1.1203 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.195 -r1.196 src/etc/mtree/NetBSD.dist.base 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/base/mi diff -u src/distrib/sets/lists/base/mi:1.1202 src/distrib/sets/lists/base/mi:1.1203 --- src/distrib/sets/lists/base/mi:1.1202 Tue Feb 26 07:31:49 2019 +++ src/distrib/sets/lists/base/mi Thu Apr 18 03:50:12 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1202 2019/02/26 07:31:49 rin Exp $ +# $NetBSD: mi,v 1.1203 2019/04/18 03:50:12 rin Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -6020,6 +6020,7 @@ ./var/cron base-cron-root ./var/cron/tabs base-cron-root ./var/db base-sys-root +./var/db/dhcpcd base-dhcpcd-root ./var/db/ns base-sys-root ./var/db/obsoletebase-sys-root ./var/db/obsolete/basebase-sys-root Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.195 src/etc/mtree/NetBSD.dist.base:1.196 --- src/etc/mtree/NetBSD.dist.base:1.195 Fri Mar 29 21:44:22 2019 +++ src/etc/mtree/NetBSD.dist.base Thu Apr 18 03:50:12 2019 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.195 2019/03/29 21:44:22 christos Exp $ +# $NetBSD: NetBSD.dist.base,v 1.196 2019/04/18 03:50:12 rin Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -1306,6 +1306,7 @@ ./var/cron ./var/cron/tabs mode=0700 ./var/db +./var/db/dhcpcd ./var/db/ns ./var/db/obsolete ./var/db/postfix uname=postfix gname=postfix mode=0755
CVS commit: src/doc
Module Name:src Committed By: sevan Date: Thu Apr 18 00:52:54 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: OpenSSH 8.0 is out To generate a diff of this commit: cvs rdiff -u -r1.1611 -r1.1612 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.1611 src/doc/3RDPARTY:1.1612 --- src/doc/3RDPARTY:1.1611 Wed Apr 17 23:38:33 2019 +++ src/doc/3RDPARTY Thu Apr 18 00:52:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1611 2019/04/17 23:38:33 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1612 2019/04/18 00:52:54 sevan Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1059,7 +1059,7 @@ Patch applied after OpenSSH import. Package: OpenSSH Version: 7.8 -Current Vers: 7.9 / portable 7.9p1 +Current Vers: 8.0 / portable 8.0p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Home Page: http://www.openssh.com/portable.html
CVS commit: src/doc
Module Name:src Committed By: roy Date: Wed Apr 17 23:38:33 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-7.2.0 To generate a diff of this commit: cvs rdiff -u -r1.1610 -r1.1611 src/doc/3RDPARTY cvs rdiff -u -r1.2523 -r1.2524 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1610 src/doc/3RDPARTY:1.1611 --- src/doc/3RDPARTY:1.1610 Sat Apr 6 00:12:28 2019 +++ src/doc/3RDPARTY Wed Apr 17 23:38:33 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1610 2019/04/06 00:12:28 sevan Exp $ +# $NetBSD: 3RDPARTY,v 1.1611 2019/04/17 23:38:33 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -341,8 +341,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 7.1.1 -Current Vers: 7.1.1 +Version: 7.2.0 +Current Vers: 7.2.0 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2523 src/doc/CHANGES:1.2524 --- src/doc/CHANGES:1.2523 Tue Apr 16 19:38:14 2019 +++ src/doc/CHANGES Wed Apr 17 23:38:33 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2523 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2524 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -354,3 +354,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: pkg_install: Updated to 20190405. [sevan 20190406] npf(7): Include npf_boot rc script which loads npf.boot.conf to protect host during early stages of startup. [sevan 20190410] + dhcpcd(8): Import dhcpcd-7.2.0 [roy 20190418]
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Wed Apr 17 23:36:30 UTC 2019 Removed Files: src/external/bsd/dhcpcd/dist: .arcconfig Log Message: Remove non distributed file. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/dhcpcd/dist/.arcconfig Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/dhcpcd/dist/src
Module Name:src
Committed By: roy
Date: Wed Apr 17 23:35:35 UTC 2019
Modified Files:
src/external/bsd/dhcpcd/dist/src: dhcp.c dhcp6.c dhcpcd.c if-bsd.c
if-options.c ipv6nd.c
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/dhcpcd/dist/src/dhcp.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcpcd/dist/src/dhcp6.c \
src/external/bsd/dhcpcd/dist/src/if-bsd.c \
src/external/bsd/dhcpcd/dist/src/ipv6nd.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/dhcpcd/dist/src/dhcpcd.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/dhcpcd/dist/src/if-options.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/dhcpcd/dist/src/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcp.c:1.16 src/external/bsd/dhcpcd/dist/src/dhcp.c:1.17
--- src/external/bsd/dhcpcd/dist/src/dhcp.c:1.16 Thu Feb 7 21:37:36 2019
+++ src/external/bsd/dhcpcd/dist/src/dhcp.c Wed Apr 17 23:35:34 2019
@@ -86,9 +86,9 @@
#define IPDEFTTL 64 /* RFC1340 */
#endif
-/* NetBSD-7 has an incomplete IP_PKTINFO implementation. */
-#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 8
-#undef IP_PKTINFO
+/* Support older systems with different defines */
+#if !defined(IP_RECVPKTINFO) && defined(IP_PKTINFO)
+#define IP_RECVPKTINFO IP_PKTINFO
#endif
/* Assert the correct structure size for on wire */
@@ -129,6 +129,9 @@ static void dhcp_arp_conflicted(struct a
#endif
static void dhcp_handledhcp(struct interface *, struct bootp *, size_t,
const struct in_addr *);
+#ifdef IP_PKTINFO
+static void dhcp_handleifudp(void *);
+#endif
static int dhcp_initstate(struct interface *);
void
@@ -447,7 +450,7 @@ decode_rfc3442_rt(struct rt_head *routes
memcpy(_addr, p, 4);
p += 4;
- /* A host route is normally set by having the
+ /* An on-link host route is normally set by having the
* gateway match the destination or assigned address */
if (gateway.s_addr == dest.s_addr ||
(gateway.s_addr == bootp->yiaddr ||
@@ -455,17 +458,14 @@ decode_rfc3442_rt(struct rt_head *routes
{
gateway.s_addr = INADDR_ANY;
netmask.s_addr = INADDR_BROADCAST;
- rt->rt_flags = RTF_HOST;
}
+ if (netmask.s_addr == INADDR_BROADCAST)
+ rt->rt_flags = RTF_HOST;
sa_in_init(>rt_dest, );
sa_in_init(>rt_netmask, );
sa_in_init(>rt_gateway, );
- /* If CIDR is 32 then it's a host route. */
- if (cidr == 32)
- rt->rt_flags = RTF_HOST;
-
TAILQ_INSERT_TAIL(routes, rt, rt_next);
n++;
}
@@ -638,7 +638,7 @@ get_option_routes(struct rt_head *routes
if ((rt = rt_new(ifp)) == NULL)
return -1;
- /* A host route is normally set by having the
+ /* A on-link host route is normally set by having the
* gateway match the destination or assigned address */
if (gateway.s_addr == dest.s_addr ||
(gateway.s_addr == bootp->yiaddr ||
@@ -646,12 +646,15 @@ get_option_routes(struct rt_head *routes
{
gateway.s_addr = INADDR_ANY;
netmask.s_addr = INADDR_BROADCAST;
-rt->rt_flags = RTF_HOST;
} else
netmask.s_addr = route_netmask(dest.s_addr);
+ if (netmask.s_addr == INADDR_BROADCAST)
+rt->rt_flags = RTF_HOST;
+
sa_in_init(>rt_dest, );
sa_in_init(>rt_netmask, );
sa_in_init(>rt_gateway, );
+
TAILQ_INSERT_TAIL(routes, rt, rt_next);
n++;
}
@@ -1587,6 +1590,11 @@ dhcp_close(struct interface *ifp)
state->bpf_fd = -1;
state->bpf_flags |= BPF_EOF;
}
+ if (state->udp_fd != -1) {
+ eloop_event_delete(ifp->ctx->eloop, state->udp_fd);
+ close(state->udp_fd);
+ state->udp_fd = -1;
+ }
state->interval = 0;
}
@@ -1604,11 +1612,15 @@ dhcp_openudp(struct interface *ifp)
n = 1;
if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, , sizeof(n)) == -1)
goto eexit;
+#ifdef IP_RECVPKTINFO
+ if (setsockopt(s, IPPROTO_IP, IP_RECVPKTINFO, , sizeof(n)) == -1)
+ goto eexit;
+#endif
memset(, 0, sizeof(sin));
sin.sin_family = AF_INET;
sin.sin_port = htons(BOOTPC);
if (ifp) {
- struct dhcp_state *state = D_STATE(ifp);
+ const struct dhcp_state *state = D_CSTATE(ifp);
if (state->addr)
sin.sin_addr.s_addr = state->addr->addr.s_addr;
@@ -1699,12 +1711,8 @@ dhcp_sendudp(struct interface *ifp, stru
struct msghdr msg;
struct sockaddr_in sin;
struct iovec iov[1];
+ struct dhcp_state *state = D_STATE(ifp);
ssize_t r;
-#ifdef IP_PKTINFO
- uint8_t cmsg[CMSG_SPACE(sizeof(struct in_pktinfo))];
- struct cmsghdr *cm;
- struct in_pktinfo ipi;
-#endif
iov[0].iov_base = data;
iov[0].iov_len = len;
@@ -1723,29 +1731,15 @@ dhcp_sendudp(struct interface *ifp, stru
msg.msg_iov = iov;
msg.msg_iovlen = 1;
-#ifdef IP_PKTINFO
- /* Set the outbound interface */
- msg.msg_control = cmsg;
- msg.msg_controllen = sizeof(cmsg);
-
- memset(, 0, sizeof(ipi));
- ipi.ipi_ifindex = ifp->index;
- cm = CMSG_FIRSTHDR();
- if (cm == NULL) {
- errno = ESRCH;
- return -1;
+ s = state->udp_fd;
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Wed Apr 17 23:33:09 UTC 2019 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11850 Log Message: Import dhcpcd-7.2.0 with the following changes: * BSD: PF_LINK sockets now closed when no longer needed * BSD: Fix detecting interface for scoped routes * script: Allow "" to mean /dev/null * script: Add static routers and routes to env * DHCP: outbound interface is no longer dictated with IP_PKTINFO * DHCP: BPF sockets now closed when no longer needed * DHCPv6: Allow nooption dhcp6_unicast to work * DHCPv6: Don't spam syslog if we always get the same error * route: Log pid which deleted routes of interest This release fixes PR bin/53705. Status: Vendor Tag: roy Release Tags: dhcpcd-7-2-0 U src/external/bsd/dhcpcd/dist/.gitignore U src/external/bsd/dhcpcd/dist/BUILDING.md U src/external/bsd/dhcpcd/dist/LICENSE U src/external/bsd/dhcpcd/dist/Makefile U src/external/bsd/dhcpcd/dist/Makefile.inc U src/external/bsd/dhcpcd/dist/README.md U src/external/bsd/dhcpcd/dist/config-null.mk U src/external/bsd/dhcpcd/dist/configure U src/external/bsd/dhcpcd/dist/iconfig.mk U src/external/bsd/dhcpcd/dist/compat/_strtoi.h U src/external/bsd/dhcpcd/dist/compat/arc4random.c U src/external/bsd/dhcpcd/dist/compat/arc4random.h U src/external/bsd/dhcpcd/dist/compat/bitops.h U src/external/bsd/dhcpcd/dist/compat/queue.h U src/external/bsd/dhcpcd/dist/compat/arc4random_uniform.c U src/external/bsd/dhcpcd/dist/compat/arc4random_uniform.h U src/external/bsd/dhcpcd/dist/compat/reallocarray.c U src/external/bsd/dhcpcd/dist/compat/dprintf.c U src/external/bsd/dhcpcd/dist/compat/dprintf.h U src/external/bsd/dhcpcd/dist/compat/endian.h U src/external/bsd/dhcpcd/dist/compat/pidfile.c U src/external/bsd/dhcpcd/dist/compat/pidfile.h U src/external/bsd/dhcpcd/dist/compat/reallocarray.h U src/external/bsd/dhcpcd/dist/compat/strlcpy.c U src/external/bsd/dhcpcd/dist/compat/strlcpy.h U src/external/bsd/dhcpcd/dist/compat/strtoi.c U src/external/bsd/dhcpcd/dist/compat/strtoi.h U src/external/bsd/dhcpcd/dist/compat/strtou.c U src/external/bsd/dhcpcd/dist/compat/crypt/hmac.c U src/external/bsd/dhcpcd/dist/compat/crypt/hmac.h U src/external/bsd/dhcpcd/dist/compat/crypt/md5.c U src/external/bsd/dhcpcd/dist/compat/crypt/md5.h U src/external/bsd/dhcpcd/dist/compat/crypt/sha256.c U src/external/bsd/dhcpcd/dist/compat/crypt/sha256.h C src/external/bsd/dhcpcd/dist/src/dhcp.c U src/external/bsd/dhcpcd/dist/src/GNUmakefile U src/external/bsd/dhcpcd/dist/src/Makefile U src/external/bsd/dhcpcd/dist/src/arp.c U src/external/bsd/dhcpcd/dist/src/arp.h U src/external/bsd/dhcpcd/dist/src/auth.c U src/external/bsd/dhcpcd/dist/src/auth.h U src/external/bsd/dhcpcd/dist/src/bpf.c U src/external/bsd/dhcpcd/dist/src/bpf.h U src/external/bsd/dhcpcd/dist/src/common.c U src/external/bsd/dhcpcd/dist/src/common.h U src/external/bsd/dhcpcd/dist/src/control.c U src/external/bsd/dhcpcd/dist/src/control.h U src/external/bsd/dhcpcd/dist/src/defs.h U src/external/bsd/dhcpcd/dist/src/dev.c U src/external/bsd/dhcpcd/dist/src/dev.h U src/external/bsd/dhcpcd/dist/src/dhcp-common.c U src/external/bsd/dhcpcd/dist/src/dhcp-common.h U src/external/bsd/dhcpcd/dist/src/dhcp.h C src/external/bsd/dhcpcd/dist/src/dhcp6.c U src/external/bsd/dhcpcd/dist/src/dhcp6.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/src/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/src/dhcpcd-definitions-small.conf U src/external/bsd/dhcpcd/dist/src/dhcpcd-definitions.conf U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c.in U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h.in C src/external/bsd/dhcpcd/dist/src/dhcpcd.c U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf U src/external/bsd/dhcpcd/dist/src/genembedc U src/external/bsd/dhcpcd/dist/src/dhcpcd.h U src/external/bsd/dhcpcd/dist/src/duid.c U src/external/bsd/dhcpcd/dist/src/duid.h U src/external/bsd/dhcpcd/dist/src/eloop.c U src/external/bsd/dhcpcd/dist/src/eloop.h U src/external/bsd/dhcpcd/dist/src/if-linux-wext.c U src/external/bsd/dhcpcd/dist/src/genembedh C src/external/bsd/dhcpcd/dist/src/if-bsd.c U src/external/bsd/dhcpcd/dist/src/if-linux.c C src/external/bsd/dhcpcd/dist/src/if-options.c U src/external/bsd/dhcpcd/dist/src/if-options.h U src/external/bsd/dhcpcd/dist/src/if-sun.c U src/external/bsd/dhcpcd/dist/src/if.c U src/external/bsd/dhcpcd/dist/src/if.h U src/external/bsd/dhcpcd/dist/src/ipv4.c U src/external/bsd/dhcpcd/dist/src/ipv4.h U src/external/bsd/dhcpcd/dist/src/ipv4ll.c U src/external/bsd/dhcpcd/dist/src/ipv4ll.h U src/external/bsd/dhcpcd/dist/src/ipv6.c U src/external/bsd/dhcpcd/dist/src/ipv6.h C src/external/bsd/dhcpcd/dist/src/ipv6nd.c U src/external/bsd/dhcpcd/dist/src/ipv6nd.h U src/external/bsd/dhcpcd/dist/src/logerr.c U src/external/bsd/dhcpcd/dist/src/logerr.h U src/external/bsd/dhcpcd/dist/src/route.c U src/external/bsd/dhcpcd/dist/src/route.h U
CVS commit: src/share/misc
Module Name:src
Committed By: sevan
Date: Wed Apr 17 22:38:14 UTC 2019
Modified Files:
src/share/misc: acronyms.comp
Log Message:
L2CAP
To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.246 src/share/misc/acronyms.comp:1.247
--- src/share/misc/acronyms.comp:1.246 Wed Apr 17 17:44:51 2019
+++ src/share/misc/acronyms.comp Wed Apr 17 22:38:14 2019
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.246 2019/04/17 17:44:51 sevan Exp $
+$NetBSD: acronyms.comp,v 1.247 2019/04/17 22:38:14 sevan Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -752,6 +752,7 @@ KVA kernel virtual address
KVM kernel virtual machine
KVM kernel virtual memory
KVM keyboard, video, [and] mouse
+L2CAP link layer control and adaptation protocol
LAMP Linux Apache MySQL {Perl,PHP,Python}
LAN local area network
LAPIC local advanced programmable interrupt controller
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Wed Apr 17 20:46:38 UTC 2019 Modified Files: src/sys/arch/hppa/hppa: disksubr.c Log Message: Get a large enough buffer for the LIF DIR To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/hppa/disksubr.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/hppa/hppa/disksubr.c diff -u src/sys/arch/hppa/hppa/disksubr.c:1.3 src/sys/arch/hppa/hppa/disksubr.c:1.4 --- src/sys/arch/hppa/hppa/disksubr.c:1.3 Wed Apr 3 22:10:50 2019 +++ src/sys/arch/hppa/hppa/disksubr.c Wed Apr 17 20:46:38 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: disksubr.c,v 1.3 2019/04/03 22:10:50 christos Exp $ */ +/* $NetBSD: disksubr.c,v 1.4 2019/04/17 20:46:38 skrll Exp $ */ /* $OpenBSD: disksubr.c,v 1.6 2000/10/18 21:00:34 mickey Exp $ */ @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.3 2019/04/03 22:10:50 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.4 2019/04/17 20:46:38 skrll Exp $"); #include #include @@ -228,7 +228,7 @@ readliflabel(struct buf *bp, void (*stra struct buf *dbp; struct hppa_lifdir *p; - dbp = geteblk(HPPA_LIF_DIRSIZE); + dbp = geteblk(lp->d_secsize); dbp->b_dev = bp->b_dev; /* read LIF directory */
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: tih
Date: Wed Apr 17 20:41:59 UTC 2019
Modified Files:
src/usr.sbin/npf/npfctl: npf_bpf_comp.c npf_build.c
Log Message:
Summary: Ensure default TCP flags are applied to rules like 'pass stateful all'
CVS: --
CVS: CVSROOT cvs.NetBSD.org:/cvsroot
CVS: please use "PR category/123" to have the commitmsg appended to PR 123
CVS:
CVS: Please evaluate your changes and consider the following.
CVS: Abort checkin if you answer no.
CVS: => For all changes:
CVS: Do the changed files compile?
CVS: Has the change been tested?
CVS: => If you are not completely familiar with the changed components:
CVS: Has the change been posted for review?
CVS: Have you allowed enough time for feedback?
CVS: => If the change is major:
CVS: => If the change adds files to, or removes files from $DESTDIR:
CVS: => If you are changing a library or kernel interface:
CVS: Have you successfully run "./build.sh release"?
The documented default "flags S/SAFR" for stateful rules that affect
TCP packets but don't specify any flags, doesn't actually get applied
to a rule like "pass stateful out all". The big problem with this is
that when you then do a "block return-rst" for an incoming packet, the
generated RST packet will create state for the connection attempt it's
blocking, so that a second attempt from the same source will pass.
This change makes the default flags actually apply to such simple
rules. It also fixes a related bug in the code generation for the
flag matching, where part of the action could erroneously be omitted.
Reviewed by
Closes PR bin/54124
Pullup to NetBSD 8
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/npf/npfctl/npf_bpf_comp.c
cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/npf/npfctl/npf_build.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/npf/npfctl/npf_bpf_comp.c
diff -u src/usr.sbin/npf/npfctl/npf_bpf_comp.c:1.11 src/usr.sbin/npf/npfctl/npf_bpf_comp.c:1.12
--- src/usr.sbin/npf/npfctl/npf_bpf_comp.c:1.11 Sat Sep 29 14:41:36 2018
+++ src/usr.sbin/npf/npfctl/npf_bpf_comp.c Wed Apr 17 20:41:58 2019
@@ -32,7 +32,7 @@
*/
#include
-__RCSID("$NetBSD: npf_bpf_comp.c,v 1.11 2018/09/29 14:41:36 rmind Exp $");
+__RCSID("$NetBSD: npf_bpf_comp.c,v 1.12 2019/04/17 20:41:58 tih Exp $");
#include
#include
@@ -565,10 +565,8 @@ npfctl_bpf_tcpfl(npf_bpf_t *ctx, uint8_t
};
add_insns(ctx, insns_cmp, __arraycount(insns_cmp));
- if (!checktcp) {
- uint32_t mwords[] = { BM_TCPFL, 2, tf, tf_mask};
- done_block(ctx, mwords, sizeof(mwords));
- }
+ uint32_t mwords[] = { BM_TCPFL, 2, tf, tf_mask};
+ done_block(ctx, mwords, sizeof(mwords));
}
/*
Index: src/usr.sbin/npf/npfctl/npf_build.c
diff -u src/usr.sbin/npf/npfctl/npf_build.c:1.47 src/usr.sbin/npf/npfctl/npf_build.c:1.48
--- src/usr.sbin/npf/npfctl/npf_build.c:1.47 Sat Jan 19 21:19:32 2019
+++ src/usr.sbin/npf/npfctl/npf_build.c Wed Apr 17 20:41:58 2019
@@ -32,7 +32,7 @@
*/
#include
-__RCSID("$NetBSD: npf_build.c,v 1.47 2019/01/19 21:19:32 rmind Exp $");
+__RCSID("$NetBSD: npf_build.c,v 1.48 2019/04/17 20:41:58 tih Exp $");
#include
#define __FAVOR_BSD
@@ -363,7 +363,7 @@ static bool
npfctl_build_code(nl_rule_t *rl, sa_family_t family, const opt_proto_t *op,
const filt_opts_t *fopts)
{
- bool noproto, noaddrs, noports, need_tcpudp = false;
+ bool noproto, noaddrs, noports, nostate, need_tcpudp = false;
const addr_port_t *apfrom = >fo_from;
const addr_port_t *apto = >fo_to;
const int proto = op->op_proto;
@@ -375,7 +375,8 @@ npfctl_build_code(nl_rule_t *rl, sa_fami
noproto = family == AF_UNSPEC && proto == -1 && !op->op_opts;
noaddrs = !apfrom->ap_netaddr && !apto->ap_netaddr;
noports = !apfrom->ap_portrange && !apto->ap_portrange;
- if (noproto && noaddrs && noports) {
+ nostate = !(npf_rule_getattr(rl) & NPF_RULE_STATEFUL);
+ if (noproto && noaddrs && noports && nostate) {
return false;
}
CVS commit: src/share/misc
Module Name:src
Committed By: sevan
Date: Wed Apr 17 17:44:51 UTC 2019
Modified Files:
src/share/misc: acronyms acronyms.comp
Log Message:
NVMM
To generate a diff of this commit:
cvs rdiff -u -r1.280 -r1.281 src/share/misc/acronyms
cvs rdiff -u -r1.245 -r1.246 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.280 src/share/misc/acronyms:1.281
--- src/share/misc/acronyms:1.280 Sat Mar 30 14:42:21 2019
+++ src/share/misc/acronyms Wed Apr 17 17:44:51 2019
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.280 2019/03/30 14:42:21 sevan Exp $
+$NetBSD: acronyms,v 1.281 2019/04/17 17:44:51 sevan Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -376,6 +376,7 @@ NTBF not to be fixed
NTN no thanks needed
NUNP no users, no problems
NVM never mind
+NVMM never mind mate
NW no way
NXT next
NYPA not your personal army
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.245 src/share/misc/acronyms.comp:1.246
--- src/share/misc/acronyms.comp:1.245 Wed Apr 17 16:45:38 2019
+++ src/share/misc/acronyms.comp Wed Apr 17 17:44:51 2019
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.245 2019/04/17 16:45:38 sevan Exp $
+$NetBSD: acronyms.comp,v 1.246 2019/04/17 17:44:51 sevan Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -984,6 +984,8 @@ NSA National Security Agency
NTM non-deterministic Turing machine
NTP Network Time Protocol
NUMA non-uniform memory access
+NVMM NetBSD Virtual Machine Monitor
+NVMM non-volatile main memory
NVRAM non-volatile random access memory
NW not write-through
NX no execute
CVS commit: src/lib/libc/time
Module Name:src
Committed By: christos
Date: Wed Apr 17 17:37:29 UTC 2019
Modified Files:
src/lib/libc/time: localtime.c
Log Message:
Pick up the latest matching (most recent) entry instead of the first one.
This fixes:
env TZ=Australia/Melbourne date
printing
Thu Apr 18 03:32:32 LMT 2019
instead of:
Thu Apr 18 03:32:32 AEST 2019
XXX: To be strictly correct, the tzgetname() call should probably take a time
reference point in order to return the appropriate zone name for the time
given.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 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.120 src/lib/libc/time/localtime.c:1.121
--- src/lib/libc/time/localtime.c:1.120 Mon Apr 8 14:50:52 2019
+++ src/lib/libc/time/localtime.c Wed Apr 17 13:37:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: localtime.c,v 1.120 2019/04/08 18:50:52 christos Exp $ */
+/* $NetBSD: localtime.c,v 1.121 2019/04/17 17:37:29 christos Exp $ */
/* Convert timestamp from time_t to struct tm. */
@@ -12,7 +12,7 @@
#if 0
static char elsieid[] = "@(#)localtime.c 8.17";
#else
-__RCSID("$NetBSD: localtime.c,v 1.120 2019/04/08 18:50:52 christos Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.121 2019/04/17 17:37:29 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -284,15 +284,20 @@ detzcode64(const char *const codep)
return result;
}
+#include
+
const char *
tzgetname(const timezone_t sp, int isdst)
{
int i;
+ const char *name = NULL;
for (i = 0; i < sp->typecnt; ++i) {
const struct ttinfo *const ttisp = >ttis[i];
if (ttisp->tt_isdst == isdst)
- return >chars[ttisp->tt_abbrind];
+ name = >chars[ttisp->tt_abbrind];
}
+ if (name != NULL)
+ return name;
errno = ESRCH;
return NULL;
}
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Wed Apr 17 16:45:38 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: BCH DSF HFS ISL LIF ODE VXFS VXVM To generate a diff of this commit: cvs rdiff -u -r1.244 -r1.245 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.244 src/share/misc/acronyms.comp:1.245 --- src/share/misc/acronyms.comp:1.244 Wed Apr 17 14:06:48 2019 +++ src/share/misc/acronyms.comp Wed Apr 17 16:45:38 2019 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.244 2019/04/17 14:06:48 sevan Exp $ +$NetBSD: acronyms.comp,v 1.245 2019/04/17 16:45:38 sevan Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -115,6 +115,7 @@ BAR base address register BBS bulletin board system BCC blind carbon copy BCD binary coded decimal +BCH boot console handler BCR byte count register BCS base configuration space BD baud @@ -408,6 +409,7 @@ DSA digital signature algorithm DSAP destination service access point DSB double-sideband modulation DSDT differentiated system descriptor table +DSF device special file DSL dataset and snapshot layer DSL digital subscriber line DSL domain specific language @@ -607,6 +609,7 @@ HECI host embedded controller interface HEST hardware error source table HF high frequency HFM highest frequency mode +HFS hierarchical file system HID human interface device HKP HTTP Keyserver Protocol HLL high-level language @@ -711,6 +714,7 @@ ISA industry standard architecture ISA instruction set architecture ISDN integrated services digital network ISI inter-symbol interference +ISL initial system load ISM industrial, scientific, [and] medical ISN initial serial number ISO International Standards Organization @@ -773,6 +777,7 @@ LFO low-frequency oscillation LFS log-structured file system LFU least frequently used LHP loop heat pipe +LIF logical interchange format LIFO last in, first out LILO LInux LOader LILO last in, last out @@ -988,6 +993,7 @@ OBO off by one OBOE off by one error OCL object constraint language OCR optical character recognition +ODE offline device environment ODM object data manager ODCM on-demand clock modulation ODT on-die termination @@ -1589,6 +1595,8 @@ VRM voltage regulator module VRRP Virtual Router Redundancy Protocol VSTP VLAN Spanning Tree Protocol VTP VLAN Trunking Protocol +VXFS Veritas file sytem +VXVM Veritas volume manager W watt W3C World Wide Web Consortium WAFL write anywhere file layout
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Apr 17 15:58:12 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ticket #1231 To generate a diff of this commit: cvs rdiff -u -r1.1.2.128 -r1.1.2.129 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.128 src/doc/CHANGES-8.1:1.1.2.129 --- src/doc/CHANGES-8.1:1.1.2.128 Tue Apr 16 03:48:02 2019 +++ src/doc/CHANGES-8.1 Wed Apr 17 15:58:12 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.128 2019/04/16 03:48:02 msaitoh Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.129 2019/04/17 15:58:12 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -2839,3 +2839,9 @@ sys/kern/sys_mqueue.c1.44 mq_send1: fix argument validation and reject too large lengths early. Discovered by Andy Nguyen. [martin, ticket #1230] + +sys/arch/i386/stand/efiboot/efidisk.c 1.7 + + efiboot: Don't panic when BLOCK_IO_PROTOCOL is not found. + [nonaka, ticket #1231] +
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: kamil
Date: Wed Apr 17 15:54:55 UTC 2019
Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c
Log Message:
Fix Clang/LLVM build in t_ptrace_wait.c
Do not compile functions that might be unused.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/tests/lib/libc/sys/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.109 src/tests/lib/libc/sys/t_ptrace_wait.c:1.110
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.109 Mon Apr 15 16:47:47 2019
+++ src/tests/lib/libc/sys/t_ptrace_wait.c Wed Apr 17 15:54:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.109 2019/04/15 16:47:47 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.110 2019/04/17 15:54:55 kamil Exp $ */
/*-
* Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.109 2019/04/15 16:47:47 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.110 2019/04/17 15:54:55 kamil Exp $");
#include
#include
@@ -87,7 +87,9 @@ static int debug = 0;
if (debug) printf(a, ##__VA_ARGS__); \
while (/*CONSTCOND*/0)
+#ifndef TEST_VFORK_ENABLED
#define TEST_VFORK_ENABLED 0
+#endif
///
@@ -3150,6 +3152,7 @@ FORK_TEST(fork7, fork, false, true, true
FORK_TEST(fork8, fork, true, true, true)
#endif
+#if TEST_VFORK_ENABLED
FORK_TEST(vfork1, vfork, false, false, false)
#if defined(TWAIT_HAVE_PID)
FORK_TEST(vfork2, vfork, true, false, false)
@@ -3162,9 +3165,11 @@ FORK_TEST(vfork6, vfork, true, false, tr
FORK_TEST(vfork7, vfork, false, true, true)
FORK_TEST(vfork8, vfork, true, true, true)
#endif
+#endif
///
+#if TEST_VFORK_ENABLED
static void
traceme_vfork_fork_body(pid_t (*fn)(void))
{
@@ -3223,6 +3228,7 @@ ATF_TC_BODY(name, tc) \
TRACEME_VFORK_FORK_TEST(traceme_vfork_fork, fork)
TRACEME_VFORK_FORK_TEST(traceme_vfork_vfork, vfork)
+#endif
///
@@ -5603,11 +5609,13 @@ ATF_TC_BODY(name, tc) \
FORK2_TEST(fork_singalmasked, true, false, false, true, false)
FORK2_TEST(fork_singalignored, true, false, false, false, true)
+#if TEST_VFORK_ENABLED
FORK2_TEST(vfork_singalmasked, false, true, false, true, false)
FORK2_TEST(vfork_singalignored, false, true, false, false, true)
FORK2_TEST(vforkdone_singalmasked, false, false, true, true, false)
FORK2_TEST(vforkdone_singalignored, false, false, true, false, true)
#endif
+#endif
///
@@ -6619,6 +6627,7 @@ CLONE_TEST(clone_files8, CLONE_FILES, tr
//CLONE_TEST(clone_sighand8, CLONE_SIGHAND, true, true, true)
#endif
+#if TEST_VFORK_ENABLED
CLONE_TEST(clone_vfork1, CLONE_VFORK, false, false, false)
#if defined(TWAIT_HAVE_PID)
CLONE_TEST(clone_vfork2, CLONE_VFORK, true, false, false)
@@ -6631,6 +6640,7 @@ CLONE_TEST(clone_vfork6, CLONE_VFORK, tr
CLONE_TEST(clone_vfork7, CLONE_VFORK, false, true, true)
CLONE_TEST(clone_vfork8, CLONE_VFORK, true, true, true)
#endif
+#endif
///
@@ -6993,12 +7003,15 @@ CLONE_TEST2(clone_files_signalignored, C
CLONE_TEST2(clone_files_signalmasked, CLONE_FILES, false, true)
//CLONE_TEST2(clone_sighand_signalignored, CLONE_SIGHAND, true, false) // XXX
//CLONE_TEST2(clone_sighand_signalmasked, CLONE_SIGHAND, false, true) // XXX
+#if TEST_VFORK_ENABLED
CLONE_TEST2(clone_vfork_signalignored, CLONE_VFORK, true, false)
CLONE_TEST2(clone_vfork_signalmasked, CLONE_VFORK, false, true)
#endif
+#endif
///
+#if TEST_VFORK_ENABLE
#if defined(TWAIT_HAVE_PID)
static void
traceme_vfork_clone_body(int flags)
@@ -7079,6 +7092,7 @@ TRACEME_VFORK_CLONE_TEST(traceme_vfork_c
//TRACEME_VFORK_CLONE_TEST(traceme_vfork_clone_sighand, CLONE_SIGHAND) // XXX
TRACEME_VFORK_CLONE_TEST(traceme_vfork_clone_vfork, CLONE_VFORK)
#endif
+#endif
///
CVS commit: [netbsd-8] src/sys/arch/i386/stand/efiboot
Module Name:src
Committed By: martin
Date: Wed Apr 17 15:55:00 UTC 2019
Modified Files:
src/sys/arch/i386/stand/efiboot [netbsd-8]: efidisk.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #1231):
sys/arch/i386/stand/efiboot/efidisk.c: revision 1.7
efiboot: Don't panic when BLOCK_IO_PROTOCOL is not found.
It has been reported that there is a machine where BLOCK_IO_PROTOCOL
can not be found when network boot without disk.
To generate a diff of this commit:
cvs rdiff -u -r1.1.12.5 -r1.1.12.6 src/sys/arch/i386/stand/efiboot/efidisk.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/i386/stand/efiboot/efidisk.c
diff -u src/sys/arch/i386/stand/efiboot/efidisk.c:1.1.12.5 src/sys/arch/i386/stand/efiboot/efidisk.c:1.1.12.6
--- src/sys/arch/i386/stand/efiboot/efidisk.c:1.1.12.5 Wed Apr 11 14:51:43 2018
+++ src/sys/arch/i386/stand/efiboot/efidisk.c Wed Apr 17 15:55:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: efidisk.c,v 1.1.12.5 2018/04/11 14:51:43 martin Exp $ */
+/* $NetBSD: efidisk.c,v 1.1.12.6 2019/04/17 15:55:00 martin Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -57,8 +57,7 @@ efi_disk_probe(void)
status = LibLocateHandle(ByProtocol, , NULL,
, );
if (EFI_ERROR(status))
- panic("LocateHandle(BlockIoProtocol): %" PRIxMAX,
- (uintmax_t)status);
+ return;
if (efi_bootdp != NULL)
depth = efi_device_path_depth(efi_bootdp, MEDIA_DEVICE_PATH);
@@ -76,8 +75,7 @@ efi_disk_probe(void)
status = uefi_call_wrapper(BS->HandleProtocol, 3, handles[i],
, (void **));
if (EFI_ERROR(status))
- panic("HandleProtocol(BlockIoProtocol): %" PRIxMAX,
- (uintmax_t)status);
+ continue;
media = bio->Media;
if (media->LogicalPartition || !media->MediaPresent)
CVS commit: src/sys/arch/sparc/include
Module Name:src
Committed By: martin
Date: Wed Apr 17 15:42:02 UTC 2019
Modified Files:
src/sys/arch/sparc/include: ptrace.h
Log Message:
Make the illegal instruction macro safe, so the compiler does not fear it
would be an illegal instruction when compiling with certain cpu options.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc/include/ptrace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/include/ptrace.h
diff -u src/sys/arch/sparc/include/ptrace.h:1.12 src/sys/arch/sparc/include/ptrace.h:1.13
--- src/sys/arch/sparc/include/ptrace.h:1.12 Tue Apr 16 11:38:21 2019
+++ src/sys/arch/sparc/include/ptrace.h Wed Apr 17 15:42:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ptrace.h,v 1.12 2019/04/16 11:38:21 martin Exp $ */
+/* $NetBSD: ptrace.h,v 1.13 2019/04/17 15:42:02 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -63,7 +63,7 @@
#define PTRACE_REG_SP(r) ((register_t)(r)->r_out[6])
#define PTRACE_REG_INTRV(r) ((register_t)(r)->r_out[0])
-#define PTRACE_ILLEGAL_ASM __asm __volatile ("illtrap 0" : : : "memory")
+#define PTRACE_ILLEGAL_ASM __asm __volatile (".word 0" : : : "memory")
#define PTRACE_BREAKPOINT ((const uint8_t[]) { 0x91, 0xd0, 0x20, 0x01 })
#define PTRACE_BREAKPOINT_ASM __asm __volatile("ta 1")
CVS commit: src/share/misc
Module Name:src
Committed By: sevan
Date: Wed Apr 17 14:06:48 UTC 2019
Modified Files:
src/share/misc: acronyms.comp
Log Message:
LZSS NC-SI NCSI ODM VPD
To generate a diff of this commit:
cvs rdiff -u -r1.243 -r1.244 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.243 src/share/misc/acronyms.comp:1.244
--- src/share/misc/acronyms.comp:1.243 Wed Apr 10 10:57:51 2019
+++ src/share/misc/acronyms.comp Wed Apr 17 14:06:48 2019
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.243 2019/04/10 10:57:51 sevan Exp $
+$NetBSD: acronyms.comp,v 1.244 2019/04/17 14:06:48 sevan Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -827,6 +827,7 @@ LVM logical volume management
LVT local vector table
LVDS Low-Voltage Differential Signaling
LWP light-weight process
+LZSS Lempel Ziv Storer Szymanski
LZW Lempel Ziv Welch
MAC mandatory access control
MAC {media,medium} access control
@@ -941,8 +942,10 @@ NAS network attached storage
NAT network address translation
NAV network allocation vector
NC numerical control
+NC-SI network controller sideband interface
NCO numerically-controlled oscillator
NCP Network Control Protocol
+NCSI network connectivity status indicator
NCQ native command queuing
ND neighbor discovery
NDFA nondeterministic finite automaton
@@ -985,6 +988,7 @@ OBO off by one
OBOE off by one error
OCL object constraint language
OCR optical character recognition
+ODM object data manager
ODCM on-demand clock modulation
ODT on-die termination
OEM original equipment manufacturer
@@ -1576,6 +1580,7 @@ VME virtual mode extension
VMX vector multimedia extensions
VMX virtual machine extensions
VOD video on demand
+VPD vital product data
VPN virtual private network
VR virtual reality
VRAM video random access memory
CVS commit: src
Module Name:src
Committed By: maya
Date: Wed Apr 17 12:30:51 UTC 2019
Modified Files:
src/lib/libperfuse: perfuse.c
src/usr.sbin/perfused: msg.c
Log Message:
fix typo
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/lib/libperfuse/perfuse.c
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/perfused/msg.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/libperfuse/perfuse.c
diff -u src/lib/libperfuse/perfuse.c:1.41 src/lib/libperfuse/perfuse.c:1.42
--- src/lib/libperfuse/perfuse.c:1.41 Fri Nov 16 02:39:02 2018
+++ src/lib/libperfuse/perfuse.c Wed Apr 17 12:30:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: perfuse.c,v 1.41 2018/11/16 02:39:02 manu Exp $ */
+/* $NetBSD: perfuse.c,v 1.42 2019/04/17 12:30:51 maya Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -199,7 +199,7 @@ perfuse_open(const char *path, int flags
}
/*
- * Set a buffer lentgh large enough so that enough FUSE packets
+ * Set a buffer length large enough so that enough FUSE packets
* will fit.
*/
opt = perfuse_bufvar_from_env("PERFUSE_BUFSIZE",
@@ -231,7 +231,7 @@ perfuse_open(const char *path, int flags
}
/*
- * Set a buffer lentgh large enough so that enough FUSE packets
+ * Set a buffer length large enough so that enough FUSE packets
* will fit.
*/
opt = perfuse_bufvar_from_env("PERFUSE_BUFSIZE",
Index: src/usr.sbin/perfused/msg.c
diff -u src/usr.sbin/perfused/msg.c:1.24 src/usr.sbin/perfused/msg.c:1.25
--- src/usr.sbin/perfused/msg.c:1.24 Wed Oct 19 01:31:05 2016
+++ src/usr.sbin/perfused/msg.c Wed Apr 17 12:30:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.c,v 1.24 2016/10/19 01:31:05 christos Exp $ */
+/* $NetBSD: msg.c,v 1.25 2019/04/17 12:30:51 maya Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -78,7 +78,7 @@ perfused_open_sock(void)
(void)strcpy(sun.sun_path, _PATH_FUSE);
/*
- * Set a buffer lentgh large enough so that a few FUSE packets
+ * Set a buffer length large enough so that a few FUSE packets
* will fit.
*/
opt = perfuse_bufvar_from_env("PERFUSE_BUFSIZE", 16 * FUSE_BUFSIZE);
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: mrg Date: Wed Apr 17 11:01:19 UTC 2019 Modified Files: src/sys/arch/riscv/include: int_fmtio.h Log Message: fix for riscv32. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/include/int_fmtio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/riscv/include/int_fmtio.h diff -u src/sys/arch/riscv/include/int_fmtio.h:1.3 src/sys/arch/riscv/include/int_fmtio.h:1.4 --- src/sys/arch/riscv/include/int_fmtio.h:1.3 Tue Apr 16 07:08:52 2019 +++ src/sys/arch/riscv/include/int_fmtio.h Wed Apr 17 11:01:19 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: int_fmtio.h,v 1.3 2019/04/16 07:08:52 maya Exp $ */ +/* $NetBSD: int_fmtio.h,v 1.4 2019/04/17 11:01:19 mrg Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -53,11 +53,13 @@ #define PRIdLEAST32 "d" /* int_least32_t */ #ifdef _LP64 #define PRIdLEAST64 "ld" /* int_least64_t */ +#define PRIdFAST8 "d" /* int_fast8_t */ +#define PRIdFAST16 "d" /* int_fast16_t */ #else #define PRIdLEAST64 "lld" /* int_least64_t */ -#endif #define PRIdFAST8 "hhd" /* int_fast8_t */ #define PRIdFAST16 "hd" /* int_fast16_t */ +#endif #define PRIdFAST32 "d" /* int_fast32_t */ #ifdef _LP64 #define PRIdFAST64 "ld" /* int_fast64_t */ @@ -81,11 +83,13 @@ #define PRIiLEAST32 "i" /* int_least32_t */ #ifdef _LP64 #define PRIiLEAST64 "li" /* int_least64_t */ +#define PRIiFAST8 "i" /* int_fast8_t */ +#define PRIiFAST16 "i" /* int_fast16_t */ #else #define PRIiLEAST64 "lli" /* int_least64_t */ -#endif #define PRIiFAST8 "hhi" /* int_fast8_t */ #define PRIiFAST16 "hi" /* int_fast16_t */ +#endif #define PRIiFAST32 "i" /* int_fast32_t */ #ifdef _LP64 #define PRIiFAST64 "li" /* int_fast64_t */ @@ -111,11 +115,13 @@ #define PRIoLEAST32 "ho" /* uint_least32_t */ #ifdef _LP64 #define PRIoLEAST64 "lo" /* uint_least64_t */ +#define PRIoFAST8 "o" /* uint_fast8_t */ +#define PRIoFAST16 "o" /* uint_fast16_t */ #else #define PRIoLEAST64 "llo" /* uint_least64_t */ -#endif #define PRIoFAST8 "hho" /* uint_fast8_t */ #define PRIoFAST16 "ho" /* uint_fast16_t */ +#endif #define PRIoFAST32 "o" /* uint_fast32_t */ #ifdef _LP64 #define PRIoFAST64 "lo" /* uint_fast64_t */ @@ -139,11 +145,13 @@ #define PRIuLEAST32 "u" /* uint_least32_t */ #ifdef _LP64 #define PRIuLEAST64 "lu" /* uint_least64_t */ +#define PRIuFAST8 "u" /* uint_fast8_t */ +#define PRIuFAST16 "u" /* uint_fast16_t */ #else #define PRIuLEAST64 "llu" /* uint_least64_t */ -#endif #define PRIuFAST8 "hhu" /* uint_fast8_t */ #define PRIuFAST16 "hu" /* uint_fast16_t */ +#endif #define PRIuFAST32 "u" /* uint_fast32_t */ #ifdef _LP64 #define PRIuFAST64 "lu" /* uint_fast64_t */ @@ -167,11 +175,13 @@ #define PRIxLEAST32 "x" /* uint_least32_t */ #ifdef _LP64 #define PRIxLEAST64 "lx" /* uint_least64_t */ +#define PRIxFAST8 "x" /* uint_fast8_t */ +#define PRIxFAST16 "x" /* uint_fast16_t */ #else #define PRIxLEAST64 "llx" /* uint_least64_t */ +#define PRIxFAST8 "hhx" /* uint_fast8_t */ +#define PRIxFAST16 "hx" /* uint_fast16_t */ #endif -#define PRIxFAST8 "x" /* uint_fast8_t */ -#define PRIxFAST16 "x" /* uint_fast16_t */ #define PRIxFAST32 "x" /* uint_fast32_t */ #ifdef _LP64 #define PRIxFAST64 "lx" /* uint_fast64_t */ @@ -195,11 +205,13 @@ #define PRIXLEAST32 "X" /* uint_least32_t */ #ifdef _LP64 #define PRIXLEAST64 "lX" /* uint_least64_t */ +#define PRIXFAST8 "X" /* uint_fast8_t */ +#define PRIXFAST16 "X" /* uint_fast16_t */ #else #define PRIXLEAST64 "llX" /* uint_least64_t */ +#define PRIXFAST8 "hhX" /* uint_fast8_t */ +#define PRIXFAST16 "hX" /* uint_fast16_t */ #endif -#define PRIXFAST8 "X" /* uint_fast8_t */ -#define PRIXFAST16 "X" /* uint_fast16_t */ #define PRIXFAST32 "X" /* uint_fast32_t */ #ifdef _LP64 #define PRIXFAST64 "lX" /* uint_fast64_t */ @@ -225,11 +237,13 @@ #define SCNdLEAST32 "d" /* int_least32_t */ #ifdef _LP64 #define SCNdLEAST64 "ld" /* int_least64_t */ +#define SCNdFAST8 "d" /* int_fast8_t */ +#define SCNdFAST16 "d" /* int_fast16_t */ #else #define SCNdLEAST64 "lld" /* int_least64_t */ +#define SCNdFAST8 "hhd" /* int_fast8_t */ +#define SCNdFAST16 "hd" /* int_fast16_t */ #endif -#define SCNdFAST8 "d" /* int_fast8_t */ -#define SCNdFAST16 "d" /* int_fast16_t */ #define SCNdFAST32 "d" /* int_fast32_t */ #ifdef _LP64 #define SCNdFAST64 "ld" /* int_fast64_t */ @@ -253,11 +267,13 @@ #define SCNiLEAST32 "i" /* int_least32_t */ #ifdef _LP64 #define SCNiLEAST64 "li" /* int_least64_t */ +#define SCNiFAST8 "i" /* int_fast8_t */ +#define SCNiFAST16 "i" /* int_fast16_t */ #else #define SCNiLEAST64 "lli" /* int_least64_t */ +#define SCNiFAST8 "hhi" /* int_fast8_t */ +#define SCNiFAST16 "hi" /* int_fast16_t */ #endif -#define SCNiFAST8 "i" /* int_fast8_t */ -#define SCNiFAST16 "i" /* int_fast16_t */ #define SCNiFAST32 "i" /* int_fast32_t */ #ifdef _LP64 #define
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Wed Apr 17 10:07:01 UTC 2019
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/riscv: netbsd.h
src/external/gpl3/gcc/dist/libgcc: config.host
src/external/gpl3/gcc/dist/libgcc/config/riscv: t-netbsd
src/external/gpl3/gcc/lib/libgcc/arch/riscv64: defs.mk
Added Files:
src/external/gpl3/gcc/dist/libgcc/config/riscv: t-netbsd64
Log Message:
- define __riscv__ again
- define *intptr_t in terms of 'long int' always
- move fixtfdi.c, fixunstfdi.c, floatditf.c, and floatunditf.c into t-netbsd64
- remove duplicated riscv case in config.gcc, reducing upstream diff as well
- regen riscv64 mknative
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h
cvs rdiff -u -r1.24 -r1.25 src/external/gpl3/gcc/dist/libgcc/config.host
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd64
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.10 src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.11
--- src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.10 Mon Apr 15 21:13:36 2019
+++ src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h Wed Apr 17 10:07:00 2019
@@ -32,6 +32,7 @@ Boston, MA 02111-1307, USA. */
#define TARGET_OS_CPP_BUILTINS()\
do {\
NETBSD_OS_CPP_BUILTINS_ELF();\
+builtin_define ("__riscv__");\
/* The GNU C++ standard library requires this. */ \
if (c_dialect_cxx ()) \
builtin_define ("_GNU_SOURCE");\
@@ -62,3 +63,9 @@ Boston, MA 02111-1307, USA. */
#undef NETBSD_ENTRY_POINT
#define NETBSD_ENTRY_POINT "_start"
+
+#undef UINTPTR_TYPE
+#define UINTPTR_TYPE "long unsigned int"
+
+#undef INTPTR_TYPE
+#define INTPTR_TYPE "long int"
Index: src/external/gpl3/gcc/dist/libgcc/config.host
diff -u src/external/gpl3/gcc/dist/libgcc/config.host:1.24 src/external/gpl3/gcc/dist/libgcc/config.host:1.25
--- src/external/gpl3/gcc/dist/libgcc/config.host:1.24 Tue Apr 16 07:50:05 2019
+++ src/external/gpl3/gcc/dist/libgcc/config.host Wed Apr 17 10:07:00 2019
@@ -168,9 +168,6 @@ or1k-*-* | or1knd-*-*)
powerpc*-*-*)
cpu_type=rs6000
;;
-riscv*-*-*)
- cpu_type=riscv
- ;;
rs6000*-*-*)
;;
riscv*-*-*)
@@ -1158,6 +1155,11 @@ riscv*-*-linux*)
;;
riscv*-*-netbsd*)
tmake_file="${tmake_file} riscv/t-netbsd"
+ case ${host} in
+ riscv64*)
+ tmake_file="${tmake_file} riscv/t-netbsd64"
+ ;;
+ esac
;;
riscv*-*-*)
tmake_file="${tmake_file} riscv/t-softfp${host_address} t-softfp riscv/t-elf riscv/t-elf${host_address}"
Index: src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd
diff -u src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd:1.1 src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd:1.2
--- src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd:1.1 Tue Apr 16 07:50:05 2019
+++ src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd Wed Apr 17 10:07:00 2019
@@ -11,10 +11,6 @@ LIB2ADD += $(srcdir)/soft-fp/addtf3.c \
$(srcdir)/soft-fp/fixunstfsi.c \
$(srcdir)/soft-fp/floatsitf.c \
$(srcdir)/soft-fp/floatunsitf.c \
- $(srcdir)/soft-fp/fixtfdi.c \
- $(srcdir)/soft-fp/fixunstfdi.c \
- $(srcdir)/soft-fp/floatditf.c \
- $(srcdir)/soft-fp/floatunditf.c \
$(srcdir)/soft-fp/extendsftf2.c \
$(srcdir)/soft-fp/extenddftf2.c \
$(srcdir)/soft-fp/trunctfsf2.c \
Index: src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk:1.5 src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk:1.6
--- src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk:1.5 Tue Apr 16 08:01:36 2019
+++ src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk Wed Apr 17 10:07:00 2019
@@ -4,7 +4,7 @@
#
G_INCLUDES=-I. -I. -I../.././gcc -I${GNUHOSTDIST}/libgcc -I${GNUHOSTDIST}/libgcc/. -I${GNUHOSTDIST}/libgcc/../gcc -I${GNUHOSTDIST}/libgcc/../include
G_INTERNAL_CFLAGS=-g -O2 -O2 -DIN_GCC-W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -fPIC -g -DIN_LIBGCC2 -fbuilding-libgcc -fno-stack-protector -fPIC -I. -I. -I../.././gcc -I${GNUHOSTDIST}/libgcc -I${GNUHOSTDIST}/libgcc/. -I${GNUHOSTDIST}/libgcc/../gcc -I${GNUHOSTDIST}/libgcc/../include -DHAVE_CC_TLS
-G_LIB2ADD= ${GNUHOSTDIST}/libgcc/soft-fp/addtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/divtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/eqtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/getf2.c ${GNUHOSTDIST}/libgcc/soft-fp/letf2.c ${GNUHOSTDIST}/libgcc/soft-fp/multf3.c ${GNUHOSTDIST}/libgcc/soft-fp/negtf2.c
CVS commit: src/sys/compat/common
Module Name:src
Committed By: msaitoh
Date: Wed Apr 17 09:21:57 UTC 2019
Modified Files:
src/sys/compat/common: compat_70_mod.c compat_80_mod.c
Log Message:
KNF. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/common/compat_70_mod.c \
src/sys/compat/common/compat_80_mod.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/compat_70_mod.c
diff -u src/sys/compat/common/compat_70_mod.c:1.2 src/sys/compat/common/compat_70_mod.c:1.3
--- src/sys/compat/common/compat_70_mod.c:1.2 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/compat_70_mod.c Wed Apr 17 09:21:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_70_mod.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: compat_70_mod.c,v 1.3 2019/04/17 09:21:57 msaitoh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: compat_70_mod.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_70_mod.c,v 1.3 2019/04/17 09:21:57 msaitoh Exp $");
#include
#include
@@ -54,7 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: compat_70_mo
#include
#include
-int compat_70_init(void)
+int
+compat_70_init(void)
{
compat70_ocreds_valid = true;
@@ -64,7 +65,8 @@ int compat_70_init(void)
return 0;
}
-int compat_70_fini(void)
+int
+compat_70_fini(void)
{
uipc_usrreq_70_fini();
Index: src/sys/compat/common/compat_80_mod.c
diff -u src/sys/compat/common/compat_80_mod.c:1.2 src/sys/compat/common/compat_80_mod.c:1.3
--- src/sys/compat/common/compat_80_mod.c:1.2 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/compat_80_mod.c Wed Apr 17 09:21:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_80_mod.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: compat_80_mod.c,v 1.3 2019/04/17 09:21:57 msaitoh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: compat_80_mod.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_80_mod.c,v 1.3 2019/04/17 09:21:57 msaitoh Exp $");
#include
#include
@@ -46,7 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: compat_80_mo
#include
#include
-int compat_80_init(void)
+int
+compat_80_init(void)
{
kern_mod_80_init();
@@ -54,7 +55,8 @@ int compat_80_init(void)
return 0;
}
-int compat_80_fini(void)
+int
+compat_80_fini(void)
{
kern_mod_80_fini();
CVS commit: src/external
Module Name:src
Committed By: mrg
Date: Wed Apr 17 08:56:10 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib/libgcc/arch/riscv32: defs.mk
src/external/gpl3/gcc/lib/libgomp/arch/riscv32: config.h omp.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32: c++config.h
cxxabi_tweaks.h defs.mk gstdint.h
src/external/gpl3/gcc/usr.bin/gcc/arch/riscv32: auto-host.h tm.h
src/external/lgpl3/gmp/lib/libgmp/arch/riscv32: Makefile.inc gmp.h
Added Files:
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32: symver-config.h
Log Message:
fake mknative, mostly enough to build real for mknative.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libgcc/arch/riscv32/defs.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libgomp/arch/riscv32/config.h \
src/external/gpl3/gcc/lib/libgomp/arch/riscv32/omp.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32/c++config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32/cxxabi_tweaks.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32/defs.mk \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32/gstdint.h
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32/symver-config.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/usr.bin/gcc/arch/riscv32/auto-host.h
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/gcc/arch/riscv32/tm.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/lgpl3/gmp/lib/libgmp/arch/riscv32/Makefile.inc \
src/external/lgpl3/gmp/lib/libgmp/arch/riscv32/gmp.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/libgcc/arch/riscv32/defs.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/riscv32/defs.mk:1.3 src/external/gpl3/gcc/lib/libgcc/arch/riscv32/defs.mk:1.4
--- src/external/gpl3/gcc/lib/libgcc/arch/riscv32/defs.mk:1.3 Wed Feb 27 08:22:43 2019
+++ src/external/gpl3/gcc/lib/libgcc/arch/riscv32/defs.mk Wed Apr 17 08:56:10 2019
@@ -4,7 +4,7 @@
#
G_INCLUDES=-I. -I. -I../.././gcc -I${GNUHOSTDIST}/libgcc -I${GNUHOSTDIST}/libgcc/. -I${GNUHOSTDIST}/libgcc/../gcc -I${GNUHOSTDIST}/libgcc/../include
G_INTERNAL_CFLAGS=-g -O2 -O2 -g -O2 -DIN_GCC -DCROSS_DIRECTORY_STRUCTURE -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -fPIC -g -DIN_LIBGCC2 -fbuilding-libgcc -fno-stack-protector -fPIC -I. -I. -I../.././gcc -I${GNUHOSTDIST}/libgcc -I${GNUHOSTDIST}/libgcc/. -I${GNUHOSTDIST}/libgcc/../gcc -I${GNUHOSTDIST}/libgcc/../include -DHAVE_CC_TLS
-G_LIB2ADD= enable-execute-stack.c
+G_LIB2ADD= ${GNUHOSTDIST}/libgcc/soft-fp/addtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/divtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/eqtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/getf2.c ${GNUHOSTDIST}/libgcc/soft-fp/letf2.c ${GNUHOSTDIST}/libgcc/soft-fp/multf3.c ${GNUHOSTDIST}/libgcc/soft-fp/negtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/subtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/unordtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/fixtfsi.c ${GNUHOSTDIST}/libgcc/soft-fp/fixunstfsi.c ${GNUHOSTDIST}/libgcc/soft-fp/floatsitf.c ${GNUHOSTDIST}/libgcc/soft-fp/floatunsitf.c ${GNUHOSTDIST}/libgcc/soft-fp/extendsftf2.c ${GNUHOSTDIST}/libgcc/soft-fp/extenddftf2.c ${GNUHOSTDIST}/libgcc/soft-fp/trunctfsf2.c ${GNUHOSTDIST}/libgcc/soft-fp/trunctfdf2.c enable-execute-stack.c
G_LIB2ADDEH=${GNUHOSTDIST}/libgcc/unwind-dw2.c ${GNUHOSTDIST}/libgcc/unwind-dw2-fde-dip.c ${GNUHOSTDIST}/libgcc/unwind-sjlj.c ${GNUHOSTDIST}/libgcc/unwind-c.c ${GNUHOSTDIST}/libgcc/emutls.c
G_LIB2ADD_ST=
G_LIB1ASMFUNCS=
Index: src/external/gpl3/gcc/lib/libgomp/arch/riscv32/config.h
diff -u src/external/gpl3/gcc/lib/libgomp/arch/riscv32/config.h:1.1 src/external/gpl3/gcc/lib/libgomp/arch/riscv32/config.h:1.2
--- src/external/gpl3/gcc/lib/libgomp/arch/riscv32/config.h:1.1 Fri Sep 19 17:23:24 2014
+++ src/external/gpl3/gcc/lib/libgomp/arch/riscv32/config.h Wed Apr 17 08:56:10 2019
@@ -1,6 +1,6 @@
/* This file is automatically generated. DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp */
-/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp */
+/* Generated from: NetBSD: mknative-gcc,v 1.100 2019/02/09 03:57:00 mrg Exp */
+/* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
@@ -29,18 +29,39 @@
/* Define to 1 if you have the header file. */
#define HAVE_DLFCN_H 1
+/* Define to 1 if you have the `getegid' function. */
+#define HAVE_GETEGID 1
+
+/* Define to 1 if you have the `geteuid' function. */
+#define HAVE_GETEUID 1
+
+/* Define to 1 if you have the `getgid' function. */
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Wed Apr 17 07:55:33 UTC 2019 Modified Files: src/distrib/sets/lists/comp: ad.riscv Log Message: fix MKCOMPAT=no builds. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/comp/ad.riscv 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.riscv diff -u src/distrib/sets/lists/comp/ad.riscv:1.12 src/distrib/sets/lists/comp/ad.riscv:1.13 --- src/distrib/sets/lists/comp/ad.riscv:1.12 Sat Jan 19 13:06:50 2019 +++ src/distrib/sets/lists/comp/ad.riscv Wed Apr 17 07:55:33 2019 @@ -1,8 +1,8 @@ -# $NetBSD: ad.riscv,v 1.12 2019/01/19 13:06:50 mrg Exp $ -./usr/include/g++/bits/riscv32 comp-c-include arch64 -./usr/include/g++/bits/riscv32/c++config.h comp-c-include arch64,gcc -./usr/include/g++/bits/riscv64 comp-c-include arch64 -./usr/include/g++/bits/riscv64/c++config.h comp-c-include arch64,gcc +# $NetBSD: ad.riscv,v 1.13 2019/04/17 07:55:33 mrg Exp $ +./usr/include/g++/bits/riscv32 comp-c-include arch64,compat +./usr/include/g++/bits/riscv32/c++config.h comp-c-include arch64,gcc,compat +./usr/include/g++/bits/riscv64 comp-c-include arch64,compat +./usr/include/g++/bits/riscv64/c++config.h comp-c-include arch64,gcc,compat ./usr/include/gcc-4.8/tgmath.h comp-obsolete obsolete ./usr/include/gcc-5/tgmath.h comp-obsolete obsolete ./usr/include/gcc-6/tgmath.h comp-c-include gcc=6
CVS commit: src/sys/net
Module Name:src Committed By: msaitoh Date: Wed Apr 17 07:47:56 UTC 2019 Modified Files: src/sys/net: if_gre.c Log Message: Remove unused inclusion. To generate a diff of this commit: cvs rdiff -u -r1.173 -r1.174 src/sys/net/if_gre.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/if_gre.c diff -u src/sys/net/if_gre.c:1.173 src/sys/net/if_gre.c:1.174 --- src/sys/net/if_gre.c:1.173 Tue Jun 26 06:48:02 2018 +++ src/sys/net/if_gre.c Wed Apr 17 07:47:56 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_gre.c,v 1.173 2018/06/26 06:48:02 msaitoh Exp $ */ +/* $NetBSD: if_gre.c,v 1.174 2019/04/17 07:47:56 msaitoh Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.173 2018/06/26 06:48:02 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.174 2019/04/17 07:47:56 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_atalk.h" @@ -119,9 +119,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1 #include -#include -#include - #include "ioconf.h" /*
CVS commit: src/lib/libm
Module Name:src
Committed By: mrg
Date: Wed Apr 17 07:45:23 UTC 2019
Modified Files:
src/lib/libm: Makefile
Log Message:
also want s_nexttoward.c on riscv. now tests/lib/libm links.
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/lib/libm/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/libm/Makefile
diff -u src/lib/libm/Makefile:1.207 src/lib/libm/Makefile:1.208
--- src/lib/libm/Makefile:1.207 Mon Apr 15 18:44:26 2019
+++ src/lib/libm/Makefile Wed Apr 17 07:45:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.207 2019/04/15 18:44:26 maya Exp $
+# $NetBSD: Makefile,v 1.208 2019/04/17 07:45:23 mrg Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -176,7 +176,7 @@ WARNS?=5
.elif (${LIBC_MACHINE_CPU} == "riscv")
.PATH: ${.CURDIR}/arch/riscv
-COMMON_SRCS+= s_rintl.c
+COMMON_SRCS+= s_nexttoward.c s_rintl.c
.if ${MKSOFTFLOAT} == "no"
COMMON_SRCS += fenv.c
CVS commit: src/common/lib/libc/arch/riscv/atomic
Module Name:src
Committed By: mrg
Date: Wed Apr 17 07:40:35 UTC 2019
Modified Files:
src/common/lib/libc/arch/riscv/atomic: Makefile.inc
Log Message:
add missing atomic_and_16_nv_cas.c atomic_and_8_nv_cas.c.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/riscv/atomic/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/common/lib/libc/arch/riscv/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/riscv/atomic/Makefile.inc:1.2 src/common/lib/libc/arch/riscv/atomic/Makefile.inc:1.3
--- src/common/lib/libc/arch/riscv/atomic/Makefile.inc:1.2 Thu Oct 16 18:52:17 2014
+++ src/common/lib/libc/arch/riscv/atomic/Makefile.inc Wed Apr 17 07:40:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2014/10/16 18:52:17 dennis Exp $
+# $NetBSD: Makefile.inc,v 1.3 2019/04/17 07:40:34 mrg Exp $
.for op in add and cas nand or sub swap xor
sizes=32
@@ -27,4 +27,8 @@ SRCS.atomic+= atomic_init_cas.c \
.endif #LIB
+.if ${LIB} == "c"
+SRCS.atomic+= atomic_and_16_nv_cas.c atomic_and_8_nv_cas.c
+.endif
+
SRCS+= ${SRCS.atomic}
CVS commit: src/common/lib/libc/arch/riscv/atomic
Module Name:src Committed By: mrg Date: Wed Apr 17 07:35:38 UTC 2019 Modified Files: src/common/lib/libc/arch/riscv/atomic: atomic_cas_32.S Log Message: add missing aliases for _atomic_cas_32_ni and atomic_cas_uint_ni. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/common/lib/libc/arch/riscv/atomic/atomic_cas_32.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/riscv/atomic/atomic_cas_32.S diff -u src/common/lib/libc/arch/riscv/atomic/atomic_cas_32.S:1.2 src/common/lib/libc/arch/riscv/atomic/atomic_cas_32.S:1.3 --- src/common/lib/libc/arch/riscv/atomic/atomic_cas_32.S:1.2 Fri Mar 27 06:42:37 2015 +++ src/common/lib/libc/arch/riscv/atomic/atomic_cas_32.S Wed Apr 17 07:35:38 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_cas_32.S,v 1.2 2015/03/27 06:42:37 matt Exp $ */ +/* $NetBSD: atomic_cas_32.S,v 1.3 2019/04/17 07:35:38 mrg Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. * All rights reserved. @@ -43,6 +43,12 @@ END(_atomic_cas_32) ATOMIC_OP_ALIAS(atomic_cas_32,_atomic_cas_32) ATOMIC_OP_ALIAS(atomic_cas_uint,_atomic_cas_32) STRONG_ALIAS(_atomic_cas_uint,_atomic_cas_32) + +ATOMIC_OP_ALIAS(atomic_cas_32_ni,_atomic_cas_32) +STRONG_ALIAS(_atomic_cas_32_ni,_atomic_cas_32) +ATOMIC_OP_ALIAS(atomic_cas_uint_ni,_atomic_cas_32) +STRONG_ALIAS(_atomic_cas_uint_ni,_atomic_cas_32) + #ifndef _LP64 ATOMIC_OP_ALIAS(atomic_cas_ulong,_atomic_cas_32) STRONG_ALIAS(_atomic_cas_ulong,_atomic_cas_32)
CVS commit: src/sys/net
Module Name:src
Committed By: msaitoh
Date: Wed Apr 17 07:04:04 UTC 2019
Modified Files:
src/sys/net: if_media.h
Log Message:
Tabify. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/net/if_media.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/net/if_media.h
diff -u src/sys/net/if_media.h:1.61 src/sys/net/if_media.h:1.62
--- src/sys/net/if_media.h:1.61 Wed Oct 4 07:08:01 2017
+++ src/sys/net/if_media.h Wed Apr 17 07:04:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_media.h,v 1.61 2017/10/04 07:08:01 msaitoh Exp $ */
+/* $NetBSD: if_media.h,v 1.62 2019/04/17 07:04:03 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -407,12 +407,12 @@ struct ifmedia_description {
{ IFM_ETHER | IFM_10G_SR | IFM_FDX, "10GSR" }, \
{ IFM_ETHER | IFM_10G_SR | IFM_FDX, "10GBASE-SR" }, \
{ IFM_ETHER | IFM_10G_LRM | IFM_FDX, "10Gbase-LRM" }, \
- { IFM_ETHER | IFM_10G_TWINAX | IFM_FDX, "10Gbase-Twinax" }, \
+ { IFM_ETHER | IFM_10G_TWINAX | IFM_FDX, "10Gbase-Twinax" }, \
{ IFM_ETHER | IFM_10G_TWINAX_LONG | IFM_FDX, "10Gbase-Twinax-Long" },\
{ IFM_ETHER | IFM_10G_T | IFM_FDX, "10Gbase-T" }, \
{ IFM_ETHER | IFM_10G_CX4 | IFM_FDX, "10GbaseCX4" }, \
{ IFM_ETHER | IFM_10G_CX4 | IFM_FDX, "10GCX4" }, \
- { IFM_ETHER | IFM_10G_CX4 | IFM_FDX, "10GBASE-CX4" }, \
+ { IFM_ETHER | IFM_10G_CX4 | IFM_FDX, "10GBASE-CX4" }, \
{ IFM_ETHER | IFM_2500_SX | IFM_FDX, "2500baseSX" }, \
{ IFM_ETHER | IFM_2500_SX | IFM_FDX, "2500SX" }, \
\
@@ -460,11 +460,11 @@ struct ifmedia_description {
{ IFM_IEEE80211 | IFM_IEEE80211_OFDM48, "OFDM48" }, \
{ IFM_IEEE80211 | IFM_IEEE80211_OFDM54, "OFDM54" }, \
{ IFM_IEEE80211 | IFM_IEEE80211_OFDM72, "OFDM72" }, \
- { IFM_IEEE80211 | IFM_IEEE80211_DS354k, "DS/354Kbps" }, \
- { IFM_IEEE80211 | IFM_IEEE80211_DS512k, "DS/512Kbps" }, \
- { IFM_IEEE80211 | IFM_IEEE80211_OFDM3, "OFDM/3Mbps" }, \
- { IFM_IEEE80211 | IFM_IEEE80211_OFDM4, "OFDM/4.5Mbps" }, \
- { IFM_IEEE80211 | IFM_IEEE80211_OFDM27, "OFDM/27Mbps" },\
+ { IFM_IEEE80211 | IFM_IEEE80211_DS354k, "DS/354Kbps" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_DS512k, "DS/512Kbps" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_OFDM3, "OFDM/3Mbps" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_OFDM4, "OFDM/4.5Mbps" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_OFDM27, "OFDM/27Mbps" }, \
\
{ 0, NULL }, \
}
@@ -514,7 +514,7 @@ struct ifmedia_description {
{ IFM_IEEE80211 | IFM_IEEE80211_MONITOR,"monitor" }, \
{ IFM_IEEE80211 | IFM_IEEE80211_TURBO, "turbo" }, \
{ IFM_IEEE80211 | IFM_IEEE80211_IBSS, "ibss" }, \
- { IFM_IEEE80211 | IFM_IEEE80211_WDS, "wds" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_WDS, "wds" }, \
{ IFM_IEEE80211 | IFM_IEEE80211_MBSS, "mesh" }, \
\
{ 0, NULL }, \
CVS commit: src/sys/arch/i386/stand/efiboot
Module Name:src
Committed By: nonaka
Date: Wed Apr 17 06:50:34 UTC 2019
Modified Files:
src/sys/arch/i386/stand/efiboot: efidisk.c
Log Message:
efiboot: Don't panic when BLOCK_IO_PROTOCOL is not found.
It has been reported that there is a machine where BLOCK_IO_PROTOCOL
can not be found when network boot without disk.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/i386/stand/efiboot/efidisk.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/i386/stand/efiboot/efidisk.c
diff -u src/sys/arch/i386/stand/efiboot/efidisk.c:1.6 src/sys/arch/i386/stand/efiboot/efidisk.c:1.7
--- src/sys/arch/i386/stand/efiboot/efidisk.c:1.6 Wed Apr 11 10:32:09 2018
+++ src/sys/arch/i386/stand/efiboot/efidisk.c Wed Apr 17 06:50:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: efidisk.c,v 1.6 2018/04/11 10:32:09 nonaka Exp $ */
+/* $NetBSD: efidisk.c,v 1.7 2019/04/17 06:50:34 nonaka Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -57,8 +57,7 @@ efi_disk_probe(void)
status = LibLocateHandle(ByProtocol, , NULL,
, );
if (EFI_ERROR(status))
- panic("LocateHandle(BlockIoProtocol): %" PRIxMAX,
- (uintmax_t)status);
+ return;
if (efi_bootdp != NULL)
depth = efi_device_path_depth(efi_bootdp, MEDIA_DEVICE_PATH);
@@ -76,8 +75,7 @@ efi_disk_probe(void)
status = uefi_call_wrapper(BS->HandleProtocol, 3, handles[i],
, (void **));
if (EFI_ERROR(status))
- panic("HandleProtocol(BlockIoProtocol): %" PRIxMAX,
- (uintmax_t)status);
+ continue;
media = bio->Media;
if (media->LogicalPartition || !media->MediaPresent)
