CVS commit: src/external/bsd/llvm/config/llvm/Config
Module Name:src Committed By: joerg Date: Wed Jun 3 10:00:55 UTC 2015 Modified Files: src/external/bsd/llvm/config/llvm/Config: config.h.in Log Message: Fix typo in PPC macro. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 \ src/external/bsd/llvm/config/llvm/Config/config.h.in 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/llvm/config/llvm/Config/config.h.in diff -u src/external/bsd/llvm/config/llvm/Config/config.h.in:1.16 src/external/bsd/llvm/config/llvm/Config/config.h.in:1.17 --- src/external/bsd/llvm/config/llvm/Config/config.h.in:1.16 Fri May 29 17:37:50 2015 +++ src/external/bsd/llvm/config/llvm/Config/config.h.in Wed Jun 3 10:00:55 2015 @@ -97,7 +97,7 @@ #define HAVE_FCNTL_H 1 /* Define to 1 if you have the header file. */ - #ifndef __powerpc + #ifndef __powerpc__ #define HAVE_FENV_H 1 #endif
CVS commit: src/sys/arch/evbarm/awin
Module Name:src Committed By: jmcneill Date: Wed Jun 3 10:01:32 UTC 2015 Modified Files: src/sys/arch/evbarm/awin: awin_machdep.c platform.h Log Message: Olimex A20-OLinuXino-LIME2 support, from Greg Willatt To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/awin/awin_machdep.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/awin/platform.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/evbarm/awin/awin_machdep.c diff -u src/sys/arch/evbarm/awin/awin_machdep.c:1.40 src/sys/arch/evbarm/awin/awin_machdep.c:1.41 --- src/sys/arch/evbarm/awin/awin_machdep.c:1.40 Mon Apr 20 01:33:22 2015 +++ src/sys/arch/evbarm/awin/awin_machdep.c Wed Jun 3 10:01:32 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: awin_machdep.c,v 1.40 2015/04/20 01:33:22 matt Exp $ */ +/* $NetBSD: awin_machdep.c,v 1.41 2015/06/03 10:01:32 jmcneill Exp $ */ /* * Machine dependent functions for kernel setup for TI OSK5912 board. @@ -125,7 +125,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: awin_machdep.c,v 1.40 2015/04/20 01:33:22 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: awin_machdep.c,v 1.41 2015/06/03 10:01:32 jmcneill Exp $"); #include "opt_machdep.h" #include "opt_ddb.h" @@ -660,7 +660,7 @@ awin_device_register(device_t self, void } else { prop_dictionary_set_bool(dict, "no-awge", true); } -#elif AWIN_board == AWIN_bpi +#elif AWIN_board == AWIN_bpi || AWIN_board == AWIN_olimexlime2 prop_dictionary_set_bool(dict, "no-awe", true); #endif return; @@ -725,7 +725,7 @@ awin_device_register(device_t self, void prop_dictionary_set_cstring(dict, "emacpwren", ">PH19"); } #endif -#if AWIN_board == AWIN_cubieboard || AWIN_board == AWIN_cubietruck +#if AWIN_board == AWIN_cubieboard || AWIN_board == AWIN_cubietruck || AWIN_board == AWIN_olimexlime2 prop_dictionary_set_cstring(dict, "mmc0detect", "
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Wed Jun 3 10:01:56 UTC 2015 Added Files: src/sys/arch/evbarm/conf: OLIMEXLIME2 Log Message: Add kernel config for Olimex A20-OLinuXino-LIME2 To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/OLIMEXLIME2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/evbarm/conf/OLIMEXLIME2 diff -u /dev/null src/sys/arch/evbarm/conf/OLIMEXLIME2:1.1 --- /dev/null Wed Jun 3 10:01:56 2015 +++ src/sys/arch/evbarm/conf/OLIMEXLIME2 Wed Jun 3 10:01:56 2015 @@ -0,0 +1,13 @@ +# $NetBSD: OLIMEXLIME2,v 1.1 2015/06/03 10:01:56 jmcneill Exp $ +# +# OLIMEXLIME2 - Olimex A20-OLinuXino-LIME2 +# + +include "arch/evbarm/conf/CUBIEBOARD" + +no makeoptions BOARDTYPE +makeoptions BOARDTYPE="olimexlime2" + +no options ALLWINNER_A10 +no makeoptions CPUFLAGS +makeoptions CPUFLAGS="-mcpu=cortex-a7 -mfpu=neon"
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Wed Jun 3 10:23:08 UTC 2015 Modified Files: src/sys/rump: TODO Log Message: Annual update of deleting one entry. At this rate the TODO will be empty in 2038! To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/rump/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/TODO diff -u src/sys/rump/TODO:1.10 src/sys/rump/TODO:1.11 --- src/sys/rump/TODO:1.10 Wed Jan 15 15:10:31 2014 +++ src/sys/rump/TODO Wed Jun 3 10:23:08 2015 @@ -1,4 +1,4 @@ - $NetBSD: TODO,v 1.10 2014/01/15 15:10:31 pooka Exp $ + $NetBSD: TODO,v 1.11 2015/06/03 10:23:08 pooka Exp $ * integrate build framework with config(1) to stop the need to maintain a separate build infrastructure. the remaining step @@ -21,6 +21,3 @@ the build system makes this quite difficult. one option for "cheating" would be to put it into librumpuser which is always available for local clients (per definition of local client). -* add autoconf support to librumpuser to clean up the #ifdef acrobatics - and fix some of the issues that cannot be handled purely with static - ifdefs (autoconf to be used for non-native builds only)
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Wed Jun 3 10:49:14 UTC 2015 Modified Files: src/sys/rump: Makefile.rump README.compileopts Log Message: Add "all" and "none" as acceptable RUMP_NBCOMPAT value aliases to undefined and empty, respectively. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/sys/rump/Makefile.rump cvs rdiff -u -r1.9 -r1.10 src/sys/rump/README.compileopts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/Makefile.rump diff -u src/sys/rump/Makefile.rump:1.111 src/sys/rump/Makefile.rump:1.112 --- src/sys/rump/Makefile.rump:1.111 Fri Apr 24 06:29:56 2015 +++ src/sys/rump/Makefile.rump Wed Jun 3 10:49:14 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.rump,v 1.111 2015/04/24 06:29:56 pooka Exp $ +# $NetBSD: Makefile.rump,v 1.112 2015/06/03 10:49:14 pooka Exp $ # .if !defined(_RUMP_MK) @@ -29,8 +29,14 @@ CPPFLAGS+= -DMIPS1=1 .endif .endif -RUMP_NBCOMPAT?= 50 60 70 -# normalize alternatively accepted comma-separated list +# which NetBSD compat to build +RUMP_NBCOMPAT?=all +.if ${RUMP_NBCOMPAT} == "all" +RUMP_NBCOMPAT= 50 60 70 +.endif +.if ${RUMP_NBCOMPAT} == "none" +RUMP_NBCOMPAT= +.endif RUMP_NBCOMPAT:= ${RUMP_NBCOMPAT:S/,/ /g} CPPFLAGS+= ${RUMP_NBCOMPAT:C/[1-9]0/-DCOMPAT_&/g} Index: src/sys/rump/README.compileopts diff -u src/sys/rump/README.compileopts:1.9 src/sys/rump/README.compileopts:1.10 --- src/sys/rump/README.compileopts:1.9 Fri Apr 24 06:29:56 2015 +++ src/sys/rump/README.compileopts Wed Jun 3 10:49:14 2015 @@ -1,4 +1,4 @@ - $NetBSD: README.compileopts,v 1.9 2015/04/24 06:29:56 pooka Exp $ + $NetBSD: README.compileopts,v 1.10 2015/06/03 10:49:14 pooka Exp $ This file describes compile-time options for rump kernels. Additionally, NetBSD build options will have an effect. See src/share/mk/bsd.README @@ -79,7 +79,7 @@ effect: Control how curlwp is obtained i RUMP_NBCOMPAT -values: comma-separated list of releases, e.g. 60,70 +values: comma-separated list of releases; e.g. "60,70"; or "all" or "none" defval: all effect: Builds NetBSD COMPAT_nn code for each of the elements in the list. This option is useful only when building rump kernels for
CVS commit: src/sys/arch/arm/allwinner
Module Name:src Committed By: skrll Date: Wed Jun 3 11:38:33 UTC 2015 Modified Files: src/sys/arch/arm/allwinner: awin_reg.h Log Message: AWIN_SDRAM_PBASE is actually 0x2000 To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/arch/arm/allwinner/awin_reg.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/arm/allwinner/awin_reg.h diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.76 src/sys/arch/arm/allwinner/awin_reg.h:1.77 --- src/sys/arch/arm/allwinner/awin_reg.h:1.76 Mon Dec 22 00:07:24 2014 +++ src/sys/arch/arm/allwinner/awin_reg.h Wed Jun 3 11:38:33 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: awin_reg.h,v 1.76 2014/12/22 00:07:24 jmcneill Exp $ */ +/* $NetBSD: awin_reg.h,v 1.77 2015/06/03 11:38:33 skrll Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -164,7 +164,7 @@ #define AWIN_DE_BE0_OFFSET 0x0026 #define AWIN_MP_OFFSET 0x0028 #define AWIN_AVG_OFFSET 0x002A -#define AWIN_SDRAM_PBASE 0x4000 +#define AWIN_SDRAM_PBASE 0x2000 /* A10/A20 SRAM Controller */ #define AWIN_SRAM_CTL0_REG 0x
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: skrll Date: Wed Jun 3 11:43:18 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: soc_tegra124.c Log Message: Use arm_dmb. No functional change To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nvidia/soc_tegra124.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/nvidia/soc_tegra124.c diff -u src/sys/arch/arm/nvidia/soc_tegra124.c:1.5 src/sys/arch/arm/nvidia/soc_tegra124.c:1.6 --- src/sys/arch/arm/nvidia/soc_tegra124.c:1.5 Sun May 31 14:42:56 2015 +++ src/sys/arch/arm/nvidia/soc_tegra124.c Wed Jun 3 11:43:18 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: soc_tegra124.c,v 1.5 2015/05/31 14:42:56 jmcneill Exp $ */ +/* $NetBSD: soc_tegra124.c,v 1.6 2015/06/03 11:43:18 skrll Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill @@ -30,7 +30,7 @@ #include "opt_multiprocessor.h" #include -__KERNEL_RCSID(0, "$NetBSD: soc_tegra124.c,v 1.5 2015/05/31 14:42:56 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: soc_tegra124.c,v 1.6 2015/06/03 11:43:18 skrll Exp $"); #include #include @@ -150,7 +150,7 @@ tegra124_mpinit(void) tegra_pmc_power(PMC_PARTID_CPU3, true); started |= __BIT(3); for (u_int i = 0x1000; i > 0; i--) { - __asm __volatile("dmb" ::: "memory"); + arm_dmb(); if (arm_cpu_hatched == started) break; }
CVS commit: src/sys/arch/arm/allwinner
Module Name:src Committed By: skrll Date: Wed Jun 3 12:22:41 UTC 2015 Modified Files: src/sys/arch/arm/allwinner: awin_reg.h Log Message: Oops fix PBASE for non-A80 To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/arch/arm/allwinner/awin_reg.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/arm/allwinner/awin_reg.h diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.77 src/sys/arch/arm/allwinner/awin_reg.h:1.78 --- src/sys/arch/arm/allwinner/awin_reg.h:1.77 Wed Jun 3 11:38:33 2015 +++ src/sys/arch/arm/allwinner/awin_reg.h Wed Jun 3 12:22:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: awin_reg.h,v 1.77 2015/06/03 11:38:33 skrll Exp $ */ +/* $NetBSD: awin_reg.h,v 1.78 2015/06/03 12:22:41 skrll Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -164,7 +164,11 @@ #define AWIN_DE_BE0_OFFSET 0x0026 #define AWIN_MP_OFFSET 0x0028 #define AWIN_AVG_OFFSET 0x002A +#if defined(ALLWINNER_A80) #define AWIN_SDRAM_PBASE 0x2000 +#else +#define AWIN_SDRAM_PBASE 0x4000 +#endif /* A10/A20 SRAM Controller */ #define AWIN_SRAM_CTL0_REG 0x
CVS commit: src/sys/net
Module Name:src Committed By: martin Date: Wed Jun 3 13:06:26 UTC 2015 Modified Files: src/sys/net: if_gif.c Log Message: Include for softnet_lock. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/net/if_gif.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_gif.c diff -u src/sys/net/if_gif.c:1.85 src/sys/net/if_gif.c:1.86 --- src/sys/net/if_gif.c:1.85 Wed Jun 3 02:17:51 2015 +++ src/sys/net/if_gif.c Wed Jun 3 13:06:26 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_gif.c,v 1.85 2015/06/03 02:17:51 hsuenaga Exp $ */ +/* $NetBSD: if_gif.c,v 1.86 2015/06/03 13:06:26 martin Exp $ */ /* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */ /* @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.85 2015/06/03 02:17:51 hsuenaga Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.86 2015/06/03 13:06:26 martin Exp $"); #include "opt_inet.h" @@ -44,6 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1 #include #include #include +#include #include #include #include
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src Committed By: pooka Date: Wed Jun 3 13:41:56 UTC 2015 Modified Files: src/sys/rump/dev/lib/libpci: Makefile Log Message: Rework how the external hypercalls are specified, more in the direction of something general. I'm not sure if it's entirely general yet (since PCI is the only place to use it), but at least a step in the right direction. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libpci/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/dev/lib/libpci/Makefile diff -u src/sys/rump/dev/lib/libpci/Makefile:1.4 src/sys/rump/dev/lib/libpci/Makefile:1.5 --- src/sys/rump/dev/lib/libpci/Makefile:1.4 Fri Aug 22 14:28:58 2014 +++ src/sys/rump/dev/lib/libpci/Makefile Wed Jun 3 13:41:56 2015 @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.4 2014/08/22 14:28:58 pooka Exp $ +# $NetBSD: Makefile,v 1.5 2015/06/03 13:41:56 pooka Exp $ # RUMPTOP= ${TOPRUMP} +.include + .PATH: ${RUMPTOP}/../dev/pci LIB= rumpdev_pci @@ -27,11 +29,17 @@ CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs CPPFLAGS+=-DRUMP_PCI_IOSPACE .endif -.if defined(RUMP_PCI_USER) -RUMPCOMP_USER_SRCS= ${RUMP_PCI_USER} -RUMPCOMP_INCS_DIR:= ${.PARSEDIR} -RUMPCOMP_USER_CPPFLAGS=-I${RUMPCOMP_INCS_DIR} -.endif +.PATH: ${RUMPCOMP_USER_PATH.rumpdev_pci} +RUMPCOMP_USER_SRCS= ${RUMPCOMP_USER_SRCS.rumpdev_pci} +MYDIR:= ${.PARSEDIR} +RUMPCOMP_USER_CPPFLAGS= -I${MYDIR} +RUMPCOMP_USER_CPPFLAGS+=${RUMPCOMP_USER_CPPFLAGS.rumpdev_pci} +RUMPCOMP_USER_CFLAGS= ${RUMPCOMP_USER_CFLAGS.rumpdev_pci} + +CPPFLAGS+= ${RUMPCOMP_CPPFLAGS.rumpdev_pci} + +# XXX: messy +.undef RUMPKERN_ONLY .include "${RUMPTOP}/Makefile.rump" .include
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src Committed By: pooka Date: Wed Jun 3 13:43:24 UTC 2015 Modified Files: src/sys/rump/dev/lib/libpci: pci_user.h Log Message: Demand that rumpcomp_userfeatures_pci.h is available for providing information about the hypercall interface implementation. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libpci/pci_user.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/rump/dev/lib/libpci/pci_user.h diff -u src/sys/rump/dev/lib/libpci/pci_user.h:1.2 src/sys/rump/dev/lib/libpci/pci_user.h:1.3 --- src/sys/rump/dev/lib/libpci/pci_user.h:1.2 Mon Apr 14 21:43:00 2014 +++ src/sys/rump/dev/lib/libpci/pci_user.h Wed Jun 3 13:43:23 2015 @@ -1,3 +1,5 @@ +#include "rumpcomp_userfeatures_pci.h" + void *rumpcomp_pci_map(unsigned long, unsigned long); int rumpcomp_pci_confread(unsigned, unsigned, unsigned, int, unsigned int *); int rumpcomp_pci_confwrite(unsigned, unsigned, unsigned, int, unsigned int);
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Wed Jun 3 13:55:42 UTC 2015 Modified Files: src/sys/rump/dev/lib/libpci: pci_user.h rumpdev_bus_dma.c src/sys/rump/include/sys: bus.h Log Message: implement bus_dmamem_free() from Robert Millan via rumpkernel-users To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci/pci_user.h \ src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c cvs rdiff -u -r1.5 -r1.6 src/sys/rump/include/sys/bus.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/rump/dev/lib/libpci/pci_user.h diff -u src/sys/rump/dev/lib/libpci/pci_user.h:1.3 src/sys/rump/dev/lib/libpci/pci_user.h:1.4 --- src/sys/rump/dev/lib/libpci/pci_user.h:1.3 Wed Jun 3 13:43:23 2015 +++ src/sys/rump/dev/lib/libpci/pci_user.h Wed Jun 3 13:55:42 2015 @@ -9,6 +9,9 @@ void *rumpcomp_pci_irq_establish(unsigne /* XXX: needs work: support boundary-restricted allocations */ int rumpcomp_pci_dmalloc(size_t, size_t, unsigned long *, unsigned long *); +#ifdef rumpcomp_pci_free +void rumpcomp_pci_free(unsigned long, size_t); +#endif struct rumpcomp_pci_dmaseg { unsigned long ds_pa; Index: src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c diff -u src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.3 src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.4 --- src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.3 Mon Apr 14 21:43:00 2014 +++ src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c Wed Jun 3 13:55:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdev_bus_dma.c,v 1.3 2014/04/14 21:43:00 pooka Exp $ */ +/* $NetBSD: rumpdev_bus_dma.c,v 1.4 2015/06/03 13:55:42 pooka Exp $ */ /*- * Copyright (c) 2013 Antti Kantee @@ -446,8 +446,14 @@ bus_dmamap_sync(bus_dma_tag_t t, bus_dma void bus_dmamem_free(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs) { +#ifdef rumpcomp_pci_free + vaddr_t vacookie = segs[0]._ds_vacookie; + bus_size_t sizecookie = segs[0]._ds_sizecookie; + rumpcomp_pci_free(vacookie, sizecookie); +#else panic("bus_dmamem_free not implemented"); +#endif } /* @@ -509,11 +515,14 @@ bus_dmamem_alloc(bus_dma_tag_t t, bus_si { paddr_t curaddr, lastaddr, pa; vaddr_t vacookie; + size_t sizecookie; int curseg, error; /* Always round the size. */ size = round_page(size); + sizecookie = size; + /* * Allocate pages from the VM system. */ @@ -536,6 +545,7 @@ bus_dmamem_alloc(bus_dma_tag_t t, bus_si lastaddr = segs[curseg].ds_addr = pa; segs[curseg].ds_len = PAGE_SIZE; segs[curseg]._ds_vacookie = vacookie; + segs[curseg]._ds_sizecookie = sizecookie; size -= PAGE_SIZE; pa += PAGE_SIZE; vacookie += PAGE_SIZE; @@ -553,6 +563,7 @@ bus_dmamem_alloc(bus_dma_tag_t t, bus_si segs[curseg].ds_addr = curaddr; segs[curseg].ds_len = PAGE_SIZE; segs[curseg]._ds_vacookie = vacookie; + segs[curseg]._ds_sizecookie = sizecookie; } lastaddr = curaddr; } Index: src/sys/rump/include/sys/bus.h diff -u src/sys/rump/include/sys/bus.h:1.5 src/sys/rump/include/sys/bus.h:1.6 --- src/sys/rump/include/sys/bus.h:1.5 Mon Apr 14 21:31:00 2014 +++ src/sys/rump/include/sys/bus.h Wed Jun 3 13:55:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bus.h,v 1.5 2014/04/14 21:31:00 pooka Exp $ */ +/* $NetBSD: bus.h,v 1.6 2015/06/03 13:55:42 pooka Exp $ */ /* * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -48,6 +48,7 @@ typedef struct { bus_addr_t ds_addr; bus_size_t ds_len; vaddr_t _ds_vacookie; + bus_size_t _ds_sizecookie; } bus_dma_segment_t; typedef struct {
CVS commit: src/sys/rump/dev
Module Name:src Committed By: pooka Date: Wed Jun 3 14:06:19 UTC 2015 Modified Files: src/sys/rump/dev: Makefile.rumpdevcomp Added Files: src/sys/rump/dev/lib/libpci_auich: Makefile PCI_AUICH.ioconf auich_at_pci.c Log Message: add rump kernel component for the auich driver contributed by Robert Millan via private email To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/rump/dev/Makefile.rumpdevcomp cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci_auich/Makefile \ src/sys/rump/dev/lib/libpci_auich/PCI_AUICH.ioconf \ src/sys/rump/dev/lib/libpci_auich/auich_at_pci.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/rump/dev/Makefile.rumpdevcomp diff -u src/sys/rump/dev/Makefile.rumpdevcomp:1.20 src/sys/rump/dev/Makefile.rumpdevcomp:1.21 --- src/sys/rump/dev/Makefile.rumpdevcomp:1.20 Wed May 20 12:21:38 2015 +++ src/sys/rump/dev/Makefile.rumpdevcomp Wed Jun 3 14:06:19 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.rumpdevcomp,v 1.20 2015/05/20 12:21:38 pooka Exp $ +# $NetBSD: Makefile.rumpdevcomp,v 1.21 2015/06/03 14:06:19 pooka Exp $ # RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb \ @@ -10,7 +10,7 @@ RUMPUSBDEVS= ubt ucom ugenhc ulpt umass RUMPPCIDEVS= pci pci_if_iwn pci_if_pcn pci_if_wm RUMPPCIDEVS+= pci_usbhc RUMPPCIDEVS+= pci_virtio virtio_if_vioif virtio_ld virtio_viornd -RUMPPCIDEVS+= audio_ac97 pci_eap pci_hdaudio hdaudio_hdafg +RUMPPCIDEVS+= audio_ac97 pci_auich pci_eap pci_hdaudio hdaudio_hdafg # Not really a PCI device, but RUMPPCIDEVS+= miiphy Added files: Index: src/sys/rump/dev/lib/libpci_auich/Makefile diff -u /dev/null src/sys/rump/dev/lib/libpci_auich/Makefile:1.1 --- /dev/null Wed Jun 3 14:06:19 2015 +++ src/sys/rump/dev/lib/libpci_auich/Makefile Wed Jun 3 14:06:19 2015 @@ -0,0 +1,18 @@ +# $NetBSD: Makefile,v 1.1 2015/06/03 14:06:19 pooka Exp $ +# + +RUMPTOP=${TOPRUMP} + +.PATH: ${RUMPTOP}/../dev/pci + +LIB= rumpdev_pci_auich +IOCONF= PCI_AUICH.ioconf +SRCS= auich_at_pci.c +SRCS+= auich.c + +CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/../dev +CPPFLAGS+= -I${.CURDIR}/../libaudio + +.include "${RUMPTOP}/Makefile.rump" +.include +.include Index: src/sys/rump/dev/lib/libpci_auich/PCI_AUICH.ioconf diff -u /dev/null src/sys/rump/dev/lib/libpci_auich/PCI_AUICH.ioconf:1.1 --- /dev/null Wed Jun 3 14:06:19 2015 +++ src/sys/rump/dev/lib/libpci_auich/PCI_AUICH.ioconf Wed Jun 3 14:06:19 2015 @@ -0,0 +1,11 @@ +# $NetBSD: PCI_AUICH.ioconf,v 1.1 2015/06/03 14:06:19 pooka Exp $ +# + +ioconf pci_auich + +include "conf/files" +include "dev/pci/files.pci" + +pseudo-root pci* + +auich* at pci? Index: src/sys/rump/dev/lib/libpci_auich/auich_at_pci.c diff -u /dev/null src/sys/rump/dev/lib/libpci_auich/auich_at_pci.c:1.1 --- /dev/null Wed Jun 3 14:06:19 2015 +++ src/sys/rump/dev/lib/libpci_auich/auich_at_pci.c Wed Jun 3 14:06:19 2015 @@ -0,0 +1,45 @@ +/* $NetBSD: auich_at_pci.c,v 1.1 2015/06/03 14:06:19 pooka Exp $ */ + +/* + * Copyright (c) 2010 Antti Kantee. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__KERNEL_RCSID(0, "$NetBSD: auich_at_pci.c,v 1.1 2015/06/03 14:06:19 pooka Exp $"); + +#include +#include +#include +#include + +#include "rump_private.h" + +#include "ioconf.c" + +RUMP_COMPONENT(RUMP_COMPONENT_DEV) +{ + + config_init_component(cfdriver_ioconf_pci_auich, + cfattach_ioconf_pci_auich, cfdata_ioconf_pci_auich); +}
CVS commit: src/lib/libperfuse
Module Name:src Committed By: manu Date: Wed Jun 3 14:07:06 UTC 2015 Modified Files: src/lib/libperfuse: ops.c Log Message: Fix dot-lookup when readdir does not provide inodes Some filesystems do not provide inode numbers through readdir (FUSE mounts without -o use_ino). We therefore have to lookup each directory entry to get the missing numbers. dot and double-dot are exceptions, as we already know the values. Moreover, the lookup code does not expect to get requests for dot and will abort perfused(8) when it gets some. In order to fix that, we just check for dot and double-dot special case and use the known values instead of sending a lookup. To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/lib/libperfuse/ops.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/ops.c diff -u src/lib/libperfuse/ops.c:1.83 src/lib/libperfuse/ops.c:1.84 --- src/lib/libperfuse/ops.c:1.83 Sun Feb 15 20:21:29 2015 +++ src/lib/libperfuse/ops.c Wed Jun 3 14:07:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ops.c,v 1.83 2015/02/15 20:21:29 manu Exp $ */ +/* $NetBSD: ops.c,v 1.84 2015/06/03 14:07:05 manu Exp $ */ /*- * Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved. @@ -651,13 +651,17 @@ fuse_to_dirent(struct puffs_usermount *p struct puffs_node *pn; struct perfuse_node_data *pnd = PERFUSE_NODE_DATA(opc); - /* - * Avoid breaking out of fs - * by lookup to .. on root - */ - if ((strcmp(name, "..") == 0) && - (pnd->pnd_nodeid == FUSE_ROOT_ID)) { -fd->ino = FUSE_ROOT_ID; + if (strcmp(name, "..") == 0) { +/* + * Avoid breaking out of fs + * by lookup to .. on root + */ +if (pnd->pnd_nodeid == FUSE_ROOT_ID) + fd->ino = FUSE_ROOT_ID; +else + fd->ino = pnd->pnd_parent_nodeid; + } else if (strcmp(name, ".") == 0 ) { +fd->ino = pnd->pnd_nodeid; } else { int error;
CVS commit: src/usr.bin
Module Name:src Committed By: christos Date: Wed Jun 3 14:32:17 UTC 2015 Modified Files: src/usr.bin: Makefile Added Files: src/usr.bin/gettext: Makefile gettext.1 gettext.c Log Message: Add a gettext implementation from William Orr. To generate a diff of this commit: cvs rdiff -u -r1.220 -r1.221 src/usr.bin/Makefile cvs rdiff -u -r0 -r1.1 src/usr.bin/gettext/Makefile \ src/usr.bin/gettext/gettext.1 src/usr.bin/gettext/gettext.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/Makefile diff -u src/usr.bin/Makefile:1.220 src/usr.bin/Makefile:1.221 --- src/usr.bin/Makefile:1.220 Mon Mar 2 16:54:13 2015 +++ src/usr.bin/Makefile Wed Jun 3 10:32:16 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.220 2015/03/02 21:54:13 christos Exp $ +# $NetBSD: Makefile,v 1.221 2015/06/03 14:32:16 christos Exp $ # from: @(#)Makefile 8.3 (Berkeley) 1/7/94 .include @@ -12,7 +12,7 @@ SUBDIR= apply asa at audio audiocfg \ eject elf2aout elf2ecoff env error expand extattr \ false fdformat fgen fincore find finger flock fmt fold fpr from \ fsplit fstat ftp gcore genassym gencat getaddrinfo getconf getent \ - getopt gprof \ + getopt gettext gprof \ head hexdump iconv id indent infocmp innetgr ipcrm ipcs join jot \ kdump ktrace ktruss lam last lastcomm ldd leave \ locale locate lock logger login logname look lorder m4 \ Added files: Index: src/usr.bin/gettext/Makefile diff -u /dev/null src/usr.bin/gettext/Makefile:1.1 --- /dev/null Wed Jun 3 10:32:17 2015 +++ src/usr.bin/gettext/Makefile Wed Jun 3 10:32:17 2015 @@ -0,0 +1,10 @@ +# $NetBSD: Makefile,v 1.1 2015/06/03 14:32:17 christos Exp $ + +.include + +PROG= gettext + +LDADD+= -lintl -lutil +DPADD+= ${LIBINTL} ${LIBUTIL} + +.include Index: src/usr.bin/gettext/gettext.1 diff -u /dev/null src/usr.bin/gettext/gettext.1:1.1 --- /dev/null Wed Jun 3 10:32:17 2015 +++ src/usr.bin/gettext/gettext.1 Wed Jun 3 10:32:17 2015 @@ -0,0 +1,104 @@ +.\" $NetBSD: gettext.1,v 1.1 2015/06/03 14:32:17 christos Exp $ +.\" +.\" Copyright (c) 2015 William Orr , +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd June 3, 2015 +.Dt GETTEXT 1 +.Os +.Sh NAME +.Nm gettext +.Nd message translation front-end +.Sh SYNOPSIS +.Nm +.Op Fl h +.Nm +.Op Fl en +.Op Ar textdomain +.Ar msgid +.Nm +.Fl s +.Op Fl n +.Op Ar msgid... +.Sh DESCRIPTION +.Nm +attempts to translate a given +.Ar msgid +into the locale-specific string as determined by the environment. +If a translation file is not found, or a translation for the given +.Ar msgid +is not found, the original string will be echoed. +.Pp +If the +.Ar textdomain +is not provided as an argument, the +.Ev textdomain +environment variable will be consulted instead. +.Pp +By default +.Nm +will look for message catalogs in +.Pa /usr/share/locale . +If the environment variable +.Ev TEXTDOMAINDIR +is defined, then that will override the default location. +.Pp +The following flags are available: +.Bl -tag -width Ds +.It Fl e +Interpret backslash escape sequences prior to translation. +.It Fl h +Print the usage information +.It Fl n +If +.Fl s +is used, do not add the trailing newline. If +.Fl s +is not provided, this flag will do nothing. +.It Fl s +Act similarly to +.Xr echo 1 . +All +.Ar msgid +arguments will be translated, and a newline will be appended to the output +string. +.Sh ENVIRONMENT +.Bl -tag -width Ds +.It Ev TEXTDOMAIN +The domain to use when looking up +.Ar msgids +.It Ev TEXTDOMAINDIR +The location of message catalogs to use, overriding +.Pa /usr/share/locale +.Sh EXIT STATUS +.Ex -std +.Sh EXAMPLES +.Bd -literal
CVS commit: src/usr.bin/gettext
Module Name:src Committed By: wiz Date: Wed Jun 3 14:38:38 UTC 2015 Modified Files: src/usr.bin/gettext: gettext.1 Log Message: Add missing .El and other minor fixes. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/gettext/gettext.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/gettext/gettext.1 diff -u src/usr.bin/gettext/gettext.1:1.1 src/usr.bin/gettext/gettext.1:1.2 --- src/usr.bin/gettext/gettext.1:1.1 Wed Jun 3 14:32:17 2015 +++ src/usr.bin/gettext/gettext.1 Wed Jun 3 14:38:38 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: gettext.1,v 1.1 2015/06/03 14:32:17 christos Exp $ +.\" $NetBSD: gettext.1,v 1.2 2015/06/03 14:38:38 wiz Exp $ .\" .\" Copyright (c) 2015 William Orr , .\" All rights reserved. @@ -40,7 +40,7 @@ .Nm .Fl s .Op Fl n -.Op Ar msgid... +.Op Ar msgid ... .Sh DESCRIPTION .Nm attempts to translate a given @@ -53,7 +53,7 @@ is not found, the original string will b If the .Ar textdomain is not provided as an argument, the -.Ev textdomain +.Ev TEXTDOMAIN environment variable will be consulted instead. .Pp By default @@ -73,7 +73,8 @@ Print the usage information .It Fl n If .Fl s -is used, do not add the trailing newline. If +is used, do not add the trailing newline. +If .Fl s is not provided, this flag will do nothing. .It Fl s @@ -83,14 +84,16 @@ All .Ar msgid arguments will be translated, and a newline will be appended to the output string. +.El .Sh ENVIRONMENT .Bl -tag -width Ds .It Ev TEXTDOMAIN The domain to use when looking up -.Ar msgids +.Ar msgids . .It Ev TEXTDOMAINDIR The location of message catalogs to use, overriding -.Pa /usr/share/locale +.Pa /usr/share/locale . +.El .Sh EXIT STATUS .Ex -std .Sh EXAMPLES @@ -99,6 +102,6 @@ $ LANG=es gettext grep 'writing output' escribiendo el resultado .Ed .Sh SEE ALSO -.Xr gettext 3 -.Xr echo 1 +.Xr echo 1 , +.Xr gettext 3 , .Xr environ 7
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Wed Jun 3 14:40:11 UTC 2015 Modified Files: src/sys/rump: Makefile.rump README.compileopts Log Message: Add a "default" alias for RUMP_NBCOMPAT, in case "default" and "all" stop being the same thing in the future. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/rump/Makefile.rump cvs rdiff -u -r1.10 -r1.11 src/sys/rump/README.compileopts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/Makefile.rump diff -u src/sys/rump/Makefile.rump:1.112 src/sys/rump/Makefile.rump:1.113 --- src/sys/rump/Makefile.rump:1.112 Wed Jun 3 10:49:14 2015 +++ src/sys/rump/Makefile.rump Wed Jun 3 14:40:11 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.rump,v 1.112 2015/06/03 10:49:14 pooka Exp $ +# $NetBSD: Makefile.rump,v 1.113 2015/06/03 14:40:11 pooka Exp $ # .if !defined(_RUMP_MK) @@ -30,8 +30,8 @@ CPPFLAGS+= -DMIPS1=1 .endif # which NetBSD compat to build -RUMP_NBCOMPAT?=all -.if ${RUMP_NBCOMPAT} == "all" +RUMP_NBCOMPAT?=default +.if ${RUMP_NBCOMPAT} == "all" || ${RUMP_NBCOMPAT} == "default" RUMP_NBCOMPAT= 50 60 70 .endif .if ${RUMP_NBCOMPAT} == "none" Index: src/sys/rump/README.compileopts diff -u src/sys/rump/README.compileopts:1.10 src/sys/rump/README.compileopts:1.11 --- src/sys/rump/README.compileopts:1.10 Wed Jun 3 10:49:14 2015 +++ src/sys/rump/README.compileopts Wed Jun 3 14:40:11 2015 @@ -1,4 +1,4 @@ - $NetBSD: README.compileopts,v 1.10 2015/06/03 10:49:14 pooka Exp $ + $NetBSD: README.compileopts,v 1.11 2015/06/03 14:40:11 pooka Exp $ This file describes compile-time options for rump kernels. Additionally, NetBSD build options will have an effect. See src/share/mk/bsd.README @@ -79,7 +79,9 @@ effect: Control how curlwp is obtained i RUMP_NBCOMPAT -values: comma-separated list of releases; e.g. "60,70"; or "all" or "none" +values: comma-separated list of releases; e.g. "60,70"; + or "all" or "default" or "none". Currently default == all (but + might not be so in the future) defval: all effect: Builds NetBSD COMPAT_nn code for each of the elements in the list. This option is useful only when building rump kernels for
CVS commit: src/gnu/usr.bin/gettext
Module Name:src Committed By: christos Date: Wed Jun 3 14:42:51 UTC 2015 Modified Files: src/gnu/usr.bin/gettext: Makefile Log Message: prefer our gettext version To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/gettext/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/gettext/Makefile diff -u src/gnu/usr.bin/gettext/Makefile:1.5 src/gnu/usr.bin/gettext/Makefile:1.6 --- src/gnu/usr.bin/gettext/Makefile:1.5 Fri Apr 29 11:05:01 2005 +++ src/gnu/usr.bin/gettext/Makefile Wed Jun 3 10:42:51 2015 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2005/04/29 15:05:01 christos Exp $ +# $NetBSD: Makefile,v 1.6 2015/06/03 14:42:51 christos Exp $ .include SUBDIR= libgrep libnlsut libnlspr info .WAIT \ - gettext msgattrib msgcat msgcmp msgcomm msgconv msgen msgfilter \ + msgattrib msgcat msgcmp msgcomm msgconv msgen msgfilter \ msgfmt msginit msgmerge msgunfmt msguniq xgettext .if ${MKNLS} != "no"
CVS commit: src/external/bsd/blacklist/bin
Module Name:src Committed By: christos Date: Wed Jun 3 15:11:40 UTC 2015 Modified Files: src/external/bsd/blacklist/bin: conf.c Log Message: dissallow interface spec in remote config (since we check against the remote address, it does not make sense). To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/external/bsd/blacklist/bin/conf.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/blacklist/bin/conf.c diff -u src/external/bsd/blacklist/bin/conf.c:1.22 src/external/bsd/blacklist/bin/conf.c:1.23 --- src/external/bsd/blacklist/bin/conf.c:1.22 Tue Jun 2 16:52:00 2015 +++ src/external/bsd/blacklist/bin/conf.c Wed Jun 3 11:11:40 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.22 2015/06/02 20:52:00 christos Exp $ */ +/* $NetBSD: conf.c,v 1.23 2015/06/03 15:11:40 christos Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #endif #include -__RCSID("$NetBSD: conf.c,v 1.22 2015/06/02 20:52:00 christos Exp $"); +__RCSID("$NetBSD: conf.c,v 1.23 2015/06/03 15:11:40 christos Exp $"); #include #include @@ -271,6 +271,8 @@ gethostport(const char *f, size_t l, boo (*lfun)(LOG_DEBUG, "%s: host4 %s", __func__, p); if (strcmp(p, "*") != 0) { if (conf_is_interface(p)) { +if (!local) + goto out2; if (debug) (*lfun)(LOG_DEBUG, "%s: interface %s", __func__, p); @@ -308,6 +310,10 @@ out1: (*lfun)(LOG_ERR, "%s: %s, %zu: Can't specify mask %d with " "interface [%s]", __func__, f, l, c->c_lmask, p); return -1; +out2: + (*lfun)(LOG_ERR, "%s: %s, %zu: Interface spec does not make sense " + "with remote config [%s]", __func__, f, l, p); + return -1; } static int @@ -490,7 +496,7 @@ out: char b1[256], b2[256]; len <<= 2; hexdump(b1, sizeof(b1), "a1", v1, len); - hexdump(b2, sizeof(b2), "a1", v2, len); + hexdump(b2, sizeof(b2), "a2", v2, len); (*lfun)(LOG_DEBUG, "%s: %s != %s [0x%x]", __func__, b1, b2, omask); }
CVS commit: src/external/bsd/blacklist/etc
Module Name:src Committed By: christos Date: Wed Jun 3 15:13:15 UTC 2015 Modified Files: src/external/bsd/blacklist/etc: blacklistd.conf Log Message: remove interface example from remote config. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/blacklist/etc/blacklistd.conf 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/blacklist/etc/blacklistd.conf diff -u src/external/bsd/blacklist/etc/blacklistd.conf:1.4 src/external/bsd/blacklist/etc/blacklistd.conf:1.5 --- src/external/bsd/blacklist/etc/blacklistd.conf:1.4 Sat May 30 18:40:17 2015 +++ src/external/bsd/blacklist/etc/blacklistd.conf Wed Jun 3 11:13:15 2015 @@ -14,7 +14,6 @@ domain dgram udp6 named * 3 12h # adr/mask:port type proto owner name nfail disable [remote] -bge0 stream tcp * =/24 = = 129.168.0.0/16 * * * = * * 6161 = = = =/24 = = * stream tcp * = = =
CVS commit: src/sbin/fsck
Module Name:src Committed By: martin Date: Wed Jun 3 17:53:23 UTC 2015 Modified Files: src/sbin/fsck: partutil.c Log Message: Make querying the disk geometry fail silently if called for a non-exitent disk. XXX: DIOCGDISKINFO returns strange error codes To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sbin/fsck/partutil.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fsck/partutil.c diff -u src/sbin/fsck/partutil.c:1.14 src/sbin/fsck/partutil.c:1.15 --- src/sbin/fsck/partutil.c:1.14 Mon Dec 29 16:35:38 2014 +++ src/sbin/fsck/partutil.c Wed Jun 3 17:53:23 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: partutil.c,v 1.14 2014/12/29 16:35:38 christos Exp $ */ +/* $NetBSD: partutil.c,v 1.15 2015/06/03 17:53:23 martin Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__RCSID("$NetBSD: partutil.c,v 1.14 2014/12/29 16:35:38 christos Exp $"); +__RCSID("$NetBSD: partutil.c,v 1.15 2015/06/03 17:53:23 martin Exp $"); #include #include @@ -99,7 +99,7 @@ getdiskinfo(const char *s, int fd, const prop_dictionary_t disk_dict, geom_dict; struct stat sb; const struct partition *pp; - int ptn; + int ptn, error; if (dt) { lp = getdiskbyname(dt); @@ -108,7 +108,13 @@ getdiskinfo(const char *s, int fd, const } /* Get disk description dictionary */ - if (prop_dictionary_recv_ioctl(fd, DIOCGDISKINFO, &disk_dict)) { + error = prop_dictionary_recv_ioctl(fd, DIOCGDISKINFO, &disk_dict); + + /* fail quickly if the device does not exist at all */ + if (error == ENXIO) + return -1; + + if (error) { /* * Ask for disklabel if DIOCGDISKINFO failed. This is * compatibility call and can be removed when all devices @@ -116,7 +122,8 @@ getdiskinfo(const char *s, int fd, const * cgd, ccd pseudo disk drives doesn't support DIOCGDDISKINFO */ if (ioctl(fd, DIOCGDINFO, lp) == -1) { - warn("DIOCGDINFO on %s failed", s); + if (errno != ENXIO) +warn("DIOCGDINFO on %s failed", s); return -1; } label2geom(geo, lp);
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Wed Jun 3 17:55:26 UTC 2015 Modified Files: src/sys/arch/mips/mips: locore.S Log Message: Save a few instructions and use ei on mipsNNr2. To generate a diff of this commit: cvs rdiff -u -r1.193 -r1.194 src/sys/arch/mips/mips/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/locore.S diff -u src/sys/arch/mips/mips/locore.S:1.193 src/sys/arch/mips/mips/locore.S:1.194 --- src/sys/arch/mips/mips/locore.S:1.193 Tue Jun 2 05:06:23 2015 +++ src/sys/arch/mips/mips/locore.S Wed Jun 3 17:55:26 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.193 2015/06/02 05:06:23 matt Exp $ */ +/* $NetBSD: locore.S,v 1.194 2015/06/03 17:55:26 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -184,9 +184,13 @@ _C_LABEL(kernel_text): /* * Now enable interrupts (but they are all masked). */ +#if __mips_isa_rev >= 2 + ei +#else mfc0 v0, MIPS_COP_0_STATUS or v0, MIPS_SR_INT_IE mtc0 v0, MIPS_COP_0_STATUS +#endif COP0_SYNC jal _C_LABEL(main) # main(void)
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: pgoyette Date: Wed Jun 3 23:09:49 UTC 2015 Modified Files: src/distrib/sets/lists/man: mi Log Message: Add some additional cat pages that are generated by the MKCATPAGES build option. Pointed out by Kamil Rytarowski on current-users@ To generate a diff of this commit: cvs rdiff -u -r1.1501 -r1.1502 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1501 src/distrib/sets/lists/man/mi:1.1502 --- src/distrib/sets/lists/man/mi:1.1501 Wed May 13 07:28:49 2015 +++ src/distrib/sets/lists/man/mi Wed Jun 3 23:09:49 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1501 2015/05/13 07:28:49 mlelstv Exp $ +# $NetBSD: mi,v 1.1502 2015/06/03 23:09:49 pgoyette Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1006,6 +1006,7 @@ ./usr/share/man/cat4/dreamcast/pvr.0 man-sys-catman .cat ./usr/share/man/cat4/drm.0 man-sys-catman .cat ./usr/share/man/cat4/drum.0 man-sys-catman .cat +./usr/share/man/cat4/drvctl.0 man-sys-catman .cat ./usr/share/man/cat4/dtide.0 man-sys-catman .cat ./usr/share/man/cat4/dtv.0 man-sys-catman .cat ./usr/share/man/cat4/dtviic.0 man-sys-catman .cat @@ -2012,6 +2013,7 @@ ./usr/share/man/cat5/ar.0 man-sys-catman .cat ./usr/share/man/cat5/atf-formats.0 man-atf-catman .cat,atf ./usr/share/man/cat5/audit-packages.conf.0 man-obsolete obsolete +./usr/share/man/cat5/blacklistd.conf.0 man-sysutil-catman .cat ./usr/share/man/cat5/bluetooth.conf.0 man-obsolete obsolete ./usr/share/man/cat5/body_checks.0 man-postfix-catman postfix,.cat ./usr/share/man/cat5/boot.cfg.0 man-sys-catman .cat @@ -2322,6 +2324,8 @@ ./usr/share/man/cat8/bebox/MAKEDEV.0 man-obsolete obsolete ./usr/share/man/cat8/bebox/makedev.0 man-obsolete obsolete ./usr/share/man/cat8/bioctl.0 man-sysutil-catman .cat +./usr/share/man/cat8/blacklistctl.0 man-sysutil-catman .cat +./usr/share/man/cat8/blacklistd.0 man-sysutil-catman .cat ./usr/share/man/cat8/boot.0 man-sysutil-catman .cat ./usr/share/man/cat8/bootparamd.0 man-bootserver-catman .cat ./usr/share/man/cat8/bootpd.0 man-bootserver-catman .cat
CVS commit: src/usr.bin/gettext
Module Name:src Committed By: enami Date: Wed Jun 3 23:15:22 UTC 2015 Modified Files: src/usr.bin/gettext: gettext.c Log Message: Fix expand() to process successive escape sequences correctly. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/gettext/gettext.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/gettext/gettext.c diff -u src/usr.bin/gettext/gettext.c:1.1 src/usr.bin/gettext/gettext.c:1.2 --- src/usr.bin/gettext/gettext.c:1.1 Wed Jun 3 14:32:17 2015 +++ src/usr.bin/gettext/gettext.c Wed Jun 3 23:15:22 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: gettext.c,v 1.1 2015/06/03 14:32:17 christos Exp $ */ +/* $NetBSD: gettext.c,v 1.2 2015/06/03 23:15:22 enami Exp $ */ /*- * Copyright (c) 2015 William Orr @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ #include -__RCSID("$NetBSD: gettext.c,v 1.1 2015/06/03 14:32:17 christos Exp $"); +__RCSID("$NetBSD: gettext.c,v 1.2 2015/06/03 23:15:22 enami Exp $"); #include #include @@ -116,6 +116,7 @@ expand(char *str) *sp++ = '\\'; break; } + continue; } *sp++ = *fp++; }
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: rmind Date: Wed Jun 3 23:36:05 UTC 2015 Modified Files: src/usr.sbin/npf/npfctl: npf_show.c Log Message: npfctl: fix the from/to port mess up when showing the rules. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/npf/npfctl/npf_show.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_show.c diff -u src/usr.sbin/npf/npfctl/npf_show.c:1.18 src/usr.sbin/npf/npfctl/npf_show.c:1.19 --- src/usr.sbin/npf/npfctl/npf_show.c:1.18 Sat Mar 21 00:49:07 2015 +++ src/usr.sbin/npf/npfctl/npf_show.c Wed Jun 3 23:36:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: npf_show.c,v 1.18 2015/03/21 00:49:07 rmind Exp $ */ +/* $NetBSD: npf_show.c,v 1.19 2015/06/03 23:36:05 rmind Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include -__RCSID("$NetBSD: npf_show.c,v 1.18 2015/03/21 00:49:07 rmind Exp $"); +__RCSID("$NetBSD: npf_show.c,v 1.19 2015/06/03 23:36:05 rmind Exp $"); #include #include @@ -214,14 +214,14 @@ print_portrange(npf_conf_info_t *ctx, co char *p; if (ctx->curmark == BM_SRC_PORTS && (ctx->flags & SEEN_SRC) == 0) - any_str = "to any "; - if (ctx->curmark == BM_DST_PORTS && (ctx->flags & SEEN_DST) == 0) any_str = "from any "; + if (ctx->curmark == BM_DST_PORTS && (ctx->flags & SEEN_DST) == 0) + any_str = "to any "; if (fport != tport) { - easprintf(&p, "%s%u:%u", any_str, fport, tport); + easprintf(&p, "%sport %u:%u", any_str, fport, tport); } else { - easprintf(&p, "%s%u", any_str, fport); + easprintf(&p, "%sport %u", any_str, fport); } return p; } @@ -271,11 +271,11 @@ static const struct mark_keyword_mapent { BM_SRC_CIDR, "from %s", ", ", SEEN_SRC, print_address, 6 }, { BM_SRC_TABLE, "from <%s>", NULL, SEEN_SRC, print_table, 1 }, - { BM_SRC_PORTS, "port %s", ", ", 0, print_portrange,2 }, + { BM_SRC_PORTS, "%s", ", ", 0, print_portrange,2 }, { BM_DST_CIDR, "to %s", ", ", SEEN_DST, print_address, 6 }, { BM_DST_TABLE, "to <%s>", NULL, SEEN_DST, print_table, 1 }, - { BM_DST_PORTS, "port %s", ", ", 0, print_portrange,2 }, + { BM_DST_PORTS, "%s", ", ", 0, print_portrange,2 }, }; static const char * __attribute__((format_arg(2))) @@ -351,6 +351,7 @@ npfctl_print_filter(npf_conf_info_t *ctx "pcap-filter \"...\"" : "unrecognized-bytecode"); return; } + ctx->flags = 0; /* * BPF filter criteria described by the byte-code marks.
CVS commit: src/share/man/man9
Module Name:src Committed By: pgoyette Date: Thu Jun 4 01:58:30 UTC 2015 Modified Files: src/share/man/man9: module.9 Log Message: Fix typo - from Kamil Rytarowski To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/share/man/man9/module.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/module.9 diff -u src/share/man/man9/module.9:1.36 src/share/man/man9/module.9:1.37 --- src/share/man/man9/module.9:1.36 Thu May 14 13:59:57 2015 +++ src/share/man/man9/module.9 Thu Jun 4 01:58:30 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: module.9,v 1.36 2015/05/14 13:59:57 wiz Exp $ +.\" $NetBSD: module.9,v 1.37 2015/06/04 01:58:30 pgoyette Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -420,7 +420,7 @@ are never auto-unloaded. .El .Sh EXAMPLES A set of example modules is available in the -.Pa src/sys/modules.examples +.Pa src/sys/modules/examples directory hierarchy. .Sh CODE REFERENCES The core of the kernel module implementation is in
CVS commit: src/sys/arch/mips
Module Name:src Committed By: matt Date: Thu Jun 4 02:26:49 UTC 2015 Modified Files: src/sys/arch/mips/include: mips_opcode.h src/sys/arch/mips/mips: db_disasm.c Log Message: Add a lot of missing mipsNNr2 instruction + cavium specific instructions. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mips/include/mips_opcode.h cvs rdiff -u -r1.24 -r1.25 src/sys/arch/mips/mips/db_disasm.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/include/mips_opcode.h diff -u src/sys/arch/mips/include/mips_opcode.h:1.19 src/sys/arch/mips/include/mips_opcode.h:1.20 --- src/sys/arch/mips/include/mips_opcode.h:1.19 Mon Jun 1 22:55:13 2015 +++ src/sys/arch/mips/include/mips_opcode.h Thu Jun 4 02:26:49 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: mips_opcode.h,v 1.19 2015/06/01 22:55:13 matt Exp $ */ +/* $NetBSD: mips_opcode.h,v 1.20 2015/06/04 02:26:49 matt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -179,7 +179,10 @@ typedef union { #define OP_PREF 063 #define OP_LLD 064 /* MIPS-II, for r4000 port */ #define OP_LDC1 065 +#define OP_LDC2 066 #define OP_LD 067 /* MIPS-II, for r4000 port */ +#define OP_CVM_BBIT0 OP_LWC2 +#define OP_CVM_BBIT032 OP_LDC2 #define OP_SC 070 #define OP_SWC0 OP_SC /* backwards source compatibility */ @@ -188,7 +191,10 @@ typedef union { #define OP_RSVD073 073 #define OP_SCD 074 /* MIPS-II, for r4000 port */ #define OP_SDC1 075 +#define OP_SDC2 076 #define OP_SD 077 /* MIPS-II, for r4000 port */ +#define OP_CVM_BBIT1 OP_SWC2 +#define OP_CVM_BBIT132 OP_SDC2 /* * Values for the 'func' field when 'op' == OP_SPECIAL. @@ -206,6 +212,16 @@ typedef union { #define OP_BREAK 015 #define OP_SYNC 017 /* MIPS-II, for r4000 port */ +#define SYNC_CVM_IODBDMA 0x02 +#define SYNC_WMB 0x04 +#define SYNC_CVM_W SYNC_WMB +#define SYNC_CVM_WS 0x05 +#define SYNC_CVM_S 0x06 +#define SYNC_MB 0x10 +#define SYNC_ACQUIRE 0x11 +#define SYNC_RELEASE 0x12 +#define SYNC_RMB 0x13 + #define OP_MFHI 020 #define OP_MTHI 021 #define OP_MFLO 022 @@ -256,22 +272,52 @@ typedef union { /* * Values for the 'func' field when 'op' == OP_SPECIAL2. */ -#define OP_MAD 000 /* QED */ -#define OP_MADU 001 /* QED */ +#define OP_MADD 000 /* QED */ +#define OP_MADDU 001 /* QED */ #define OP_MUL 002 /* QED */ +#define OP_CVM_DMUL 003 /* OCTEON */ #define OP_MSUB 004 /* MIPS32/64 */ #define OP_MSUBU 005 /* MIPS32/64 */ +#define OP_CVM_SAA 030 /* OCTEON */ +#define OP_CVM_SAAD 031 /* OCTEON */ #define OP_CLZ 040 /* MIPS32/64 */ #define OP_CLO 041 /* MIPS32/64 */ #define OP_DCLZ 044 /* MIPS32/64 */ #define OP_DCLO 045 /* MIPS32/64 */ +#define OP_CVM_BADDU 050 /* OCTEON */ +#define OP_CVM_SEQ 052 /* OCTEON */ +#define OP_CVM_SNE 053 /* OCTEON */ +#define OP_CVM_SEQI 056 /* OCTEON */ +#define OP_CVM_SNEI 057 /* OCTEON */ +#define OP_CVM_POP 054 /* OCTEON */ +#define OP_CVM_DPOP 055 /* OCTEON */ +#define OP_CVM_CINS 062 /* OCTEON */ +#define OP_CVM_CINS32 063 /* OCTEON */ +#define OP_CVM_EXTS 072 /* OCTEON */ +#define OP_CVM_EXTS32 073 /* OCTEON */ +#define OP_SDBBP 077 /* MIPS32/MIPS64 */ /* * Values for the 'func' field when 'op' == OP_SPECIAL3. */ +#define OP_EXT 000 /* MIPS32/64 r2 */ +#define OP_DEXTM 001 /* MIPS32/64 r2 */ +#define OP_DEXTU 002 /* MIPS32/64 r2 */ +#define OP_DEXT 003 /* MIPS32/64 r2 */ +#define OP_INS 004 /* MIPS32/64 r2 */ +#define OP_DINSM 005 /* MIPS32/64 r2 */ +#define OP_DINSU 006 /* MIPS32/64 r2 */ +#define OP_DINS 007 /* MIPS32/64 r2 */ #define OP_LX 012 /* DSP */ +#define OP_BSHFL 040 /* MIPS32/64 r2 */ +#define OP_DBSHFL 044 /* MIPS32/64 r2 */ #define OP_RDHWR 073 /* MIPS32/64 r2 */ +#define OP_BSHFL_SBH 2 /* swap bytes within halfwords */ +#define OP_BSHFL_SHD 4 /* swap halfworks within double */ +#define OP_BSHFL_SEB 16 /* sign extend byte */ +#define OP_BSHFL_SEH 24 /* sign extend halfword */ + #define OP_LX_LWX 0 /* lwx */ #define OP_LX_LHX 4 /* lhx */ #define OP_LX_LBUX 6 /* lbux */ @@ -309,6 +355,7 @@ typedef union { #define OP_CT 006 #define OP_MTH 007 #define OP_BCx 010 +#define OP_MFM 013 /* MIPS32/64 r2 */ #define OP_BCy 014 /* Index: src/sys/arch/mips/mips/db_disasm.c diff -u src/sys/arch/mips/mips/db_disasm.c:1.24 src/sys/arch/mips/mips/db_disasm.c:1.25 --- src/sys/arch/mips/mips/db_disasm.c:1.24 Thu Aug 18 21:04:23 2011 +++ src/sys/arch/mips/mips/db_disasm.c Thu Jun 4 02:26:49 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: db_disasm.c,v 1.24 2011/08/18 21:04:23 matt Exp $ */ +/* $NetBSD: db_disasm.c,v 1.25 2015/06/04 02:26:49 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.24 2011/08/18 21:04:23 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.25 2015/06/04 02:26:49 matt Exp $"); #include #include @@ -58,13 +58,18 @@ static cons
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Thu Jun 4 02:27:25 UTC 2015 Modified Files: src/sys/arch/mips/mips: mipsX_subr.S Log Message: Use ei/di on mipsNNr2 where possible. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/mips/mips/mipsX_subr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/mipsX_subr.S diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.57 src/sys/arch/mips/mips/mipsX_subr.S:1.58 --- src/sys/arch/mips/mips/mipsX_subr.S:1.57 Tue May 26 02:18:20 2015 +++ src/sys/arch/mips/mips/mipsX_subr.S Thu Jun 4 02:27:25 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: mipsX_subr.S,v 1.57 2015/05/26 02:18:20 matt Exp $ */ +/* $NetBSD: mipsX_subr.S,v 1.58 2015/06/04 02:27:25 matt Exp $ */ /* * Copyright 2002 Wasabi Systems, Inc. @@ -997,9 +997,13 @@ NESTED_NOPROFILE(MIPSX(kern_intr), KERNF * Interrupts handled, restore registers and return from the interrupt. * First, clear interrupt enable */ +#if __mips_isa_rev >= 2 + di v0# disable interrupts +#else mfc0 v0, MIPS_COP_0_STATUS # read it xor v0, MIPS_SR_INT_IE # disable interrupts mtc0 v0, MIPS_COP_0_STATUS # write it +#endif COP0_SYNC or v0, MIPS_SR_EXL # set exception mode @@ -1348,10 +1352,14 @@ NESTED_NOPROFILE(MIPSX(user_intr), CALLF /* * Disable interrupts */ +#if __mips_isa_rev >= 2 + di # disable interrupts +#else mfc0 v1, MIPS_COP_0_STATUS and v0, v1, MIPS_SR_INT_IE # clear interrupt enable xor v0, v1 mtc0 v0, MIPS_COP_0_STATUS # interrupts are disabled +#endif COP0_SYNC /* @@ -1382,10 +1390,14 @@ NESTED_NOPROFILE(MIPSX(user_intr), CALLF REG_S s6, CALLFRAME_SIZ+TF_REG_S6(sp) # $22 REG_S s7, CALLFRAME_SIZ+TF_REG_S7(sp) # $23 REG_S s8, CALLFRAME_SIZ+TF_REG_S8(sp) # $30 +#if !defined(MIPS_DYNAMIC_STATUS_MASK) && __mips_isa_rev > 2 + ei # enable interrupts +#else mfc0 t0, MIPS_COP_0_STATUS # or t0, MIPS_SR_INT_IE # enable interrupts DYNAMIC_STATUS_MASK(t0, t1) # machine dependent masking mtc0 t0, MIPS_COP_0_STATUS # enable interrupts (spl0) +#endif COP0_SYNC PTR_LA ra, MIPSX(user_return) @@ -2181,6 +2193,9 @@ LEAF_NOPROFILE(MIPSX(tlb_record_asids)) li ta3, 1 move v0, zero # start at zero ASIDs +#if __mips_isa_rev >= 2 + di v1# disable interrupts +#else mfc0 v1, MIPS_COP_0_STATUS # save status register #ifdef _LP64 and t0, v1, MIPS_SR_INT_IE @@ -2189,6 +2204,7 @@ LEAF_NOPROFILE(MIPSX(tlb_record_asids)) #else mtc0 zero, MIPS_COP_0_STATUS # disable interrupts #endif +#endif COP0_SYNC # do {} while (ta0 < ta1)
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Thu Jun 4 02:28:06 UTC 2015 Modified Files: src/sys/arch/mips/mips: lock_stubs_llsc.S Log Message: Use syncw on OCTEON To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/mips/lock_stubs_llsc.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/lock_stubs_llsc.S diff -u src/sys/arch/mips/mips/lock_stubs_llsc.S:1.2 src/sys/arch/mips/mips/lock_stubs_llsc.S:1.3 --- src/sys/arch/mips/mips/lock_stubs_llsc.S:1.2 Sun Jul 10 23:21:59 2011 +++ src/sys/arch/mips/mips/lock_stubs_llsc.S Thu Jun 4 02:28:06 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs_llsc.S,v 1.2 2011/07/10 23:21:59 matt Exp $ */ +/* $NetBSD: lock_stubs_llsc.S,v 1.3 2015/06/04 02:28:06 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -45,8 +45,13 @@ #endif #if defined(MULTIPROCESSOR) +#if defined(__OCTEON__) +#define SYNC syncw +#define BDSYNC syncw +#else #define SYNC sync #define BDSYNC sync +#endif #else #define SYNC /* nothing */ #define BDSYNC nop
CVS commit: src/sys/arch/evbmips/cavium
Module Name:src Committed By: matt Date: Thu Jun 4 05:21:09 UTC 2015 Modified Files: src/sys/arch/evbmips/cavium: machdep.c Log Message: If booting a MULTIPROCESSOR kernel, use the llsc atomic primitives To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/cavium/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/evbmips/cavium/machdep.c diff -u src/sys/arch/evbmips/cavium/machdep.c:1.3 src/sys/arch/evbmips/cavium/machdep.c:1.4 --- src/sys/arch/evbmips/cavium/machdep.c:1.3 Mon Jun 1 22:55:12 2015 +++ src/sys/arch/evbmips/cavium/machdep.c Thu Jun 4 05:21:09 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.3 2015/06/01 22:55:12 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.4 2015/06/04 05:21:09 matt Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -112,7 +112,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.3 2015/06/01 22:55:12 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.4 2015/06/04 05:21:09 matt Exp $"); #include #include @@ -275,7 +275,11 @@ mach_init_vector(void) * first printf() after that is called). * Also clears the I+D caches. */ +#if MULTIPROCESSOR + mips_vector_init(NULL, true); +#else mips_vector_init(NULL, false); +#endif } void @@ -439,9 +443,10 @@ haltsys: delay(8); /* initiate chip soft-reset */ - octeon_write_csr(CIU_SOFT_BIST, 0x0001ULL); + uint64_t fuse = octeon_read_csr(CIU_FUSE); + octeon_write_csr(CIU_SOFT_BIST, fuse); octeon_read_csr(CIU_SOFT_RST); - octeon_write_csr(CIU_SOFT_RST, 0x0001ULL); + octeon_write_csr(CIU_SOFT_RST, fuse); delay(100);
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Thu Jun 4 05:22:11 UTC 2015 Modified Files: src/sys/arch/evbmips/cavium: octeon_bootbus_machdep.c src/sys/arch/mips/cavium/include: bootbusvar.h Log Message: minor constification To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/cavium/octeon_bootbus_machdep.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/cavium/include/bootbusvar.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/evbmips/cavium/octeon_bootbus_machdep.c diff -u src/sys/arch/evbmips/cavium/octeon_bootbus_machdep.c:1.1 src/sys/arch/evbmips/cavium/octeon_bootbus_machdep.c:1.2 --- src/sys/arch/evbmips/cavium/octeon_bootbus_machdep.c:1.1 Wed Apr 29 08:32:01 2015 +++ src/sys/arch/evbmips/cavium/octeon_bootbus_machdep.c Thu Jun 4 05:22:10 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: octeon_bootbus_machdep.c,v 1.1 2015/04/29 08:32:01 hikaru Exp $ */ +/* $NetBSD: octeon_bootbus_machdep.c,v 1.2 2015/06/04 05:22:10 matt Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: octeon_bootbus_machdep.c,v 1.1 2015/04/29 08:32:01 hikaru Exp $"); +__KERNEL_RCSID(0, "$NetBSD: octeon_bootbus_machdep.c,v 1.2 2015/06/04 05:22:10 matt Exp $"); #include #include @@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: octeon_bootb #include -const struct bootbus_dev *bootbus_devs[] = { +const struct bootbus_dev * const bootbus_devs[] = { }; const size_t bootbus_ndevs = __arraycount(bootbus_devs); Index: src/sys/arch/mips/cavium/include/bootbusvar.h diff -u src/sys/arch/mips/cavium/include/bootbusvar.h:1.1 src/sys/arch/mips/cavium/include/bootbusvar.h:1.2 --- src/sys/arch/mips/cavium/include/bootbusvar.h:1.1 Wed Apr 29 08:32:01 2015 +++ src/sys/arch/mips/cavium/include/bootbusvar.h Thu Jun 4 05:22:11 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bootbusvar.h,v 1.1 2015/04/29 08:32:01 hikaru Exp $ */ +/* $NetBSD: bootbusvar.h,v 1.2 2015/06/04 05:22:11 matt Exp $ */ /* * Copyright (c) 2007 @@ -57,7 +57,7 @@ struct bootbus_attach_args { bus_dma_tag_t aa_dmat; }; -extern const struct bootbus_dev *bootbus_devs[]; +extern const struct bootbus_dev * const bootbus_devs[]; extern const size_t bootbus_ndevs; void bootbus_bootstrap(struct octeon_config *);
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Thu Jun 4 05:23:40 UTC 2015 Modified Files: src/sys/arch/mips/mips: db_disasm.c Log Message: Fix J/JAL address calculation to not throw the top 32-bits. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mips/mips/db_disasm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/db_disasm.c diff -u src/sys/arch/mips/mips/db_disasm.c:1.25 src/sys/arch/mips/mips/db_disasm.c:1.26 --- src/sys/arch/mips/mips/db_disasm.c:1.25 Thu Jun 4 02:26:49 2015 +++ src/sys/arch/mips/mips/db_disasm.c Thu Jun 4 05:23:40 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: db_disasm.c,v 1.25 2015/06/04 02:26:49 matt Exp $ */ +/* $NetBSD: db_disasm.c,v 1.26 2015/06/04 05:23:40 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.25 2015/06/04 02:26:49 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.26 2015/06/04 05:23:40 matt Exp $"); #include #include @@ -697,7 +697,7 @@ db_disasm_insn(int insn, db_addr_t loc, case OP_J: case OP_JAL: db_printf("%s\t", op_name[i.JType.op]); - print_addr((loc & 0xF000) | (i.JType.target << 2)); + print_addr((loc & ~0x0FFFL) | (i.JType.target << 2)); bdslot = true; break;
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Thu Jun 4 05:32:05 UTC 2015 Modified Files: src/sys/arch/mips/mips: cpu_subr.c Log Message: Add a verbose message when booting secondary cpus. Fix octeon cpu_info_alloc To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mips/mips/cpu_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/cpu_subr.c diff -u src/sys/arch/mips/mips/cpu_subr.c:1.20 src/sys/arch/mips/mips/cpu_subr.c:1.21 --- src/sys/arch/mips/mips/cpu_subr.c:1.20 Mon Jun 1 22:55:13 2015 +++ src/sys/arch/mips/mips/cpu_subr.c Thu Jun 4 05:32:05 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_subr.c,v 1.20 2015/06/01 22:55:13 matt Exp $ */ +/* $NetBSD: cpu_subr.c,v 1.21 2015/06/04 05:32:05 matt Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -30,8 +30,9 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.20 2015/06/01 22:55:13 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.21 2015/06/04 05:32:05 matt Exp $"); +#include "opt_cputype.h" #include "opt_ddb.h" #include "opt_multiprocessor.h" @@ -118,19 +119,16 @@ struct cpu_info * cpu_info_alloc(struct pmap_tlb_info *ti, cpuid_t cpu_id, cpuid_t cpu_package_id, cpuid_t cpu_core_id, cpuid_t cpu_smt_id) { - struct pglist pglist; - int error; - KASSERT(cpu_id < MAXCPUS); -#ifdef MIPS64O_OCTEON +#ifdef MIPS64_OCTEON const vaddr_t cpu_info_offset = 0x800; vaddr_t exc_page = MIPS_UTLB_MISS_EXC_VEC + 0x1000*cpu_id; __CTASSERT(sizeof(struct cpu_info) <= 0x800); __CTASSERT(sizeof(struct pmap_tlb_info) <= 0x400); - struct cpu_info * const ci = (void *) (va + cpu_info_offset); - memset((void *)va, 0, PAGE_SIZE); + struct cpu_info * const ci = (void *) (exc_page + cpu_info_offset); + memset((void *)exc_page, 0, PAGE_SIZE); if (ti == NULL) { ti = ((struct pmap_tlb_info *)ci) - 1; @@ -138,6 +136,8 @@ cpu_info_alloc(struct pmap_tlb_info *ti, } #else const vaddr_t cpu_info_offset = (vaddr_t)&cpu_info_store & PAGE_MASK; + struct pglist pglist; + int error; /* * Grab a page from the first 512MB (mappable by KSEG0) to use to store @@ -179,6 +179,7 @@ cpu_info_alloc(struct pmap_tlb_info *ti, #endif #endif /* MIPS64_OCTEON */ + KASSERT(cpu_id != 0); ci->ci_cpuid = cpu_id; ci->ci_data.cpu_package_id = cpu_package_id; ci->ci_data.cpu_core_id = cpu_core_id; @@ -279,6 +280,7 @@ cpu_attach_common(device_t self, struct cpuid_infos[ci->ci_cpuid] = ci; membar_producer(); } + KASSERT(cpuid_infos[ci->ci_cpuid] != NULL); evcnt_attach_dynamic(&ci->ci_evcnt_synci_activate_rqst, EVCNT_TYPE_MISC, NULL, xname, "syncicache activate request"); @@ -860,9 +862,6 @@ cpu_hatch(struct cpu_info *ci) tlb_invalidate_all(); mips3_cp0_wired_write(ti->ti_wired); - // Show this CPU as present. - atomic_or_ulong(&ci->ci_flags, CPUF_PRESENT); - /* * Setup HWRENA and USERLOCAL COP0 registers (MIPSxxR2). */ @@ -890,6 +889,9 @@ cpu_hatch(struct cpu_info *ci) */ (*mips_locoresw.lsw_cpu_init)(ci); + // Show this CPU as present. + atomic_or_ulong(&ci->ci_flags, CPUF_PRESENT); + /* * Announce we are hatched */ @@ -933,6 +935,8 @@ cpu_boot_secondary_processors(void) { CPU_INFO_ITERATOR cii; struct cpu_info *ci; + aprint_verbose("Booting secondary processors (%#"PRIx64")", + cpus_hatched); for (CPU_INFO_FOREACH(cii, ci)) { if (CPU_IS_PRIMARY(ci)) continue; @@ -944,10 +948,12 @@ cpu_boot_secondary_processors(void) if (! CPUSET_HAS_P(cpus_hatched, cpu_index(ci))) continue; + aprint_verbose(" %s", cpu_name(ci)); ci->ci_data.cpu_cc_skew = mips3_cp0_count_read(); atomic_or_ulong(&ci->ci_flags, CPUF_RUNNING); CPUSET_ADD(cpus_running, cpu_index(ci)); } + aprint_verbose("\n"); } void
CVS commit: [netbsd-7] src/external/gpl3/gcc
Module Name:src Committed By: martin Date: Thu Jun 4 05:40:48 UTC 2015 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm [netbsd-7]: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb [netbsd-7]: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf [netbsd-7]: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb [netbsd-7]: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4 [netbsd-7]: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb [netbsd-7]: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6 [netbsd-7]: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb [netbsd-7]: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf [netbsd-7]: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb [netbsd-7]: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7 [netbsd-7]: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb [netbsd-7]: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf [netbsd-7]: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb [netbsd-7]: c++config.h src/external/gpl3/gcc/usr.bin/gcc/arch/earm [netbsd-7]: multilib.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb [netbsd-7]: multilib.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf [netbsd-7]: multilib.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb [netbsd-7]: multilib.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4 [netbsd-7]: multilib.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb [netbsd-7]: multilib.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6 [netbsd-7]: multilib.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb [netbsd-7]: multilib.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf [netbsd-7]: multilib.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb [netbsd-7]: multilib.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7 [netbsd-7]: multilib.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb [netbsd-7]: multilib.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf [netbsd-7]: multilib.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb [netbsd-7]: multilib.h Log Message: Apply patch, requested by mrg in #819: lib/libstdc++-v3/arch/earm/c++config.h (patch) lib/libstdc++-v3/arch/earmeb/c++config.h(patch) lib/libstdc++-v3/arch/earmhf/c++config.h(patch) lib/libstdc++-v3/arch/earmhfeb/c++config.h (patch) lib/libstdc++-v3/arch/earmv4/c++config.h(patch) lib/libstdc++-v3/arch/earmv4eb/c++config.h (patch) lib/libstdc++-v3/arch/earmv6/c++config.h(patch) lib/libstdc++-v3/arch/earmv6eb/c++config.h (patch) lib/libstdc++-v3/arch/earmv6hf/c++config.h (patch) lib/libstdc++-v3/arch/earmv6hfeb/c++config.h(patch) lib/libstdc++-v3/arch/earmv7/c++config.h(patch) lib/libstdc++-v3/arch/earmv7eb/c++config.h (patch) lib/libstdc++-v3/arch/earmv7hf/c++config.h (patch) lib/libstdc++-v3/arch/earmv7hfeb/c++config.h(patch) usr.bin/gcc/arch/earm/multilib.h(patch) usr.bin/gcc/arch/earmeb/multilib.h (patch) usr.bin/gcc/arch/earmhf/multilib.h (patch) usr.bin/gcc/arch/earmhfeb/multilib.h(patch) usr.bin/gcc/arch/earmv4/multilib.h (patch) usr.bin/gcc/arch/earmv4eb/multilib.h(patch) usr.bin/gcc/arch/earmv6/multilib.h (patch) usr.bin/gcc/arch/earmv6eb/multilib.h(patch) usr.bin/gcc/arch/earmv6hf/multilib.h(patch) usr.bin/gcc/arch/earmv6hfeb/multilib.h (patch) usr.bin/gcc/arch/earmv7/multilib.h (patch) usr.bin/gcc/arch/earmv7eb/multilib.h(patch) usr.bin/gcc/arch/earmv7hf/multilib.h(patch) usr.bin/gcc/arch/earmv7hfeb/multilib.h (patch) Regen for arm OABI compat changes. To generate a diff of this commit: cvs rdiff -u -r1.10.2.2 -r1.10.2.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h cvs rdiff -u -r1.8.2.2 -r1.8.2.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h cvs rdiff -u -r1.8.2.2 -r1.8.2.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h cvs rdiff -u -r1.6.2.2 -r1.6.2.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++config.h cvs rdiff -u -r1.5.2.2 -r1.5.2.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++conf
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Jun 4 05:42:39 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #819 To generate a diff of this commit: cvs rdiff -u -r1.1.2.318 -r1.1.2.319 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.318 src/doc/CHANGES-7.0:1.1.2.319 --- src/doc/CHANGES-7.0:1.1.2.318 Wed Jun 3 06:53:37 2015 +++ src/doc/CHANGES-7.0 Thu Jun 4 05:42:38 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.318 2015/06/03 06:53:37 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.319 2015/06/04 05:42:38 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -23701,3 +23701,35 @@ sys/modules/examples/readhappy/readhappy Provide a more comprehensive set of example kernel modules. [pgoyette, ticket #752] + lib/libstdc++-v3/arch/earm/c++config.h (patch) +lib/libstdc++-v3/arch/earmeb/c++config.h (patch) +lib/libstdc++-v3/arch/earmhf/c++config.h (patch) +lib/libstdc++-v3/arch/earmhfeb/c++config.h (patch) +lib/libstdc++-v3/arch/earmv4/c++config.h (patch) +lib/libstdc++-v3/arch/earmv4eb/c++config.h (patch) +lib/libstdc++-v3/arch/earmv6/c++config.h (patch) +lib/libstdc++-v3/arch/earmv6eb/c++config.h (patch) +lib/libstdc++-v3/arch/earmv6hf/c++config.h (patch) +lib/libstdc++-v3/arch/earmv6hfeb/c++config.h (patch) +lib/libstdc++-v3/arch/earmv7/c++config.h (patch) +lib/libstdc++-v3/arch/earmv7eb/c++config.h (patch) +lib/libstdc++-v3/arch/earmv7hf/c++config.h (patch) +lib/libstdc++-v3/arch/earmv7hfeb/c++config.h (patch) +usr.bin/gcc/arch/earm/multilib.h (patch) +usr.bin/gcc/arch/earmeb/multilib.h (patch) +usr.bin/gcc/arch/earmhf/multilib.h (patch) +usr.bin/gcc/arch/earmhfeb/multilib.h (patch) +usr.bin/gcc/arch/earmv4/multilib.h (patch) +usr.bin/gcc/arch/earmv4eb/multilib.h (patch) +usr.bin/gcc/arch/earmv6/multilib.h (patch) +usr.bin/gcc/arch/earmv6eb/multilib.h (patch) +usr.bin/gcc/arch/earmv6hf/multilib.h (patch) +usr.bin/gcc/arch/earmv6hfeb/multilib.h (patch) +usr.bin/gcc/arch/earmv7/multilib.h (patch) +usr.bin/gcc/arch/earmv7eb/multilib.h (patch) +usr.bin/gcc/arch/earmv7hf/multilib.h (patch) +usr.bin/gcc/arch/earmv7hfeb/multilib.h (patch) + + Regen for arm OABI compat changes. + [mrg, #819] +
CVS commit: src/share/mk
Module Name:src Committed By: martin Date: Thu Jun 4 05:56:23 UTC 2015 Modified Files: src/share/mk: bsd.own.mk Log Message: Cosmetics: simplify MKCOMPAT default settings To generate a diff of this commit: cvs rdiff -u -r1.852 -r1.853 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.852 src/share/mk/bsd.own.mk:1.853 --- src/share/mk/bsd.own.mk:1.852 Fri May 29 14:15:14 2015 +++ src/share/mk/bsd.own.mk Thu Jun 4 05:56:23 2015 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.852 2015/05/29 14:15:14 martin Exp $ +# $NetBSD: bsd.own.mk,v 1.853 2015/06/04 05:56:23 martin Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -896,9 +896,8 @@ MK${var}:= yes .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" \ || ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \ || ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_CPU} == "aarch64" \ -|| ${MACHINE_ARCH} == "riscv64" -MKCOMPAT?= yes -.elif !empty(MACHINE_ARCH:Mearm*) +|| ${MACHINE_ARCH} == "riscv64" \ +|| !empty(MACHINE_ARCH:Mearm*) MKCOMPAT?= yes .else # Don't let this build where it really isn't supported.
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Thu Jun 4 05:58:17 UTC 2015 Modified Files: src/sys/arch/mips/mips: locore_mips3.S Log Message: Don't .set mips3 if we are >= mips3 already Use dins if we have it rather than two shifts. To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/sys/arch/mips/mips/locore_mips3.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/locore_mips3.S diff -u src/sys/arch/mips/mips/locore_mips3.S:1.104 src/sys/arch/mips/mips/locore_mips3.S:1.105 --- src/sys/arch/mips/mips/locore_mips3.S:1.104 Tue Jun 2 05:09:15 2015 +++ src/sys/arch/mips/mips/locore_mips3.S Thu Jun 4 05:58:17 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locore_mips3.S,v 1.104 2015/06/02 05:09:15 matt Exp $ */ +/* $NetBSD: locore_mips3.S,v 1.105 2015/06/04 05:58:17 matt Exp $ */ /* * Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author) @@ -122,7 +122,9 @@ * */ .set noreorder +#if __mips < 3 .set mips3 +#endif #ifdef _LP64 #define _MFC0 dmfc0 @@ -639,8 +641,12 @@ END(baderr64) LEAF(mips3_cp0_tlb_entry_hi_probe) dmfc0 t0, MIPS_COP_0_TLB_HI li v0, -1 /* all 1s */ +#if defined(__mips_isa_rev) && __mips_isa_rev >= 2 + dinsu v0, zero, 62, 2 +#else dsll v0, v0, 2 /* except the top 2 */ dsrl v0, v0, 2 +#endif dmtc0 v0, MIPS_COP_0_TLB_HI COP0_SYNC dmfc0 v0, MIPS_COP_0_TLB_HI
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Thu Jun 4 06:01:24 UTC 2015 Modified Files: src/share/mk: bsd.lib.mk Log Message: fix MKDEBUG vs parallel builds. split the creation of the final .so file from the main link of it, and use the main file as the input for both the .so output and the .so.debug file. for MKDEBUG builds we now: (a) create the (new) .so.full file (d) create the .so.debug file (c) create the (installable) .so file for other builds, we simply use the same rule for (a) to create (c). this stops the .so.debug rule from modifying the .so rule's target and leading to mayhem. see this thread for more details: http://mail-index.netbsd.org/tech-toolchain/2015/06/03/msg002616.html To generate a diff of this commit: cvs rdiff -u -r1.357 -r1.358 src/share/mk/bsd.lib.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.lib.mk diff -u src/share/mk/bsd.lib.mk:1.357 src/share/mk/bsd.lib.mk:1.358 --- src/share/mk/bsd.lib.mk:1.357 Tue Jun 2 23:00:25 2015 +++ src/share/mk/bsd.lib.mk Thu Jun 4 06:01:24 2015 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.357 2015/06/02 23:00:25 christos Exp $ +# $NetBSD: bsd.lib.mk,v 1.358 2015/06/04 06:01:24 mrg Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .include @@ -406,6 +406,7 @@ _LIB.ln:=llib-l${LIB}.ln _LIB.so:=${_LIB}.so _LIB.so.major:=${_LIB}.so.${SHLIB_MAJOR} _LIB.so.full:=${_LIB}.so.${SHLIB_FULLVERSION} +_LIB.so.link:=${_LIB}.so.${SHLIB_FULLVERSION}.link .if ${MKDEBUG} != "no" _LIB.so.debug:=${_LIB.so.full}.debug .endif @@ -614,8 +615,25 @@ LIBCC:= ${CC} _LDADD.${_LIB}= ${LDADD} ${LDADD.${_LIB}} _LDFLAGS.${_LIB}= ${LDFLAGS} ${LDFLAGS.${_LIB}} -${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPLIBC} \ -${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE} +_MAINLIBDEPS= ${SOLIB} ${DPADD} ${DPLIBC} \ + ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE} + +.if defined(_LIB.so.debug) +${_LIB.so.debug}: ${_LIB.so.link} + ${_MKTARGET_CREATE} + ( ${OBJCOPY} --only-keep-debug \ + ${_LIB.so.link} ${_LIB.so.debug} \ + ) || (rm -f ${.TARGET}; false) +${_LIB.so.full}: ${_LIB.so.link} ${_LIB.so.debug} + ${_MKTARGET_CREATE} + ( ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \ + --add-gnu-debuglink=${_LIB.so.debug} \ + ${_LIB.so.link} ${_LIB.so.full} \ + ) || (rm -f ${.TARGET}; false) +${_LIB.so.link}: ${_MAINLIBDEPS} +.else # aka no MKDEBUG +${_LIB.so.full}: ${_MAINLIBDEPS} +.endif ${_MKTARGET_BUILD} rm -f ${.TARGET} ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} \ @@ -625,6 +643,8 @@ ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPL # We don't use INSTALL_SYMLINK here because this is just # happening inside the build directory/objdir. XXX Why does # this spend so much effort on libraries that aren't live??? XXX +# XXX Also creates dead symlinks until the .full rule runs +# above and creates the main link .if defined(SHLIB_FULLVERSION) && defined(SHLIB_MAJOR) && \ "${SHLIB_FULLVERSION}" != "${SHLIB_MAJOR}" ${HOST_LN} -sf ${_LIB.so.full} ${_LIB.so.major}.tmp @@ -636,16 +656,6 @@ ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPL ${OBJCOPY} -R .ident ${.TARGET} .endif -.if defined(_LIB.so.debug) -${_LIB.so.debug}: ${_LIB.so.full} - ${_MKTARGET_CREATE} - ( ${OBJCOPY} --only-keep-debug ${_LIB.so.full} ${_LIB.so.debug} \ - && ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \ - --add-gnu-debuglink=${_LIB.so.debug} ${_LIB.so.full} \ - ${_LIB.so.full}.tmp && mv -f ${_LIB.so.full}.tmp ${_LIB.so.full} \ - ) || (rm -f ${.TARGET}; false) -.endif - .if !empty(LOBJS) # { LLIBS?= -lc ${_LIB.ln}: ${LOBJS}