CVS commit: src/tests/net
Module Name:src Committed By: ozaki-r Date: Mon Nov 28 07:29:56 UTC 2016 Modified Files: src/tests/net: net_common.sh Log Message: Use redirection instead of pipeline This is a workaround for PR bin/51667. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/tests/net/net_common.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/net/net_common.sh diff -u src/tests/net/net_common.sh:1.8 src/tests/net/net_common.sh:1.9 --- src/tests/net/net_common.sh:1.8 Sat Nov 26 03:20:42 2016 +++ src/tests/net/net_common.sh Mon Nov 28 07:29:56 2016 @@ -1,4 +1,4 @@ -# $NetBSD: net_common.sh,v 1.8 2016/11/26 03:20:42 ozaki-r Exp $ +# $NetBSD: net_common.sh,v 1.9 2016/11/28 07:29:56 ozaki-r Exp $ # # Copyright (c) 2016 Internet Initiative Japan Inc. # All rights reserved. @@ -219,13 +219,15 @@ rump_server_destroy_ifaces() local backup=$RUMP_SERVER $DEBUG && cat $_rump_server_ifaces - cat $_rump_server_ifaces | while read sock ifname; do + # XXX using pipe doesn't work. See PR bin/51667 + #cat $_rump_server_ifaces | while read sock ifname; do + while read sock ifname; do export RUMP_SERVER=$sock if rump.ifconfig -l |grep -q $ifname; then atf_check -s exit:0 rump.ifconfig $ifname destroy fi atf_check -s exit:0 -o ignore rump.ifconfig - done + done < $_rump_server_ifaces export RUMP_SERVER=$backup return 0
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: knakahara
Date: Mon Nov 28 06:09:19 UTC 2016
Modified Files:
src/sys/dev/pci/ixgbe: ixv.c
Log Message:
fix build of ixv enabled NO_PCI_MSI_MSIX option.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/ixgbe/ixv.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/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.18 src/sys/dev/pci/ixgbe/ixv.c:1.19
--- src/sys/dev/pci/ixgbe/ixv.c:1.18 Fri Nov 25 13:33:24 2016
+++ src/sys/dev/pci/ixgbe/ixv.c Mon Nov 28 06:09:19 2016
@@ -31,7 +31,7 @@
**/
/*$FreeBSD: head/sys/dev/ixgbe/ixv.c 275358 2014-12-01 11:45:24Z hselasky $*/
-/*$NetBSD: ixv.c,v 1.18 2016/11/25 13:33:24 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.19 2016/11/28 06:09:19 knakahara Exp $*/
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -264,9 +264,9 @@ static int ixv_total_ports;
static int
ixv_probe(device_t dev, cfdata_t cf, void *aux)
{
+#ifdef __HAVE_PCI_MSI_MSIX
const struct pci_attach_args *pa = aux;
-#ifdef __HAVE_PCI_MSI_MSIX
return (ixv_lookup(pa) != NULL) ? 1 : 0;
#else
return 0;
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: knakahara
Date: Mon Nov 28 05:00:41 UTC 2016
Modified Files:
src/sys/arch/x86/pci: pci_intr_machdep.c pci_msi_machdep.c
Log Message:
fix build of amd64/i386 with NO_PCI_MSI_MSIX option.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/x86/pci/pci_intr_machdep.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/pci/pci_msi_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/x86/pci/pci_intr_machdep.c
diff -u src/sys/arch/x86/pci/pci_intr_machdep.c:1.38 src/sys/arch/x86/pci/pci_intr_machdep.c:1.39
--- src/sys/arch/x86/pci/pci_intr_machdep.c:1.38 Mon Jul 11 06:14:51 2016
+++ src/sys/arch/x86/pci/pci_intr_machdep.c Mon Nov 28 05:00:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_intr_machdep.c,v 1.38 2016/07/11 06:14:51 knakahara Exp $ */
+/* $NetBSD: pci_intr_machdep.c,v 1.39 2016/11/28 05:00:41 knakahara Exp $ */
/*-
* Copyright (c) 1997, 1998, 2009 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.38 2016/07/11 06:14:51 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.39 2016/11/28 05:00:41 knakahara Exp $");
#include
#include
@@ -274,8 +274,8 @@ pci_intr_setattr(pci_chipset_tag_t pc, p
}
}
-void *
-pci_intr_establish_xname(pci_chipset_tag_t pc, pci_intr_handle_t ih,
+static void *
+pci_intr_establish_xname_internal(pci_chipset_tag_t pc, pci_intr_handle_t ih,
int level, int (*func)(void *), void *arg, const char *xname)
{
int pin, irq;
@@ -331,8 +331,19 @@ pci_intr_establish(pci_chipset_tag_t pc,
int level, int (*func)(void *), void *arg)
{
- return pci_intr_establish_xname(pc, ih, level, func, arg, "unknown");
+ return pci_intr_establish_xname_internal(pc, ih, level, func, arg, "unknown");
+}
+
+#ifdef __HAVE_PCI_MSI_MSIX
+void *
+pci_intr_establish_xname(pci_chipset_tag_t pc, pci_intr_handle_t ih,
+int level, int (*func)(void *), void *arg, const char *xname)
+{
+
+ return pci_intr_establish_xname_internal(pc, ih, level, func, arg, xname);
}
+#endif
+
void
pci_intr_disestablish(pci_chipset_tag_t pc, void *cookie)
@@ -351,6 +362,7 @@ pci_intr_disestablish(pci_chipset_tag_t
}
#if NIOAPIC > 0
+#ifdef __HAVE_PCI_MSI_MSIX
pci_intr_type_t
pci_intr_type(pci_chipset_tag_t pc, pci_intr_handle_t ih)
{
@@ -544,4 +556,5 @@ pci_intr_release(pci_chipset_tag_t pc, p
}
}
-#endif
+#endif /* __HAVE_PCI_MSI_MSIX */
+#endif /* NIOAPIC > 0 */
Index: src/sys/arch/x86/pci/pci_msi_machdep.c
diff -u src/sys/arch/x86/pci/pci_msi_machdep.c:1.9 src/sys/arch/x86/pci/pci_msi_machdep.c:1.10
--- src/sys/arch/x86/pci/pci_msi_machdep.c:1.9 Mon Aug 17 06:16:03 2015
+++ src/sys/arch/x86/pci/pci_msi_machdep.c Mon Nov 28 05:00:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_msi_machdep.c,v 1.9 2015/08/17 06:16:03 knakahara Exp $ */
+/* $NetBSD: pci_msi_machdep.c,v 1.10 2016/11/28 05:00:41 knakahara Exp $ */
/*
* Copyright (c) 2015 Internet Initiative Japan Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_msi_machdep.c,v 1.9 2015/08/17 06:16:03 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_msi_machdep.c,v 1.10 2016/11/28 05:00:41 knakahara Exp $");
#include "opt_intrdebug.h"
@@ -88,6 +88,7 @@ pci_msi_calculate_handle(struct pic *msi
return pih;
}
+#ifdef __HAVE_PCI_MSI_MSIX
static pci_intr_handle_t *
pci_msi_alloc_vectors(struct pic *msi_pic, uint *table_indexes, int *count)
{
@@ -130,6 +131,7 @@ pci_msi_alloc_vectors(struct pic *msi_pi
return vectors;
}
+#endif /* __HAVE_PCI_MSI_MSIX */
static void
pci_msi_free_vectors(struct pic *msi_pic, pci_intr_handle_t *pihs, int count)
@@ -151,6 +153,7 @@ pci_msi_free_vectors(struct pic *msi_pic
kmem_free(pihs, sizeof(pihs[0]) * count);
}
+#ifdef __HAVE_PCI_MSI_MSIX
static int
pci_msi_alloc_common(pci_intr_handle_t **ihps, int *count,
const struct pci_attach_args *pa, bool exact)
@@ -205,6 +208,7 @@ pci_msi_alloc_common(pci_intr_handle_t *
*ihps = vectors;
return 0;
}
+#endif /* __HAVE_PCI_MSI_MSIX */
static void *
pci_msi_common_establish(pci_chipset_tag_t pc, pci_intr_handle_t ih,
@@ -231,6 +235,7 @@ pci_msi_common_disestablish(pci_chipset_
intr_disestablish(cookie);
}
+#ifdef __HAVE_PCI_MSI_MSIX
static int
pci_msix_alloc_common(pci_intr_handle_t **ihps, u_int *table_indexes,
int *count, const struct pci_attach_args *pa, bool exact)
@@ -299,6 +304,7 @@ x86_pci_msi_alloc_exact(pci_intr_handle_
return pci_msi_alloc_common(ihps, &count, pa, true);
}
+#endif /* __HAVE_PCI_MSI_MSIX */
static void
x86_pci_msi_release_internal(pci_intr_handle_t *pihs, int count)
@@ -313,6 +319,7 @@ x86_pci_msi_release_internal(pci_intr_ha
msipic_destruct_msi_pic(pic);
}
+#ifdef __HAVE_PCI_MSI_MSIX
static int
x86_pci_msix_alloc(pci_intr_handle_t **ihps, int *count,
const struct pci_attach_args *pa)
@@ -336,
CVS commit: src/sys/arch/mips/cavium
Module Name:src
Committed By: mrg
Date: Mon Nov 28 04:18:08 UTC 2016
Modified Files:
src/sys/arch/mips/cavium: octeon_intr.c
Log Message:
fix non-DIAG builds.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/cavium/octeon_intr.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/cavium/octeon_intr.c
diff -u src/sys/arch/mips/cavium/octeon_intr.c:1.8 src/sys/arch/mips/cavium/octeon_intr.c:1.9
--- src/sys/arch/mips/cavium/octeon_intr.c:1.8 Mon Oct 31 12:27:22 2016
+++ src/sys/arch/mips/cavium/octeon_intr.c Mon Nov 28 04:18:08 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_intr.c,v 1.8 2016/10/31 12:27:22 skrll Exp $ */
+/* $NetBSD: octeon_intr.c,v 1.9 2016/11/28 04:18:08 mrg Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
* All rights reserved.
@@ -45,7 +45,7 @@
#define __INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: octeon_intr.c,v 1.8 2016/10/31 12:27:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_intr.c,v 1.9 2016/11/28 04:18:08 mrg Exp $");
#include
#include
@@ -302,7 +302,9 @@ octeon_mbox_test(void)
void
octeon_intr_init(struct cpu_info *ci)
{
+#ifdef DIAGNOSTIC
const int cpunum = cpu_index(ci);
+#endif
const char * const xname = cpu_name(ci);
struct cpu_softc *cpu = ci->ci_softc;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Nov 28 02:23:33 UTC 2016 Modified Files: src/sys/dev/pci: files.pci src/sys/dev/pci/ixgbe: ixgbe.c ixgbe.h Added Files: src/sys/dev/pci/ixgbe: ix_txrx.c Log Message: FreeBSD r280181 made new file ix_txrx.c and moved ixgbe.c and ixv's common code into it. Before sync with whole of them, just move ixgbe.c and ixv.c's common code into ix_txrx.c from ixgbe.c. In this commit, only ixgbe.c is split into the device dependent part and the common part. ixv.c isn't change to make this commit no functional change. To use ixv.c with ix_txrx.c, it's required to modify the common part's API and functions themselves. This commit is done to make the next change easy to understand. To generate a diff of this commit: cvs rdiff -u -r1.382 -r1.383 src/sys/dev/pci/files.pci cvs rdiff -u -r0 -r1.1 src/sys/dev/pci/ixgbe/ix_txrx.c cvs rdiff -u -r1.41 -r1.42 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/ixgbe/ixgbe.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/files.pci diff -u src/sys/dev/pci/files.pci:1.382 src/sys/dev/pci/files.pci:1.383 --- src/sys/dev/pci/files.pci:1.382 Mon Nov 21 16:34:34 2016 +++ src/sys/dev/pci/files.pci Mon Nov 28 02:23:33 2016 @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.382 2016/11/21 16:34:34 macallan Exp $ +# $NetBSD: files.pci,v 1.383 2016/11/28 02:23:33 msaitoh Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -665,8 +665,10 @@ attach stge at pci file dev/pci/if_stge.c stge # Intel i82598 & i82599 10-Gigabit Ethernet +define ixgbe_common +file dev/pci/ixgbe/ix_txrx.c ixgbe_common device ixg: ether, ifnet, arp -attach ixg at pci +attach ixg at pci: ixgbe_common file dev/pci/ixgbe/ixgbe.c ixg file dev/pci/ixgbe/ixgbe_netbsd.c ixg file dev/pci/ixgbe/ixgbe_82598.c ixg Index: src/sys/dev/pci/ixgbe/ixgbe.c diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.41 src/sys/dev/pci/ixgbe/ixgbe.c:1.42 --- src/sys/dev/pci/ixgbe/ixgbe.c:1.41 Fri Nov 25 13:33:24 2016 +++ src/sys/dev/pci/ixgbe/ixgbe.c Mon Nov 28 02:23:33 2016 @@ -59,7 +59,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ /*$FreeBSD: head/sys/dev/ixgbe/ixgbe.c 279805 2015-03-09 10:29:15Z araujo $*/ -/*$NetBSD: ixgbe.c,v 1.41 2016/11/25 13:33:24 msaitoh Exp $*/ +/*$NetBSD: ixgbe.c,v 1.42 2016/11/28 02:23:33 msaitoh Exp $*/ #include "opt_inet.h" #include "opt_inet6.h" @@ -136,15 +136,6 @@ static int ixgbe_detach(device_t, i #if 0 static int ixgbe_shutdown(device_t); #endif -#ifdef IXGBE_LEGACY_TX -static void ixgbe_start(struct ifnet *); -static void ixgbe_start_locked(struct tx_ring *, struct ifnet *); -#else /* ! IXGBE_LEGACY_TX */ -static int ixgbe_mq_start(struct ifnet *, struct mbuf *); -static int ixgbe_mq_start_locked(struct ifnet *, struct tx_ring *); -static void ixgbe_qflush(struct ifnet *); -static void ixgbe_deferred_mq_start(void *, int); -#endif /* IXGBE_LEGACY_TX */ static int ixgbe_ioctl(struct ifnet *, u_long, void *); static void ixgbe_ifstop(struct ifnet *, int); static int ixgbe_init(struct ifnet *); @@ -160,50 +151,26 @@ static int ixgbe_allocate_msix(stru const struct pci_attach_args *); static int ixgbe_allocate_legacy(struct adapter *, const struct pci_attach_args *); -static int ixgbe_allocate_queues(struct adapter *); static int ixgbe_setup_msix(struct adapter *); static void ixgbe_free_pci_resources(struct adapter *); static void ixgbe_local_timer(void *); static int ixgbe_setup_interface(device_t, struct adapter *); static void ixgbe_config_link(struct adapter *); -static int ixgbe_allocate_transmit_buffers(struct tx_ring *); -static int ixgbe_setup_transmit_structures(struct adapter *); -static void ixgbe_setup_transmit_ring(struct tx_ring *); static void ixgbe_initialize_transmit_units(struct adapter *); -static void ixgbe_free_transmit_structures(struct adapter *); -static void ixgbe_free_transmit_buffers(struct tx_ring *); -static int ixgbe_allocate_receive_buffers(struct rx_ring *); -static int ixgbe_setup_receive_structures(struct adapter *); -static int ixgbe_setup_receive_ring(struct rx_ring *); + static void ixgbe_initialize_receive_units(struct adapter *); -static void ixgbe_free_receive_structures(struct adapter *); -static void ixgbe_free_receive_buffers(struct rx_ring *); -static void ixgbe_setup_hw_rsc(struct rx_ring *); static void ixgbe_enable_intr(struct adapter *); static void ixgbe_disable_intr(struct adapter *); static void ixgbe_update_stats_counters(struct adapter *); -static void ixgbe_txeof(struct tx_ring *); -static bool ixgbe_rxeof(struct ix_queue *); -static void ixgbe_rx_checksum(u32, struct mbuf *, u32, - struct ixgbe_hw_stats *); static void ixgbe
CVS commit: src/sys/net
Module Name:src
Committed By: joerg
Date: Mon Nov 28 00:39:03 UTC 2016
Modified Files:
src/sys/net: if_vlan.c
Log Message:
Don't check parent capabilities when a parent interface hasn't been
assigned.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/net/if_vlan.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_vlan.c
diff -u src/sys/net/if_vlan.c:1.91 src/sys/net/if_vlan.c:1.92
--- src/sys/net/if_vlan.c:1.91 Sun Aug 7 17:38:34 2016
+++ src/sys/net/if_vlan.c Mon Nov 28 00:39:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vlan.c,v 1.91 2016/08/07 17:38:34 christos Exp $ */
+/* $NetBSD: if_vlan.c,v 1.92 2016/11/28 00:39:03 joerg Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.91 2016/08/07 17:38:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.92 2016/11/28 00:39:03 joerg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -571,6 +571,10 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd
case SIOCSIFCAP:
ifcr = data;
/* make sure caps are enabled on parent */
+ if (ifv->ifv_p == NULL) {
+ error = EINVAL;
+ break;
+ }
if ((ifv->ifv_p->if_capenable & ifcr->ifcr_capenable) !=
ifcr->ifcr_capenable) {
error = EINVAL;
CVS commit: src/external/bsd/dhcp/bin/clientscript
Module Name:src
Committed By: maya
Date: Sun Nov 27 19:04:41 UTC 2016
Modified Files:
src/external/bsd/dhcp/bin/clientscript: dhclient-script
Log Message:
Do not attempt to pass -llinfo to route.
llinfo was removed, and the command fails because of it.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/dhcp/bin/clientscript/dhclient-script
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/dhcp/bin/clientscript/dhclient-script
diff -u src/external/bsd/dhcp/bin/clientscript/dhclient-script:1.2 src/external/bsd/dhcp/bin/clientscript/dhclient-script:1.3
--- src/external/bsd/dhcp/bin/clientscript/dhclient-script:1.2 Thu Feb 26 09:59:55 2015
+++ src/external/bsd/dhcp/bin/clientscript/dhclient-script Sun Nov 27 19:04:40 2016
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: dhclient-script,v 1.2 2015/02/26 09:59:55 roy Exp $
+# $NetBSD: dhclient-script,v 1.3 2016/11/27 19:04:40 maya Exp $
ENTERHOOKS=/etc/dhclient-enter-hooks
EXITHOOKS=/etc/dhclient-exit-hooks
@@ -85,7 +85,7 @@ delete_old_routes() {
shift; shift
done
- route -n flush -inet -llinfo -host
+ route -n flush -inet -host
}
# Invoke the local dhcp client enter hooks, if they exist.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Nov 27 18:53:05 UTC 2016
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch vax to new binutils and gdb.
To generate a diff of this commit:
cvs rdiff -u -r1.988 -r1.989 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.988 src/share/mk/bsd.own.mk:1.989
--- src/share/mk/bsd.own.mk:1.988 Mon Nov 21 12:00:32 2016
+++ src/share/mk/bsd.own.mk Sun Nov 27 13:53:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.988 2016/11/21 17:00:32 snj Exp $
+# $NetBSD: bsd.own.mk,v 1.989 2016/11/27 18:53:05 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -132,7 +132,6 @@ USE_SSP?= yes
# What GDB is used?
#
.if \
-${MACHINE} == "vax" || \
${MACHINE_CPU} == "m68k" || \
${MACHINE_ARCH} == "mips64el" || \
${MACHINE_ARCH} == "mips64eb"
@@ -154,7 +153,8 @@ EXTERNAL_GDB_SUBDIR= /does/not/exist
#
.if \
${MACHINE_ARCH} == "i386" || \
-${MACHINE_ARCH} == "x86_64"
+${MACHINE_ARCH} == "x86_64" || \
+${MACHINE_ARCH} == "vax"
HAVE_BINUTILS?= 227
.else
HAVE_BINUTILS?= 226
CVS commit: src/external/gpl3/gdb/lib/libgdb/arch/vax
Module Name:src
Committed By: christos
Date: Sun Nov 27 18:52:19 UTC 2016
Modified Files:
src/external/gpl3/gdb/lib/libgdb/arch/vax: config.h defs.mk init.c
Log Message:
regen for vax
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/lib/libgdb/arch/vax/config.h
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gdb/lib/libgdb/arch/vax/defs.mk \
src/external/gpl3/gdb/lib/libgdb/arch/vax/init.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/lib/libgdb/arch/vax/config.h
diff -u src/external/gpl3/gdb/lib/libgdb/arch/vax/config.h:1.7 src/external/gpl3/gdb/lib/libgdb/arch/vax/config.h:1.8
--- src/external/gpl3/gdb/lib/libgdb/arch/vax/config.h:1.7 Mon Oct 17 13:38:07 2016
+++ src/external/gpl3/gdb/lib/libgdb/arch/vax/config.h Sun Nov 27 13:52:19 2016
@@ -582,7 +582,7 @@
/* #undef HAVE_WAIT_H */
/* Define to 1 if you have the `wborder' function. */
-#define HAVE_WBORDER 1
+/* #undef HAVE_WBORDER */
/* Define to 1 if you have the header file. */
/* #undef HAVE_WINDOWS_H */
@@ -594,7 +594,7 @@
#define HAVE_WORKING_VFORK 1
/* Define to 1 if you have the `wresize' function. */
-#define HAVE_WRESIZE 1
+/* #undef HAVE_WRESIZE */
/* Define to 1 if you have the `XML_StopParser' function. */
/* #undef HAVE_XML_STOPPARSER */
Index: src/external/gpl3/gdb/lib/libgdb/arch/vax/defs.mk
diff -u src/external/gpl3/gdb/lib/libgdb/arch/vax/defs.mk:1.9 src/external/gpl3/gdb/lib/libgdb/arch/vax/defs.mk:1.10
--- src/external/gpl3/gdb/lib/libgdb/arch/vax/defs.mk:1.9 Mon Oct 17 13:38:07 2016
+++ src/external/gpl3/gdb/lib/libgdb/arch/vax/defs.mk Sun Nov 27 13:52:19 2016
@@ -2,6 +2,6 @@
# Generated from: NetBSD: mknative-gdb,v 1.7 2016/10/16 04:37:42 mrg Exp
# Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp
#
-G_INTERNAL_CFLAGS=-D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS-I. -I${GNUHOSTDIST}/gdb -I${GNUHOSTDIST}/gdb/common -I${GNUHOSTDIST}/gdb/config -DLOCALEDIR="\"/usr/share/locale\"" -DHAVE_CONFIG_H -I${GNUHOSTDIST}/gdb/../include/opcode -I${GNUHOSTDIST}/gdb/../opcodes/.. -I${GNUHOSTDIST}/gdb/../readline/.. -I${GNUHOSTDIST}/gdb/../zlib -I../bfd -I${GNUHOSTDIST}/gdb/../bfd -I${GNUHOSTDIST}/gdb/../include -I../libdecnumber -I${GNUHOSTDIST}/gdb/../libdecnumber -I./../intl -I${GNUHOSTDIST}/gdb/gnulib/import -Ibuild-gnulib/import -DTUI=1 -Wall -Wpointer-arith -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wempty-body -Wunused-but-set-parameter -Wunused-but-set-variable -Wno-sign-compare -Wno-write-strings -Wno-narrowing -Wformat-nonliteral
-G_LIBGDB_OBS=vax-tdep.o vaxnbsd-tdep.o solib-svr4.o ser-base.o ser-unix.o ser-pipe.o ser-tcp.o fork-child.o inf-ptrace.o nbsd-nat.o vaxbsd-nat.o bsd-kvm.o nbsd-thread.o remote.o dcache.o tracepoint.o ax-general.o ax-gdb.o remote-fileio.o remote-notif.o ctf.o tracefile.o tracefile-tfile.o cli-dump.o cli-decode.o cli-script.o cli-cmds.o cli-setshow.o cli-logging.o cli-interp.o cli-utils.o mi-out.o mi-console.o mi-cmds.o mi-cmd-catch.o mi-cmd-env.o mi-cmd-var.o mi-cmd-break.o mi-cmd-stack.o mi-cmd-file.o mi-cmd-disas.o mi-symbol-cmds.o mi-cmd-target.o mi-cmd-info.o mi-interp.o mi-main.o mi-parse.o mi-getopt.o tui-command.o tui-data.o tui-disasm.o tui-file.o tui-hooks.o tui-interp.o tui-io.o tui-layout.o tui-out.o tui-regs.o tui-source.o tui-stack.o tui-win.o tui-windata.o tui-wingeneral.o tui-winsource.o tui.o python.o guile.o elfread.o stap-probe.o dtrace-probe.o posix-hdep.o posix-strerror.o c-exp.o cp-name-parser.o ada-exp.o jv-exp.o d-exp.o f-exp.o
go-exp.o m2-exp.o p-exp.o rust-exp.o version.o annotate.o addrmap.o auto-load.o auxv.o agent.o bfd-target.o blockframe.o breakpoint.o break-catch-sig.o break-catch-throw.o break-catch-syscall.o findvar.o regcache.o cleanups.o charset.o continuations.o corelow.o disasm.o dummy-frame.o dfp.o source.o value.o eval.o valops.o valarith.o valprint.o printcmd.o block.o symtab.o psymtab.o symfile.o symfile-debug.o symmisc.o linespec.o dictionary.o namespace.o location.o infcall.o infcmd.o infrun.o expprint.o environ.o stack.o tid-parse.o thread.o thread-fsm.o exceptions.o extension.o filesystem.o filestuff.o inf-child.o interps.o minidebug.o main.o macrotab.o macrocmd.o macroexp.o macroscope.o mi-common.o event-loop.o event-top.o inf-loop.o completer.o gdbarch.o arch-utils.o gdbtypes.o gdb_bfd.o gdb_obstack.o osabi.o copying.o memattr.o mem-break.o target.o target-dcache.o parse.o language.o build-id.o buildsym.o findcmd.o std-regs.o signals-state-save-rest
ore.o signals.o exec.o reverse.o bcache.o objfiles.o observer.o minsyms.o maint.o demangle.o dbxread.o coffread.o coff-pe-read.o dwarf2read.o mipsread.o stabsread.o corefile.o dwarf2expr.o dwarf2loc.o dwarf2-frame.o dwarf2-frame-tailcall.o ada-lang.o c-l
CVS commit: src/external/gpl3/binutils
Module Name:src Committed By: christos Date: Sun Nov 27 18:52:05 UTC 2016 Modified Files: src/external/gpl3/binutils/lib/libbfd/arch/vax: bfd.h bfdver.h config.h src/external/gpl3/binutils/lib/libopcodes/arch/vax: config.h src/external/gpl3/binutils/usr.bin/common/arch/vax: config.h defs.mk src/external/gpl3/binutils/usr.bin/gas/arch/vax: config.h src/external/gpl3/binutils/usr.bin/gprof/arch/vax: gconfig.h src/external/gpl3/binutils/usr.bin/ld/arch/vax: config.h Log Message: regen for vax To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/lib/libbfd/arch/vax/bfd.h cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/binutils/lib/libbfd/arch/vax/bfdver.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/lib/libbfd/arch/vax/config.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/lib/libopcodes/arch/vax/config.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/usr.bin/common/arch/vax/config.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/binutils/usr.bin/common/arch/vax/defs.mk cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/binutils/usr.bin/gas/arch/vax/config.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/usr.bin/gprof/arch/vax/gconfig.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/usr.bin/ld/arch/vax/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/binutils/lib/libbfd/arch/vax/bfd.h diff -u src/external/gpl3/binutils/lib/libbfd/arch/vax/bfd.h:1.6 src/external/gpl3/binutils/lib/libbfd/arch/vax/bfd.h:1.7 --- src/external/gpl3/binutils/lib/libbfd/arch/vax/bfd.h:1.6 Fri Jan 29 12:30:24 2016 +++ src/external/gpl3/binutils/lib/libbfd/arch/vax/bfd.h Sun Nov 27 13:52:05 2016 @@ -11,7 +11,7 @@ /* Main header file for the bfd library -- portable access to object files. - Copyright (C) 1990-2015 Free Software Foundation, Inc. + Copyright (C) 1990-2016 Free Software Foundation, Inc. Contributed by Cygnus Support. @@ -522,7 +522,6 @@ extern void warn_deprecated (const char #define bfd_get_file_flags(abfd) ((abfd)->flags) #define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags) #define bfd_applicable_section_flags(abfd) ((abfd)->xvec->section_flags) -#define bfd_my_archive(abfd) ((abfd)->my_archive) #define bfd_has_map(abfd) ((abfd)->has_armap) #define bfd_is_thin_archive(abfd) ((abfd)->is_thin_archive) @@ -914,6 +913,9 @@ extern bfd_boolean bfd_elf32_arm_get_bfd extern bfd_boolean bfd_elf32_arm_add_glue_sections_to_bfd (bfd *, struct bfd_link_info *); +extern void bfd_elf32_arm_keep_private_stub_output_sections + (struct bfd_link_info *); + /* ELF ARM mapping symbol support. */ #define BFD_ARM_SPECIAL_SYM_TYPE_MAP (1 << 0) #define BFD_ARM_SPECIAL_SYM_TYPE_TAG (1 << 1) @@ -945,7 +947,8 @@ extern void elf32_arm_next_input_section (struct bfd_link_info *, struct bfd_section *); extern bfd_boolean elf32_arm_size_stubs (bfd *, bfd *, struct bfd_link_info *, bfd_signed_vma, - struct bfd_section * (*) (const char *, struct bfd_section *, unsigned int), + struct bfd_section * (*) (const char *, struct bfd_section *, + struct bfd_section *, unsigned int), void (*) (void)); extern bfd_boolean elf32_arm_build_stubs (struct bfd_link_info *); @@ -958,13 +961,6 @@ extern bfd_boolean elf32_arm_fix_exidx_c extern bfd_boolean elf32_tic6x_fix_exidx_coverage (struct bfd_section **, unsigned int, struct bfd_link_info *, bfd_boolean); -/* PowerPC @tls opcode transform/validate. */ -extern unsigned int _bfd_elf_ppc_at_tls_transform - (unsigned int, unsigned int); -/* PowerPC @tprel opcode transform/validate. */ -extern unsigned int _bfd_elf_ppc_at_tprel_transform - (unsigned int, unsigned int); - extern void bfd_elf64_aarch64_init_maps (bfd *); @@ -972,10 +968,10 @@ extern void bfd_elf32_aarch64_init_maps (bfd *); extern void bfd_elf64_aarch64_set_options - (bfd *, struct bfd_link_info *, int, int, int, int, int); + (bfd *, struct bfd_link_info *, int, int, int, int, int, int); extern void bfd_elf32_aarch64_set_options - (bfd *, struct bfd_link_info *, int, int, int, int, int); + (bfd *, struct bfd_link_info *, int, int, int, int, int, int); /* ELF AArch64 mapping symbol support. */ #define BFD_AARCH64_SPECIAL_SYM_TYPE_MAP (1 << 0) @@ -1436,6 +1432,9 @@ typedef struct bfd_section when memory read flag isn't set. */ #define SEC_COFF_NOREAD 0x4000 + /* Indicate that section has the no read flag set. */ +#define SEC_ELF_NOREAD 0x8000 + /* End of section flags. */ /* Some internal packed boolean fields. */ @@ -1502,7 +1501,7 @@ typedef struct bfd_section information. */ bfd_vma lma; - /* The size of the section in octets, as it will be output. + /* The size of the section in *octets*, as it will be output. Contains a val
CVS commit: src/external/bsd/wpa/dist/wpa_supplicant
Module Name:src Committed By: christos Date: Sun Nov 27 17:06:09 UTC 2016 Modified Files: src/external/bsd/wpa/dist/wpa_supplicant: wpa_supplicant.c Log Message: fix printf formats for time_t To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.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/wpa/dist/wpa_supplicant/wpa_supplicant.c diff -u src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c:1.7 src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c:1.8 --- src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c:1.7 Mon Nov 21 15:15:17 2016 +++ src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c Sun Nov 27 12:06:09 2016 @@ -4422,8 +4422,8 @@ static void radio_start_next_work(void * os_get_reltime(&now); os_reltime_sub(&now, &work->time, &diff); wpa_dbg(wpa_s, MSG_DEBUG, - "Starting radio work '%s'@%p after %ld.%06ld second wait", - work->type, work, diff.sec, diff.usec); + "Starting radio work '%s'@%p after %jd.%06ld second wait", + work->type, work, (intmax_t)diff.sec, diff.usec); work->started = 1; work->time = now; radio->num_active_works++; @@ -6903,7 +6903,7 @@ int wpa_is_bss_tmp_disallowed(struct wpa os_reltime_sub(&bss->disallowed_until, &now, &age); wpa_printf(MSG_DEBUG, - "BSS " MACSTR " disabled for %ld.%0ld seconds", - MAC2STR(bss->bssid), age.sec, age.usec); + "BSS " MACSTR " disabled for %jd.%0ld seconds", + MAC2STR(bss->bssid), (intmax_t)age.sec, age.usec); return 1; }
CVS commit: src/sys/arch
Module Name:src Committed By: kamil Date: Sun Nov 27 14:49:21 UTC 2016 Modified Files: src/sys/arch/amd64/amd64: cpufunc.S src/sys/arch/i386/i386: i386func.S src/sys/arch/x86/include: cpufunc.h src/sys/arch/xen/x86: xenfunc.c Added Files: src/sys/arch/x86/include: dbregs.h Log Message: Add accessors for available x86 Debug Registers There are 8 Debug Registers on i386 (available at least since 80386) and 16 on AMD64. Currently DR4 and DR5 are reserved on both cpu-families and DR9-DR15 are still reserved on AMD64. Therefore add accessors for DR0-DR3, DR6-DR7 for all ports. Debug Registers x86: * DR0-DR3 Debug Address Registers * DR4-DR5 Reserved * DR6 Debug Status Register * DR7 Debug Control Register * DR8-DR15 Reserved Access the registers is available only from a kernel (ring 0) as there is needed top protected access. For this reason there is need to use special XEN functions to get and set the registers in the XEN3 kernels. XEN specific functions as defined in NetBSD: - HYPERVISOR_get_debugreg() - HYPERVISOR_set_debugreg() This code extends the existing rdr6() and ldr6() accessor for additional: - rdr0() & ldr0() - rdr1() & ldr1() - rdr2() & ldr2() - rdr3() & ldr3() - rdr7() & ldr7() Traditionally accessors for DR6 were passing vaddr_t argument, while it's appropriate type for DR0-DR3, DR6-DR7 should be using u_long, however it's not a big deal. The resulting functionality should be equivalent so stick to this convention and use the vaddr_t type for all DR accessors. There was already a function defined for rdr6() in XEN, but it had a nit on AMD64 as it was casting HYPERVISOR_get_debugreg() to u_int (32-bit on AMD64), truncating result. It still works for DR6, but for the sake of simplicity always return full 64-bit value. New accessors duplicate functionality of the dr0() function available on i386 within the KSTACK_CHECK_DR0 option. dr0() is a specialized layer with logic to set appropriate types of interrupts, now accessors are designed to pass verbatim values from user-land (with simple sanity checks in the kernel). At the moment there are no plans to make possible to coexist KSTACK_CHECK_DR0 with debug registers for user applications (debuggers). options KSTACK_CHECK_DR0 Detect kernel stack overflow using DR0 register. This option uses DR0 register exclusively so you can't use DR0 register for other purpose (e.g., hardware breakpoint) if you turn this on. The KSTACK_CHECK_DR0 functionality was designed for i386 and never ported to amd64. Code tested on i386 and amd64 with kernels: GENERIC, XEN3_DOMU, XEN3_DOM0. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/amd64/amd64/cpufunc.S cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/i386/i386func.S cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x86/include/cpufunc.h cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/include/dbregs.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/xen/x86/xenfunc.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/amd64/amd64/cpufunc.S diff -u src/sys/arch/amd64/amd64/cpufunc.S:1.26 src/sys/arch/amd64/amd64/cpufunc.S:1.27 --- src/sys/arch/amd64/amd64/cpufunc.S:1.26 Sun Nov 27 02:32:56 2016 +++ src/sys/arch/amd64/amd64/cpufunc.S Sun Nov 27 14:49:21 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.S,v 1.26 2016/11/27 02:32:56 kamil Exp $ */ +/* $NetBSD: cpufunc.S,v 1.27 2016/11/27 14:49:21 kamil Exp $ */ /*- * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc. @@ -158,6 +158,38 @@ ENTRY(tlbflush) movq %rax, %cr3 ret +ENTRY(ldr0) + movq %rdi, %dr0 + ret + +ENTRY(rdr0) + movq %dr0, %rax + ret + +ENTRY(ldr1) + movq %rdi, %dr1 + ret + +ENTRY(rdr1) + movq %dr1, %rax + ret + +ENTRY(ldr2) + movq %rdi, %dr2 + ret + +ENTRY(rdr2) + movq %dr2, %rax + ret + +ENTRY(ldr3) + movq %rdi, %dr3 + ret + +ENTRY(rdr3) + movq %dr3, %rax + ret + ENTRY(ldr6) movq %rdi, %dr6 ret @@ -166,6 +198,14 @@ ENTRY(rdr6) movq %dr6, %rax ret +ENTRY(ldr7) + movq %rdi, %dr7 + ret + +ENTRY(rdr7) + movq %dr7, %rax + ret + ENTRY(x86_disable_intr) cli ret Index: src/sys/arch/i386/i386/i386func.S diff -u src/sys/arch/i386/i386/i386func.S:1.17 src/sys/arch/i386/i386/i386func.S:1.18 --- src/sys/arch/i386/i386/i386func.S:1.17 Wed Aug 29 22:43:35 2012 +++ src/sys/arch/i386/i386/i386func.S Sun Nov 27 14:49:21 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: i386func.S,v 1.17 2012/08/29 22:43:35 rmind Exp $ */ +/* $NetBSD: i386func.S,v 1.18 2016/11/27 14:49:21 kamil Exp $ */ /*- * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: i386func.S,v 1.17 2012/08/29 22:43:35 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i386func.S,v 1.18 2016/11/27 14:49:21 kamil Exp $"); #include #include @@ -123,6 +123,50 @@ ENTRY(tlbflush) ret END(tlbflush) +ENTRY(ldr0
