From owner-svn-src-projects@FreeBSD.ORG Sun May 17 16:14:51 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0BB40911; Sun, 17 May 2015 16:14:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ED7431056; Sun, 17 May 2015 16:14:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4HGEo3M067651; Sun, 17 May 2015 16:14:50 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4HGEnZQ067631; Sun, 17 May 2015 16:14:49 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201505171614.t4HGEnZQ067631@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Sun, 17 May 2015 16:14:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r283030 - in projects/ci20_mips/sys/mips: conf ingenic X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 May 2015 16:14:51 -0000 Author: sbruno Date: Sun May 17 16:14:48 2015 New Revision: 283030 URL: https://svnweb.freebsd.org/changeset/base/283030 Log: Begin support for Imagination Tech CI20 Creator Board. Add netbsd files to support devices (untested, does not compile). Add basic kernconf, more or less a copy of MALTA. Sponsored by: Imagination Tech Added: projects/ci20_mips/sys/mips/conf/CI20 projects/ci20_mips/sys/mips/ingenic/ projects/ci20_mips/sys/mips/ingenic/apbus.c (contents, props changed) projects/ci20_mips/sys/mips/ingenic/files.ingenic projects/ci20_mips/sys/mips/ingenic/ingenic_com.c (contents, props changed) projects/ci20_mips/sys/mips/ingenic/ingenic_dme.c (contents, props changed) projects/ci20_mips/sys/mips/ingenic/ingenic_dwctwo.c (contents, props changed) projects/ci20_mips/sys/mips/ingenic/ingenic_ehci.c (contents, props changed) projects/ci20_mips/sys/mips/ingenic/ingenic_machdep.c (contents, props changed) projects/ci20_mips/sys/mips/ingenic/ingenic_ohci.c (contents, props changed) projects/ci20_mips/sys/mips/ingenic/ingenic_regs.h (contents, props changed) projects/ci20_mips/sys/mips/ingenic/ingenic_var.h (contents, props changed) projects/ci20_mips/sys/mips/ingenic/jziic.c (contents, props changed) Added: projects/ci20_mips/sys/mips/conf/CI20 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ci20_mips/sys/mips/conf/CI20 Sun May 17 16:14:48 2015 (r283030) @@ -0,0 +1,37 @@ +# $FreeBSD: $ + +machine mips mips +cpu CPU_MIPS74KC +ident CI20 +machine mips mips +makeoptions KERNLOADADDR=0x80050000 +options HZ=1000 + + +files "../ingenic/files.ingenic" + +# Don't build any modules yet. +makeoptions MODULES_OVERRIDE="" + +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols + +options DDB +options KDB + +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options NFSCL #Network Filesystem Client +options NFS_ROOT #NFS usable as /, requires NFSCL +options PSEUDOFS #Pseudo-filesystem framework +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions + +# Debugging for use in -current +options DEADLKRES #Enable the deadlock resolver +options INVARIANTS #Enable calls of extra sanity checking +options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +options WITNESS #Enable checks to detect deadlocks and cycles +options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed + +device loop +device ether +device md Added: projects/ci20_mips/sys/mips/ingenic/apbus.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ci20_mips/sys/mips/ingenic/apbus.c Sun May 17 16:14:48 2015 (r283030) @@ -0,0 +1,275 @@ +/* $NetBSD: apbus.c,v 1.14 2015/05/04 12:23:15 macallan Exp $ */ + +/*- + * Copyright (c) 2014 Michael Lorenz + * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. + */ + +/* catch-all for on-chip peripherals */ + +#include +__KERNEL_RCSID(0, "$NetBSD: apbus.c,v 1.14 2015/05/04 12:23:15 macallan Exp $"); + +#include "locators.h" +#define _MIPS_BUS_DMA_PRIVATE + +#include +#include +#include +#include +#include + +#include +#include + +#include "opt_ingenic.h" + +static int apbus_match(device_t, cfdata_t, void *); +static void apbus_attach(device_t, device_t, void *); +static int apbus_print(void *, const char *); +static void apbus_bus_mem_init(bus_space_tag_t, void *); + +CFATTACH_DECL_NEW(apbus, 0, apbus_match, apbus_attach, NULL, NULL); + +static struct mips_bus_space apbus_mbst; +bus_space_tag_t apbus_memt = NULL; + +struct mips_bus_dma_tag apbus_dmat = { + ._bounce_alloc_hi = 0x10000000, + ._dmamap_ops = _BUS_DMAMAP_OPS_INITIALIZER, + ._dmamem_ops = _BUS_DMAMEM_OPS_INITIALIZER, + ._dmatag_ops = _BUS_DMATAG_OPS_INITIALIZER, +}; + +typedef struct apbus_dev { + const char *name; /* driver name */ + bus_addr_t addr; /* base address */ + uint32_t irq; /* interrupt */ + uint32_t clk0; /* bit(s) in CLKGR0 */ + uint32_t clk1; /* bit(s) in CLKGR1 */ +} apbus_dev_t; + +static const apbus_dev_t apbus_devs[] = { + { "dwctwo", JZ_DWC2_BASE, 21, CLK_OTG0 | CLK_UHC, CLK_OTG1}, + { "ohci", JZ_OHCI_BASE, 5, CLK_UHC, 0}, + { "ehci", JZ_EHCI_BASE, 20, CLK_UHC, 0}, + { "dme", JZ_DME_BASE, -1, 0, 0}, + { "jzgpio", JZ_GPIO_A_BASE, 17, 0, 0}, + { "jzgpio", JZ_GPIO_B_BASE, 16, 0, 0}, + { "jzgpio", JZ_GPIO_C_BASE, 15, 0, 0}, + { "jzgpio", JZ_GPIO_D_BASE, 14, 0, 0}, + { "jzgpio", JZ_GPIO_E_BASE, 13, 0, 0}, + { "jzgpio", JZ_GPIO_F_BASE, 12, 0, 0}, + { "jziic", JZ_SMB0_BASE, 60, CLK_SMB0, 0}, + { "jziic", JZ_SMB1_BASE, 59, CLK_SMB1, 0}, + { "jziic", JZ_SMB2_BASE, 58, CLK_SMB2, 0}, + { "jziic", JZ_SMB3_BASE, 57, 0, CLK_SMB3}, + { "jziic", JZ_SMB4_BASE, 56, 0, CLK_SMB4}, + { "jzmmc", JZ_MSC0_BASE, 37, CLK_MSC0, 0}, + { "jzmmc", JZ_MSC1_BASE, 36, CLK_MSC1, 0}, + { "jzmmc", JZ_MSC2_BASE, 35, CLK_MSC2, 0}, + { "jzfb", JZ_LCDC0_BASE, 31, CLK_LCD, CLK_HDMI}, + { NULL, -1, -1, 0, 0} +}; + +void +apbus_init(void) +{ + static bool done = false; + if (done) + return; + done = true; + + apbus_bus_mem_init(&apbus_mbst, NULL); + apbus_memt = &apbus_mbst; +} + +int +apbus_match(device_t parent, cfdata_t match, void *aux) +{ + struct mainbusdev { + const char *md_name; + } *aa = aux; + if (strcmp(aa->md_name, "apbus") == 0) return 1; + return 0; +} + +void +apbus_attach(device_t parent, device_t self, void *aux) +{ + uint32_t reg, mpll, m, n, p, mclk, pclk, pdiv, cclk, cdiv; + aprint_normal("\n"); + + /* should have been called early on */ + apbus_init(); + +#ifdef INGENIC_DEBUG + printf("core ctrl: %08x\n", MFC0(12, 2)); + printf("core status: %08x\n", MFC0(12, 3)); + printf("REIM: %08x\n", MFC0(12, 4)); + printf("ID: %08x\n", MFC0(15, 1)); +#endif + /* assuming we're using MPLL */ + mpll = readreg(JZ_CPMPCR); + m = (mpll & JZ_PLLM_M) >> JZ_PLLM_S; + n = (mpll & JZ_PLLN_M) >> JZ_PLLN_S; + p = (mpll & JZ_PLLP_M) >> JZ_PLLP_S; + + /* assuming 48MHz EXTCLK */ + mclk = (48000 * (m + 1) / (n + 1)) / (p + 1); + + reg = readreg(JZ_CPCCR); + pdiv = ((reg & JZ_PDIV_M) >> JZ_PDIV_S) + 1; + pclk = mclk / pdiv; + cdiv = (reg & JZ_CDIV_M) + 1; + cclk = mclk / cdiv; + + aprint_debug_dev(self, "mclk %d kHz\n", mclk); + aprint_debug_dev(self, "pclk %d kHz\n", pclk); + aprint_debug_dev(self, "CPU clock %d kHz\n", cclk); + + /* enable clocks */ + reg = readreg(JZ_CLKGR1); + reg &= ~CLK_AHB_MON; /* AHB_MON clock */ + writereg(JZ_CLKGR1, reg); + + /* wake up the USB part */ + reg = readreg(JZ_OPCR); + reg |= OPCR_SPENDN0 | OPCR_SPENDN1; + writereg(JZ_OPCR, reg); + + /* wire up GPIOs */ + /* iic0 */ + gpio_as_dev0(3, 30); + gpio_as_dev0(3, 31); + /* iic1 */ + gpio_as_dev0(4, 30); + gpio_as_dev0(4, 31); + /* iic2 */ + gpio_as_dev2(5, 16); + gpio_as_dev2(5, 17); + /* iic3 */ + gpio_as_dev1(3, 10); + gpio_as_dev1(3, 11); + /* iic4 */ + /* make sure these aren't SMB4 */ + gpio_as_dev3(4, 3); + gpio_as_dev3(4, 4); + /* these are supposed to be connected to the RTC */ + gpio_as_dev1(4, 12); + gpio_as_dev1(4, 13); + /* these can be DDC2 or SMB4, set them to DDC2 */ + gpio_as_dev0(5, 24); + gpio_as_dev0(5, 25); + + /* MSC0 */ + gpio_as_dev1(0, 4); + gpio_as_dev1(0, 5); + gpio_as_dev1(0, 6); + gpio_as_dev1(0, 7); + gpio_as_dev1(0, 18); + gpio_as_dev1(0, 19); + gpio_as_dev1(0, 20); + gpio_as_dev1(0, 21); + gpio_as_dev1(0, 22); + gpio_as_dev1(0, 23); + gpio_as_dev1(0, 24); + gpio_as_intr_level_low(5, 20); /* card detect */ + + /* MSC1, for wifi/bt */ + gpio_as_dev0(3, 20); + gpio_as_dev0(3, 21); + gpio_as_dev0(3, 22); + gpio_as_dev0(3, 23); + gpio_as_dev0(3, 24); + gpio_as_dev0(3, 25); + + /* MSC2, on expansion header */ + gpio_as_dev0(1, 20); + gpio_as_dev0(1, 21); + gpio_as_dev0(1, 28); + gpio_as_dev0(1, 29); + gpio_as_dev0(1, 30); + gpio_as_dev0(1, 31); + +#ifdef INGENIC_DEBUG + printf("JZ_CLKGR0 %08x\n", readreg(JZ_CLKGR0)); + printf("JZ_CLKGR1 %08x\n", readreg(JZ_CLKGR1)); + printf("JZ_SPCR0 %08x\n", readreg(JZ_SPCR0)); + printf("JZ_SPCR1 %08x\n", readreg(JZ_SPCR1)); + printf("JZ_SRBC %08x\n", readreg(JZ_SRBC)); + printf("JZ_OPCR %08x\n", readreg(JZ_OPCR)); + printf("JZ_UHCCDR %08x\n", readreg(JZ_UHCCDR)); +#endif + + for (const apbus_dev_t *adv = apbus_devs; adv->name != NULL; adv++) { + struct apbus_attach_args aa; + aa.aa_name = adv->name; + aa.aa_addr = adv->addr; + aa.aa_irq = adv->irq; + aa.aa_dmat = &apbus_dmat; + aa.aa_bst = apbus_memt; + aa.aa_pclk = pclk; + aa.aa_mclk = mclk; + + /* enable clocks as needed */ + if (adv->clk0 != 0) { + reg = readreg(JZ_CLKGR0); + reg &= ~adv->clk0; + writereg(JZ_CLKGR0, reg); + } + + if (adv->clk1 != 0) { + reg = readreg(JZ_CLKGR1); + reg &= ~adv->clk1; + writereg(JZ_CLKGR1, reg); + } + + (void) config_found_ia(self, "apbus", &aa, apbus_print); + } +} + +int +apbus_print(void *aux, const char *pnp) +{ + struct apbus_attach_args *aa = aux; + + if (pnp) { + aprint_normal("%s at %s", aa->aa_name, pnp); + } + if (aa->aa_addr != -1) + aprint_normal(" addr 0x%" PRIxBUSADDR, aa->aa_addr); + if ((pnp == NULL) && (aa->aa_irq != -1)) + aprint_normal(" irq %d", aa->aa_irq); + return (UNCONF); +} + +#define CHIP apbus +#define CHIP_MEM /* defined */ +#define CHIP_W1_BUS_START(v) 0x10000000UL +#define CHIP_W1_BUS_END(v) 0x20000000UL +#define CHIP_W1_SYS_START(v) 0x10000000UL +#define CHIP_W1_SYS_END(v) 0x20000000UL + +#include Added: projects/ci20_mips/sys/mips/ingenic/files.ingenic ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ci20_mips/sys/mips/ingenic/files.ingenic Sun May 17 16:14:48 2015 (r283030) @@ -0,0 +1,15 @@ +# $FreeBSD: $ + +mips/ingenic/apbus.c optional ingenic_abp +mips/ingenic/ingenic_com.c optional uart_ignenic +mips/ingenic/ingenic_dwctwo.c optional test +mips/ingenic/ingenic_ohci.c optional test +mips/ingenic/ingenic_ehci.c optional test +mips/ingenic/ingenic_dme.c optional test +mips/ingenic/jziic.c optional test + +mips/ingenic/ingenic_machdep.c standard +mips/mips/intr_machdep.c standard +mips/mips/tick.c standard + +dev/hwpmc/hwpmc_mips24k.c optional hwpmc_mips24k Added: projects/ci20_mips/sys/mips/ingenic/ingenic_com.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ci20_mips/sys/mips/ingenic/ingenic_com.c Sun May 17 16:14:48 2015 (r283030) @@ -0,0 +1,205 @@ +/* $NetBSD: ingenic_com.c,v 1.4 2015/03/07 15:35:33 macallan Exp $ */ + +/*- + * Copyright (c) 2014 Michael Lorenz + * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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: ingenic_com.c,v 1.4 2015/03/07 15:35:33 macallan Exp $"); + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include + +#include + +#include "opt_com.h" + +volatile int32_t *com0addr = (int32_t *)MIPS_PHYS_TO_KSEG1(JZ_UART0); + +void ingenic_putchar_init(void); +void ingenic_puts(const char *); +void ingenic_putchar(char); + +#ifndef CONMODE +# define CONMODE ((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8) +#endif + + +static struct mips_bus_space ingenic_com_mbst; +static int mbst_valid = 0; +static void ingenic_com_bus_mem_init(bus_space_tag_t, void *); +void ingenic_com_cnattach(void); + +static int ingenic_com_match(device_t, cfdata_t , void *); +static void ingenic_com_attach(device_t, device_t, void *); + +struct ingenic_com_softc { + struct com_softc sc_com; +}; + +CFATTACH_DECL_NEW(com_mainbus, sizeof(struct ingenic_com_softc), + ingenic_com_match, ingenic_com_attach, NULL, NULL); + +bus_space_handle_t regh = 0; + +void +ingenic_putchar_init(void) +{ + /* + * XXX don't screw with the UART's speed until we know what clock + * we're on + */ +#if 0 + int rate; +#endif + extern int comspeed(long, long, int); + + com0addr = (uint32_t *)MIPS_PHYS_TO_KSEG1(JZ_UART0); +#if 0 + if (comcnfreq != -1) { + rate = comspeed(comcnspeed, comcnfreq, COM_TYPE_INGENIC); + if (rate < 0) + return; /* XXX */ +#endif + com0addr[com_ier] = 0; + com0addr[com_lctl] = htole32(LCR_DLAB); +#if 0 + com0addr[com_dlbl] = htole32(rate & 0xff); + com0addr[com_dlbh] = htole32(rate >> 8); +#endif + com0addr[com_lctl] = htole32(LCR_8BITS); /* XXX */ + com0addr[com_mcr] = htole32(MCR_DTR|MCR_RTS); + com0addr[com_fifo] = htole32( + FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | + FIFO_TRIGGER_1 | FIFO_UART_ON); +#if 0 + } +#endif +} + + +void +ingenic_putchar(char c) +{ + int timo = 150000; + + while ((le32toh(com0addr[com_lsr]) & LSR_TXRDY) == 0) + if (--timo == 0) + break; + + com0addr[com_data] = htole32((uint32_t)c); + + while ((le32toh(com0addr[com_lsr]) & LSR_TSRE) == 0) + if (--timo == 0) + break; +} + +void +ingenic_puts(const char *restrict s) +{ + char c; + + while ((c = *s++) != 0) + ingenic_putchar(c); +} + +static void +ingenic_com_bus_init(void) +{ + if (mbst_valid) return; + ingenic_com_bus_mem_init(&ingenic_com_mbst, NULL); + mbst_valid = 1; +} + +void +ingenic_com_cnattach(void) +{ + struct com_regs regs; + + ingenic_com_bus_init(); + bus_space_map(&ingenic_com_mbst, 0, 0x1000, 0, ®h); + + memset(®s, 0, sizeof(regs)); + COM_INIT_REGS(regs, &ingenic_com_mbst, regh, 0); + + /* + * XXX + * UART clock is either 6MHz or 12MHz, the manual is rather unclear + * so we just leave alone whatever u-boot set up + * my uplcom is too tolerant to show any difference + */ + comcnattach1(®s, 115200, 48000000, COM_TYPE_INGENIC, CONMODE); +} + +static int +ingenic_com_match(device_t parent, cfdata_t cfdata, void *args) +{ + struct mainbusdev { + const char *md_name; + } *aa = args; + if (strcmp(aa->md_name, "com") == 0) return 1; + return 0; +} + + +static void +ingenic_com_attach(device_t parent, device_t self, void *args) +{ + struct ingenic_com_softc *isc = device_private(self); + struct com_softc *sc = &isc->sc_com; + + sc->sc_dev = self; + sc->sc_frequency = 48000000; + sc->sc_type = COM_TYPE_INGENIC; + memset(&sc->sc_regs, 0, sizeof(sc->sc_regs)); + COM_INIT_REGS(sc->sc_regs, &ingenic_com_mbst, regh, 0); + com_attach_subr(sc); + printf("\n"); + evbmips_intr_establish(51, comintr, sc); +} + +#define CHIP ingenic_com +#define CHIP_MEM /* defined */ +#define CHIP_W1_BUS_START(v) 0x00000000UL +#define CHIP_W1_BUS_END(v) 0x00010000UL +#define CHIP_W1_SYS_START(v) 0x10030000UL +#define CHIP_W1_SYS_END(v) 0x10035000UL +#define CHIP_ACCESS_SIZE 1 +#define CHIP_ALIGN_STRIDE 2 + +#include Added: projects/ci20_mips/sys/mips/ingenic/ingenic_dme.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ci20_mips/sys/mips/ingenic/ingenic_dme.c Sun May 17 16:14:48 2015 (r283030) @@ -0,0 +1,165 @@ +/* $NetBSD: ingenic_dme.c,v 1.1 2015/03/10 18:15:47 macallan Exp $ */ + +/*- + * Copyright (c) 2015 Michael Lorenz + * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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: ingenic_dme.c,v 1.1 2015/03/10 18:15:47 macallan Exp $"); + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +#include +#include + +#include "opt_ingenic.h" + +static int ingenic_dme_match(device_t, struct cfdata *, void *); +static void ingenic_dme_attach(device_t, device_t, void *); +static int ingenic_dme_intr(void *); + +CFATTACH_DECL_NEW(ingenic_dme, sizeof(struct dme_softc), + ingenic_dme_match, ingenic_dme_attach, NULL, NULL); + +#define GPIO_DME_INT 19 +#define GPIO_DME_INT_MASK (1 << GPIO_DME_INT) + +/* ARGSUSED */ +static int +ingenic_dme_match(device_t parent, struct cfdata *match, void *aux) +{ + struct apbus_attach_args *aa = aux; + + if (strcmp(aa->aa_name, "dme") != 0) + return 0; + + return 1; +} + +/* ARGSUSED */ +static void +ingenic_dme_attach(device_t parent, device_t self, void *aux) +{ + struct dme_softc *sc = device_private(self); + struct apbus_attach_args *aa = aux; + void *ih; + static uint8_t enaddr[ETHER_ADDR_LEN]; + int error; + + sc->sc_dev = self; + + sc->sc_iot = aa->aa_bst; + sc->dme_io = JZ_DME_IO; + sc->dme_data = JZ_DME_DATA; + sc->sc_phy_initialized = 0; + + if (aa->aa_addr == 0) + aa->aa_addr = JZ_DME_BASE; + + error = bus_space_map(aa->aa_bst, aa->aa_addr, 4, 0, &sc->sc_ioh); + if (error) { + aprint_error_dev(self, + "can't map registers for %s: %d\n", aa->aa_name, error); + return; + } + + aprint_naive(": DM9000 Ethernet controller\n"); + aprint_normal(": DM9000 Ethernet controller\n"); + + + /* make sure the chip is powered up and not in reset */ + gpio_as_output(1, 25); + gpio_set(1, 25, 1); + gpio_as_output(5, 12); + gpio_set(5, 12, 1); + + /* setup pins to talk to the chip */ + gpio_as_dev0(1, 1); + gpio_as_dev0(0, 0); + gpio_as_dev0(0, 1); + gpio_as_dev0(0, 2); + gpio_as_dev0(0, 3); + gpio_as_dev0(0, 4); + gpio_as_dev0(0, 5); + gpio_as_dev0(0, 6); + gpio_as_dev0(0, 7); + + gpio_as_dev0(0, 16); + gpio_as_dev0(0, 17); + gpio_as_dev0(0, 26); + + /* DM9000 interrupt is on GPIO E pin 19 */ + gpio_as_intr_level(4, GPIO_DME_INT); + ih = evbmips_intr_establish(13, ingenic_dme_intr, sc); + + if (ih == NULL) { + aprint_error_dev(self, "failed to establish interrupt %d\n", + 13); + goto fail; + } + + /* + * XXX grab MAC address set by uboot + * I'm not sure uboot will program the MAC address into the chip when + * not netbooting, so this needs to go away + */ + dme_read_c(sc, DM9000_PAB0, enaddr, 6); + dme_attach(sc, enaddr); + return; +fail: + if (ih) { + evbmips_intr_disestablish(ih); + } + bus_space_unmap(sc->sc_iot, sc->sc_ioh, 4); +} + +static int +ingenic_dme_intr(void *arg) +{ + uint32_t reg; + int ret = 0; + + /* see if it's us */ + reg = readreg(JZ_GPIO_E_BASE + JZ_GPIO_FLAG); + if (reg & GPIO_DME_INT_MASK) { + /* yes, it's ours, handle it... */ + ret = dme_intr(arg); + /* ... and clear it */ + writereg(JZ_GPIO_E_BASE + JZ_GPIO_FLAGC, GPIO_DME_INT_MASK); + } + return ret; +} Added: projects/ci20_mips/sys/mips/ingenic/ingenic_dwctwo.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ci20_mips/sys/mips/ingenic/ingenic_dwctwo.c Sun May 17 16:14:48 2015 (r283030) @@ -0,0 +1,216 @@ +/* $NetBSD: ingenic_dwctwo.c,v 1.10 2015/04/28 15:07:07 macallan Exp $ */ + +/*- + * Copyright (c) 2014 Michael Lorenz + * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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: ingenic_dwctwo.c,v 1.10 2015/04/28 15:07:07 macallan Exp $"); + +/* + * adapted from bcm2835_dwctwo.c + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include "dwc2_core.h" + +#include "opt_ingenic.h" + +struct ingenic_dwc2_softc { + struct dwc2_softc sc_dwc2; + + void *sc_ih; +}; + +static struct dwc2_core_params ingenic_dwc2_params = { + .otg_cap = -1, /* HNP/SRP capable */ + .otg_ver = -1, /* 1.3 */ + .dma_enable = 1, + .dma_desc_enable = 0, + .speed = -1, /* High Speed */ + .enable_dynamic_fifo = -1, + .en_multiple_tx_fifo = -1, + .host_rx_fifo_size = 1024, /* 1024 DWORDs */ + .host_nperio_tx_fifo_size = 1024, /* 1024 DWORDs */ + .host_perio_tx_fifo_size = 1024, /* 1024 DWORDs */ + .max_transfer_size = -1, + .max_packet_count = -1, + .host_channels = -1, + .phy_type = -1, /* UTMI */ + .phy_utmi_width = -1, /* 16 bits */ + .phy_ulpi_ddr = -1, /* Single */ + .phy_ulpi_ext_vbus = -1, + .i2c_enable = -1, + .ulpi_fs_ls = -1, + .host_support_fs_ls_low_power = -1, + .host_ls_low_power_phy_clk = -1, /* 48 MHz */ + .ts_dline = -1, + .reload_ctl = -1, + .ahbcfg = -1, + .uframe_sched = 0, +}; + +static int ingenic_dwc2_match(device_t, struct cfdata *, void *); +static void ingenic_dwc2_attach(device_t, device_t, void *); +static void ingenic_dwc2_deferred(device_t); + +CFATTACH_DECL_NEW(ingenic_dwctwo, sizeof(struct ingenic_dwc2_softc), + ingenic_dwc2_match, ingenic_dwc2_attach, NULL, NULL); + +/* ARGSUSED */ +static int +ingenic_dwc2_match(device_t parent, struct cfdata *match, void *aux) +{ + struct apbus_attach_args *aa = aux; + + if (strcmp(aa->aa_name, "dwctwo") != 0) + return 0; + + return 1; +} + +/* ARGSUSED */ +static void +ingenic_dwc2_attach(device_t parent, device_t self, void *aux) +{ + struct ingenic_dwc2_softc *sc = device_private(self); + struct apbus_attach_args *aa = aux; + uint32_t reg; + int error; + + sc->sc_dwc2.sc_dev = self; + + sc->sc_dwc2.sc_iot = aa->aa_bst; + sc->sc_dwc2.sc_bus.dmatag = aa->aa_dmat; + sc->sc_dwc2.sc_params = &ingenic_dwc2_params; + + if (aa->aa_addr == 0) + aa->aa_addr = JZ_DWC2_BASE; + + error = bus_space_map(aa->aa_bst, aa->aa_addr, 0x20000, 0, + &sc->sc_dwc2.sc_ioh); + if (error) { + aprint_error_dev(self, + "can't map registers for %s: %d\n", aa->aa_name, error); + return; + } + + aprint_naive(": USB OTG controller\n"); + aprint_normal(": USB OTG controller\n"); + + /* reset PHY, flash LED */ + gpio_set(5, 15, 0); + delay(250000); + gpio_set(5, 15, 1); + + reg = readreg(JZ_USBPCR); + reg |= PCR_VBUSVLDEXTSEL; + reg |= PCR_VBUSVLDEXT; + reg |= PCR_USB_MODE; + reg |= PCR_COMMONONN; + reg &= ~PCR_OTG_DISABLE; + writereg(JZ_USBPCR, reg); +#ifdef INGENIC_DEBUG + printf("JZ_USBPCR %08x\n", reg); +#endif + + reg = readreg(JZ_USBPCR1); + reg |= PCR_SYNOPSYS; + reg |= PCR_REFCLK_CORE; + reg &= ~PCR_CLK_M; + reg |= PCR_CLK_48; + reg |= PCR_WORD_I_F0; + reg |= PCR_WORD_I_F1; + writereg(JZ_USBPCR1, reg); +#ifdef INGENIC_DEBUG + printf("JZ_USBPCR1 %08x\n", reg); + printf("JZ_USBRDT %08x\n", readreg(JZ_USBRDT)); +#endif + + delay(10000); + + reg = readreg(JZ_USBPCR); + reg |= PCR_POR; + writereg(JZ_USBPCR, reg); + delay(1000); + reg &= ~PCR_POR; + writereg(JZ_USBPCR, reg); + + delay(10000); + + sc->sc_ih = evbmips_intr_establish(aa->aa_irq, dwc2_intr, &sc->sc_dwc2); + + if (sc->sc_ih == NULL) { + aprint_error_dev(self, "failed to establish interrupt %d\n", + aa->aa_irq); + goto fail; + } + + config_defer(self, ingenic_dwc2_deferred); + + return; + +fail: + if (sc->sc_ih) { + evbmips_intr_disestablish(sc->sc_ih); + sc->sc_ih = NULL; + } + bus_space_unmap(sc->sc_dwc2.sc_iot, sc->sc_dwc2.sc_ioh, 0x20000); +} + +static void +ingenic_dwc2_deferred(device_t self) +{ + struct ingenic_dwc2_softc *sc = device_private(self); + int error; + + sc->sc_dwc2.sc_id_vendor = USB_VENDOR_INGENIC; + strlcpy(sc->sc_dwc2.sc_vendor, "Ingenic", sizeof(sc->sc_dwc2.sc_vendor)); + error = dwc2_init(&sc->sc_dwc2); + if (error != 0) { + aprint_error_dev(self, "couldn't initialize host, error=%d\n", + error); + return; + } + sc->sc_dwc2.sc_child = config_found(sc->sc_dwc2.sc_dev, + &sc->sc_dwc2.sc_bus, usbctlprint); +} Added: projects/ci20_mips/sys/mips/ingenic/ingenic_ehci.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ci20_mips/sys/mips/ingenic/ingenic_ehci.c Sun May 17 16:14:48 2015 (r283030) @@ -0,0 +1,155 @@ +/* $NetBSD: ingenic_ehci.c,v 1.3 2015/03/17 09:27:09 macallan Exp $ */ + +/*- + * Copyright (c) 2015 Michael Lorenz + * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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: ingenic_ehci.c,v 1.3 2015/03/17 09:27:09 macallan Exp $"); + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + +#include +#include + +#include + +#include "opt_ingenic.h" +#include "ohci.h" + +static int ingenic_ehci_match(device_t, struct cfdata *, void *); +static void ingenic_ehci_attach(device_t, device_t, void *); + +CFATTACH_DECL_NEW(ingenic_ehci, sizeof(struct ehci_softc), + ingenic_ehci_match, ingenic_ehci_attach, NULL, NULL); + +#if NOHCI > 0 +extern device_t ingenic_ohci; +#endif + +/* ARGSUSED */ +static int *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sun May 17 16:17:21 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D574AA23; Sun, 17 May 2015 16:17:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C14CE106D; Sun, 17 May 2015 16:17:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4HGHLmh068109; Sun, 17 May 2015 16:17:21 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4HGHGaf068075; Sun, 17 May 2015 16:17:16 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201505171617.t4HGHGaf068075@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Sun, 17 May 2015 16:17:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r283031 - in projects/ci20_mips: cddl/contrib/opensolaris/lib/libdtrace/common cddl/lib/libdtrace contrib/gcc contrib/gdb/gdb contrib/libarchive/libarchive gnu/lib include lib/libthr/th... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 May 2015 16:17:21 -0000 Author: sbruno Date: Sun May 17 16:17:15 2015 New Revision: 283031 URL: https://svnweb.freebsd.org/changeset/base/283031 Log: MFH @283030 Added: projects/ci20_mips/cddl/lib/libdtrace/siftr.d - copied unchanged from r283030, head/cddl/lib/libdtrace/siftr.d projects/ci20_mips/sys/arm/annapurna/ - copied from r283030, head/sys/arm/annapurna/ projects/ci20_mips/sys/arm/conf/ALPINE - copied unchanged from r283030, head/sys/arm/conf/ALPINE projects/ci20_mips/sys/boot/fdt/dts/arm/annapurna-alpine.dts - copied unchanged from r283030, head/sys/boot/fdt/dts/arm/annapurna-alpine.dts projects/ci20_mips/tools/build/stdlib.h - copied unchanged from r283030, head/tools/build/stdlib.h Modified: projects/ci20_mips/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l projects/ci20_mips/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/ci20_mips/cddl/lib/libdtrace/Makefile projects/ci20_mips/cddl/lib/libdtrace/tcp.d projects/ci20_mips/contrib/gcc/dwarf2.h projects/ci20_mips/contrib/gdb/gdb/c-valprint.c projects/ci20_mips/contrib/gdb/gdb/dwarf2expr.c projects/ci20_mips/contrib/gdb/gdb/dwarf2expr.h projects/ci20_mips/contrib/gdb/gdb/dwarf2loc.c projects/ci20_mips/contrib/gdb/gdb/dwarf2read.c projects/ci20_mips/contrib/gdb/gdb/value.h projects/ci20_mips/contrib/gdb/gdb/values.c projects/ci20_mips/contrib/libarchive/libarchive/archive_read.c projects/ci20_mips/contrib/libarchive/libarchive/archive_read_support_format_cpio.c projects/ci20_mips/gnu/lib/Makefile projects/ci20_mips/include/stdlib.h projects/ci20_mips/lib/libthr/thread/thr_spec.c projects/ci20_mips/sbin/ifconfig/ifconfig.8 projects/ci20_mips/sbin/ifconfig/ifgif.c projects/ci20_mips/sbin/ifconfig/sfp.c projects/ci20_mips/share/man/man4/iic.4 projects/ci20_mips/share/mk/src.libnames.mk projects/ci20_mips/sys/amd64/amd64/pmap.c projects/ci20_mips/sys/arm/arm/cpufunc.c projects/ci20_mips/sys/arm/arm/cpufunc_asm_armv7.S projects/ci20_mips/sys/arm/arm/cpuinfo.c projects/ci20_mips/sys/arm/arm/pmap.c projects/ci20_mips/sys/arm/include/cpu-v6.h projects/ci20_mips/sys/arm/include/cpufunc.h projects/ci20_mips/sys/boot/arm/uboot/Makefile projects/ci20_mips/sys/boot/i386/boot0/boot0.S projects/ci20_mips/sys/dev/acpi_support/acpi_ibm.c projects/ci20_mips/sys/dev/fdt/simplebus.c projects/ci20_mips/sys/dev/gpio/ofw_gpiobus.c projects/ci20_mips/sys/dev/iscsi/icl_soft.c projects/ci20_mips/sys/dev/iwn/if_iwn.c projects/ci20_mips/sys/dev/ixl/if_ixlv.c projects/ci20_mips/sys/dev/netmap/netmap_mem2.c projects/ci20_mips/sys/dev/ofw/ofw_bus_subr.c projects/ci20_mips/sys/dev/ofw/ofw_bus_subr.h projects/ci20_mips/sys/dev/ofw/ofw_iicbus.c projects/ci20_mips/sys/dev/sfxge/sfxge.c projects/ci20_mips/sys/dev/sfxge/sfxge_port.c projects/ci20_mips/sys/dev/sfxge/sfxge_rx.c projects/ci20_mips/sys/dev/sfxge/sfxge_tx.c projects/ci20_mips/sys/dev/sfxge/sfxge_tx.h projects/ci20_mips/sys/kern/init_main.c projects/ci20_mips/sys/kern/kern_condvar.c projects/ci20_mips/sys/kern/kern_thread.c projects/ci20_mips/sys/mips/beri/beri_simplebus.c projects/ci20_mips/sys/mips/include/intr_machdep.h projects/ci20_mips/sys/net/if_gif.h projects/ci20_mips/sys/net/sff8436.h projects/ci20_mips/sys/net/sff8472.h projects/ci20_mips/sys/netinet/in_gif.c projects/ci20_mips/sys/netinet6/in6_gif.c projects/ci20_mips/sys/netipsec/esp.h projects/ci20_mips/sys/powerpc/ofw/ofw_pcibus.c projects/ci20_mips/sys/powerpc/pseries/vdevice.c projects/ci20_mips/sys/sys/cdefs.h projects/ci20_mips/sys/sys/condvar.h projects/ci20_mips/sys/sys/malloc.h projects/ci20_mips/sys/sys/proc.h projects/ci20_mips/sys/x86/acpica/srat.c projects/ci20_mips/tools/build/Makefile projects/ci20_mips/tools/build/mk/OptionalObsoleteFiles.inc projects/ci20_mips/tools/regression/p1003_1b/main.c projects/ci20_mips/tools/regression/p1003_1b/prutil.c projects/ci20_mips/tools/tools/ath/athaggrstats/Makefile projects/ci20_mips/tools/tools/ath/athstats/Makefile projects/ci20_mips/tools/tools/mwl/mwlstats/Makefile projects/ci20_mips/tools/tools/net80211/wlanstats/Makefile projects/ci20_mips/tools/tools/npe/npestats/Makefile projects/ci20_mips/usr.bin/man/man.sh projects/ci20_mips/usr.bin/netstat/route.c projects/ci20_mips/usr.bin/ssh-copy-id/ssh-copy-id.sh projects/ci20_mips/usr.sbin/bsdinstall/scripts/zfsboot projects/ci20_mips/usr.sbin/mountd/mountd.c projects/ci20_mips/usr.sbin/syslogd/pathnames.h Directory Properties: projects/ci20_mips/ (props changed) projects/ci20_mips/cddl/ (props changed) projects/ci20_mips/cddl/contrib/opensolaris/ (props changed) projects/ci20_mips/contrib/gcc/ (props changed) projects/ci20_mips/contrib/gdb/ (props changed) projects/ci20_mips/contrib/libarchive/ (props changed) projects/ci20_mips/contrib/libarchive/libarchive/ (props changed) projects/ci20_mips/gnu/lib/ (props changed) projects/ci20_mips/include/ (props changed) projects/ci20_mips/sbin/ (props changed) projects/ci20_mips/share/ (props changed) projects/ci20_mips/share/man/man4/ (props changed) projects/ci20_mips/sys/ (props changed) projects/ci20_mips/sys/boot/ (props changed) Modified: projects/ci20_mips/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l ============================================================================== --- projects/ci20_mips/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l Sun May 17 16:17:15 2015 (r283031) @@ -743,6 +743,7 @@ yyinit(dt_pcb_t *pcb) #ifdef illumos yysptr = yysbuf; #endif + YY_FLUSH_BUFFER; } /* Modified: projects/ci20_mips/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/ci20_mips/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Sun May 17 16:17:15 2015 (r283031) @@ -1785,17 +1785,11 @@ dtrace_program_link(dtrace_hdl_t *dtp, d "failed to open %s: %s", file, strerror(errno))); } #else - if (dtp->dt_lazyload) { - if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0666)) < 0) - return (dt_link_error(dtp, NULL, -1, NULL, - "failed to open %s: %s", file, strerror(errno))); - } else { - snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file); - if ((fd = mkstemp(tfile)) == -1) - return (dt_link_error(dtp, NULL, -1, NULL, - "failed to create temporary file %s: %s", - tfile, strerror(errno))); - } + snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file); + if ((fd = mkostemp(tfile, O_CLOEXEC)) == -1) + return (dt_link_error(dtp, NULL, -1, NULL, + "failed to create temporary file %s: %s", + tfile, strerror(errno))); #endif /* @@ -1951,14 +1945,23 @@ dtrace_program_link(dtrace_hdl_t *dtp, d } #endif } else { +#ifdef __FreeBSD__ + if (rename(tfile, file) != 0) { + ret = dt_link_error(dtp, NULL, fd, NULL, + "failed to rename %s to %s: %s", tfile, file, + strerror(errno)); + goto done; + } +#endif (void) close(fd); } done: dtrace_dof_destroy(dtp, dof); -#ifndef illumos - unlink(tfile); +#ifdef illumos + if (!dtp->dt_lazyload) + (void) unlink(tfile); #endif return (ret); } Modified: projects/ci20_mips/cddl/lib/libdtrace/Makefile ============================================================================== --- projects/ci20_mips/cddl/lib/libdtrace/Makefile Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/cddl/lib/libdtrace/Makefile Sun May 17 16:17:15 2015 (r283031) @@ -50,6 +50,7 @@ DSRCS= errno.d \ io.d \ ip.d \ psinfo.d \ + siftr.d \ signal.d \ tcp.d \ udp.d \ Copied: projects/ci20_mips/cddl/lib/libdtrace/siftr.d (from r283030, head/cddl/lib/libdtrace/siftr.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ci20_mips/cddl/lib/libdtrace/siftr.d Sun May 17 16:17:15 2015 (r283031, copy of r283030, head/cddl/lib/libdtrace/siftr.d) @@ -0,0 +1,100 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + * + * $FreeBSD$ + */ + +#pragma D depends_on module siftr +#pragma D depends_on provider tcp + +/* + * Convert a SIFTR direction value to a string + */ +#pragma D binding "1.12.1" SIFTR_IN +inline int SIFTR_IN = 1; +#pragma D binding "1.12.1" SIFTR_OUT +inline int SIFTR_OUT = 2; + +/* SIFTR direction strings. */ +#pragma D binding "1.12.1" siftr_dir_string +inline string siftr_dir_string[uint8_t direction] = + direction == SIFTR_IN ? "in" : + direction == SIFTR_OUT ? "out" : + "unknown" ; + +typedef struct siftrinfo { + struct timeval tval; + uint8_t direction; + uint8_t ipver; + uint32_t hash; + uint16_t tcp_localport; + uint16_t tcp_foreignport; + uint64_t snd_cwnd; + u_long snd_wnd; + u_long rcv_wnd; + u_long snd_bwnd; + u_long snd_ssthresh; + int conn_state; + u_int max_seg_size; + int smoothed_rtt; + u_char sack_enabled; + u_char snd_scale; + u_char rcv_scale; + u_int flags; + int rxt_length; + u_int snd_buf_hiwater; + u_int snd_buf_cc; + u_int rcv_buf_hiwater; + u_int rcv_buf_cc; + u_int sent_inflight_bytes; + int t_segqlen; + u_int flowid; + u_int flowtype; +} siftrinfo_t; + +#pragma D binding "1.12.1" translator +translator siftrinfo_t < struct pkt_node *p > { + direction = p == NULL ? 0 : p->direction; + ipver = p == NULL ? 0 : p->ipver; + hash = p == NULL ? 0 : p->hash; + tcp_localport = p == NULL ? 0 : ntohs(p->tcp_localport); + tcp_foreignport = p == NULL ? 0 : ntohs(p->tcp_foreignport); + snd_cwnd = p == NULL ? 0 : p->snd_cwnd; + snd_wnd = p == NULL ? 0 : p->snd_wnd; + rcv_wnd = p == NULL ? 0 : p->rcv_wnd; + snd_bwnd = p == NULL ? 0 : p->snd_bwnd; + snd_ssthresh = p == NULL ? 0 : p->snd_ssthresh; + conn_state = p == NULL ? 0 : p->conn_state; + max_seg_size = p == NULL ? 0 : p->max_seg_size; + smoothed_rtt = p == NULL ? 0 : p->smoothed_rtt; + sack_enabled = p == NULL ? 0 : p->sack_enabled; + snd_scale = p == NULL ? 0 : p->snd_scale; + rcv_scale = p == NULL ? 0 : p->rcv_scale; + flags = p == NULL ? 0 : p->flags; + rxt_length = p == NULL ? 0 : p->rxt_length; + snd_buf_hiwater = p == NULL ? 0 : p->snd_buf_hiwater; + snd_buf_cc = p == NULL ? 0 : p->snd_buf_cc; + rcv_buf_hiwater = p == NULL ? 0 : p->rcv_buf_hiwater; + rcv_buf_cc = p == NULL ? 0 : p->rcv_buf_cc; + sent_inflight_bytes = p == NULL ? 0 : p->sent_inflight_bytes; + t_segqlen = p == NULL ? 0 : p->t_segqlen; + flowid = p == NULL ? 0 : p->flowid; + flowtype = p == NULL ? 0 : p->flowtype; +}; Modified: projects/ci20_mips/cddl/lib/libdtrace/tcp.d ============================================================================== --- projects/ci20_mips/cddl/lib/libdtrace/tcp.d Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/cddl/lib/libdtrace/tcp.d Sun May 17 16:17:15 2015 (r283031) @@ -241,78 +241,3 @@ translator tcpinfoh_t < struct tcphdr *p translator tcplsinfo_t < int s > { tcps_state = s; }; - -/* - * Convert a SIFTR direction value to a string - */ -#pragma D binding "1.12.1" SIFTR_IN -inline int SIFTR_IN = 1; -#pragma D binding "1.12.1" SIFTR_OUT -inline int SIFTR_OUT = 2; - -/* SIFTR direction strings. */ -#pragma D binding "1.12.1" siftr_dir_string -inline string siftr_dir_string[uint8_t direction] = - direction == SIFTR_IN ? "in" : - direction == SIFTR_OUT ? "out" : - "unknown" ; - -typedef struct siftrinfo { - struct timeval tval; - uint8_t direction; - uint8_t ipver; - uint32_t hash; - uint16_t tcp_localport; - uint16_t tcp_foreignport; - uint64_t snd_cwnd; - u_long snd_wnd; - u_long rcv_wnd; - u_long snd_bwnd; - u_long snd_ssthresh; - int conn_state; - u_int max_seg_size; - int smoothed_rtt; - u_char sack_enabled; - u_char snd_scale; - u_char rcv_scale; - u_int flags; - int rxt_length; - u_int snd_buf_hiwater; - u_int snd_buf_cc; - u_int rcv_buf_hiwater; - u_int rcv_buf_cc; - u_int sent_inflight_bytes; - int t_segqlen; - u_int flowid; - u_int flowtype; -} siftrinfo_t; - -#pragma D binding "1.12.1" translator -translator siftrinfo_t < struct pkt_node *p > { - direction = p == NULL ? 0 : p->direction; - ipver = p == NULL ? 0 : p->ipver; - hash = p == NULL ? 0 : p->hash; - tcp_localport = p == NULL ? 0 : ntohs(p->tcp_localport); - tcp_foreignport = p == NULL ? 0 : ntohs(p->tcp_foreignport); - snd_cwnd = p == NULL ? 0 : p->snd_cwnd; - snd_wnd = p == NULL ? 0 : p->snd_wnd; - rcv_wnd = p == NULL ? 0 : p->rcv_wnd; - snd_bwnd = p == NULL ? 0 : p->snd_bwnd; - snd_ssthresh = p == NULL ? 0 : p->snd_ssthresh; - conn_state = p == NULL ? 0 : p->conn_state; - max_seg_size = p == NULL ? 0 : p->max_seg_size; - smoothed_rtt = p == NULL ? 0 : p->smoothed_rtt; - sack_enabled = p == NULL ? 0 : p->sack_enabled; - snd_scale = p == NULL ? 0 : p->snd_scale; - rcv_scale = p == NULL ? 0 : p->rcv_scale; - flags = p == NULL ? 0 : p->flags; - rxt_length = p == NULL ? 0 : p->rxt_length; - snd_buf_hiwater = p == NULL ? 0 : p->snd_buf_hiwater; - snd_buf_cc = p == NULL ? 0 : p->snd_buf_cc; - rcv_buf_hiwater = p == NULL ? 0 : p->rcv_buf_hiwater; - rcv_buf_cc = p == NULL ? 0 : p->rcv_buf_cc; - sent_inflight_bytes = p == NULL ? 0 : p->sent_inflight_bytes; - t_segqlen = p == NULL ? 0 : p->t_segqlen; - flowid = p == NULL ? 0 : p->flowid; - flowtype = p == NULL ? 0 : p->flowtype; -}; Modified: projects/ci20_mips/contrib/gcc/dwarf2.h ============================================================================== --- projects/ci20_mips/contrib/gcc/dwarf2.h Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/contrib/gcc/dwarf2.h Sun May 17 16:17:15 2015 (r283031) @@ -547,6 +547,7 @@ enum dwarf_location_atom DW_OP_bit_piece = 0x9d, /* GNU extensions. */ DW_OP_GNU_push_tls_address = 0xe0, + DW_OP_GNU_uninit = 0xf0, /* HP extensions. */ DW_OP_HP_unknown = 0xe0, /* Ouch, the same as GNU_push_tls_address. */ DW_OP_HP_is_value = 0xe1, Modified: projects/ci20_mips/contrib/gdb/gdb/c-valprint.c ============================================================================== --- projects/ci20_mips/contrib/gdb/gdb/c-valprint.c Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/contrib/gdb/gdb/c-valprint.c Sun May 17 16:17:15 2015 (r283031) @@ -559,6 +559,10 @@ c_value_print (struct value *val, struct fprintf_filtered (stream, ") "); } } + + if (!value_initialized (val)) + fprintf_filtered (stream, " [uninitialized] "); + if (objectprint && (TYPE_CODE (VALUE_TYPE (val)) == TYPE_CODE_CLASS)) { /* Attempt to determine real type of object */ Modified: projects/ci20_mips/contrib/gdb/gdb/dwarf2expr.c ============================================================================== --- projects/ci20_mips/contrib/gdb/gdb/dwarf2expr.c Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/contrib/gdb/gdb/dwarf2expr.c Sun May 17 16:17:15 2015 (r283031) @@ -42,6 +42,8 @@ new_dwarf_expr_context (void) retval->stack_len = 0; retval->stack_allocated = 10; retval->stack = xmalloc (retval->stack_allocated * sizeof (CORE_ADDR)); + retval->num_pieces = 0; + retval->pieces = 0; return retval; } @@ -51,6 +53,7 @@ void free_dwarf_expr_context (struct dwarf_expr_context *ctx) { xfree (ctx->stack); + xfree (ctx->pieces); xfree (ctx); } @@ -100,6 +103,29 @@ dwarf_expr_fetch (struct dwarf_expr_cont } +/* Add a new piece to CTX's piece list. */ +static void +add_piece (struct dwarf_expr_context *ctx, + int in_reg, CORE_ADDR value, ULONGEST size) +{ + struct dwarf_expr_piece *p; + + ctx->num_pieces++; + + if (ctx->pieces) + ctx->pieces = xrealloc (ctx->pieces, + (ctx->num_pieces + * sizeof (struct dwarf_expr_piece))); + else + ctx->pieces = xmalloc (ctx->num_pieces + * sizeof (struct dwarf_expr_piece)); + + p = &ctx->pieces[ctx->num_pieces - 1]; + p->in_reg = in_reg; + p->value = value; + p->size = size; +} + /* Evaluate the expression at ADDR (LEN bytes long) using the context CTX. */ @@ -230,6 +256,7 @@ execute_stack_op (struct dwarf_expr_cont unsigned char *op_end) { ctx->in_reg = 0; + ctx->initialized = 1; /* Default is initialized. */ while (op_ptr < op_end) { @@ -356,9 +383,12 @@ execute_stack_op (struct dwarf_expr_cont case DW_OP_reg29: case DW_OP_reg30: case DW_OP_reg31: - if (op_ptr != op_end && *op_ptr != DW_OP_piece) - error ("DWARF-2 expression error: DW_OP_reg operations must be " - "used either alone or in conjuction with DW_OP_piece."); + if (op_ptr != op_end + && *op_ptr != DW_OP_piece + && *op_ptr != DW_OP_bit_piece + && *op_ptr != DW_OP_GNU_uninit) + error (_("DWARF-2 expression error: DW_OP_reg operations must be " + "used either alone or in conjuction with DW_OP_piece.")); result = op - DW_OP_reg0; ctx->in_reg = 1; @@ -661,6 +691,30 @@ execute_stack_op (struct dwarf_expr_cont case DW_OP_nop: goto no_push; + case DW_OP_piece: + { + ULONGEST size; + CORE_ADDR addr_or_regnum; + + /* Record the piece. */ + op_ptr = read_uleb128 (op_ptr, op_end, &size); + addr_or_regnum = dwarf_expr_fetch (ctx, 0); + add_piece (ctx, ctx->in_reg, addr_or_regnum, size); + + /* Pop off the address/regnum, and clear the in_reg flag. */ + dwarf_expr_pop (ctx); + ctx->in_reg = 0; + } + goto no_push; + + case DW_OP_GNU_uninit: + if (op_ptr != op_end) + error (_("DWARF-2 expression error: DW_OP_GNU_unint must always " + "be the very last op.")); + + ctx->initialized = 0; + goto no_push; + default: error ("Unhandled dwarf expression opcode 0x%x", op); } Modified: projects/ci20_mips/contrib/gdb/gdb/dwarf2expr.h ============================================================================== --- projects/ci20_mips/contrib/gdb/gdb/dwarf2expr.h Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/contrib/gdb/gdb/dwarf2expr.h Sun May 17 16:17:15 2015 (r283031) @@ -74,6 +74,51 @@ struct dwarf_expr_context /* Non-zero if the result is in a register. The register number will be on the expression stack. */ int in_reg; + /* Initialization status of variable: Non-zero if variable has been + initialized; zero otherwise. */ + int initialized; + + /* An array of pieces. PIECES points to its first element; + NUM_PIECES is its length. + + Each time DW_OP_piece is executed, we add a new element to the + end of this array, recording the current top of the stack, the + current in_reg flag, and the size given as the operand to + DW_OP_piece. We then pop the top value from the stack, clear the + in_reg flag, and resume evaluation. + + The Dwarf spec doesn't say whether DW_OP_piece pops the top value + from the stack. We do, ensuring that clients of this interface + expecting to see a value left on the top of the stack (say, code + evaluating frame base expressions or CFA's specified with + DW_CFA_def_cfa_expression) will get an error if the expression + actually marks all the values it computes as pieces. + + If an expression never uses DW_OP_piece, num_pieces will be zero. + (It would be nice to present these cases as expressions yielding + a single piece, with in_reg clear, so that callers need not + distinguish between the no-DW_OP_piece and one-DW_OP_piece cases. + But expressions with no DW_OP_piece operations have no value to + place in a piece's 'size' field; the size comes from the + surrounding data. So the two cases need to be handled + separately.) */ + int num_pieces; + struct dwarf_expr_piece *pieces; +}; + +/* A piece of an object, as recorded by DW_OP_piece or DW_OP_bit_piece. */ +struct dwarf_expr_piece +{ + /* If IN_REG is zero, then the piece is in memory, and VALUE is its address. + If IN_REG is non-zero, then the piece is in a register, and VALUE + is the register number. */ + int in_reg; + + /* This piece's address or register number. */ + CORE_ADDR value; + + /* The length of the piece, in bytes. */ + ULONGEST size; }; struct dwarf_expr_context *new_dwarf_expr_context (void); Modified: projects/ci20_mips/contrib/gdb/gdb/dwarf2loc.c ============================================================================== --- projects/ci20_mips/contrib/gdb/gdb/dwarf2loc.c Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/contrib/gdb/gdb/dwarf2loc.c Sun May 17 16:17:15 2015 (r283031) @@ -206,6 +206,7 @@ dwarf2_evaluate_loc_desc (struct symbol struct objfile *objfile) { CORE_ADDR result; + struct gdbarch *arch = get_frame_arch (frame); struct value *retval; struct dwarf_expr_baton baton; struct dwarf_expr_context *ctx; @@ -230,7 +231,32 @@ dwarf2_evaluate_loc_desc (struct symbol dwarf_expr_eval (ctx, data, size); result = dwarf_expr_fetch (ctx, 0); - if (ctx->in_reg) + if (ctx->num_pieces > 0) + { + int i; + long offset = 0; + bfd_byte *contents; + + retval = allocate_value (SYMBOL_TYPE (var)); + contents = VALUE_CONTENTS_RAW (retval); + for (i = 0; i < ctx->num_pieces; i++) + { + struct dwarf_expr_piece *p = &ctx->pieces[i]; + if (p->in_reg) + { + bfd_byte regval[MAX_REGISTER_SIZE]; + int gdb_regnum = DWARF2_REG_TO_REGNUM (p->value); + get_frame_register (frame, gdb_regnum, regval); + memcpy (contents + offset, regval, p->size); + } + else /* In memory? */ + { + read_memory (p->value, contents + offset, p->size); + } + offset += p->size; + } + } + else if (ctx->in_reg) { int regnum = DWARF2_REG_TO_REGNUM (result); retval = value_from_register (SYMBOL_TYPE (var), regnum, frame); @@ -245,6 +271,8 @@ dwarf2_evaluate_loc_desc (struct symbol VALUE_ADDRESS (retval) = result; } + set_value_initialized (retval, ctx->initialized); + free_dwarf_expr_context (ctx); return retval; @@ -322,6 +350,17 @@ dwarf2_loc_desc_needs_frame (unsigned ch in_reg = ctx->in_reg; + if (ctx->num_pieces > 0) + { + int i; + + /* If the location has several pieces, and any of them are in + registers, then we will need a frame to fetch them from. */ + for (i = 0; i < ctx->num_pieces; i++) + if (ctx->pieces[i].in_reg) + in_reg = 1; + } + free_dwarf_expr_context (ctx); return baton.needs_frame || in_reg; Modified: projects/ci20_mips/contrib/gdb/gdb/dwarf2read.c ============================================================================== --- projects/ci20_mips/contrib/gdb/gdb/dwarf2read.c Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/contrib/gdb/gdb/dwarf2read.c Sun May 17 16:17:15 2015 (r283031) @@ -7110,6 +7110,8 @@ dwarf_stack_op_name (unsigned op) /* GNU extensions. */ case DW_OP_GNU_push_tls_address: return "DW_OP_GNU_push_tls_address"; + case DW_OP_GNU_uninit: + return "DW_OP_GNU_uninit"; default: return "OP_"; } @@ -7634,6 +7636,9 @@ decode_locdesc (struct dwarf_block *blk, dwarf2_complex_location_expr_complaint (); break; + case DW_OP_GNU_uninit: + break; + default: complaint (&symfile_complaints, "unsupported stack op: '%s'", dwarf_stack_op_name (op)); Modified: projects/ci20_mips/contrib/gdb/gdb/value.h ============================================================================== --- projects/ci20_mips/contrib/gdb/gdb/value.h Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/contrib/gdb/gdb/value.h Sun May 17 16:17:15 2015 (r283031) @@ -165,6 +165,9 @@ struct value /* The BFD section associated with this value. */ asection *bfd_section; + /* If value is a variable, is it initialized or not. */ + int initialized; + /* Actual contents of the value. For use of this value; setting it uses the stuff above. Not valid if lazy is nonzero. Target byte-order. We force it to be aligned properly for any Modified: projects/ci20_mips/contrib/gdb/gdb/values.c ============================================================================== --- projects/ci20_mips/contrib/gdb/gdb/values.c Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/contrib/gdb/gdb/values.c Sun May 17 16:17:15 2015 (r283031) @@ -101,6 +101,7 @@ allocate_value (struct type *type) VALUE_EMBEDDED_OFFSET (val) = 0; VALUE_POINTED_TO_OFFSET (val) = 0; val->modifiable = 1; + val->initialized = 1; /* Default to initialized. */ return val; } @@ -1311,6 +1312,22 @@ using_struct_return (struct type *value_ == RETURN_VALUE_STRUCT_CONVENTION); } +/* Set the initialized field in a value struct. */ + +void +set_value_initialized (struct value *val, int status) +{ + val->initialized = status; +} + +/* Return the initialized field in a value struct. */ + +int +value_initialized (struct value *val) +{ + return val->initialized; +} + void _initialize_values (void) { Modified: projects/ci20_mips/contrib/libarchive/libarchive/archive_read.c ============================================================================== --- projects/ci20_mips/contrib/libarchive/libarchive/archive_read.c Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/contrib/libarchive/libarchive/archive_read.c Sun May 17 16:17:15 2015 (r283031) @@ -1395,6 +1395,8 @@ __archive_read_filter_consume(struct arc { int64_t skipped; + if (request < 0) + return ARCHIVE_FATAL; if (request == 0) return 0; Modified: projects/ci20_mips/contrib/libarchive/libarchive/archive_read_support_format_cpio.c ============================================================================== --- projects/ci20_mips/contrib/libarchive/libarchive/archive_read_support_format_cpio.c Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/contrib/libarchive/libarchive/archive_read_support_format_cpio.c Sun May 17 16:17:15 2015 (r283031) @@ -198,7 +198,7 @@ static int archive_read_format_cpio_read static int archive_read_format_cpio_read_header(struct archive_read *, struct archive_entry *); static int archive_read_format_cpio_skip(struct archive_read *); -static int be4(const unsigned char *); +static int64_t be4(const unsigned char *); static int find_odc_header(struct archive_read *); static int find_newc_header(struct archive_read *); static int header_bin_be(struct archive_read *, struct cpio *, @@ -213,7 +213,7 @@ static int header_afiol(struct archive_r struct archive_entry *, size_t *, size_t *); static int is_octal(const char *, size_t); static int is_hex(const char *, size_t); -static int le4(const unsigned char *); +static int64_t le4(const unsigned char *); static int record_hardlink(struct archive_read *a, struct cpio *cpio, struct archive_entry *entry); @@ -864,8 +864,11 @@ header_bin_le(struct archive_read *a, st /* Read fixed-size portion of header. */ h = __archive_read_ahead(a, bin_header_size, NULL); - if (h == NULL) + if (h == NULL) { + archive_set_error(&a->archive, 0, + "End of file trying to read next cpio header"); return (ARCHIVE_FATAL); + } /* Parse out binary fields. */ header = (const unsigned char *)h; @@ -900,8 +903,11 @@ header_bin_be(struct archive_read *a, st /* Read fixed-size portion of header. */ h = __archive_read_ahead(a, bin_header_size, NULL); - if (h == NULL) + if (h == NULL) { + archive_set_error(&a->archive, 0, + "End of file trying to read next cpio header"); return (ARCHIVE_FATAL); + } /* Parse out binary fields. */ header = (const unsigned char *)h; @@ -944,17 +950,17 @@ archive_read_format_cpio_cleanup(struct return (ARCHIVE_OK); } -static int +static int64_t le4(const unsigned char *p) { - return ((p[0]<<16) + (p[1]<<24) + (p[2]<<0) + (p[3]<<8)); + return ((p[0] << 16) + (((int64_t)p[1]) << 24) + (p[2] << 0) + (p[3] << 8)); } -static int +static int64_t be4(const unsigned char *p) { - return ((p[0]<<24) + (p[1]<<16) + (p[2]<<8) + (p[3])); + return ((((int64_t)p[0]) << 24) + (p[1] << 16) + (p[2] << 8) + (p[3])); } /* Modified: projects/ci20_mips/gnu/lib/Makefile ============================================================================== --- projects/ci20_mips/gnu/lib/Makefile Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/gnu/lib/Makefile Sun May 17 16:17:15 2015 (r283031) @@ -2,7 +2,11 @@ .include -SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline +SUBDIR= csu libgcc libgcov libdialog libregex libreadline + +.if ${MK_GCC} != "no" +SUBDIR+= libgomp +.endif .if ${MK_SSP} != "no" SUBDIR+= libssp Modified: projects/ci20_mips/include/stdlib.h ============================================================================== --- projects/ci20_mips/include/stdlib.h Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/include/stdlib.h Sun May 17 16:17:15 2015 (r283031) @@ -156,7 +156,8 @@ _Noreturn void _Exit(int); * If we're in a mode greater than C99, expose C11 functions. */ #if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L -void * aligned_alloc(size_t, size_t) __malloc_like __alloc_size(2); +void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align(1) + __alloc_size(2); int at_quick_exit(void (*)(void)); _Noreturn void quick_exit(int); @@ -171,7 +172,7 @@ char *realpath(const char * __restrict, int rand_r(unsigned *); /* (TSF) */ #endif #if __POSIX_VISIBLE >= 200112 -int posix_memalign(void **, size_t, size_t) __nonnull(1) +int posix_memalign(void **, size_t, size_t) __nonnull(1) __alloc_align(2) __alloc_size(3); /* (ADV) */ int setenv(const char *, const char *, int); int unsetenv(const char *); Modified: projects/ci20_mips/lib/libthr/thread/thr_spec.c ============================================================================== --- projects/ci20_mips/lib/libthr/thread/thr_spec.c Sun May 17 16:14:48 2015 (r283030) +++ projects/ci20_mips/lib/libthr/thread/thr_spec.c Sun May 17 16:17:15 2015 (r283031) @@ -30,6 +30,7 @@ */ #include "namespace.h" +#include #include #include #include @@ -40,7 +41,6 @@ #include "thr_private.h" -/* Static variables: */ struct pthread_key _thread_keytable[PTHREAD_KEYS_MAX]; __weak_reference(_pthread_key_create, pthread_key_create); @@ -50,7 +50,7 @@ __weak_reference(_pthread_setspecific, p int -_pthread_key_create(pthread_key_t *key, void (*destructor) (void *)) +_pthread_key_create(pthread_key_t *key, void (*destructor)(void *)) { struct pthread *curthread; int i; @@ -59,7 +59,6 @@ _pthread_key_create(pthread_key_t *key, curthread = _get_curthread(); - /* Lock the key table: */ THR_LOCK_ACQUIRE(curthread, &_keytable_lock); for (i = 0; i < PTHREAD_KEYS_MAX; i++) { @@ -68,14 +67,12 @@ _pthread_key_create(pthread_key_t *key, _thread_keytable[i].destructor = destructor; _thread_keytable[i].seqno++; - /* Unlock the key table: */ THR_LOCK_RELEASE(curthread, &_keytable_lock); *key = i + 1; return (0); } } - /* Unlock the key table: */ THR_LOCK_RELEASE(curthread, &_keytable_lock); return (EAGAIN); } @@ -83,44 +80,40 @@ _pthread_key_create(pthread_key_t *key, int _pthread_key_delete(pthread_key_t userkey) { - struct pthread *curthread = _get_curthread(); - int key = userkey - 1; - int ret = 0; - - if ((unsigned int)key < PTHREAD_KEYS_MAX) { - /* Lock the key table: */ - THR_LOCK_ACQUIRE(curthread, &_keytable_lock); - - if (_thread_keytable[key].allocated) - _thread_keytable[key].allocated = 0; - else - ret = EINVAL; - - /* Unlock the key table: */ - THR_LOCK_RELEASE(curthread, &_keytable_lock); - } else + struct pthread *curthread; + int key, ret; + + key = userkey - 1; + if ((unsigned int)key >= PTHREAD_KEYS_MAX) + return (EINVAL); + curthread = _get_curthread(); + THR_LOCK_ACQUIRE(curthread, &_keytable_lock); + if (_thread_keytable[key].allocated) { + _thread_keytable[key].allocated = 0; + ret = 0; + } else { ret = EINVAL; + } + THR_LOCK_RELEASE(curthread, &_keytable_lock); return (ret); } void _thread_cleanupspecific(void) { - struct pthread *curthread = _get_curthread(); - void (*destructor)( void *); - const void *data = NULL; - int key; - int i; + struct pthread *curthread; + void (*destructor)(void *); + const void *data; + int i, key; + curthread = _get_curthread(); if (curthread->specific == NULL) return; - - /* Lock the key table: */ THR_LOCK_ACQUIRE(curthread, &_keytable_lock); - for (i = 0; (i < PTHREAD_DESTRUCTOR_ITERATIONS) && - (curthread->specific_data_count > 0); i++) { - for (key = 0; (key < PTHREAD_KEYS_MAX) && - (curthread->specific_data_count > 0); key++) { + for (i = 0; i < PTHREAD_DESTRUCTOR_ITERATIONS && + curthread->specific_data_count > 0; i++) { + for (key = 0; key < PTHREAD_KEYS_MAX && + curthread->specific_data_count > 0; key++) { destructor = NULL; if (_thread_keytable[key].allocated && @@ -128,31 +121,29 @@ _thread_cleanupspecific(void) if (curthread->specific[key].seqno == _thread_keytable[key].seqno) { data = curthread->specific[key].data; - destructor = _thread_keytable[key].destructor; + destructor = _thread_keytable[key]. + destructor; } curthread->specific[key].data = NULL; curthread->specific_data_count--; - } - else if (curthread->specific[key].data != NULL) { + } else if (curthread->specific[key].data != NULL) { /* - * This can happen if the key is deleted via - * pthread_key_delete without first setting the value - * to NULL in all threads. POSIX says that the - * destructor is not invoked in this case. + * This can happen if the key is + * deleted via pthread_key_delete + * without first setting the value to + * NULL in all threads. POSIX says + * that the destructor is not invoked + * in this case. */ curthread->specific[key].data = NULL; curthread->specific_data_count--; } /* - * If there is a destructor, call it - * with the key table entry unlocked: + * If there is a destructor, call it with the + * key table entry unlocked. */ if (destructor != NULL) { - /* - * Don't hold the lock while calling the - * destructor: - */ THR_LOCK_RELEASE(curthread, &_keytable_lock); destructor(__DECONST(void *, data)); THR_LOCK_ACQUIRE(curthread, &_keytable_lock); @@ -160,102 +151,92 @@ _thread_cleanupspecific(void) } } THR_LOCK_RELEASE(curthread, &_keytable_lock); - free(curthread->specific); + munmap(curthread->specific, PTHREAD_KEYS_MAX * sizeof(struct + pthread_specific_elem)); curthread->specific = NULL; - if (curthread->specific_data_count > 0) + if (curthread->specific_data_count > 0) { stderr_debug("Thread %p has exited with leftover " "thread-specific data after %d destructor iterations\n", curthread, PTHREAD_DESTRUCTOR_ITERATIONS); -} - -static inline struct pthread_specific_elem * -pthread_key_allocate_data(void) -{ - struct pthread_specific_elem *new_data; - - new_data = (struct pthread_specific_elem *) - calloc(1, sizeof(struct pthread_specific_elem) * PTHREAD_KEYS_MAX); - return (new_data); + } } int _pthread_setspecific(pthread_key_t userkey, const void *value) { - struct pthread *pthread; - pthread_key_t key = userkey - 1; - int ret = 0; + struct pthread *pthread; + void *tmp; + pthread_key_t key; + + key = userkey - 1; + if ((unsigned int)key >= PTHREAD_KEYS_MAX || + !_thread_keytable[key].allocated) + return (EINVAL); - /* Point to the running thread: */ pthread = _get_curthread(); - - if ((pthread->specific) || - (pthread->specific = pthread_key_allocate_data())) { - if ((unsigned int)key < PTHREAD_KEYS_MAX) { - if (_thread_keytable[key].allocated) { - if (pthread->specific[key].data == NULL) { - if (value != NULL) - pthread->specific_data_count++; - } else if (value == NULL) - pthread->specific_data_count--; - pthread->specific[key].data = value; - pthread->specific[key].seqno = - _thread_keytable[key].seqno; - ret = 0; - } else - ret = EINVAL; - } else - ret = EINVAL; - } else - ret = ENOMEM; - return (ret); + if (pthread->specific == NULL) { + tmp = mmap(NULL, PTHREAD_KEYS_MAX * + sizeof(struct pthread_specific_elem), + PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); + if (tmp == MAP_FAILED) + return (ENOMEM); + pthread->specific = tmp; + } + if (pthread->specific[key].data == NULL) { + if (value != NULL) + pthread->specific_data_count++; + } else if (value == NULL) + pthread->specific_data_count--; + pthread->specific[key].data = value; + pthread->specific[key].seqno = _thread_keytable[key].seqno; + return (0); } void * _pthread_getspecific(pthread_key_t userkey) { - struct pthread *pthread; - pthread_key_t key = userkey - 1; - const void *data; + struct pthread *pthread; + const void *data; + pthread_key_t key; + + /* Check if there is specific data. */ + key = userkey - 1; + if ((unsigned int)key >= PTHREAD_KEYS_MAX) + return (NULL); - /* Point to the running thread: */ pthread = _get_curthread(); - - /* Check if there is specific data: */ - if (pthread->specific != NULL && (unsigned int)key < PTHREAD_KEYS_MAX) { - /* Check if this key has been used before: */ - if (_thread_keytable[key].allocated && - (pthread->specific[key].seqno == _thread_keytable[key].seqno)) { - /* Return the value: */ - data = pthread->specific[key].data; - } else { - /* - * This key has not been used before, so return NULL - * instead: - */ - data = NULL; - } - } else - /* No specific data has been created, so just return NULL: */ + /* Check if this key has been used before. */ + if (_thread_keytable[key].allocated && pthread->specific != NULL && + pthread->specific[key].seqno == _thread_keytable[key].seqno) { + /* Return the value: */ + data = pthread->specific[key].data; + } else { + /* + * This key has not been used before, so return NULL + * instead. + */ data = NULL; + } return (__DECONST(void *, data)); } void _thr_tsd_unload(struct dl_phdr_info *phdr_info) { - struct pthread *curthread = _get_curthread(); + struct pthread *curthread; void (*destructor)(void *); int key; + curthread = _get_curthread(); THR_LOCK_ACQUIRE(curthread, &_keytable_lock); for (key = 0; key < PTHREAD_KEYS_MAX; key++) { - if (_thread_keytable[key].allocated) { - destructor = _thread_keytable[key].destructor; - if (destructor != NULL) { - if (__elf_phdr_match_addr(phdr_info, destructor)) - _thread_keytable[key].destructor = NULL; - } - } + if (!_thread_keytable[key].allocated) + continue; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri May 22 17:06:45 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E0B009DA; Fri, 22 May 2015 17:06:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CAE3A1FDE; Fri, 22 May 2015 17:06:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4MH6j0f038236; Fri, 22 May 2015 17:06:45 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4MH6ZqI038136; Fri, 22 May 2015 17:06:35 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201505221706.t4MH6ZqI038136@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Fri, 22 May 2015 17:06:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r283292 - in projects/em_mq: . bin/date bin/pax cddl/contrib/opensolaris/common/ctf cddl/contrib/opensolaris/lib/libdtrace/common cddl/lib cddl/lib/libdtrace cddl/sbin cddl/usr.bin cddl... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 May 2015 17:06:46 -0000 Author: sbruno Date: Fri May 22 17:06:33 2015 New Revision: 283292 URL: https://svnweb.freebsd.org/changeset/base/283292 Log: MFH @283290 Added: projects/em_mq/cddl/lib/libdtrace/siftr.d - copied unchanged from r283290, head/cddl/lib/libdtrace/siftr.d projects/em_mq/contrib/bmake/unit-tests/cond2.exp - copied unchanged from r283290, head/contrib/bmake/unit-tests/cond2.exp projects/em_mq/contrib/bmake/unit-tests/cond2.mk - copied unchanged from r283290, head/contrib/bmake/unit-tests/cond2.mk projects/em_mq/lib/csu/i386/ - copied from r283290, head/lib/csu/i386/ projects/em_mq/lib/libc/aarch64/gen/fabs.S - copied unchanged from r283290, head/lib/libc/aarch64/gen/fabs.S projects/em_mq/release/Makefile.mirrors - copied unchanged from r283290, head/release/Makefile.mirrors projects/em_mq/release/arm/WANDBOARD.conf - copied unchanged from r283290, head/release/arm/WANDBOARD.conf projects/em_mq/release/tools/arm.subr - copied unchanged from r283290, head/release/tools/arm.subr projects/em_mq/sys/arm/allwinner/a10_mmc.c - copied unchanged from r283290, head/sys/arm/allwinner/a10_mmc.c projects/em_mq/sys/arm/allwinner/a10_mmc.h - copied unchanged from r283290, head/sys/arm/allwinner/a10_mmc.h projects/em_mq/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c - copied unchanged from r283290, head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c projects/em_mq/sys/arm/annapurna/ - copied from r283290, head/sys/arm/annapurna/ projects/em_mq/sys/arm/broadcom/bcm2835/bcm2836_mp.c - copied unchanged from r283290, head/sys/arm/broadcom/bcm2835/bcm2836_mp.c projects/em_mq/sys/arm/conf/ALPINE - copied unchanged from r283290, head/sys/arm/conf/ALPINE projects/em_mq/sys/arm/ti/am335x/am335x_ecap.c - copied unchanged from r283290, head/sys/arm/ti/am335x/am335x_ecap.c projects/em_mq/sys/arm/ti/am335x/am335x_ehrpwm.c - copied unchanged from r283290, head/sys/arm/ti/am335x/am335x_ehrpwm.c projects/em_mq/sys/arm/ti/am335x/am335x_musb.c - copied unchanged from r283290, head/sys/arm/ti/am335x/am335x_musb.c projects/em_mq/sys/arm/ti/am335x/am335x_pwmss.c - copied unchanged from r283290, head/sys/arm/ti/am335x/am335x_pwmss.c projects/em_mq/sys/arm/ti/ti_hwmods.c - copied unchanged from r283290, head/sys/arm/ti/ti_hwmods.c projects/em_mq/sys/arm/ti/ti_hwmods.h - copied unchanged from r283290, head/sys/arm/ti/ti_hwmods.h projects/em_mq/sys/arm/ti/ti_pinmux.c - copied unchanged from r283290, head/sys/arm/ti/ti_pinmux.c projects/em_mq/sys/arm/ti/ti_pinmux.h - copied unchanged from r283290, head/sys/arm/ti/ti_pinmux.h projects/em_mq/sys/arm/ti/usb/omap_host.c - copied unchanged from r283290, head/sys/arm/ti/usb/omap_host.c projects/em_mq/sys/arm/ti/usb/omap_tll.c - copied unchanged from r283290, head/sys/arm/ti/usb/omap_tll.c projects/em_mq/sys/arm64/arm64/busdma_bounce.c - copied unchanged from r283290, head/sys/arm64/arm64/busdma_bounce.c projects/em_mq/sys/arm64/arm64/gic_v3.c - copied unchanged from r283290, head/sys/arm64/arm64/gic_v3.c projects/em_mq/sys/arm64/arm64/gic_v3_fdt.c - copied unchanged from r283290, head/sys/arm64/arm64/gic_v3_fdt.c projects/em_mq/sys/arm64/arm64/gic_v3_reg.h - copied unchanged from r283290, head/sys/arm64/arm64/gic_v3_reg.h projects/em_mq/sys/arm64/arm64/gic_v3_var.h - copied unchanged from r283290, head/sys/arm64/arm64/gic_v3_var.h projects/em_mq/sys/arm64/include/bus_dma_impl.h - copied unchanged from r283290, head/sys/arm64/include/bus_dma_impl.h projects/em_mq/sys/boot/common/self_reloc.c - copied unchanged from r283290, head/sys/boot/common/self_reloc.c projects/em_mq/sys/boot/fdt/dts/arm/annapurna-alpine.dts - copied unchanged from r283290, head/sys/boot/fdt/dts/arm/annapurna-alpine.dts projects/em_mq/sys/boot/fdt/dts/arm/beaglebone-common.dtsi - copied unchanged from r283290, head/sys/boot/fdt/dts/arm/beaglebone-common.dtsi projects/em_mq/sys/boot/fdt/dts/arm/pandaboard-common.dtsi - copied unchanged from r283290, head/sys/boot/fdt/dts/arm/pandaboard-common.dtsi projects/em_mq/sys/boot/fdt/dts/arm/pandaboard-es.dts - copied unchanged from r283290, head/sys/boot/fdt/dts/arm/pandaboard-es.dts projects/em_mq/sys/contrib/dev/acpica/common/ahtable.c - copied unchanged from r283290, head/sys/contrib/dev/acpica/common/ahtable.c projects/em_mq/sys/contrib/dev/acpica/include/acuuid.h - copied unchanged from r283290, head/sys/contrib/dev/acpica/include/acuuid.h projects/em_mq/sys/dev/hwpmc/hwpmc_arm64.c - copied unchanged from r283290, head/sys/dev/hwpmc/hwpmc_arm64.c projects/em_mq/sys/dev/hwpmc/hwpmc_arm64.h - copied unchanged from r283290, head/sys/dev/hwpmc/hwpmc_arm64.h projects/em_mq/sys/dev/hwpmc/hwpmc_arm64_md.c - copied unchanged from r283290, head/sys/dev/hwpmc/hwpmc_arm64_md.c projects/em_mq/sys/mips/atheros/qca955x_pci.c - copied unchanged from r283290, head/sys/mips/atheros/qca955x_pci.c projects/em_mq/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c - copied unchanged from r283290, head/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c projects/em_mq/sys/xen/xenmem/ - copied from r283290, head/sys/xen/xenmem/ projects/em_mq/tests/etc/ - copied from r283290, head/tests/etc/ projects/em_mq/tests/sys/kern/ptrace_test.c - copied unchanged from r283290, head/tests/sys/kern/ptrace_test.c projects/em_mq/tools/build/stdlib.h - copied unchanged from r283290, head/tools/build/stdlib.h Deleted: projects/em_mq/etc/rc.d/tests/ projects/em_mq/etc/tests/Makefile projects/em_mq/gnu/usr.bin/groff/src/preproc/soelim/ projects/em_mq/kerberos5/lib/libheimsqlite/ projects/em_mq/lib/csu/i386-elf/ projects/em_mq/lib/libmandoc/ projects/em_mq/release/arm/WANDBOARD-QUAD.conf projects/em_mq/release/arm/ZEDBOARD.conf projects/em_mq/release/arm/release.sh projects/em_mq/release/tools/arm/ projects/em_mq/sys/arm/conf/WANDBOARD-DUAL projects/em_mq/sys/arm/conf/WANDBOARD-QUAD projects/em_mq/sys/arm/conf/WANDBOARD-SOLO projects/em_mq/sys/arm/ti/am335x/am335x_pwm.c projects/em_mq/sys/boot/efi/loader/reloc.c projects/em_mq/sys/boot/fdt/dts/arm/am335x.dtsi projects/em_mq/usr.bin/demandoc/ Modified: projects/em_mq/Makefile.inc1 projects/em_mq/ObsoleteFiles.inc projects/em_mq/UPDATING projects/em_mq/bin/date/date.1 projects/em_mq/bin/date/date.c projects/em_mq/bin/pax/ar_subs.c projects/em_mq/bin/pax/buf_subs.c projects/em_mq/bin/pax/cache.c projects/em_mq/bin/pax/cpio.c projects/em_mq/bin/pax/file_subs.c projects/em_mq/bin/pax/gen_subs.c projects/em_mq/bin/pax/getoldopt.c projects/em_mq/bin/pax/pat_rep.c projects/em_mq/bin/pax/pax.c projects/em_mq/bin/pax/sel_subs.c projects/em_mq/bin/pax/tar.c projects/em_mq/bin/pax/tty_subs.c projects/em_mq/cddl/contrib/opensolaris/common/ctf/ctf_create.c projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/em_mq/cddl/lib/Makefile projects/em_mq/cddl/lib/libdtrace/Makefile projects/em_mq/cddl/lib/libdtrace/tcp.d projects/em_mq/cddl/sbin/Makefile projects/em_mq/cddl/usr.bin/Makefile projects/em_mq/cddl/usr.bin/ctfconvert/Makefile projects/em_mq/cddl/usr.bin/ctfdump/Makefile projects/em_mq/cddl/usr.sbin/Makefile projects/em_mq/cddl/usr.sbin/dtrace/Makefile projects/em_mq/cddl/usr.sbin/dtrace/tests/tools/exclude.sh projects/em_mq/cddl/usr.sbin/lockstat/Makefile projects/em_mq/cddl/usr.sbin/plockstat/Makefile projects/em_mq/contrib/atf/atf-sh/atf_check_test.sh projects/em_mq/contrib/atf/atf-sh/misc_helpers.sh projects/em_mq/contrib/bmake/ChangeLog projects/em_mq/contrib/bmake/FILES projects/em_mq/contrib/bmake/Makefile projects/em_mq/contrib/bmake/cond.c projects/em_mq/contrib/bmake/machine.sh projects/em_mq/contrib/bmake/mk/ChangeLog projects/em_mq/contrib/bmake/mk/dirdeps.mk projects/em_mq/contrib/bmake/mk/install-mk projects/em_mq/contrib/bmake/nonints.h projects/em_mq/contrib/bmake/unit-tests/Makefile.in projects/em_mq/contrib/bmake/var.c projects/em_mq/contrib/elftoolchain/addr2line/addr2line.1 projects/em_mq/contrib/elftoolchain/addr2line/addr2line.c projects/em_mq/contrib/elftoolchain/common/native-elf-format projects/em_mq/contrib/elftoolchain/cxxfilt/c++filt.1 projects/em_mq/contrib/elftoolchain/elfcopy/elfcopy.1 projects/em_mq/contrib/elftoolchain/elfcopy/sections.c projects/em_mq/contrib/elftoolchain/elfcopy/segments.c projects/em_mq/contrib/elftoolchain/elfcopy/symbols.c projects/em_mq/contrib/elftoolchain/libdwarf/dwarf.3 projects/em_mq/contrib/elftoolchain/libdwarf/dwarf_add_line_entry.3 projects/em_mq/contrib/elftoolchain/libdwarf/dwarf_def_macro.3 projects/em_mq/contrib/elftoolchain/libdwarf/dwarf_expand_frame_instructions.3 projects/em_mq/contrib/elftoolchain/libdwarf/dwarf_formblock.3 projects/em_mq/contrib/elftoolchain/libdwarf/dwarf_formflag.3 projects/em_mq/contrib/elftoolchain/libdwarf/dwarf_formref.3 projects/em_mq/contrib/elftoolchain/libdwarf/dwarf_formsig8.3 projects/em_mq/contrib/elftoolchain/libdwarf/dwarf_formudata.3 projects/em_mq/contrib/elftoolchain/libdwarf/dwarf_get_fde_info_for_all_regs.3 projects/em_mq/contrib/elftoolchain/libdwarf/dwarf_get_fde_info_for_reg.3 projects/em_mq/contrib/elftoolchain/libdwarf/dwarf_get_ranges.3 projects/em_mq/contrib/elftoolchain/libdwarf/dwarf_hasattr.3 projects/em_mq/contrib/elftoolchain/libdwarf/dwarf_next_cu_header.3 projects/em_mq/contrib/elftoolchain/libdwarf/dwarf_producer_init.3 projects/em_mq/contrib/elftoolchain/libdwarf/dwarf_whatattr.3 projects/em_mq/contrib/elftoolchain/libelf/elf.3 projects/em_mq/contrib/elftoolchain/libelf/elf_begin.3 projects/em_mq/contrib/elftoolchain/libelf/elf_cntl.3 projects/em_mq/contrib/elftoolchain/libelf/elf_getdata.3 projects/em_mq/contrib/elftoolchain/libelf/elf_open.3 projects/em_mq/contrib/elftoolchain/libelf/elf_update.c projects/em_mq/contrib/elftoolchain/libelf/gelf.3 projects/em_mq/contrib/elftoolchain/libelftc/elftc_demangle.3 projects/em_mq/contrib/elftoolchain/libelftc/elftc_symbol_table_create.3 projects/em_mq/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c projects/em_mq/contrib/elftoolchain/nm/nm.1 projects/em_mq/contrib/elftoolchain/readelf/readelf.1 projects/em_mq/contrib/elftoolchain/readelf/readelf.c projects/em_mq/contrib/elftoolchain/size/size.1 projects/em_mq/contrib/elftoolchain/size/size.c projects/em_mq/contrib/elftoolchain/strings/strings.1 projects/em_mq/contrib/gcc/dwarf2.h projects/em_mq/contrib/gdb/gdb/c-valprint.c projects/em_mq/contrib/gdb/gdb/dwarf2expr.c projects/em_mq/contrib/gdb/gdb/dwarf2expr.h projects/em_mq/contrib/gdb/gdb/dwarf2loc.c projects/em_mq/contrib/gdb/gdb/dwarf2read.c projects/em_mq/contrib/gdb/gdb/value.h projects/em_mq/contrib/gdb/gdb/values.c projects/em_mq/contrib/libarchive/libarchive/archive_read.c projects/em_mq/contrib/libarchive/libarchive/archive_read_support_format_cpio.c projects/em_mq/contrib/netcat/netcat.c projects/em_mq/contrib/tzdata/africa projects/em_mq/contrib/tzdata/antarctica projects/em_mq/contrib/tzdata/backward projects/em_mq/contrib/tzdata/europe projects/em_mq/contrib/tzdata/northamerica projects/em_mq/contrib/tzdata/southamerica projects/em_mq/etc/Makefile projects/em_mq/etc/etc.arm/ttys projects/em_mq/etc/rc.d/Makefile projects/em_mq/gnu/lib/Makefile projects/em_mq/include/stdlib.h projects/em_mq/include/stringlist.h projects/em_mq/kerberos5/lib/Makefile projects/em_mq/kerberos5/lib/libhdb/Makefile projects/em_mq/lib/Makefile projects/em_mq/lib/csu/Makefile projects/em_mq/lib/libc/aarch64/Symbol.map projects/em_mq/lib/libc/aarch64/gen/Makefile.inc projects/em_mq/lib/libc/arm/SYS.h projects/em_mq/lib/libc/arm/aeabi/aeabi_vfp_double.S projects/em_mq/lib/libc/arm/aeabi/aeabi_vfp_float.S projects/em_mq/lib/libc/arm/gen/_setjmp.S projects/em_mq/lib/libc/arm/gen/setjmp.S projects/em_mq/lib/libc/arm/sys/brk.S projects/em_mq/lib/libc/arm/sys/sbrk.S projects/em_mq/lib/libc/db/hash/hash.c projects/em_mq/lib/libc/gen/directory.3 projects/em_mq/lib/libc/gen/dlfcn.c projects/em_mq/lib/libc/gen/stringlist.c projects/em_mq/lib/libc/gen/telldir.c projects/em_mq/lib/libc/net/recv.c projects/em_mq/lib/libc/net/send.c projects/em_mq/lib/libedit/chartype.c projects/em_mq/lib/libedit/chartype.h projects/em_mq/lib/libedit/edit/readline/readline.h projects/em_mq/lib/libedit/el.c projects/em_mq/lib/libedit/eln.c projects/em_mq/lib/libedit/map.c projects/em_mq/lib/libedit/readline.c projects/em_mq/lib/libedit/tty.c projects/em_mq/lib/libelftc/elftc_version.c projects/em_mq/lib/libmd/Makefile projects/em_mq/lib/libmd/md4.h projects/em_mq/lib/libmd/md4c.c projects/em_mq/lib/libmd/md5.h projects/em_mq/lib/libmd/md5c.c projects/em_mq/lib/libmd/mdXhl.c projects/em_mq/lib/libmd/ripemd.h projects/em_mq/lib/libmd/rmd160c.c projects/em_mq/lib/libmd/sha.h projects/em_mq/lib/libmd/sha1c.c projects/em_mq/lib/libmd/sha256.h projects/em_mq/lib/libmd/sha256c.c projects/em_mq/lib/libmd/sha512.h projects/em_mq/lib/libmd/sha512c.c projects/em_mq/lib/libmd/shadriver.c projects/em_mq/lib/libpmc/libpmc.c projects/em_mq/lib/libproc/Makefile projects/em_mq/lib/libprocstat/Makefile projects/em_mq/lib/libprocstat/libprocstat.3 projects/em_mq/lib/libthr/thread/thr_spec.c projects/em_mq/lib/libufs/Makefile projects/em_mq/lib/libvmmapi/vmmapi.c projects/em_mq/lib/libvmmapi/vmmapi.h projects/em_mq/lib/msun/src/e_j0.c projects/em_mq/lib/msun/src/e_j0f.c projects/em_mq/lib/msun/src/e_j1.c projects/em_mq/lib/msun/src/e_j1f.c projects/em_mq/libexec/rtld-elf/debug.h projects/em_mq/libexec/rtld-elf/rtld.c projects/em_mq/release/Makefile.ec2 projects/em_mq/release/arm/BEAGLEBONE.conf projects/em_mq/release/arm/PANDABOARD.conf projects/em_mq/release/arm/RPI-B.conf projects/em_mq/release/arm/RPI2.conf projects/em_mq/release/release.sh projects/em_mq/release/tools/vmimage.subr projects/em_mq/sbin/devd/devd.conf.5 projects/em_mq/sbin/geom/class/mountver/geom_mountver.c projects/em_mq/sbin/geom/class/mountver/gmountver.8 projects/em_mq/sbin/ifconfig/af_inet.c projects/em_mq/sbin/ifconfig/af_inet6.c projects/em_mq/sbin/ifconfig/ifconfig.8 projects/em_mq/sbin/ifconfig/iffib.c projects/em_mq/sbin/ifconfig/ifgif.c projects/em_mq/sbin/ifconfig/sfp.c projects/em_mq/sbin/ipfw/tables.c projects/em_mq/share/man/man3/pthread_getspecific.3 projects/em_mq/share/man/man4/acpi.4 projects/em_mq/share/man/man4/ctl.4 projects/em_mq/share/man/man4/iic.4 projects/em_mq/share/man/man4/usb_quirk.4 projects/em_mq/share/man/man9/Makefile projects/em_mq/share/man/man9/namei.9 projects/em_mq/share/man/man9/psignal.9 projects/em_mq/share/mk/src.libnames.mk projects/em_mq/share/syscons/keymaps/INDEX.keymaps projects/em_mq/share/vt/keymaps/INDEX.keymaps projects/em_mq/sys/amd64/acpica/acpi_machdep.c projects/em_mq/sys/amd64/amd64/apic_vector.S projects/em_mq/sys/amd64/amd64/cpu_switch.S projects/em_mq/sys/amd64/amd64/db_disasm.c projects/em_mq/sys/amd64/amd64/genassym.c projects/em_mq/sys/amd64/amd64/machdep.c projects/em_mq/sys/amd64/amd64/mp_machdep.c projects/em_mq/sys/amd64/amd64/pmap.c projects/em_mq/sys/amd64/amd64/vm_machdep.c projects/em_mq/sys/amd64/conf/GENERIC projects/em_mq/sys/amd64/include/cpufunc.h projects/em_mq/sys/amd64/include/md_var.h projects/em_mq/sys/amd64/include/pcpu.h projects/em_mq/sys/amd64/include/pmap.h projects/em_mq/sys/amd64/include/smp.h projects/em_mq/sys/amd64/include/vmm.h (contents, props changed) projects/em_mq/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/em_mq/sys/amd64/linux32/linux32_machdep.c projects/em_mq/sys/amd64/vmm/vmm.c projects/em_mq/sys/amd64/vmm/vmm_dev.c projects/em_mq/sys/amd64/vmm/vmm_instruction_emul.c projects/em_mq/sys/arm/allwinner/a10_clk.c projects/em_mq/sys/arm/allwinner/a10_clk.h projects/em_mq/sys/arm/allwinner/a20/files.a20 projects/em_mq/sys/arm/allwinner/files.allwinner projects/em_mq/sys/arm/allwinner/std.a10 projects/em_mq/sys/arm/altera/socfpga/files.socfpga projects/em_mq/sys/arm/amlogic/aml8726/aml8726_ccm.c projects/em_mq/sys/arm/amlogic/aml8726/aml8726_machdep.c projects/em_mq/sys/arm/amlogic/aml8726/aml8726_pic.c projects/em_mq/sys/arm/amlogic/aml8726/aml8726_pinctrl.c projects/em_mq/sys/arm/amlogic/aml8726/aml8726_rtc.c projects/em_mq/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c projects/em_mq/sys/arm/amlogic/aml8726/aml8726_usb_phy-m6.c projects/em_mq/sys/arm/amlogic/aml8726/files.aml8726 projects/em_mq/sys/arm/arm/cpufunc.c projects/em_mq/sys/arm/arm/cpufunc_asm_armv7.S projects/em_mq/sys/arm/arm/cpuinfo.c projects/em_mq/sys/arm/arm/db_disasm.c projects/em_mq/sys/arm/arm/exception.S projects/em_mq/sys/arm/arm/fusu.S projects/em_mq/sys/arm/arm/intr.c projects/em_mq/sys/arm/arm/machdep.c projects/em_mq/sys/arm/arm/mp_machdep.c projects/em_mq/sys/arm/arm/pmap-v6-new.c projects/em_mq/sys/arm/arm/pmap.c projects/em_mq/sys/arm/arm/pmu.c projects/em_mq/sys/arm/arm/stdatomic.c projects/em_mq/sys/arm/arm/swtch.S projects/em_mq/sys/arm/arm/syscall.c projects/em_mq/sys/arm/arm/undefined.c projects/em_mq/sys/arm/arm/vm_machdep.c projects/em_mq/sys/arm/at91/at91_pio.c projects/em_mq/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c projects/em_mq/sys/arm/broadcom/bcm2835/bcm2836.c projects/em_mq/sys/arm/broadcom/bcm2835/files.bcm2836 projects/em_mq/sys/arm/broadcom/bcm2835/std.bcm2836 projects/em_mq/sys/arm/conf/AML8726 projects/em_mq/sys/arm/conf/APALIS-IMX6 projects/em_mq/sys/arm/conf/ARMADAXP projects/em_mq/sys/arm/conf/ARNDALE projects/em_mq/sys/arm/conf/ARNDALE-OCTA projects/em_mq/sys/arm/conf/ATMEL projects/em_mq/sys/arm/conf/AVILA projects/em_mq/sys/arm/conf/BEAGLEBONE projects/em_mq/sys/arm/conf/BWCT projects/em_mq/sys/arm/conf/CAMBRIA projects/em_mq/sys/arm/conf/CHROMEBOOK projects/em_mq/sys/arm/conf/CHROMEBOOK-PEACH-PIT projects/em_mq/sys/arm/conf/CHROMEBOOK-SNOW projects/em_mq/sys/arm/conf/CHROMEBOOK-SPRING projects/em_mq/sys/arm/conf/CNS11XXNAS projects/em_mq/sys/arm/conf/COLIBRI-VF50 projects/em_mq/sys/arm/conf/COSMIC projects/em_mq/sys/arm/conf/CRB projects/em_mq/sys/arm/conf/CUBIEBOARD projects/em_mq/sys/arm/conf/CUBIEBOARD2 projects/em_mq/sys/arm/conf/DB-78XXX projects/em_mq/sys/arm/conf/DB-88F5XXX projects/em_mq/sys/arm/conf/DB-88F6XXX projects/em_mq/sys/arm/conf/DIGI-CCWMX53 projects/em_mq/sys/arm/conf/DOCKSTAR projects/em_mq/sys/arm/conf/DREAMPLUG-1001 projects/em_mq/sys/arm/conf/EA3250 projects/em_mq/sys/arm/conf/EB9200 projects/em_mq/sys/arm/conf/EFIKA_MX projects/em_mq/sys/arm/conf/EP80219 projects/em_mq/sys/arm/conf/ETHERNUT5 projects/em_mq/sys/arm/conf/EXYNOS5.common projects/em_mq/sys/arm/conf/EXYNOS5250 projects/em_mq/sys/arm/conf/EXYNOS5420 projects/em_mq/sys/arm/conf/GUMSTIX projects/em_mq/sys/arm/conf/HL200 projects/em_mq/sys/arm/conf/HL201 projects/em_mq/sys/arm/conf/IMX53 projects/em_mq/sys/arm/conf/IMX53-QSB projects/em_mq/sys/arm/conf/IMX6 projects/em_mq/sys/arm/conf/IQ31244 projects/em_mq/sys/arm/conf/KB920X projects/em_mq/sys/arm/conf/LN2410SBC projects/em_mq/sys/arm/conf/NSLU projects/em_mq/sys/arm/conf/ODROIDC1 projects/em_mq/sys/arm/conf/PANDABOARD projects/em_mq/sys/arm/conf/QILA9G20 projects/em_mq/sys/arm/conf/QUARTZ projects/em_mq/sys/arm/conf/RADXA projects/em_mq/sys/arm/conf/RADXA-LITE projects/em_mq/sys/arm/conf/RK3188 projects/em_mq/sys/arm/conf/RPI-B projects/em_mq/sys/arm/conf/RPI2 projects/em_mq/sys/arm/conf/SAM9260EK projects/em_mq/sys/arm/conf/SAM9G20EK projects/em_mq/sys/arm/conf/SAM9X25EK projects/em_mq/sys/arm/conf/SHEEVAPLUG projects/em_mq/sys/arm/conf/SN9G45 projects/em_mq/sys/arm/conf/SOCKIT.common projects/em_mq/sys/arm/conf/TS7800 projects/em_mq/sys/arm/conf/VERSATILEPB projects/em_mq/sys/arm/conf/VIRT projects/em_mq/sys/arm/conf/VSATV102 projects/em_mq/sys/arm/conf/VYBRID projects/em_mq/sys/arm/conf/ZEDBOARD projects/em_mq/sys/arm/freescale/imx/files.imx6 projects/em_mq/sys/arm/freescale/vybrid/files.vybrid projects/em_mq/sys/arm/include/armreg.h projects/em_mq/sys/arm/include/asm.h projects/em_mq/sys/arm/include/atomic.h projects/em_mq/sys/arm/include/cpu-v6.h projects/em_mq/sys/arm/include/cpufunc.h projects/em_mq/sys/arm/include/pl310.h projects/em_mq/sys/arm/include/pmap-v6.h projects/em_mq/sys/arm/include/proc.h projects/em_mq/sys/arm/include/smp.h projects/em_mq/sys/arm/include/sysreg.h projects/em_mq/sys/arm/qemu/files.qemu projects/em_mq/sys/arm/rockchip/files.rk30xx projects/em_mq/sys/arm/samsung/exynos/files.exynos5 projects/em_mq/sys/arm/ti/aintc.c projects/em_mq/sys/arm/ti/am335x/am335x_dmtimer.c projects/em_mq/sys/arm/ti/am335x/am335x_gpio.c projects/em_mq/sys/arm/ti/am335x/am335x_lcd.c projects/em_mq/sys/arm/ti/am335x/am335x_lcd.h projects/em_mq/sys/arm/ti/am335x/am335x_pmic.c projects/em_mq/sys/arm/ti/am335x/am335x_prcm.c projects/em_mq/sys/arm/ti/am335x/am335x_pwm.h projects/em_mq/sys/arm/ti/am335x/am335x_scm_padconf.c projects/em_mq/sys/arm/ti/am335x/am335x_usbss.c projects/em_mq/sys/arm/ti/am335x/files.am335x projects/em_mq/sys/arm/ti/cpsw/if_cpsw.c projects/em_mq/sys/arm/ti/cpsw/if_cpswreg.h projects/em_mq/sys/arm/ti/cpsw/if_cpswvar.h projects/em_mq/sys/arm/ti/files.ti projects/em_mq/sys/arm/ti/omap4/files.omap4 projects/em_mq/sys/arm/ti/omap4/omap4_gpio.c projects/em_mq/sys/arm/ti/omap4/omap4_prcm_clks.c projects/em_mq/sys/arm/ti/omap4/omap4_scm_padconf.c projects/em_mq/sys/arm/ti/ti_adc.c projects/em_mq/sys/arm/ti/ti_common.c projects/em_mq/sys/arm/ti/ti_edma3.c projects/em_mq/sys/arm/ti/ti_gpio.c projects/em_mq/sys/arm/ti/ti_gpio.h projects/em_mq/sys/arm/ti/ti_i2c.c projects/em_mq/sys/arm/ti/ti_mbox.c projects/em_mq/sys/arm/ti/ti_prcm.h projects/em_mq/sys/arm/ti/ti_pruss.c projects/em_mq/sys/arm/ti/ti_pruss.h projects/em_mq/sys/arm/ti/ti_scm.c projects/em_mq/sys/arm/ti/ti_scm.h projects/em_mq/sys/arm/ti/ti_sdhci.c projects/em_mq/sys/arm/ti/ti_sdma.c projects/em_mq/sys/arm/ti/usb/omap_ehci.c projects/em_mq/sys/arm/ti/usb/omap_usb.h projects/em_mq/sys/arm/xilinx/files.zynq7 projects/em_mq/sys/arm64/arm64/busdma_machdep.c projects/em_mq/sys/arm64/arm64/db_disasm.c projects/em_mq/sys/arm64/arm64/intr_machdep.c projects/em_mq/sys/arm64/arm64/locore.S projects/em_mq/sys/arm64/conf/GENERIC projects/em_mq/sys/arm64/include/armreg.h projects/em_mq/sys/arm64/include/pmc_mdep.h projects/em_mq/sys/boot/arm/uboot/Makefile projects/em_mq/sys/boot/arm/uboot/ldscript.arm projects/em_mq/sys/boot/arm/uboot/start.S projects/em_mq/sys/boot/common/dev_net.c projects/em_mq/sys/boot/common/dev_net.h projects/em_mq/sys/boot/common/load_elf.c projects/em_mq/sys/boot/efi/boot1/Makefile projects/em_mq/sys/boot/efi/loader/Makefile projects/em_mq/sys/boot/efi/loader/arch/amd64/start.S projects/em_mq/sys/boot/efi/loader/arch/arm/ldscript.arm projects/em_mq/sys/boot/efi/loader/arch/arm/start.S projects/em_mq/sys/boot/efi/loader/arch/arm64/start.S projects/em_mq/sys/boot/efi/loader/arch/i386/start.S projects/em_mq/sys/boot/fdt/dts/arm/am335x-evm.dts projects/em_mq/sys/boot/fdt/dts/arm/beaglebone-black.dts projects/em_mq/sys/boot/fdt/dts/arm/beaglebone.dts projects/em_mq/sys/boot/fdt/dts/arm/cubieboard.dts projects/em_mq/sys/boot/fdt/dts/arm/cubieboard2.dts projects/em_mq/sys/boot/fdt/dts/arm/odroidc1.dts projects/em_mq/sys/boot/fdt/dts/arm/pandaboard.dts projects/em_mq/sys/boot/fdt/dts/arm/rpi2.dts projects/em_mq/sys/boot/fdt/dts/arm/sun4i-a10.dtsi projects/em_mq/sys/boot/fdt/dts/arm/sun7i-a20.dtsi projects/em_mq/sys/boot/fdt/dts/arm/vsatv102-m6.dts projects/em_mq/sys/boot/i386/boot0/boot0.S projects/em_mq/sys/boot/uboot/common/main.c projects/em_mq/sys/boot/uboot/lib/copy.c projects/em_mq/sys/boot/uboot/lib/elf_freebsd.c projects/em_mq/sys/boot/uboot/lib/libuboot.h projects/em_mq/sys/boot/uboot/lib/net.c projects/em_mq/sys/cam/ctl/ctl_backend_block.c projects/em_mq/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/em_mq/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/em_mq/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/em_mq/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c projects/em_mq/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/em_mq/sys/cddl/dev/dtrace/i386/dtrace_subr.c projects/em_mq/sys/compat/freebsd32/freebsd32_misc.c projects/em_mq/sys/compat/svr4/svr4_misc.c projects/em_mq/sys/conf/NOTES projects/em_mq/sys/conf/files projects/em_mq/sys/conf/files.arm projects/em_mq/sys/conf/files.arm64 projects/em_mq/sys/conf/files.powerpc projects/em_mq/sys/conf/options projects/em_mq/sys/conf/options.arm projects/em_mq/sys/contrib/dev/acpica/changes.txt projects/em_mq/sys/contrib/dev/acpica/common/adisasm.c projects/em_mq/sys/contrib/dev/acpica/common/ahpredef.c projects/em_mq/sys/contrib/dev/acpica/common/dmextern.c projects/em_mq/sys/contrib/dev/acpica/common/dmtable.c projects/em_mq/sys/contrib/dev/acpica/common/dmtbdump.c projects/em_mq/sys/contrib/dev/acpica/common/dmtbinfo.c projects/em_mq/sys/contrib/dev/acpica/compiler/aslascii.c projects/em_mq/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/em_mq/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/em_mq/sys/contrib/dev/acpica/compiler/asldefine.h projects/em_mq/sys/contrib/dev/acpica/compiler/aslfiles.c projects/em_mq/sys/contrib/dev/acpica/compiler/aslmessages.c projects/em_mq/sys/contrib/dev/acpica/compiler/aslmessages.h projects/em_mq/sys/contrib/dev/acpica/compiler/aslprepkg.c projects/em_mq/sys/contrib/dev/acpica/compiler/aslstartup.c projects/em_mq/sys/contrib/dev/acpica/compiler/aslutils.c projects/em_mq/sys/contrib/dev/acpica/compiler/dtcompile.c projects/em_mq/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/em_mq/sys/contrib/dev/acpica/compiler/dtio.c projects/em_mq/sys/contrib/dev/acpica/compiler/dtsubtable.c projects/em_mq/sys/contrib/dev/acpica/compiler/dttable.c projects/em_mq/sys/contrib/dev/acpica/compiler/dttemplate.c projects/em_mq/sys/contrib/dev/acpica/compiler/dttemplate.h projects/em_mq/sys/contrib/dev/acpica/compiler/dtutils.c projects/em_mq/sys/contrib/dev/acpica/compiler/preprocess.h projects/em_mq/sys/contrib/dev/acpica/compiler/prscan.c projects/em_mq/sys/contrib/dev/acpica/compiler/prutils.c projects/em_mq/sys/contrib/dev/acpica/components/debugger/dbfileio.c projects/em_mq/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/em_mq/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c projects/em_mq/sys/contrib/dev/acpica/components/hardware/hwpci.c projects/em_mq/sys/contrib/dev/acpica/components/namespace/nsprepkg.c projects/em_mq/sys/contrib/dev/acpica/components/namespace/nsrepair.c projects/em_mq/sys/contrib/dev/acpica/components/parser/psopinfo.c projects/em_mq/sys/contrib/dev/acpica/components/utilities/utfileio.c projects/em_mq/sys/contrib/dev/acpica/components/utilities/uthex.c projects/em_mq/sys/contrib/dev/acpica/components/utilities/utxferror.c projects/em_mq/sys/contrib/dev/acpica/include/acdebug.h projects/em_mq/sys/contrib/dev/acpica/include/acdisasm.h projects/em_mq/sys/contrib/dev/acpica/include/aclocal.h projects/em_mq/sys/contrib/dev/acpica/include/acparser.h projects/em_mq/sys/contrib/dev/acpica/include/acpixf.h projects/em_mq/sys/contrib/dev/acpica/include/acpredef.h projects/em_mq/sys/contrib/dev/acpica/include/actbl.h projects/em_mq/sys/contrib/dev/acpica/include/actbl1.h projects/em_mq/sys/contrib/dev/acpica/include/actbl2.h projects/em_mq/sys/contrib/dev/acpica/include/actbl3.h projects/em_mq/sys/contrib/dev/acpica/include/actypes.h projects/em_mq/sys/contrib/dev/acpica/include/acutils.h projects/em_mq/sys/contrib/dev/acpica/include/platform/acenv.h projects/em_mq/sys/contrib/dev/acpica/include/platform/acenvex.h projects/em_mq/sys/ddb/db_access.c projects/em_mq/sys/ddb/db_access.h projects/em_mq/sys/ddb/db_break.c projects/em_mq/sys/ddb/db_capture.c projects/em_mq/sys/ddb/db_command.c projects/em_mq/sys/ddb/db_examine.c projects/em_mq/sys/ddb/db_expr.c projects/em_mq/sys/ddb/db_input.c projects/em_mq/sys/ddb/db_main.c projects/em_mq/sys/ddb/db_print.c projects/em_mq/sys/ddb/db_ps.c projects/em_mq/sys/ddb/db_run.c projects/em_mq/sys/ddb/db_script.c projects/em_mq/sys/ddb/db_sym.c projects/em_mq/sys/ddb/db_sym.h projects/em_mq/sys/ddb/db_textdump.c projects/em_mq/sys/ddb/db_thread.c projects/em_mq/sys/ddb/db_variables.c projects/em_mq/sys/ddb/db_watch.c projects/em_mq/sys/ddb/db_write_cmd.c projects/em_mq/sys/ddb/ddb.h projects/em_mq/sys/dev/acpi_support/acpi_ibm.c projects/em_mq/sys/dev/acpica/acpi_cpu.c projects/em_mq/sys/dev/acpica/acpi_package.c projects/em_mq/sys/dev/acpica/acpi_throttle.c projects/em_mq/sys/dev/acpica/acpivar.h projects/em_mq/sys/dev/atkbdc/psm.c projects/em_mq/sys/dev/bxe/bxe.c projects/em_mq/sys/dev/bxe/bxe_stats.c projects/em_mq/sys/dev/bxe/bxe_stats.h projects/em_mq/sys/dev/e1000/if_em.c projects/em_mq/sys/dev/fdt/fdt_common.c projects/em_mq/sys/dev/fdt/fdt_common.h projects/em_mq/sys/dev/fdt/simplebus.c projects/em_mq/sys/dev/gpio/ofw_gpiobus.c projects/em_mq/sys/dev/hwpmc/hwpmc_amd.c projects/em_mq/sys/dev/hwpmc/hwpmc_armv7.c projects/em_mq/sys/dev/hwpmc/hwpmc_core.c projects/em_mq/sys/dev/hwpmc/hwpmc_e500.c projects/em_mq/sys/dev/hwpmc/hwpmc_intel.c projects/em_mq/sys/dev/hwpmc/hwpmc_logging.c projects/em_mq/sys/dev/hwpmc/hwpmc_mips.c projects/em_mq/sys/dev/hwpmc/hwpmc_mips24k.c projects/em_mq/sys/dev/hwpmc/hwpmc_mips74k.c projects/em_mq/sys/dev/hwpmc/hwpmc_mod.c projects/em_mq/sys/dev/hwpmc/hwpmc_mpc7xxx.c projects/em_mq/sys/dev/hwpmc/hwpmc_octeon.c projects/em_mq/sys/dev/hwpmc/hwpmc_piv.c projects/em_mq/sys/dev/hwpmc/hwpmc_ppc970.c projects/em_mq/sys/dev/hwpmc/hwpmc_ppro.c projects/em_mq/sys/dev/hwpmc/hwpmc_soft.c projects/em_mq/sys/dev/hwpmc/hwpmc_tsc.c projects/em_mq/sys/dev/hwpmc/hwpmc_uncore.c projects/em_mq/sys/dev/hwpmc/hwpmc_xscale.c projects/em_mq/sys/dev/hwpmc/pmc_events.h projects/em_mq/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/em_mq/sys/dev/hyperv/storvsc/hv_vstorage.h projects/em_mq/sys/dev/if_ndis/if_ndis.c projects/em_mq/sys/dev/iicbus/iicbus.c projects/em_mq/sys/dev/iicbus/iicbus.h projects/em_mq/sys/dev/iscsi/icl_soft.c projects/em_mq/sys/dev/iwn/if_iwn.c projects/em_mq/sys/dev/ixl/if_ixlv.c projects/em_mq/sys/dev/mmc/mmc.c projects/em_mq/sys/dev/netmap/netmap_mem2.c projects/em_mq/sys/dev/ofw/ofw_bus_subr.c projects/em_mq/sys/dev/ofw/ofw_bus_subr.h projects/em_mq/sys/dev/ofw/ofw_iicbus.c projects/em_mq/sys/dev/pci/pci_pci.c projects/em_mq/sys/dev/pci/pcib_private.h projects/em_mq/sys/dev/sdhci/sdhci.c projects/em_mq/sys/dev/sdhci/sdhci.h projects/em_mq/sys/dev/sfxge/sfxge.c projects/em_mq/sys/dev/sfxge/sfxge_port.c projects/em_mq/sys/dev/sfxge/sfxge_rx.c projects/em_mq/sys/dev/sfxge/sfxge_tx.c projects/em_mq/sys/dev/sfxge/sfxge_tx.h projects/em_mq/sys/dev/sound/pci/hda/hdaa.c projects/em_mq/sys/dev/sound/pcm/channel.c projects/em_mq/sys/dev/sound/pcm/channel.h projects/em_mq/sys/dev/sound/pcm/feeder_chain.c projects/em_mq/sys/dev/sound/pcm/sound.h projects/em_mq/sys/dev/sound/usb/uaudio.c projects/em_mq/sys/dev/uart/uart_dev_ti8250.c projects/em_mq/sys/dev/usb/controller/dwc_otg.c projects/em_mq/sys/dev/usb/controller/dwc_otg.h projects/em_mq/sys/dev/usb/quirk/usb_quirk.c projects/em_mq/sys/dev/usb/quirk/usb_quirk.h projects/em_mq/sys/dev/usb/usb_device.c projects/em_mq/sys/dev/usb/usb_msctest.c projects/em_mq/sys/dev/usb/usb_msctest.h projects/em_mq/sys/dev/usb/usbdevs projects/em_mq/sys/dev/usb/video/udl.c projects/em_mq/sys/dev/usb/wlan/if_urtwn.c projects/em_mq/sys/dev/usb/wlan/if_urtwnreg.h projects/em_mq/sys/dev/vt/vt.h projects/em_mq/sys/dev/vt/vt_core.c projects/em_mq/sys/dev/xen/blkback/blkback.c projects/em_mq/sys/dev/xen/grant_table/grant_table.c projects/em_mq/sys/dev/xen/netback/netback.c projects/em_mq/sys/dev/xen/netfront/netfront.c projects/em_mq/sys/dev/xen/privcmd/privcmd.c projects/em_mq/sys/fs/nfsclient/nfs_clbio.c projects/em_mq/sys/fs/nfsclient/nfs_clvnops.c projects/em_mq/sys/fs/procfs/procfs_ctl.c projects/em_mq/sys/geom/uncompress/g_uncompress.c projects/em_mq/sys/i386/acpica/acpi_machdep.c projects/em_mq/sys/i386/conf/GENERIC projects/em_mq/sys/i386/i386/db_disasm.c projects/em_mq/sys/i386/ibcs2/ibcs2_misc.c projects/em_mq/sys/i386/include/md_var.h projects/em_mq/sys/i386/linux/linux_machdep.c projects/em_mq/sys/kern/init_main.c projects/em_mq/sys/kern/kern_cpuset.c projects/em_mq/sys/kern/kern_descrip.c projects/em_mq/sys/kern/kern_exec.c projects/em_mq/sys/kern/kern_exit.c projects/em_mq/sys/kern/kern_fork.c projects/em_mq/sys/kern/kern_ktr.c projects/em_mq/sys/kern/kern_malloc.c projects/em_mq/sys/kern/kern_racct.c projects/em_mq/sys/kern/kern_shutdown.c projects/em_mq/sys/kern/kern_thread.c projects/em_mq/sys/kern/subr_nvlist.c projects/em_mq/sys/kern/subr_nvpair.c projects/em_mq/sys/kern/subr_turnstile.c projects/em_mq/sys/kern/subr_witness.c projects/em_mq/sys/kern/uipc_mbuf.c projects/em_mq/sys/kern/vfs_syscalls.c projects/em_mq/sys/mips/atheros/files.ar71xx projects/em_mq/sys/mips/beri/beri_simplebus.c projects/em_mq/sys/mips/conf/AP135 projects/em_mq/sys/mips/conf/AP135.hints projects/em_mq/sys/mips/conf/QCA955X_BASE projects/em_mq/sys/mips/conf/ROUTERSTATION projects/em_mq/sys/mips/conf/RSPRO projects/em_mq/sys/mips/include/intr_machdep.h projects/em_mq/sys/mips/mips/db_disasm.c projects/em_mq/sys/mips/mips/pmap.c projects/em_mq/sys/mips/mips/vm_machdep.c projects/em_mq/sys/modules/Makefile projects/em_mq/sys/net/if_bridge.c projects/em_mq/sys/net/if_gif.c projects/em_mq/sys/net/if_gif.h projects/em_mq/sys/net/if_gre.c projects/em_mq/sys/net/if_me.c projects/em_mq/sys/net/sff8436.h projects/em_mq/sys/net/sff8472.h projects/em_mq/sys/net80211/ieee80211.h projects/em_mq/sys/net80211/ieee80211_adhoc.c projects/em_mq/sys/net80211/ieee80211_freebsd.c projects/em_mq/sys/net80211/ieee80211_hostap.c projects/em_mq/sys/net80211/ieee80211_ht.c projects/em_mq/sys/net80211/ieee80211_input.h projects/em_mq/sys/net80211/ieee80211_mesh.c projects/em_mq/sys/net80211/ieee80211_output.c projects/em_mq/sys/net80211/ieee80211_scan.c projects/em_mq/sys/net80211/ieee80211_scan.h projects/em_mq/sys/net80211/ieee80211_scan_sta.c projects/em_mq/sys/net80211/ieee80211_scan_sw.c projects/em_mq/sys/net80211/ieee80211_scan_sw.h projects/em_mq/sys/net80211/ieee80211_sta.c projects/em_mq/sys/net80211/ieee80211_wds.c projects/em_mq/sys/netinet/in_gif.c projects/em_mq/sys/netinet/sctp_input.c projects/em_mq/sys/netinet/tcp_hostcache.c projects/em_mq/sys/netinet/tcp_input.c projects/em_mq/sys/netinet6/in6_gif.c projects/em_mq/sys/netinet6/ip6_ipsec.c projects/em_mq/sys/netinet6/ip6_output.c projects/em_mq/sys/netinet6/nd6.h projects/em_mq/sys/netinet6/nd6_nbr.c projects/em_mq/sys/netipsec/esp.h projects/em_mq/sys/netipsec/key.c projects/em_mq/sys/netipsec/keysock.c projects/em_mq/sys/netpfil/ipfw/dn_sched.h projects/em_mq/sys/netpfil/ipfw/ip_dn_private.h projects/em_mq/sys/netpfil/ipfw/ip_fw2.c projects/em_mq/sys/netpfil/ipfw/ip_fw_pfil.c projects/em_mq/sys/netpfil/ipfw/ip_fw_sockopt.c projects/em_mq/sys/netpfil/ipfw/ip_fw_table_value.c projects/em_mq/sys/netpfil/pf/pf.c projects/em_mq/sys/netpfil/pf/pf_if.c projects/em_mq/sys/netpfil/pf/pf_ioctl.c projects/em_mq/sys/netpfil/pf/pf_norm.c projects/em_mq/sys/ofed/drivers/net/mlx4/en_netdev.c projects/em_mq/sys/ofed/include/linux/bitops.h projects/em_mq/sys/ofed/include/linux/jiffies.h projects/em_mq/sys/pc98/conf/GENERIC projects/em_mq/sys/powerpc/conf/GENERIC projects/em_mq/sys/powerpc/mpc85xx/pci_mpc85xx.c projects/em_mq/sys/powerpc/ofw/ofw_pcibus.c projects/em_mq/sys/powerpc/powerpc/db_disasm.c projects/em_mq/sys/powerpc/pseries/vdevice.c projects/em_mq/sys/sparc64/conf/GENERIC projects/em_mq/sys/sparc64/sparc64/db_disasm.c projects/em_mq/sys/sys/cdefs.h projects/em_mq/sys/sys/elf_common.h projects/em_mq/sys/sys/imgact.h projects/em_mq/sys/sys/ktr.h projects/em_mq/sys/sys/malloc.h projects/em_mq/sys/sys/module.h projects/em_mq/sys/sys/mouse.h projects/em_mq/sys/sys/nvpair_impl.h projects/em_mq/sys/sys/param.h projects/em_mq/sys/sys/pmc.h projects/em_mq/sys/sys/proc.h projects/em_mq/sys/sys/sockio.h projects/em_mq/sys/sys/systm.h projects/em_mq/sys/vm/default_pager.c projects/em_mq/sys/vm/device_pager.c projects/em_mq/sys/vm/phys_pager.c projects/em_mq/sys/vm/sg_pager.c projects/em_mq/sys/vm/swap_pager.c projects/em_mq/sys/vm/uma.h projects/em_mq/sys/vm/uma_core.c projects/em_mq/sys/vm/vm_meter.c projects/em_mq/sys/vm/vm_object.c projects/em_mq/sys/vm/vm_page.c projects/em_mq/sys/vm/vm_pageout.c projects/em_mq/sys/vm/vm_phys.c projects/em_mq/sys/vm/vm_phys.h projects/em_mq/sys/vm/vnode_pager.c projects/em_mq/sys/x86/acpica/srat.c projects/em_mq/sys/x86/include/acpica_machdep.h (contents, props changed) projects/em_mq/sys/x86/include/specialreg.h projects/em_mq/sys/x86/x86/cpu_machdep.c projects/em_mq/sys/x86/xen/xen_apic.c projects/em_mq/sys/x86/xen/xenpv.c projects/em_mq/sys/xen/xen-os.h projects/em_mq/tests/Makefile projects/em_mq/tests/sys/kern/Makefile projects/em_mq/tools/bsdbox/Makefile.base projects/em_mq/tools/build/Makefile projects/em_mq/tools/build/mk/OptionalObsoleteFiles.inc projects/em_mq/tools/regression/p1003_1b/main.c projects/em_mq/tools/regression/p1003_1b/prutil.c projects/em_mq/tools/tools/ath/athaggrstats/Makefile projects/em_mq/tools/tools/ath/athstats/Makefile projects/em_mq/tools/tools/mwl/mwlstats/Makefile projects/em_mq/tools/tools/net80211/wlanstats/Makefile projects/em_mq/tools/tools/npe/npestats/Makefile projects/em_mq/usr.bin/Makefile projects/em_mq/usr.bin/bmake/Makefile projects/em_mq/usr.bin/bmake/unit-tests/Makefile projects/em_mq/usr.bin/checknr/checknr.c projects/em_mq/usr.bin/col/col.1 projects/em_mq/usr.bin/col/col.c projects/em_mq/usr.bin/ctlstat/ctlstat.8 projects/em_mq/usr.bin/elfdump/elfdump.c projects/em_mq/usr.bin/m4/extern.h projects/em_mq/usr.bin/m4/gnum4.c projects/em_mq/usr.bin/m4/look.c projects/em_mq/usr.bin/m4/m4.1 projects/em_mq/usr.bin/m4/main.c projects/em_mq/usr.bin/m4/mdef.h projects/em_mq/usr.bin/m4/misc.c projects/em_mq/usr.bin/m4/parser.y projects/em_mq/usr.bin/man/man.sh projects/em_mq/usr.bin/mandoc/Makefile projects/em_mq/usr.bin/netstat/if.c projects/em_mq/usr.bin/netstat/route.c projects/em_mq/usr.bin/procstat/procstat.1 projects/em_mq/usr.bin/rctl/rctl.8 projects/em_mq/usr.bin/soelim/soelim.1 projects/em_mq/usr.bin/soelim/soelim.c projects/em_mq/usr.bin/ssh-copy-id/ssh-copy-id.sh projects/em_mq/usr.bin/tar/Makefile projects/em_mq/usr.bin/time/time.c projects/em_mq/usr.bin/vtfontcvt/vtfontcvt.c projects/em_mq/usr.bin/whois/whois.1 projects/em_mq/usr.bin/whois/whois.c projects/em_mq/usr.sbin/acpi/acpidb/acpidb.c projects/em_mq/usr.sbin/acpi/iasl/Makefile projects/em_mq/usr.sbin/bhyve/bhyve.8 projects/em_mq/usr.sbin/bhyve/block_if.c projects/em_mq/usr.sbin/bhyve/inout.c projects/em_mq/usr.sbin/bhyve/pci_ahci.c projects/em_mq/usr.sbin/bhyve/pci_hostbridge.c projects/em_mq/usr.sbin/bhyve/pci_virtio_block.c projects/em_mq/usr.sbin/bhyve/pci_virtio_net.c projects/em_mq/usr.sbin/bhyve/pci_virtio_rnd.c projects/em_mq/usr.sbin/bhyve/task_switch.c projects/em_mq/usr.sbin/bhyve/virtio.c projects/em_mq/usr.sbin/bhyvectl/bhyvectl.c projects/em_mq/usr.sbin/bhyveload/bhyveload.c projects/em_mq/usr.sbin/bluetooth/bthidd/Makefile projects/em_mq/usr.sbin/bsdinstall/scripts/zfsboot projects/em_mq/usr.sbin/crunch/crunchide/exec_elf32.c projects/em_mq/usr.sbin/ctladm/ctladm.8 projects/em_mq/usr.sbin/ctld/ctld.8 projects/em_mq/usr.sbin/iostat/iostat.8 projects/em_mq/usr.sbin/kbdmap/kbdmap.c projects/em_mq/usr.sbin/mountd/mountd.c projects/em_mq/usr.sbin/pmcstat/pmcstat.8 projects/em_mq/usr.sbin/pmcstat/pmcstat.c projects/em_mq/usr.sbin/pmcstat/pmcstat_log.c projects/em_mq/usr.sbin/pw/Makefile projects/em_mq/usr.sbin/pw/fileupd.c projects/em_mq/usr.sbin/pw/grupd.c projects/em_mq/usr.sbin/pw/pw_conf.c projects/em_mq/usr.sbin/pw/pw_nis.c projects/em_mq/usr.sbin/pw/pw_user.c projects/em_mq/usr.sbin/pw/pwupd.c projects/em_mq/usr.sbin/pw/pwupd.h projects/em_mq/usr.sbin/syslogd/pathnames.h projects/em_mq/usr.sbin/uefisign/pe.c Directory Properties: projects/em_mq/ (props changed) projects/em_mq/cddl/ (props changed) projects/em_mq/cddl/contrib/opensolaris/ (props changed) projects/em_mq/contrib/atf/ (props changed) projects/em_mq/contrib/bmake/ (props changed) projects/em_mq/contrib/elftoolchain/ (props changed) projects/em_mq/contrib/gcc/ (props changed) projects/em_mq/contrib/gdb/ (props changed) projects/em_mq/contrib/libarchive/ (props changed) projects/em_mq/contrib/libarchive/libarchive/ (props changed) projects/em_mq/contrib/netcat/ (props changed) projects/em_mq/contrib/tzdata/ (props changed) projects/em_mq/etc/ (props changed) projects/em_mq/gnu/lib/ (props changed) projects/em_mq/include/ (props changed) projects/em_mq/lib/libc/ (props changed) projects/em_mq/lib/libvmmapi/ (props changed) projects/em_mq/sbin/ (props changed) projects/em_mq/sbin/ipfw/ (props changed) projects/em_mq/share/ (props changed) projects/em_mq/share/man/man4/ (props changed) projects/em_mq/sys/ (props changed) projects/em_mq/sys/amd64/vmm/ (props changed) projects/em_mq/sys/boot/ (props changed) projects/em_mq/sys/cddl/contrib/opensolaris/ (props changed) projects/em_mq/sys/conf/ (props changed) projects/em_mq/sys/contrib/dev/acpica/ (props changed) projects/em_mq/sys/dev/hyperv/ (props changed) projects/em_mq/sys/dev/ixl/i40e_adminq.c (props changed) projects/em_mq/sys/dev/ixl/i40e_adminq.h (props changed) projects/em_mq/sys/dev/ixl/i40e_adminq_cmd.h (props changed) projects/em_mq/sys/dev/ixl/i40e_alloc.h (props changed) projects/em_mq/sys/dev/ixl/i40e_common.c (props changed) projects/em_mq/sys/dev/ixl/i40e_hmc.c (props changed) projects/em_mq/sys/dev/ixl/i40e_hmc.h (props changed) projects/em_mq/sys/dev/ixl/i40e_lan_hmc.c (props changed) projects/em_mq/sys/dev/ixl/i40e_lan_hmc.h (props changed) projects/em_mq/sys/dev/ixl/i40e_nvm.c (props changed) projects/em_mq/sys/dev/ixl/i40e_osdep.c (props changed) projects/em_mq/sys/dev/ixl/i40e_osdep.h (props changed) projects/em_mq/sys/dev/ixl/i40e_prototype.h (props changed) projects/em_mq/sys/dev/ixl/i40e_register.h (props changed) projects/em_mq/sys/dev/ixl/i40e_status.h (props changed) projects/em_mq/sys/dev/ixl/i40e_type.h (props changed) projects/em_mq/sys/dev/ixl/i40e_virtchnl.h (props changed) projects/em_mq/sys/dev/ixl/if_ixl.c (props changed) projects/em_mq/sys/dev/ixl/ixl_txrx.c (props changed) projects/em_mq/usr.bin/procstat/ (props changed) projects/em_mq/usr.sbin/bhyve/ (props changed) projects/em_mq/usr.sbin/bhyvectl/ (props changed) projects/em_mq/usr.sbin/bhyveload/ (props changed) Modified: projects/em_mq/Makefile.inc1 ============================================================================== --- projects/em_mq/Makefile.inc1 Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/Makefile.inc1 Fri May 22 17:06:33 2015 (r283292) @@ -1297,7 +1297,9 @@ _cat= bin/cat _lex= usr.bin/lex .endif -.if ${BOOTSTRAPPING} < 1001507 +# r277259 crunchide: Correct 64-bit section header offset +# r281674 crunchide: always include both 32- and 64-bit ELF support +.if ${BOOTSTRAPPING} < 1100071 _crunch= usr.sbin/crunch .endif @@ -1361,6 +1363,9 @@ _kerberos5_bootstrap_tools= \ .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g} .endif +# Rebuild up-to-date libmd for xinstall +${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd + bootstrap-tools: .PHONY # Please document (add comment) why something is in 'bootstrap-tools'. @@ -1463,11 +1468,6 @@ kernel-tools: .MAKE _btxld= usr.sbin/btxld .endif .endif -.if ${TARGET_ARCH} != ${MACHINE_ARCH} -.if ${MK_RESCUE} != "no" -_crunchide= usr.sbin/crunch/crunchide -.endif -.endif # If we're given an XAS, don't build binutils. .if ${XAS:M/*} == "" @@ -1502,6 +1502,9 @@ _clang_libs= lib/clang _cc= gnu/usr.bin/cc .endif .endif +.if ${MK_USB} != "no" +_usb_tools= sys/boot/usb/tools +.endif cross-tools: .MAKE .for _tool in \ @@ -1512,7 +1515,7 @@ cross-tools: .MAKE ${_cc} \ ${_btxld} \ ${_crunchide} \ - sys/boot/usb/tools + ${_usb_tools} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${MAKE} DIRPRFX=${_tool}/ obj && \ @@ -1657,13 +1660,7 @@ _prereq_libs= gnu/lib/libssp/libssp_nons # all shared libraries for ELF. # _startup_libs= gnu/lib/csu -.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) -_startup_libs+= lib/csu/${MACHINE_ARCH}-elf -.elif exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}) -_startup_libs+= lib/csu/${MACHINE_ARCH} -.else -_startup_libs+= lib/csu/${MACHINE_CPUARCH} -.endif +_startup_libs+= lib/csu _startup_libs+= gnu/lib/libgcc _startup_libs+= lib/libcompiler_rt _startup_libs+= lib/libc @@ -1682,7 +1679,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_kerberos5_lib_libhdb} \ ${_kerberos5_lib_libheimbase} \ ${_kerberos5_lib_libheimntlm} \ - ${_kerberos5_lib_libheimsqlite} \ + ${_libsqlite3} \ ${_kerberos5_lib_libheimipcc} \ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ @@ -1758,6 +1755,13 @@ _cddl_lib= cddl/lib cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L cddl/lib/libzfs__L: lib/libgeom__L cddl/lib/libctf__L: lib/libz__L +# cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built +# on select architectures though (see cddl/lib/Makefile) +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ + ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \ + ${MACHINE_CPUARCH} == "arm" +_prebuild_libs+= lib/libproc lib/librtld_db +.endif .endif .if ${MK_CRYPT} != "no" @@ -1789,7 +1793,7 @@ _secure_lib= secure/lib kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L \ - kerberos5/lib/libwind__L kerberos5/lib/libheimsqlite__L + kerberos5/lib/libwind__L lib/libsqlite3__L kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libroken__L lib/libcom_err__L kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ @@ -1802,7 +1806,7 @@ kerberos5/lib/libroken__L: lib/libcrypt_ kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L kerberos5/lib/libheimbase__L: lib/libthr__L kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L -kerberos5/lib/libheimsqlite__L: lib/libthr__L +lib/libsqlite3__L: lib/libthr__L .endif .if ${MK_GSSAPI} != "no" @@ -1818,7 +1822,7 @@ _kerberos5_lib_libkrb5= kerberos5/lib/li _kerberos5_lib_libhx509= kerberos5/lib/libhx509 _kerberos5_lib_libroken= kerberos5/lib/libroken _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm -_kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite +_libsqlite3= lib/libsqlite3 _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc _kerberos5_lib_libwind= kerberos5/lib/libwind _libcom_err= lib/libcom_err @@ -1832,6 +1836,16 @@ _lib_libypclnt= lib/libypclnt lib/libradius__L: lib/libmd__L .endif +lib/libproc__L: \ + ${_cddl_lib_libctf:D${_cddl_lib_libctf}__L} lib/libelf__L lib/librtld_db__L lib/libutil__L +.if ${MK_CXX} != "no" +.if ${MK_LIBCPLUSPLUS} != "no" +lib/libproc__L: lib/libcxxrt__L +.else # This implies MK_GNUCXX != "no"; see lib/libproc +lib/libproc__L: gnu/lib/libsupc++__L +.endif +.endif + gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L .for _lib in ${_prereq_libs} Modified: projects/em_mq/ObsoleteFiles.inc ============================================================================== --- projects/em_mq/ObsoleteFiles.inc Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/ObsoleteFiles.inc Fri May 22 17:06:33 2015 (r283292) @@ -38,6 +38,22 @@ # xargs -n1 | sort | uniq -d; # done +# 20150521 +OLD_FILES+=usr/bin/demandoc +OLD_FILES+=usr/share/man/man1/demandoc.1.gz +OLD_FILES+=usr/share/man/man3/mandoc.3.gz +OLD_FILES+=usr/share/man/man3/mandoc_headers.3.gz +# 20150520 +OLD_FILES+=usr/lib/libheimsqlite.a +OLD_FILES+=usr/lib/libheimsqlite.so +OLD_LIBS+=usr/lib/libheimsqlite.so.11 +OLD_FILES+=usr/lib/libheimsqlite_p.a +OLD_FILES+=usr/lib32/libheimsqlite.a +OLD_FILES+=usr/lib32/libheimsqlite.so +OLD_LIBS+=usr/lib32/libheimsqlite.so.11 +OLD_FILES+=usr/lib32/libheimsqlite_p.a +# 20150506 +OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz # 20150504 OLD_LIBS+=usr/lib32/private/libatf-c++.so.2 OLD_LIBS+=usr/lib32/private/libbsdstat.so.1 @@ -430,10 +446,6 @@ OLD_FILES+=usr/lib/debug/usr/lib32/i18n OLD_FILES+=usr/lib/debug/usr/lib32/private # 20141015: OpenSSL 1.0.1j import OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz -.if ${MK_GCC} == "no" -# 20141009: gperf disabled by default -OLD_FILES+=usr/bin/gperf -.endif # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz @@ -450,6 +462,33 @@ OLD_LIBS+=usr/lib32/libopie.so.7 OLD_FILES+=usr/bin/otp-sha OLD_FILES+=usr/share/man/man1/otp-sha.1.gz # 20140807: Remove private lib files that should not be installed. +OLD_FILES+=usr/lib32/private/libatf-c.a +OLD_FILES+=usr/lib32/private/libatf-c.so +OLD_FILES+=usr/lib32/private/libatf-c_p.a +OLD_FILES+=usr/lib32/private/libatf-c++.a +OLD_FILES+=usr/lib32/private/libatf-c++.so +OLD_FILES+=usr/lib32/private/libatf-c++_p.a +OLD_FILES+=usr/lib32/private/libbsdstat.a +OLD_FILES+=usr/lib32/private/libbsdstat.so +OLD_FILES+=usr/lib32/private/libbsdstat_p.a +OLD_FILES+=usr/lib32/private/libheimipcc.a +OLD_FILES+=usr/lib32/private/libheimipcc.so +OLD_FILES+=usr/lib32/private/libheimipcc_p.a +OLD_FILES+=usr/lib32/private/libheimipcs.a +OLD_FILES+=usr/lib32/private/libheimipcs.so +OLD_FILES+=usr/lib32/private/libheimipcs_p.a +OLD_FILES+=usr/lib32/private/libldns.a +OLD_FILES+=usr/lib32/private/libldns.so +OLD_FILES+=usr/lib32/private/libldns_p.a +OLD_FILES+=usr/lib32/private/libssh.a +OLD_FILES+=usr/lib32/private/libssh.so +OLD_FILES+=usr/lib32/private/libssh_p.a +OLD_FILES+=usr/lib32/private/libunbound.a +OLD_FILES+=usr/lib32/private/libunbound.so +OLD_FILES+=usr/lib32/private/libunbound_p.a +OLD_FILES+=usr/lib32/private/libucl.a +OLD_FILES+=usr/lib32/private/libucl.so +OLD_FILES+=usr/lib32/private/libucl_p.a OLD_FILES+=usr/lib/private/libatf-c.a OLD_FILES+=usr/lib/private/libatf-c.so OLD_FILES+=usr/lib/private/libatf-c_p.a @@ -470,7 +509,7 @@ OLD_FILES+=usr/lib/private/libldns.so OLD_FILES+=usr/lib/private/libldns_p.a OLD_FILES+=usr/lib/private/libssh.a OLD_FILES+=usr/lib/private/libssh.so -OLD_FILES+=usr/lib/private/libssh.p.a +OLD_FILES+=usr/lib/private/libssh_p.a OLD_FILES+=usr/lib/private/libunbound.a OLD_FILES+=usr/lib/private/libunbound.so OLD_FILES+=usr/lib/private/libunbound_p.a @@ -622,8 +661,12 @@ OLD_FILES+=usr/libexec/bsdconfig/070.use # 20140223: Remove libyaml OLD_FILES+=usr/lib/private/libyaml.a OLD_FILES+=usr/lib/private/libyaml.so -OLD_FILES+=usr/lib/private/libyaml.so.1 +OLD_LIBS+=usr/lib/private/libyaml.so.1 OLD_FILES+=usr/lib/private/libyaml_p.a +OLD_FILES+=usr/lib32/private/libyaml.a +OLD_FILES+=usr/lib32/private/libyaml.so +OLD_LIBS+=usr/lib32/private/libyaml.so.1 +OLD_FILES+=usr/lib32/private/libyaml_p.a # 20140216: new clang import which bumps version from 3.3 to 3.4. OLD_FILES+=usr/bin/llvm-prof OLD_FILES+=usr/bin/llvm-ranlib Modified: projects/em_mq/UPDATING ============================================================================== --- projects/em_mq/UPDATING Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/UPDATING Fri May 22 17:06:33 2015 (r283292) @@ -31,6 +31,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150521: + TI platform code switched to using vendor DTS files and this update + may break existing systems running on Beaglebone, Beaglebone Black, + and Pandaboard: + + - dtb files should be regenerated/reinstalled. Filenames are the + same but content is different now + - GPIO addressing was changed, now each GPIO bank (32 pins per bank) + has its own /dev/gpiocX device, e.g. pin 121 on /dev/gpioc0 in old + addressing scheme is now pin 25 on /dev/gpioc3. + - Pandaboard: /etc/ttys should be updated, serial console device is + now /dev/ttyu2, not /dev/ttyu0 + 20150501: soelim(1) from gnu/usr.bin/groff has been replaced by usr.bin/soelim. If you need the GNU extension from groff soelim(1), install groff Modified: projects/em_mq/bin/date/date.1 ============================================================================== --- projects/em_mq/bin/date/date.1 Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/bin/date/date.1 Fri May 22 17:06:33 2015 (r283292) @@ -32,7 +32,7 @@ .\" @(#)date.1 8.3 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd April 26, 2014 +.Dd May 7, 2015 .Dt DATE 1 .Os .Sh NAME @@ -41,7 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl jRu -.Op Fl r Ar seconds +.Op Fl r Ar seconds | Ar filename .Oo .Fl v .Sm off @@ -150,6 +150,9 @@ is the number of seconds since the Epoch see .Xr time 3 ) , and can be specified in decimal, octal, or hex. +.It Fl r Ar filename +Print the date and time of the last modification of +.Ar filename . .It Fl t Ar minutes_west Set the system's value for minutes west of .Tn GMT . Modified: projects/em_mq/bin/date/date.c ============================================================================== --- projects/em_mq/bin/date/date.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/bin/date/date.c Fri May 22 17:06:33 2015 (r283292) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -85,6 +86,7 @@ main(int argc, char *argv[]) struct vary *v; const struct vary *badv; struct tm lt; + struct stat sb; v = NULL; fmt = NULL; @@ -116,8 +118,12 @@ main(int argc, char *argv[]) case 'r': /* user specified seconds */ rflag = 1; tval = strtoq(optarg, &tmp, 0); - if (*tmp != 0) - usage(); + if (*tmp != 0) { + if (stat(optarg, &sb) == 0) + tval = sb.st_mtim.tv_sec; + else + usage(); + } break; case 't': /* minutes west of UTC */ /* error check; don't allow "PST" */ Modified: projects/em_mq/bin/pax/ar_subs.c ============================================================================== --- projects/em_mq/bin/pax/ar_subs.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/bin/pax/ar_subs.c Fri May 22 17:06:33 2015 (r283292) @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "pax.h" #include "extern.h" Modified: projects/em_mq/bin/pax/buf_subs.c ============================================================================== --- projects/em_mq/bin/pax/buf_subs.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/bin/pax/buf_subs.c Fri May 22 17:06:33 2015 (r283292) @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "pax.h" #include "extern.h" Modified: projects/em_mq/bin/pax/cache.c ============================================================================== --- projects/em_mq/bin/pax/cache.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/bin/pax/cache.c Fri May 22 17:06:33 2015 (r283292) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "pax.h" #include "cache.h" Modified: projects/em_mq/bin/pax/cpio.c ============================================================================== --- projects/em_mq/bin/pax/cpio.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/bin/pax/cpio.c Fri May 22 17:06:33 2015 (r283292) @@ -45,8 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include "pax.h" #include "cpio.h" #include "extern.h" Modified: projects/em_mq/bin/pax/file_subs.c ============================================================================== --- projects/em_mq/bin/pax/file_subs.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/bin/pax/file_subs.c Fri May 22 17:06:33 2015 (r283292) @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "pax.h" #include "options.h" #include "extern.h" Modified: projects/em_mq/bin/pax/gen_subs.c ============================================================================== --- projects/em_mq/bin/pax/gen_subs.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/bin/pax/gen_subs.c Fri May 22 17:06:33 2015 (r283292) @@ -45,8 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include #include "pax.h" #include "extern.h" Modified: projects/em_mq/bin/pax/getoldopt.c ============================================================================== --- projects/em_mq/bin/pax/getoldopt.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/bin/pax/getoldopt.c Fri May 22 17:06:33 2015 (r283292) @@ -19,8 +19,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include "pax.h" -#include "extern.h" +int getoldopt(int, char **, const char *); int getoldopt(int argc, char **argv, const char *optstring) Modified: projects/em_mq/bin/pax/pat_rep.c ============================================================================== --- projects/em_mq/bin/pax/pat_rep.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/bin/pax/pat_rep.c Fri May 22 17:06:33 2015 (r283292) @@ -43,9 +43,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include -#include #ifdef NET2_REGEX #include #else Modified: projects/em_mq/bin/pax/pax.c ============================================================================== --- projects/em_mq/bin/pax/pax.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/bin/pax/pax.c Fri May 22 17:06:33 2015 (r283292) @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "pax.h" #include "extern.h" static int gen_init(void); Modified: projects/em_mq/bin/pax/sel_subs.c ============================================================================== --- projects/em_mq/bin/pax/sel_subs.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/bin/pax/sel_subs.c Fri May 22 17:06:33 2015 (r283292) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "pax.h" #include "sel_subs.h" Modified: projects/em_mq/bin/pax/tar.c ============================================================================== --- projects/em_mq/bin/pax/tar.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/bin/pax/tar.c Fri May 22 17:06:33 2015 (r283292) @@ -44,8 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include "pax.h" #include "extern.h" #include "tar.h" Modified: projects/em_mq/bin/pax/tty_subs.c ============================================================================== --- projects/em_mq/bin/pax/tty_subs.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/bin/pax/tty_subs.c Fri May 22 17:06:33 2015 (r283292) @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "pax.h" #include "extern.h" Modified: projects/em_mq/cddl/contrib/opensolaris/common/ctf/ctf_create.c ============================================================================== --- projects/em_mq/cddl/contrib/opensolaris/common/ctf/ctf_create.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/contrib/opensolaris/common/ctf/ctf_create.c Fri May 22 17:06:33 2015 (r283292) @@ -1328,15 +1328,28 @@ ctf_add_type(ctf_file_t *dst_fp, ctf_fil * we are looking for. This is necessary to permit ctf_add_type() to * operate recursively on entities such as a struct that contains a * pointer member that refers to the same struct type. + * + * In the case of integer and floating point types, we match using the + * type encoding as well - else we may incorrectly return a bitfield + * type, for instance. */ if (dst_type == CTF_ERR && name[0] != '\0') { for (dtd = ctf_list_prev(&dst_fp->ctf_dtdefs); dtd != NULL && CTF_TYPE_TO_INDEX(dtd->dtd_type) > dst_fp->ctf_dtoldid; dtd = ctf_list_prev(dtd)) { - if (CTF_INFO_KIND(dtd->dtd_data.ctt_info) == kind && - dtd->dtd_name != NULL && - strcmp(dtd->dtd_name, name) == 0) - return (dtd->dtd_type); + if (CTF_INFO_KIND(dtd->dtd_data.ctt_info) != kind || + dtd->dtd_name == NULL || + strcmp(dtd->dtd_name, name) != 0) + continue; + if (kind == CTF_K_INTEGER || kind == CTF_K_FLOAT) { + if (ctf_type_encoding(src_fp, src_type, + &src_en) != 0) + continue; + if (bcmp(&src_en, &dtd->dtd_u.dtu_enc, + sizeof (ctf_encoding_t)) != 0) + continue; + } + return (dtd->dtd_type); } } Modified: projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l ============================================================================== --- projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l Fri May 22 17:06:33 2015 (r283292) @@ -743,6 +743,7 @@ yyinit(dt_pcb_t *pcb) #ifdef illumos yysptr = yysbuf; #endif + YY_FLUSH_BUFFER; } /* Modified: projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Fri May 22 17:06:33 2015 (r283292) @@ -1785,17 +1785,11 @@ dtrace_program_link(dtrace_hdl_t *dtp, d "failed to open %s: %s", file, strerror(errno))); } #else - if (dtp->dt_lazyload) { - if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0666)) < 0) - return (dt_link_error(dtp, NULL, -1, NULL, - "failed to open %s: %s", file, strerror(errno))); - } else { - snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file); - if ((fd = mkstemp(tfile)) == -1) - return (dt_link_error(dtp, NULL, -1, NULL, - "failed to create temporary file %s: %s", - tfile, strerror(errno))); - } + snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file); + if ((fd = mkostemp(tfile, O_CLOEXEC)) == -1) + return (dt_link_error(dtp, NULL, -1, NULL, + "failed to create temporary file %s: %s", + tfile, strerror(errno))); #endif /* @@ -1868,23 +1862,9 @@ dtrace_program_link(dtrace_hdl_t *dtp, d (void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file, fd, drti); #else const char *fmt = "%s -o %s -r %s %s"; + dt_dirpath_t *dp = dt_list_next(&dtp->dt_lib_path); -#if defined(__amd64__) - /* - * Arches which default to 64-bit need to explicitly use - * the 32-bit library path. - */ - int use_32 = (dtp->dt_oflags & DTRACE_O_ILP32); -#else - /* - * Arches which are 32-bit only just use the normal - * library path. - */ - int use_32 = 0; -#endif - - (void) snprintf(drti, sizeof (drti), "/usr/lib%s/dtrace/drti.o", - use_32 ? "32" : ""); + (void) snprintf(drti, sizeof (drti), "%s/drti.o", dp->dir_path); len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile, drti) + 1; @@ -1951,14 +1931,23 @@ dtrace_program_link(dtrace_hdl_t *dtp, d } #endif } else { +#ifdef __FreeBSD__ + if (rename(tfile, file) != 0) { + ret = dt_link_error(dtp, NULL, fd, NULL, + "failed to rename %s to %s: %s", tfile, file, + strerror(errno)); + goto done; + } +#endif (void) close(fd); } done: dtrace_dof_destroy(dtp, dof); -#ifndef illumos - unlink(tfile); +#ifdef __FreeBSD__ + if (!dtp->dt_lazyload) + (void) unlink(tfile); #endif return (ret); } Modified: projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Fri May 22 17:06:33 2015 (r283292) @@ -792,6 +792,7 @@ const char *_dtrace_libdir = "/usr/lib/d #ifdef illumos const char *_dtrace_provdir = "/dev/dtrace/provider"; /* provider directory */ #else +const char *_dtrace_libdir32 = "/usr/lib32/dtrace"; const char *_dtrace_provdir = "/dev/dtrace"; /* provider directory */ #endif @@ -1581,8 +1582,19 @@ alloc: * compile, and to provide better error reporting (because the full * reporting of compiler errors requires dtrace_open() to succeed). */ +#ifdef __FreeBSD__ +#ifdef __LP64__ + if ((dtp->dt_oflags & DTRACE_O_ILP32) != 0) { + if (dtrace_setopt(dtp, "libdir", _dtrace_libdir32) != 0) + return (set_open_errno(dtp, errp, dtp->dt_errno)); + } +#endif if (dtrace_setopt(dtp, "libdir", _dtrace_libdir) != 0) return (set_open_errno(dtp, errp, dtp->dt_errno)); +#else + if (dtrace_setopt(dtp, "libdir", _dtrace_libdir) != 0) + return (set_open_errno(dtp, errp, dtp->dt_errno)); +#endif return (dtp); } Modified: projects/em_mq/cddl/lib/Makefile ============================================================================== --- projects/em_mq/cddl/lib/Makefile Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/lib/Makefile Fri May 22 17:06:33 2015 (r283292) @@ -33,4 +33,11 @@ _drti= drti _libdtrace= libdtrace .endif +SUBDIR_DEPEND_libdtrace= libctf +SUBDIR_DEPEND_libzfs_core= libnvpair +SUBDIR_DEPEND_libzfs= libavl libnvpair libumem libuutil libzfs_core +SUBDIR_DEPEND_libzpool= libavl libnvpair libumem + +SUBDIR_PARALLEL= + .include Modified: projects/em_mq/cddl/lib/libdtrace/Makefile ============================================================================== --- projects/em_mq/cddl/lib/libdtrace/Makefile Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/lib/libdtrace/Makefile Fri May 22 17:06:33 2015 (r283292) @@ -50,6 +50,7 @@ DSRCS= errno.d \ io.d \ ip.d \ psinfo.d \ + siftr.d \ signal.d \ tcp.d \ udp.d \ @@ -103,6 +104,8 @@ LFLAGS+=-l YFLAGS+=-d +LIBADD= ctf elf proc pthread rtld_db + CLEANFILES= dt_errtags.c dt_names.c dt_errtags.c: Copied: projects/em_mq/cddl/lib/libdtrace/siftr.d (from r283290, head/cddl/lib/libdtrace/siftr.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/em_mq/cddl/lib/libdtrace/siftr.d Fri May 22 17:06:33 2015 (r283292, copy of r283290, head/cddl/lib/libdtrace/siftr.d) @@ -0,0 +1,100 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + * + * $FreeBSD$ + */ + +#pragma D depends_on module siftr +#pragma D depends_on provider tcp + +/* + * Convert a SIFTR direction value to a string + */ +#pragma D binding "1.12.1" SIFTR_IN +inline int SIFTR_IN = 1; +#pragma D binding "1.12.1" SIFTR_OUT +inline int SIFTR_OUT = 2; + +/* SIFTR direction strings. */ +#pragma D binding "1.12.1" siftr_dir_string +inline string siftr_dir_string[uint8_t direction] = + direction == SIFTR_IN ? "in" : + direction == SIFTR_OUT ? "out" : + "unknown" ; + +typedef struct siftrinfo { + struct timeval tval; + uint8_t direction; + uint8_t ipver; + uint32_t hash; + uint16_t tcp_localport; + uint16_t tcp_foreignport; + uint64_t snd_cwnd; + u_long snd_wnd; + u_long rcv_wnd; + u_long snd_bwnd; + u_long snd_ssthresh; + int conn_state; + u_int max_seg_size; + int smoothed_rtt; + u_char sack_enabled; + u_char snd_scale; + u_char rcv_scale; + u_int flags; + int rxt_length; + u_int snd_buf_hiwater; + u_int snd_buf_cc; + u_int rcv_buf_hiwater; + u_int rcv_buf_cc; + u_int sent_inflight_bytes; + int t_segqlen; + u_int flowid; + u_int flowtype; +} siftrinfo_t; + +#pragma D binding "1.12.1" translator +translator siftrinfo_t < struct pkt_node *p > { + direction = p == NULL ? 0 : p->direction; + ipver = p == NULL ? 0 : p->ipver; + hash = p == NULL ? 0 : p->hash; + tcp_localport = p == NULL ? 0 : ntohs(p->tcp_localport); + tcp_foreignport = p == NULL ? 0 : ntohs(p->tcp_foreignport); + snd_cwnd = p == NULL ? 0 : p->snd_cwnd; + snd_wnd = p == NULL ? 0 : p->snd_wnd; + rcv_wnd = p == NULL ? 0 : p->rcv_wnd; + snd_bwnd = p == NULL ? 0 : p->snd_bwnd; + snd_ssthresh = p == NULL ? 0 : p->snd_ssthresh; + conn_state = p == NULL ? 0 : p->conn_state; + max_seg_size = p == NULL ? 0 : p->max_seg_size; + smoothed_rtt = p == NULL ? 0 : p->smoothed_rtt; + sack_enabled = p == NULL ? 0 : p->sack_enabled; + snd_scale = p == NULL ? 0 : p->snd_scale; + rcv_scale = p == NULL ? 0 : p->rcv_scale; + flags = p == NULL ? 0 : p->flags; + rxt_length = p == NULL ? 0 : p->rxt_length; + snd_buf_hiwater = p == NULL ? 0 : p->snd_buf_hiwater; + snd_buf_cc = p == NULL ? 0 : p->snd_buf_cc; + rcv_buf_hiwater = p == NULL ? 0 : p->rcv_buf_hiwater; + rcv_buf_cc = p == NULL ? 0 : p->rcv_buf_cc; + sent_inflight_bytes = p == NULL ? 0 : p->sent_inflight_bytes; + t_segqlen = p == NULL ? 0 : p->t_segqlen; + flowid = p == NULL ? 0 : p->flowid; + flowtype = p == NULL ? 0 : p->flowtype; +}; Modified: projects/em_mq/cddl/lib/libdtrace/tcp.d ============================================================================== --- projects/em_mq/cddl/lib/libdtrace/tcp.d Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/lib/libdtrace/tcp.d Fri May 22 17:06:33 2015 (r283292) @@ -241,78 +241,3 @@ translator tcpinfoh_t < struct tcphdr *p translator tcplsinfo_t < int s > { tcps_state = s; }; - -/* - * Convert a SIFTR direction value to a string - */ -#pragma D binding "1.12.1" SIFTR_IN -inline int SIFTR_IN = 1; -#pragma D binding "1.12.1" SIFTR_OUT -inline int SIFTR_OUT = 2; - -/* SIFTR direction strings. */ -#pragma D binding "1.12.1" siftr_dir_string -inline string siftr_dir_string[uint8_t direction] = - direction == SIFTR_IN ? "in" : - direction == SIFTR_OUT ? "out" : - "unknown" ; - -typedef struct siftrinfo { - struct timeval tval; - uint8_t direction; - uint8_t ipver; - uint32_t hash; - uint16_t tcp_localport; - uint16_t tcp_foreignport; - uint64_t snd_cwnd; - u_long snd_wnd; - u_long rcv_wnd; - u_long snd_bwnd; - u_long snd_ssthresh; - int conn_state; - u_int max_seg_size; - int smoothed_rtt; - u_char sack_enabled; - u_char snd_scale; - u_char rcv_scale; - u_int flags; - int rxt_length; - u_int snd_buf_hiwater; - u_int snd_buf_cc; - u_int rcv_buf_hiwater; - u_int rcv_buf_cc; - u_int sent_inflight_bytes; - int t_segqlen; - u_int flowid; - u_int flowtype; -} siftrinfo_t; - -#pragma D binding "1.12.1" translator -translator siftrinfo_t < struct pkt_node *p > { - direction = p == NULL ? 0 : p->direction; - ipver = p == NULL ? 0 : p->ipver; - hash = p == NULL ? 0 : p->hash; - tcp_localport = p == NULL ? 0 : ntohs(p->tcp_localport); - tcp_foreignport = p == NULL ? 0 : ntohs(p->tcp_foreignport); - snd_cwnd = p == NULL ? 0 : p->snd_cwnd; - snd_wnd = p == NULL ? 0 : p->snd_wnd; - rcv_wnd = p == NULL ? 0 : p->rcv_wnd; - snd_bwnd = p == NULL ? 0 : p->snd_bwnd; - snd_ssthresh = p == NULL ? 0 : p->snd_ssthresh; - conn_state = p == NULL ? 0 : p->conn_state; - max_seg_size = p == NULL ? 0 : p->max_seg_size; - smoothed_rtt = p == NULL ? 0 : p->smoothed_rtt; - sack_enabled = p == NULL ? 0 : p->sack_enabled; - snd_scale = p == NULL ? 0 : p->snd_scale; - rcv_scale = p == NULL ? 0 : p->rcv_scale; - flags = p == NULL ? 0 : p->flags; - rxt_length = p == NULL ? 0 : p->rxt_length; - snd_buf_hiwater = p == NULL ? 0 : p->snd_buf_hiwater; - snd_buf_cc = p == NULL ? 0 : p->snd_buf_cc; - rcv_buf_hiwater = p == NULL ? 0 : p->rcv_buf_hiwater; - rcv_buf_cc = p == NULL ? 0 : p->rcv_buf_cc; - sent_inflight_bytes = p == NULL ? 0 : p->sent_inflight_bytes; - t_segqlen = p == NULL ? 0 : p->t_segqlen; - flowid = p == NULL ? 0 : p->flowid; - flowtype = p == NULL ? 0 : p->flowtype; -}; Modified: projects/em_mq/cddl/sbin/Makefile ============================================================================== --- projects/em_mq/cddl/sbin/Makefile Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/sbin/Makefile Fri May 22 17:06:33 2015 (r283292) @@ -13,4 +13,6 @@ _zfs= zfs _zpool= zpool .endif +SUBDIR_PARALLEL= + .include Modified: projects/em_mq/cddl/usr.bin/Makefile ============================================================================== --- projects/em_mq/cddl/usr.bin/Makefile Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/usr.bin/Makefile Fri May 22 17:06:33 2015 (r283292) @@ -26,4 +26,6 @@ _zstreamdump = zstreamdump .endif .endif +SUBDIR_PARALLEL= + .include Modified: projects/em_mq/cddl/usr.bin/ctfconvert/Makefile ============================================================================== --- projects/em_mq/cddl/usr.bin/ctfconvert/Makefile Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/usr.bin/ctfconvert/Makefile Fri May 22 17:06:33 2015 (r283292) @@ -3,8 +3,6 @@ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt -DEBUG_FLAGS= -g - PROG= ctfconvert SRCS= alist.c \ ctf.c \ @@ -36,7 +34,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -DPADD= ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} -LDADD= -ldwarf -lelf -lz -lpthread +LIBADD= dwarf elf z pthread .include Modified: projects/em_mq/cddl/usr.bin/ctfdump/Makefile ============================================================================== --- projects/em_mq/cddl/usr.bin/ctfdump/Makefile Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/usr.bin/ctfdump/Makefile Fri May 22 17:06:33 2015 (r283292) @@ -17,7 +17,6 @@ CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -DPADD= ${LIBPTHREAD} ${LIBELF} ${LIBZ} -LDADD= -lpthread -lelf -lz +LIBADD= elf z .include Modified: projects/em_mq/cddl/usr.sbin/Makefile ============================================================================== --- projects/em_mq/cddl/usr.sbin/Makefile Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/usr.sbin/Makefile Fri May 22 17:06:33 2015 (r283292) @@ -46,4 +46,6 @@ _dtruss= dtruss _lockstat= lockstat .endif +SUBDIR_PARALLEL= + .include Modified: projects/em_mq/cddl/usr.sbin/dtrace/Makefile ============================================================================== --- projects/em_mq/cddl/usr.sbin/dtrace/Makefile Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/usr.sbin/dtrace/Makefile Fri May 22 17:06:33 2015 (r283292) @@ -20,9 +20,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ #CFLAGS+= -DNEED_ERRLOC #YFLAGS+= -d -DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ - ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB} -LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lutil \ - -lrtld_db +LIBADD= dtrace .include Modified: projects/em_mq/cddl/usr.sbin/dtrace/tests/tools/exclude.sh ============================================================================== --- projects/em_mq/cddl/usr.sbin/dtrace/tests/tools/exclude.sh Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/usr.sbin/dtrace/tests/tools/exclude.sh Fri May 22 17:06:33 2015 (r283292) @@ -38,7 +38,6 @@ exclude EXFAIL common/ip/tst.ipv4localud exclude EXFAIL common/mdb/tst.dtracedcmd.ksh exclude EXFAIL common/misc/tst.dofmax.ksh exclude EXFAIL common/misc/tst.include.ksh -exclude EXFAIL common/pragma/tst.libchain.ksh exclude EXFAIL common/safety/tst.copyin2.d exclude EXFAIL common/safety/tst.msgdsize.d exclude EXFAIL common/safety/tst.msgsize.d Modified: projects/em_mq/cddl/usr.sbin/lockstat/Makefile ============================================================================== --- projects/em_mq/cddl/usr.sbin/lockstat/Makefile Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/usr.sbin/lockstat/Makefile Fri May 22 17:06:33 2015 (r283292) @@ -21,10 +21,6 @@ CFLAGS+= -DNEED_ERRLOC -g #YFLAGS+= -d -DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ - ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBRT} ${LIBUTIL} \ - ${LIBRTLD_DB} -LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt -lutil \ - -lrtld_db +LIBADD= elf dtrace rt .include Modified: projects/em_mq/cddl/usr.sbin/plockstat/Makefile ============================================================================== --- projects/em_mq/cddl/usr.sbin/plockstat/Makefile Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/cddl/usr.sbin/plockstat/Makefile Fri May 22 17:06:33 2015 (r283292) @@ -18,9 +18,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${.CURDIR}/../../../cddl/lib/libdtrace \ -I${.CURDIR}/../../../sys -DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} ${LIBCTF}\ - ${LIBELF} ${LIBZ} ${LIBRT} ${LIBRTLD_DB} ${LIBUTIL} -LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt \ - -lrtld_db -lutil +LIBADD= dtrace proc .include Modified: projects/em_mq/contrib/atf/atf-sh/atf_check_test.sh ============================================================================== --- projects/em_mq/contrib/atf/atf-sh/atf_check_test.sh Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/contrib/atf/atf-sh/atf_check_test.sh Fri May 22 17:06:33 2015 (r283292) @@ -164,18 +164,22 @@ equal_body() grep '^failed: \${x} != \${y} (a != b)$' resfile } -atf_test_case flush_stdout_on_timeout -flush_stdout_on_timeout_body() +atf_test_case flush_stdout_on_death +flush_stdout_on_death_body() { - "$(atf_get_srcdir)/misc_helpers" -s "$(atf_get_srcdir)" atf_check_timeout \ - >out 2>err & + CONTROL_FILE="$(pwd)/done" "$(atf_get_srcdir)/misc_helpers" \ + -s "$(atf_get_srcdir)" atf_check_flush_stdout >out 2>err & pid="${!}" - sleep 1 - kill "${pid}" + while [ ! -f ./done ]; do + echo "Still waiting for helper to create control file" + ls + sleep 1 + done + kill -9 "${pid}" grep 'Executing command.*true' out \ || atf_fail 'First command not in output' - grep 'Executing command.*sleep 42' out \ + grep 'Executing command.*false' out \ || atf_fail 'Second command not in output' } @@ -187,7 +191,7 @@ atf_init_test_cases() atf_add_test_case null_stdout atf_add_test_case null_stderr atf_add_test_case equal - atf_add_test_case flush_stdout_on_timeout + atf_add_test_case flush_stdout_on_death } # vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4 Modified: projects/em_mq/contrib/atf/atf-sh/misc_helpers.sh ============================================================================== --- projects/em_mq/contrib/atf/atf-sh/misc_helpers.sh Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/contrib/atf/atf-sh/misc_helpers.sh Fri May 22 17:06:33 2015 (r283292) @@ -139,16 +139,20 @@ atf_check_equal_eval_fail_body() atf_check_equal '${x}' '${y}' } -atf_test_case atf_check_timeout -atf_check_timeout_head() +atf_test_case atf_check_flush_stdout +atf_check_flush_stdout_head() { atf_set "descr" "Helper test case for the t_atf_check test program" - atf_set "timeout" 1 + atf_set "timeout" "30" } -atf_check_timeout_body() +atf_check_flush_stdout_body() { atf_check true - atf_check sleep 42 + atf_check -s exit:1 false + touch "${CONTROL_FILE:-done}" + while :; do + sleep 1 + done } # ------------------------------------------------------------------------- @@ -281,7 +285,7 @@ atf_init_test_cases() atf_add_test_case atf_check_equal_fail atf_add_test_case atf_check_equal_eval_ok atf_add_test_case atf_check_equal_eval_fail - atf_add_test_case atf_check_timeout + atf_add_test_case atf_check_flush_stdout # Add helper tests for t_config. atf_add_test_case config_get Modified: projects/em_mq/contrib/bmake/ChangeLog ============================================================================== --- projects/em_mq/contrib/bmake/ChangeLog Fri May 22 17:05:21 2015 (r283291) +++ projects/em_mq/contrib/bmake/ChangeLog Fri May 22 17:06:33 2015 (r283292) @@ -1,3 +1,16 @@ +2015-05-05 Simon J. Gerraty *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri May 22 18:23:34 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D6EA08D3; Fri, 22 May 2015 18:23:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C077C19FF; Fri, 22 May 2015 18:23:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4MINYQr080296; Fri, 22 May 2015 18:23:34 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4MINOYU080098; Fri, 22 May 2015 18:23:24 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201505221823.t4MINOYU080098@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 22 May 2015 18:23:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r283294 - in projects/ifnet: . bin/cp bin/date bin/pax cddl/contrib/opensolaris/common/ctf cddl/contrib/opensolaris/lib/libdtrace/common cddl/lib cddl/lib/libdtrace cddl/sbin cddl/usr.b... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 May 2015 18:23:34 -0000 Author: glebius Date: Fri May 22 18:23:21 2015 New Revision: 283294 URL: https://svnweb.freebsd.org/changeset/base/283294 Log: Merge head r257698 through r283293. Added: projects/ifnet/cddl/lib/libdtrace/siftr.d - copied unchanged from r283293, head/cddl/lib/libdtrace/siftr.d projects/ifnet/contrib/bmake/unit-tests/cond2.exp - copied unchanged from r283293, head/contrib/bmake/unit-tests/cond2.exp projects/ifnet/contrib/bmake/unit-tests/cond2.mk - copied unchanged from r283293, head/contrib/bmake/unit-tests/cond2.mk projects/ifnet/lib/csu/i386/ - copied from r283293, head/lib/csu/i386/ projects/ifnet/lib/libc/aarch64/gen/fabs.S - copied unchanged from r283293, head/lib/libc/aarch64/gen/fabs.S projects/ifnet/release/Makefile.mirrors - copied unchanged from r283293, head/release/Makefile.mirrors projects/ifnet/release/arm/RPI2.conf - copied unchanged from r283293, head/release/arm/RPI2.conf projects/ifnet/release/arm/WANDBOARD.conf - copied unchanged from r283293, head/release/arm/WANDBOARD.conf projects/ifnet/release/tools/arm.subr - copied unchanged from r283293, head/release/tools/arm.subr projects/ifnet/sys/arm/allwinner/a10_mmc.c - copied unchanged from r283293, head/sys/arm/allwinner/a10_mmc.c projects/ifnet/sys/arm/allwinner/a10_mmc.h - copied unchanged from r283293, head/sys/arm/allwinner/a10_mmc.h projects/ifnet/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c - copied unchanged from r283293, head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c projects/ifnet/sys/arm/annapurna/ - copied from r283293, head/sys/arm/annapurna/ projects/ifnet/sys/arm/broadcom/bcm2835/bcm2836_mp.c - copied unchanged from r283293, head/sys/arm/broadcom/bcm2835/bcm2836_mp.c projects/ifnet/sys/arm/conf/ALPINE - copied unchanged from r283293, head/sys/arm/conf/ALPINE projects/ifnet/sys/arm/conf/std.arm - copied unchanged from r283293, head/sys/arm/conf/std.arm projects/ifnet/sys/arm/conf/std.armv6 - copied unchanged from r283293, head/sys/arm/conf/std.armv6 projects/ifnet/sys/arm/ti/am335x/am335x_ecap.c - copied unchanged from r283293, head/sys/arm/ti/am335x/am335x_ecap.c projects/ifnet/sys/arm/ti/am335x/am335x_ehrpwm.c - copied unchanged from r283293, head/sys/arm/ti/am335x/am335x_ehrpwm.c projects/ifnet/sys/arm/ti/am335x/am335x_musb.c - copied unchanged from r283293, head/sys/arm/ti/am335x/am335x_musb.c projects/ifnet/sys/arm/ti/am335x/am335x_pwmss.c - copied unchanged from r283293, head/sys/arm/ti/am335x/am335x_pwmss.c projects/ifnet/sys/arm/ti/ti_hwmods.c - copied unchanged from r283293, head/sys/arm/ti/ti_hwmods.c projects/ifnet/sys/arm/ti/ti_hwmods.h - copied unchanged from r283293, head/sys/arm/ti/ti_hwmods.h projects/ifnet/sys/arm/ti/ti_pinmux.c - copied unchanged from r283293, head/sys/arm/ti/ti_pinmux.c projects/ifnet/sys/arm/ti/ti_pinmux.h - copied unchanged from r283293, head/sys/arm/ti/ti_pinmux.h projects/ifnet/sys/arm/ti/usb/omap_host.c - copied unchanged from r283293, head/sys/arm/ti/usb/omap_host.c projects/ifnet/sys/arm/ti/usb/omap_tll.c - copied unchanged from r283293, head/sys/arm/ti/usb/omap_tll.c projects/ifnet/sys/arm64/arm64/busdma_bounce.c - copied unchanged from r283293, head/sys/arm64/arm64/busdma_bounce.c projects/ifnet/sys/arm64/arm64/gic_v3.c - copied unchanged from r283293, head/sys/arm64/arm64/gic_v3.c projects/ifnet/sys/arm64/arm64/gic_v3_fdt.c - copied unchanged from r283293, head/sys/arm64/arm64/gic_v3_fdt.c projects/ifnet/sys/arm64/arm64/gic_v3_reg.h - copied unchanged from r283293, head/sys/arm64/arm64/gic_v3_reg.h projects/ifnet/sys/arm64/arm64/gic_v3_var.h - copied unchanged from r283293, head/sys/arm64/arm64/gic_v3_var.h projects/ifnet/sys/arm64/include/bus_dma_impl.h - copied unchanged from r283293, head/sys/arm64/include/bus_dma_impl.h projects/ifnet/sys/boot/common/self_reloc.c - copied unchanged from r283293, head/sys/boot/common/self_reloc.c projects/ifnet/sys/boot/fdt/dts/arm/annapurna-alpine.dts - copied unchanged from r283293, head/sys/boot/fdt/dts/arm/annapurna-alpine.dts projects/ifnet/sys/boot/fdt/dts/arm/beaglebone-common.dtsi - copied unchanged from r283293, head/sys/boot/fdt/dts/arm/beaglebone-common.dtsi projects/ifnet/sys/boot/fdt/dts/arm/pandaboard-common.dtsi - copied unchanged from r283293, head/sys/boot/fdt/dts/arm/pandaboard-common.dtsi projects/ifnet/sys/boot/fdt/dts/arm/pandaboard-es.dts - copied unchanged from r283293, head/sys/boot/fdt/dts/arm/pandaboard-es.dts projects/ifnet/sys/contrib/dev/acpica/common/ahtable.c - copied unchanged from r283293, head/sys/contrib/dev/acpica/common/ahtable.c projects/ifnet/sys/contrib/dev/acpica/include/acuuid.h - copied unchanged from r283293, head/sys/contrib/dev/acpica/include/acuuid.h projects/ifnet/sys/dev/hwpmc/hwpmc_arm64.c - copied unchanged from r283293, head/sys/dev/hwpmc/hwpmc_arm64.c projects/ifnet/sys/dev/hwpmc/hwpmc_arm64.h - copied unchanged from r283293, head/sys/dev/hwpmc/hwpmc_arm64.h projects/ifnet/sys/dev/hwpmc/hwpmc_arm64_md.c - copied unchanged from r283293, head/sys/dev/hwpmc/hwpmc_arm64_md.c projects/ifnet/sys/mips/atheros/qca955x_pci.c - copied unchanged from r283293, head/sys/mips/atheros/qca955x_pci.c projects/ifnet/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c - copied unchanged from r283293, head/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c projects/ifnet/sys/xen/xenmem/ - copied from r283293, head/sys/xen/xenmem/ projects/ifnet/tests/etc/ - copied from r283293, head/tests/etc/ projects/ifnet/tests/sys/kern/ptrace_test.c - copied unchanged from r283293, head/tests/sys/kern/ptrace_test.c projects/ifnet/tools/build/stdlib.h - copied unchanged from r283293, head/tools/build/stdlib.h Deleted: projects/ifnet/etc/rc.d/tests/ projects/ifnet/etc/tests/Makefile projects/ifnet/gnu/usr.bin/groff/src/preproc/soelim/ projects/ifnet/kerberos5/lib/libheimsqlite/ projects/ifnet/lib/csu/i386-elf/ projects/ifnet/lib/libmandoc/ projects/ifnet/release/arm/WANDBOARD-QUAD.conf projects/ifnet/release/arm/ZEDBOARD.conf projects/ifnet/release/arm/release.sh projects/ifnet/release/tools/arm/ projects/ifnet/sys/arm/conf/WANDBOARD-DUAL projects/ifnet/sys/arm/conf/WANDBOARD-QUAD projects/ifnet/sys/arm/conf/WANDBOARD-SOLO projects/ifnet/sys/arm/ti/am335x/am335x_pwm.c projects/ifnet/sys/boot/efi/loader/reloc.c projects/ifnet/sys/boot/fdt/dts/arm/am335x.dtsi projects/ifnet/usr.bin/demandoc/ Modified: projects/ifnet/Makefile.inc1 projects/ifnet/ObsoleteFiles.inc projects/ifnet/UPDATING projects/ifnet/bin/cp/cp.c projects/ifnet/bin/date/date.1 projects/ifnet/bin/date/date.c projects/ifnet/bin/pax/ar_subs.c projects/ifnet/bin/pax/buf_subs.c projects/ifnet/bin/pax/cache.c projects/ifnet/bin/pax/cpio.c projects/ifnet/bin/pax/file_subs.c projects/ifnet/bin/pax/gen_subs.c projects/ifnet/bin/pax/getoldopt.c projects/ifnet/bin/pax/pat_rep.c projects/ifnet/bin/pax/pax.c projects/ifnet/bin/pax/sel_subs.c projects/ifnet/bin/pax/tar.c projects/ifnet/bin/pax/tty_subs.c projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/ifnet/cddl/lib/Makefile projects/ifnet/cddl/lib/libdtrace/Makefile projects/ifnet/cddl/lib/libdtrace/tcp.d projects/ifnet/cddl/sbin/Makefile projects/ifnet/cddl/usr.bin/Makefile projects/ifnet/cddl/usr.bin/ctfconvert/Makefile projects/ifnet/cddl/usr.bin/ctfdump/Makefile projects/ifnet/cddl/usr.sbin/Makefile projects/ifnet/cddl/usr.sbin/dtrace/Makefile projects/ifnet/cddl/usr.sbin/dtrace/tests/tools/exclude.sh projects/ifnet/cddl/usr.sbin/lockstat/Makefile projects/ifnet/cddl/usr.sbin/plockstat/Makefile projects/ifnet/contrib/atf/atf-sh/atf_check_test.sh projects/ifnet/contrib/atf/atf-sh/misc_helpers.sh projects/ifnet/contrib/binutils/bfd/elf32-arm.c projects/ifnet/contrib/bmake/ChangeLog projects/ifnet/contrib/bmake/FILES projects/ifnet/contrib/bmake/Makefile projects/ifnet/contrib/bmake/cond.c projects/ifnet/contrib/bmake/machine.sh projects/ifnet/contrib/bmake/mk/ChangeLog projects/ifnet/contrib/bmake/mk/dirdeps.mk projects/ifnet/contrib/bmake/mk/install-mk projects/ifnet/contrib/bmake/nonints.h projects/ifnet/contrib/bmake/unit-tests/Makefile.in projects/ifnet/contrib/bmake/var.c projects/ifnet/contrib/elftoolchain/addr2line/addr2line.1 projects/ifnet/contrib/elftoolchain/addr2line/addr2line.c projects/ifnet/contrib/elftoolchain/common/native-elf-format projects/ifnet/contrib/elftoolchain/cxxfilt/c++filt.1 projects/ifnet/contrib/elftoolchain/elfcopy/elfcopy.1 projects/ifnet/contrib/elftoolchain/elfcopy/sections.c projects/ifnet/contrib/elftoolchain/elfcopy/segments.c projects/ifnet/contrib/elftoolchain/elfcopy/symbols.c projects/ifnet/contrib/elftoolchain/libdwarf/dwarf.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_add_line_entry.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_def_macro.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_expand_frame_instructions.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_formblock.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_formflag.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_formref.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_formsig8.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_formudata.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_get_fde_info_for_all_regs.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_get_fde_info_for_reg.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_get_ranges.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_hasattr.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_next_cu_header.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_producer_init.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_whatattr.3 projects/ifnet/contrib/elftoolchain/libelf/elf.3 projects/ifnet/contrib/elftoolchain/libelf/elf_begin.3 projects/ifnet/contrib/elftoolchain/libelf/elf_cntl.3 projects/ifnet/contrib/elftoolchain/libelf/elf_getdata.3 projects/ifnet/contrib/elftoolchain/libelf/elf_open.3 projects/ifnet/contrib/elftoolchain/libelf/elf_update.c projects/ifnet/contrib/elftoolchain/libelf/gelf.3 projects/ifnet/contrib/elftoolchain/libelftc/elftc_demangle.3 projects/ifnet/contrib/elftoolchain/libelftc/elftc_symbol_table_create.3 projects/ifnet/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c projects/ifnet/contrib/elftoolchain/nm/nm.1 projects/ifnet/contrib/elftoolchain/readelf/readelf.1 projects/ifnet/contrib/elftoolchain/readelf/readelf.c projects/ifnet/contrib/elftoolchain/size/size.1 projects/ifnet/contrib/elftoolchain/size/size.c projects/ifnet/contrib/elftoolchain/strings/strings.1 projects/ifnet/contrib/gcc/dwarf2.h projects/ifnet/contrib/gdb/gdb/c-valprint.c projects/ifnet/contrib/gdb/gdb/dwarf2expr.c projects/ifnet/contrib/gdb/gdb/dwarf2expr.h projects/ifnet/contrib/gdb/gdb/dwarf2loc.c projects/ifnet/contrib/gdb/gdb/dwarf2read.c projects/ifnet/contrib/gdb/gdb/value.h projects/ifnet/contrib/gdb/gdb/values.c projects/ifnet/contrib/libarchive/libarchive/archive_read.c projects/ifnet/contrib/libarchive/libarchive/archive_read_support_format_cpio.c projects/ifnet/contrib/netcat/netcat.c projects/ifnet/contrib/tzdata/africa projects/ifnet/contrib/tzdata/antarctica projects/ifnet/contrib/tzdata/backward projects/ifnet/contrib/tzdata/europe projects/ifnet/contrib/tzdata/northamerica projects/ifnet/contrib/tzdata/southamerica projects/ifnet/etc/Makefile projects/ifnet/etc/etc.arm/ttys projects/ifnet/etc/rc.d/Makefile projects/ifnet/gnu/lib/Makefile projects/ifnet/include/stdlib.h projects/ifnet/include/stringlist.h projects/ifnet/kerberos5/lib/Makefile projects/ifnet/kerberos5/lib/libhdb/Makefile projects/ifnet/lib/Makefile projects/ifnet/lib/csu/Makefile projects/ifnet/lib/libc/aarch64/Symbol.map projects/ifnet/lib/libc/aarch64/gen/Makefile.inc projects/ifnet/lib/libc/arm/SYS.h projects/ifnet/lib/libc/arm/aeabi/aeabi_vfp_double.S projects/ifnet/lib/libc/arm/aeabi/aeabi_vfp_float.S projects/ifnet/lib/libc/arm/gen/_setjmp.S projects/ifnet/lib/libc/arm/gen/setjmp.S projects/ifnet/lib/libc/arm/sys/brk.S projects/ifnet/lib/libc/arm/sys/sbrk.S projects/ifnet/lib/libc/db/hash/hash.c projects/ifnet/lib/libc/gen/directory.3 projects/ifnet/lib/libc/gen/dlfcn.c projects/ifnet/lib/libc/gen/readdir.c projects/ifnet/lib/libc/gen/rewinddir.c projects/ifnet/lib/libc/gen/stringlist.c projects/ifnet/lib/libc/gen/telldir.c projects/ifnet/lib/libc/gen/telldir.h projects/ifnet/lib/libc/net/recv.c projects/ifnet/lib/libc/net/send.c projects/ifnet/lib/libc/stdlib/reallocarray.3 projects/ifnet/lib/libedit/chartype.c projects/ifnet/lib/libedit/chartype.h projects/ifnet/lib/libedit/edit/readline/readline.h projects/ifnet/lib/libedit/el.c projects/ifnet/lib/libedit/eln.c projects/ifnet/lib/libedit/map.c projects/ifnet/lib/libedit/readline.c projects/ifnet/lib/libedit/tty.c projects/ifnet/lib/libelftc/elftc_version.c projects/ifnet/lib/libmd/Makefile projects/ifnet/lib/libmd/md4.h projects/ifnet/lib/libmd/md4c.c projects/ifnet/lib/libmd/md5.h projects/ifnet/lib/libmd/md5c.c projects/ifnet/lib/libmd/mdXhl.c projects/ifnet/lib/libmd/ripemd.h projects/ifnet/lib/libmd/rmd160c.c projects/ifnet/lib/libmd/sha.h projects/ifnet/lib/libmd/sha1c.c projects/ifnet/lib/libmd/sha256.h projects/ifnet/lib/libmd/sha256c.c projects/ifnet/lib/libmd/sha512.h projects/ifnet/lib/libmd/sha512c.c projects/ifnet/lib/libmd/shadriver.c projects/ifnet/lib/libpmc/libpmc.c projects/ifnet/lib/libproc/Makefile projects/ifnet/lib/libprocstat/Makefile projects/ifnet/lib/libprocstat/libprocstat.3 projects/ifnet/lib/libthr/thread/thr_spec.c projects/ifnet/lib/libufs/Makefile projects/ifnet/lib/libvmmapi/vmmapi.c projects/ifnet/lib/libvmmapi/vmmapi.h projects/ifnet/lib/msun/src/e_j0.c projects/ifnet/lib/msun/src/e_j0f.c projects/ifnet/lib/msun/src/e_j1.c projects/ifnet/lib/msun/src/e_j1f.c projects/ifnet/libexec/rtld-elf/debug.h projects/ifnet/libexec/rtld-elf/rtld.c projects/ifnet/release/Makefile.ec2 projects/ifnet/release/arm/BEAGLEBONE.conf projects/ifnet/release/arm/PANDABOARD.conf projects/ifnet/release/arm/RPI-B.conf projects/ifnet/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/ifnet/release/doc/share/xml/sponsor.ent projects/ifnet/release/release.sh projects/ifnet/release/tools/vmimage.subr projects/ifnet/sbin/devd/devd.conf.5 projects/ifnet/sbin/geom/class/mountver/geom_mountver.c projects/ifnet/sbin/geom/class/mountver/gmountver.8 projects/ifnet/sbin/ifconfig/af_inet.c projects/ifnet/sbin/ifconfig/af_inet6.c projects/ifnet/sbin/ifconfig/ifconfig.8 projects/ifnet/sbin/ifconfig/iffib.c projects/ifnet/sbin/ifconfig/ifgif.c projects/ifnet/sbin/ifconfig/sfp.c projects/ifnet/sbin/ipfw/tables.c projects/ifnet/share/man/man3/pthread_getspecific.3 projects/ifnet/share/man/man4/acpi.4 projects/ifnet/share/man/man4/ctl.4 projects/ifnet/share/man/man4/iic.4 projects/ifnet/share/man/man4/usb_quirk.4 projects/ifnet/share/man/man9/Makefile projects/ifnet/share/man/man9/namei.9 projects/ifnet/share/man/man9/psignal.9 projects/ifnet/share/misc/bsd-family-tree projects/ifnet/share/mk/src.libnames.mk projects/ifnet/share/syscons/keymaps/INDEX.keymaps projects/ifnet/share/vt/keymaps/INDEX.keymaps projects/ifnet/sys/amd64/acpica/acpi_machdep.c projects/ifnet/sys/amd64/amd64/apic_vector.S projects/ifnet/sys/amd64/amd64/cpu_switch.S projects/ifnet/sys/amd64/amd64/db_disasm.c projects/ifnet/sys/amd64/amd64/genassym.c projects/ifnet/sys/amd64/amd64/machdep.c projects/ifnet/sys/amd64/amd64/mp_machdep.c projects/ifnet/sys/amd64/amd64/mp_watchdog.c projects/ifnet/sys/amd64/amd64/pmap.c projects/ifnet/sys/amd64/amd64/vm_machdep.c projects/ifnet/sys/amd64/conf/GENERIC projects/ifnet/sys/amd64/include/cpufunc.h projects/ifnet/sys/amd64/include/md_var.h projects/ifnet/sys/amd64/include/pcpu.h projects/ifnet/sys/amd64/include/pmap.h projects/ifnet/sys/amd64/include/smp.h projects/ifnet/sys/amd64/include/vmm.h (contents, props changed) projects/ifnet/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/ifnet/sys/amd64/linux32/linux32_machdep.c projects/ifnet/sys/amd64/vmm/amd/svm.c projects/ifnet/sys/amd64/vmm/intel/vmx.c projects/ifnet/sys/amd64/vmm/io/vatpit.c projects/ifnet/sys/amd64/vmm/vmm.c projects/ifnet/sys/amd64/vmm/vmm_dev.c projects/ifnet/sys/amd64/vmm/vmm_instruction_emul.c projects/ifnet/sys/amd64/vmm/x86.c projects/ifnet/sys/amd64/vmm/x86.h projects/ifnet/sys/arm/allwinner/a10_clk.c projects/ifnet/sys/arm/allwinner/a10_clk.h projects/ifnet/sys/arm/allwinner/a20/files.a20 projects/ifnet/sys/arm/allwinner/files.allwinner projects/ifnet/sys/arm/allwinner/std.a10 projects/ifnet/sys/arm/altera/socfpga/files.socfpga projects/ifnet/sys/arm/amlogic/aml8726/aml8726_ccm.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_machdep.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_pic.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_pinctrl.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_rng.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_rtc.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_uart.h projects/ifnet/sys/arm/amlogic/aml8726/aml8726_usb_phy-m6.c projects/ifnet/sys/arm/amlogic/aml8726/files.aml8726 projects/ifnet/sys/arm/amlogic/aml8726/uart_dev_aml8726.c projects/ifnet/sys/arm/arm/cpufunc.c projects/ifnet/sys/arm/arm/cpufunc_asm_armv7.S projects/ifnet/sys/arm/arm/cpuinfo.c projects/ifnet/sys/arm/arm/db_disasm.c projects/ifnet/sys/arm/arm/exception.S projects/ifnet/sys/arm/arm/fusu.S projects/ifnet/sys/arm/arm/generic_timer.c projects/ifnet/sys/arm/arm/intr.c projects/ifnet/sys/arm/arm/machdep.c projects/ifnet/sys/arm/arm/mp_machdep.c projects/ifnet/sys/arm/arm/pmap-v6-new.c projects/ifnet/sys/arm/arm/pmap.c projects/ifnet/sys/arm/arm/pmu.c projects/ifnet/sys/arm/arm/stdatomic.c projects/ifnet/sys/arm/arm/swtch.S projects/ifnet/sys/arm/arm/syscall.c projects/ifnet/sys/arm/arm/undefined.c projects/ifnet/sys/arm/arm/vm_machdep.c projects/ifnet/sys/arm/at91/at91_pio.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2836.c projects/ifnet/sys/arm/broadcom/bcm2835/files.bcm2836 projects/ifnet/sys/arm/broadcom/bcm2835/std.bcm2836 projects/ifnet/sys/arm/conf/AML8726 projects/ifnet/sys/arm/conf/APALIS-IMX6 projects/ifnet/sys/arm/conf/ARMADAXP projects/ifnet/sys/arm/conf/ARNDALE projects/ifnet/sys/arm/conf/ARNDALE-OCTA projects/ifnet/sys/arm/conf/ATMEL projects/ifnet/sys/arm/conf/AVILA projects/ifnet/sys/arm/conf/BEAGLEBONE projects/ifnet/sys/arm/conf/BWCT projects/ifnet/sys/arm/conf/CAMBRIA projects/ifnet/sys/arm/conf/CHROMEBOOK projects/ifnet/sys/arm/conf/CHROMEBOOK-PEACH-PIT projects/ifnet/sys/arm/conf/CHROMEBOOK-SNOW projects/ifnet/sys/arm/conf/CHROMEBOOK-SPRING projects/ifnet/sys/arm/conf/CNS11XXNAS projects/ifnet/sys/arm/conf/COLIBRI-VF50 projects/ifnet/sys/arm/conf/COSMIC projects/ifnet/sys/arm/conf/CRB projects/ifnet/sys/arm/conf/CUBIEBOARD projects/ifnet/sys/arm/conf/CUBIEBOARD2 projects/ifnet/sys/arm/conf/DB-78XXX projects/ifnet/sys/arm/conf/DB-88F5XXX projects/ifnet/sys/arm/conf/DB-88F6XXX projects/ifnet/sys/arm/conf/DIGI-CCWMX53 projects/ifnet/sys/arm/conf/DOCKSTAR projects/ifnet/sys/arm/conf/DREAMPLUG-1001 projects/ifnet/sys/arm/conf/EA3250 projects/ifnet/sys/arm/conf/EB9200 projects/ifnet/sys/arm/conf/EFIKA_MX projects/ifnet/sys/arm/conf/EP80219 projects/ifnet/sys/arm/conf/ETHERNUT5 projects/ifnet/sys/arm/conf/EXYNOS5.common projects/ifnet/sys/arm/conf/EXYNOS5250 projects/ifnet/sys/arm/conf/EXYNOS5420 projects/ifnet/sys/arm/conf/GUMSTIX projects/ifnet/sys/arm/conf/HL200 projects/ifnet/sys/arm/conf/HL201 projects/ifnet/sys/arm/conf/IMX53 projects/ifnet/sys/arm/conf/IMX53-QSB projects/ifnet/sys/arm/conf/IMX6 projects/ifnet/sys/arm/conf/IQ31244 projects/ifnet/sys/arm/conf/KB920X projects/ifnet/sys/arm/conf/LN2410SBC projects/ifnet/sys/arm/conf/NSLU projects/ifnet/sys/arm/conf/ODROIDC1 projects/ifnet/sys/arm/conf/PANDABOARD projects/ifnet/sys/arm/conf/QILA9G20 projects/ifnet/sys/arm/conf/QUARTZ projects/ifnet/sys/arm/conf/RADXA projects/ifnet/sys/arm/conf/RADXA-LITE projects/ifnet/sys/arm/conf/RK3188 projects/ifnet/sys/arm/conf/RPI-B projects/ifnet/sys/arm/conf/RPI2 projects/ifnet/sys/arm/conf/SAM9260EK projects/ifnet/sys/arm/conf/SAM9G20EK projects/ifnet/sys/arm/conf/SAM9X25EK projects/ifnet/sys/arm/conf/SHEEVAPLUG projects/ifnet/sys/arm/conf/SN9G45 projects/ifnet/sys/arm/conf/SOCKIT.common projects/ifnet/sys/arm/conf/TS7800 projects/ifnet/sys/arm/conf/VERSATILEPB projects/ifnet/sys/arm/conf/VIRT projects/ifnet/sys/arm/conf/VSATV102 projects/ifnet/sys/arm/conf/VYBRID projects/ifnet/sys/arm/conf/ZEDBOARD projects/ifnet/sys/arm/freescale/imx/files.imx6 projects/ifnet/sys/arm/freescale/imx/imx6_anatop.c projects/ifnet/sys/arm/freescale/imx/imx6_ccm.c projects/ifnet/sys/arm/freescale/imx/imx6_ccmreg.h projects/ifnet/sys/arm/freescale/imx/imx_ccmvar.h projects/ifnet/sys/arm/freescale/imx/imx_sdhci.c projects/ifnet/sys/arm/freescale/vybrid/files.vybrid projects/ifnet/sys/arm/include/armreg.h projects/ifnet/sys/arm/include/asm.h projects/ifnet/sys/arm/include/atomic.h projects/ifnet/sys/arm/include/cpu-v6.h projects/ifnet/sys/arm/include/cpufunc.h projects/ifnet/sys/arm/include/pl310.h projects/ifnet/sys/arm/include/pmap-v6.h projects/ifnet/sys/arm/include/proc.h projects/ifnet/sys/arm/include/smp.h projects/ifnet/sys/arm/include/sysreg.h projects/ifnet/sys/arm/qemu/files.qemu projects/ifnet/sys/arm/rockchip/files.rk30xx projects/ifnet/sys/arm/samsung/exynos/files.exynos5 projects/ifnet/sys/arm/ti/aintc.c projects/ifnet/sys/arm/ti/am335x/am335x_dmtimer.c projects/ifnet/sys/arm/ti/am335x/am335x_gpio.c projects/ifnet/sys/arm/ti/am335x/am335x_lcd.c projects/ifnet/sys/arm/ti/am335x/am335x_lcd.h projects/ifnet/sys/arm/ti/am335x/am335x_pmic.c projects/ifnet/sys/arm/ti/am335x/am335x_prcm.c projects/ifnet/sys/arm/ti/am335x/am335x_pwm.h projects/ifnet/sys/arm/ti/am335x/am335x_scm_padconf.c projects/ifnet/sys/arm/ti/am335x/am335x_usbss.c projects/ifnet/sys/arm/ti/am335x/files.am335x projects/ifnet/sys/arm/ti/cpsw/if_cpsw.c projects/ifnet/sys/arm/ti/cpsw/if_cpswreg.h projects/ifnet/sys/arm/ti/cpsw/if_cpswvar.h projects/ifnet/sys/arm/ti/files.ti projects/ifnet/sys/arm/ti/omap4/files.omap4 projects/ifnet/sys/arm/ti/omap4/omap4_gpio.c projects/ifnet/sys/arm/ti/omap4/omap4_prcm_clks.c projects/ifnet/sys/arm/ti/omap4/omap4_scm_padconf.c projects/ifnet/sys/arm/ti/ti_adc.c projects/ifnet/sys/arm/ti/ti_common.c projects/ifnet/sys/arm/ti/ti_edma3.c projects/ifnet/sys/arm/ti/ti_gpio.c projects/ifnet/sys/arm/ti/ti_gpio.h projects/ifnet/sys/arm/ti/ti_i2c.c projects/ifnet/sys/arm/ti/ti_mbox.c projects/ifnet/sys/arm/ti/ti_prcm.h projects/ifnet/sys/arm/ti/ti_pruss.c projects/ifnet/sys/arm/ti/ti_pruss.h projects/ifnet/sys/arm/ti/ti_scm.c projects/ifnet/sys/arm/ti/ti_scm.h projects/ifnet/sys/arm/ti/ti_sdhci.c projects/ifnet/sys/arm/ti/ti_sdma.c projects/ifnet/sys/arm/ti/usb/omap_ehci.c projects/ifnet/sys/arm/ti/usb/omap_usb.h projects/ifnet/sys/arm/xilinx/files.zynq7 projects/ifnet/sys/arm64/arm64/busdma_machdep.c projects/ifnet/sys/arm64/arm64/db_disasm.c projects/ifnet/sys/arm64/arm64/intr_machdep.c projects/ifnet/sys/arm64/arm64/locore.S projects/ifnet/sys/arm64/arm64/nexus.c projects/ifnet/sys/arm64/conf/GENERIC projects/ifnet/sys/arm64/include/armreg.h projects/ifnet/sys/arm64/include/pmc_mdep.h projects/ifnet/sys/boot/arm/uboot/Makefile projects/ifnet/sys/boot/arm/uboot/ldscript.arm projects/ifnet/sys/boot/arm/uboot/start.S projects/ifnet/sys/boot/common/dev_net.c projects/ifnet/sys/boot/common/dev_net.h projects/ifnet/sys/boot/common/load_elf.c projects/ifnet/sys/boot/efi/boot1/Makefile projects/ifnet/sys/boot/efi/libefi/Makefile projects/ifnet/sys/boot/efi/loader/Makefile projects/ifnet/sys/boot/efi/loader/arch/amd64/start.S projects/ifnet/sys/boot/efi/loader/arch/arm/ldscript.arm projects/ifnet/sys/boot/efi/loader/arch/arm/start.S projects/ifnet/sys/boot/efi/loader/arch/arm64/Makefile.inc projects/ifnet/sys/boot/efi/loader/arch/arm64/start.S projects/ifnet/sys/boot/efi/loader/arch/i386/start.S projects/ifnet/sys/boot/efi/loader/main.c projects/ifnet/sys/boot/fdt/dts/arm/am335x-evm.dts projects/ifnet/sys/boot/fdt/dts/arm/beaglebone-black.dts projects/ifnet/sys/boot/fdt/dts/arm/beaglebone.dts projects/ifnet/sys/boot/fdt/dts/arm/cubieboard.dts projects/ifnet/sys/boot/fdt/dts/arm/cubieboard2.dts projects/ifnet/sys/boot/fdt/dts/arm/odroidc1.dts projects/ifnet/sys/boot/fdt/dts/arm/pandaboard.dts projects/ifnet/sys/boot/fdt/dts/arm/rpi2.dts projects/ifnet/sys/boot/fdt/dts/arm/sun4i-a10.dtsi projects/ifnet/sys/boot/fdt/dts/arm/sun7i-a20.dtsi projects/ifnet/sys/boot/fdt/dts/arm/vsatv102-m6.dts projects/ifnet/sys/boot/i386/boot0/boot0.S projects/ifnet/sys/boot/uboot/common/main.c projects/ifnet/sys/boot/uboot/lib/copy.c projects/ifnet/sys/boot/uboot/lib/elf_freebsd.c projects/ifnet/sys/boot/uboot/lib/libuboot.h projects/ifnet/sys/boot/uboot/lib/net.c projects/ifnet/sys/cam/ctl/ctl_backend_block.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c projects/ifnet/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/ifnet/sys/cddl/dev/dtrace/i386/dtrace_subr.c projects/ifnet/sys/cddl/dev/profile/profile.c projects/ifnet/sys/compat/freebsd32/freebsd32_misc.c projects/ifnet/sys/compat/ndis/subr_ntoskrnl.c projects/ifnet/sys/compat/svr4/svr4_misc.c projects/ifnet/sys/conf/NOTES projects/ifnet/sys/conf/files projects/ifnet/sys/conf/files.arm projects/ifnet/sys/conf/files.arm64 projects/ifnet/sys/conf/files.powerpc projects/ifnet/sys/conf/options projects/ifnet/sys/conf/options.arm projects/ifnet/sys/contrib/dev/acpica/changes.txt projects/ifnet/sys/contrib/dev/acpica/common/adisasm.c projects/ifnet/sys/contrib/dev/acpica/common/ahpredef.c projects/ifnet/sys/contrib/dev/acpica/common/dmextern.c projects/ifnet/sys/contrib/dev/acpica/common/dmtable.c projects/ifnet/sys/contrib/dev/acpica/common/dmtbdump.c projects/ifnet/sys/contrib/dev/acpica/common/dmtbinfo.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslascii.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/ifnet/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/ifnet/sys/contrib/dev/acpica/compiler/asldefine.h projects/ifnet/sys/contrib/dev/acpica/compiler/aslfiles.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmessages.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmessages.h projects/ifnet/sys/contrib/dev/acpica/compiler/aslprepkg.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslstartup.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslutils.c projects/ifnet/sys/contrib/dev/acpica/compiler/dtcompile.c projects/ifnet/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/ifnet/sys/contrib/dev/acpica/compiler/dtio.c projects/ifnet/sys/contrib/dev/acpica/compiler/dtsubtable.c projects/ifnet/sys/contrib/dev/acpica/compiler/dttable.c projects/ifnet/sys/contrib/dev/acpica/compiler/dttemplate.c projects/ifnet/sys/contrib/dev/acpica/compiler/dttemplate.h projects/ifnet/sys/contrib/dev/acpica/compiler/dtutils.c projects/ifnet/sys/contrib/dev/acpica/compiler/preprocess.h projects/ifnet/sys/contrib/dev/acpica/compiler/prscan.c projects/ifnet/sys/contrib/dev/acpica/compiler/prutils.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbfileio.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwpci.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsprepkg.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsrepair.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psopinfo.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utfileio.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/uthex.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utxferror.c projects/ifnet/sys/contrib/dev/acpica/include/acdebug.h projects/ifnet/sys/contrib/dev/acpica/include/acdisasm.h projects/ifnet/sys/contrib/dev/acpica/include/aclocal.h projects/ifnet/sys/contrib/dev/acpica/include/acparser.h projects/ifnet/sys/contrib/dev/acpica/include/acpixf.h projects/ifnet/sys/contrib/dev/acpica/include/acpredef.h projects/ifnet/sys/contrib/dev/acpica/include/actbl.h projects/ifnet/sys/contrib/dev/acpica/include/actbl1.h projects/ifnet/sys/contrib/dev/acpica/include/actbl2.h projects/ifnet/sys/contrib/dev/acpica/include/actbl3.h projects/ifnet/sys/contrib/dev/acpica/include/actypes.h projects/ifnet/sys/contrib/dev/acpica/include/acutils.h projects/ifnet/sys/contrib/dev/acpica/include/platform/acenv.h projects/ifnet/sys/contrib/dev/acpica/include/platform/acenvex.h projects/ifnet/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) projects/ifnet/sys/contrib/vchiq/interface/compat/vchi_bsd.c projects/ifnet/sys/ddb/db_access.c projects/ifnet/sys/ddb/db_access.h projects/ifnet/sys/ddb/db_break.c projects/ifnet/sys/ddb/db_capture.c projects/ifnet/sys/ddb/db_command.c projects/ifnet/sys/ddb/db_examine.c projects/ifnet/sys/ddb/db_expr.c projects/ifnet/sys/ddb/db_input.c projects/ifnet/sys/ddb/db_main.c projects/ifnet/sys/ddb/db_print.c projects/ifnet/sys/ddb/db_ps.c projects/ifnet/sys/ddb/db_run.c projects/ifnet/sys/ddb/db_script.c projects/ifnet/sys/ddb/db_sym.c projects/ifnet/sys/ddb/db_sym.h projects/ifnet/sys/ddb/db_textdump.c projects/ifnet/sys/ddb/db_thread.c projects/ifnet/sys/ddb/db_variables.c projects/ifnet/sys/ddb/db_watch.c projects/ifnet/sys/ddb/db_write_cmd.c projects/ifnet/sys/ddb/ddb.h projects/ifnet/sys/dev/acpi_support/acpi_ibm.c projects/ifnet/sys/dev/acpica/acpi.c projects/ifnet/sys/dev/acpica/acpi_cpu.c projects/ifnet/sys/dev/acpica/acpi_package.c projects/ifnet/sys/dev/acpica/acpi_throttle.c projects/ifnet/sys/dev/acpica/acpi_timer.c projects/ifnet/sys/dev/acpica/acpivar.h projects/ifnet/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c projects/ifnet/sys/dev/ath/if_ath.c projects/ifnet/sys/dev/atkbdc/psm.c projects/ifnet/sys/dev/bxe/bxe.c projects/ifnet/sys/dev/bxe/bxe_stats.c projects/ifnet/sys/dev/bxe/bxe_stats.h projects/ifnet/sys/dev/ce/if_ce.c projects/ifnet/sys/dev/cp/if_cp.c projects/ifnet/sys/dev/ctau/if_ct.c projects/ifnet/sys/dev/cx/if_cx.c projects/ifnet/sys/dev/cxgb/cxgb_main.c projects/ifnet/sys/dev/cxgb/cxgb_sge.c projects/ifnet/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c projects/ifnet/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/ifnet/sys/dev/cxgbe/t4_main.c projects/ifnet/sys/dev/dcons/dcons_os.c projects/ifnet/sys/dev/drm2/drm_irq.c projects/ifnet/sys/dev/drm2/i915/intel_display.c projects/ifnet/sys/dev/e1000/if_em.c projects/ifnet/sys/dev/fdt/fdt_common.c projects/ifnet/sys/dev/fdt/fdt_common.h projects/ifnet/sys/dev/fdt/simplebus.c projects/ifnet/sys/dev/glxsb/glxsb.c projects/ifnet/sys/dev/gpio/ofw_gpiobus.c projects/ifnet/sys/dev/gxemul/cons/gxemul_cons.c projects/ifnet/sys/dev/hifn/hifn7751.c projects/ifnet/sys/dev/hwpmc/hwpmc_amd.c projects/ifnet/sys/dev/hwpmc/hwpmc_armv7.c projects/ifnet/sys/dev/hwpmc/hwpmc_core.c projects/ifnet/sys/dev/hwpmc/hwpmc_e500.c projects/ifnet/sys/dev/hwpmc/hwpmc_intel.c projects/ifnet/sys/dev/hwpmc/hwpmc_logging.c projects/ifnet/sys/dev/hwpmc/hwpmc_mips.c projects/ifnet/sys/dev/hwpmc/hwpmc_mips24k.c projects/ifnet/sys/dev/hwpmc/hwpmc_mips74k.c projects/ifnet/sys/dev/hwpmc/hwpmc_mod.c projects/ifnet/sys/dev/hwpmc/hwpmc_mpc7xxx.c projects/ifnet/sys/dev/hwpmc/hwpmc_octeon.c projects/ifnet/sys/dev/hwpmc/hwpmc_piv.c projects/ifnet/sys/dev/hwpmc/hwpmc_ppc970.c projects/ifnet/sys/dev/hwpmc/hwpmc_ppro.c projects/ifnet/sys/dev/hwpmc/hwpmc_soft.c projects/ifnet/sys/dev/hwpmc/hwpmc_tsc.c projects/ifnet/sys/dev/hwpmc/hwpmc_uncore.c projects/ifnet/sys/dev/hwpmc/hwpmc_xscale.c projects/ifnet/sys/dev/hwpmc/pmc_events.h projects/ifnet/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/ifnet/sys/dev/hyperv/storvsc/hv_vstorage.h projects/ifnet/sys/dev/if_ndis/if_ndis.c projects/ifnet/sys/dev/iicbus/iicbus.c projects/ifnet/sys/dev/iicbus/iicbus.h projects/ifnet/sys/dev/isci/isci_io_request.c projects/ifnet/sys/dev/iscsi/icl_soft.c projects/ifnet/sys/dev/iwn/if_iwn.c projects/ifnet/sys/dev/ixl/if_ixlv.c projects/ifnet/sys/dev/mfi/mfi.c projects/ifnet/sys/dev/mmc/mmc.c projects/ifnet/sys/dev/mrsas/mrsas.c projects/ifnet/sys/dev/mrsas/mrsas.h projects/ifnet/sys/dev/mrsas/mrsas_cam.c projects/ifnet/sys/dev/mrsas/mrsas_fp.c projects/ifnet/sys/dev/mrsas/mrsas_ioctl.c projects/ifnet/sys/dev/mrsas/mrsas_ioctl.h projects/ifnet/sys/dev/mrsas/mrsas_linux.c projects/ifnet/sys/dev/mwl/if_mwl.c projects/ifnet/sys/dev/nand/nandsim_chip.c projects/ifnet/sys/dev/netmap/netmap_mem2.c projects/ifnet/sys/dev/ntb/if_ntb/if_ntb.c projects/ifnet/sys/dev/ntb/ntb_hw/ntb_hw.c projects/ifnet/sys/dev/nxge/if_nxge.c projects/ifnet/sys/dev/oce/oce_if.c projects/ifnet/sys/dev/ofw/ofw_bus_subr.c projects/ifnet/sys/dev/ofw/ofw_bus_subr.h projects/ifnet/sys/dev/ofw/ofw_iicbus.c projects/ifnet/sys/dev/ofw/ofwbus.c projects/ifnet/sys/dev/patm/if_patm_attach.c projects/ifnet/sys/dev/pci/pci_pci.c projects/ifnet/sys/dev/pci/pcib_private.h projects/ifnet/sys/dev/qlxgb/qla_os.c projects/ifnet/sys/dev/qlxgbe/ql_os.c projects/ifnet/sys/dev/qlxge/qls_os.c projects/ifnet/sys/dev/rndtest/rndtest.c projects/ifnet/sys/dev/safe/safe.c projects/ifnet/sys/dev/sdhci/sdhci.c projects/ifnet/sys/dev/sdhci/sdhci.h projects/ifnet/sys/dev/sfxge/sfxge.c projects/ifnet/sys/dev/sfxge/sfxge_port.c projects/ifnet/sys/dev/sfxge/sfxge_rx.c projects/ifnet/sys/dev/sfxge/sfxge_tx.c projects/ifnet/sys/dev/sfxge/sfxge_tx.h projects/ifnet/sys/dev/sound/midi/mpu401.c projects/ifnet/sys/dev/sound/pci/atiixp.c projects/ifnet/sys/dev/sound/pci/es137x.c projects/ifnet/sys/dev/sound/pci/hda/hdaa.c projects/ifnet/sys/dev/sound/pci/hda/hdac.c projects/ifnet/sys/dev/sound/pci/via8233.c projects/ifnet/sys/dev/sound/pcm/channel.c projects/ifnet/sys/dev/sound/pcm/channel.h projects/ifnet/sys/dev/sound/pcm/feeder_chain.c projects/ifnet/sys/dev/sound/pcm/sound.h projects/ifnet/sys/dev/sound/usb/uaudio.c projects/ifnet/sys/dev/twa/tw_osl_freebsd.c projects/ifnet/sys/dev/tws/tws.c projects/ifnet/sys/dev/uart/uart_dev_ti8250.c projects/ifnet/sys/dev/ubsec/ubsec.c projects/ifnet/sys/dev/usb/controller/dwc_otg.c projects/ifnet/sys/dev/usb/controller/dwc_otg.h projects/ifnet/sys/dev/usb/quirk/usb_quirk.c projects/ifnet/sys/dev/usb/quirk/usb_quirk.h projects/ifnet/sys/dev/usb/serial/u3g.c projects/ifnet/sys/dev/usb/serial/uftdi.c projects/ifnet/sys/dev/usb/usb_device.c projects/ifnet/sys/dev/usb/usb_msctest.c projects/ifnet/sys/dev/usb/usb_msctest.h projects/ifnet/sys/dev/usb/usbdevs projects/ifnet/sys/dev/usb/video/udl.c projects/ifnet/sys/dev/usb/wlan/if_urtwn.c projects/ifnet/sys/dev/usb/wlan/if_urtwnreg.h projects/ifnet/sys/dev/virtio/random/virtio_random.c projects/ifnet/sys/dev/vt/vt.h projects/ifnet/sys/dev/vt/vt_core.c projects/ifnet/sys/dev/watchdog/watchdog.c projects/ifnet/sys/dev/xen/blkback/blkback.c projects/ifnet/sys/dev/xen/grant_table/grant_table.c projects/ifnet/sys/dev/xen/netback/netback.c projects/ifnet/sys/dev/xen/netfront/netfront.c projects/ifnet/sys/dev/xen/privcmd/privcmd.c projects/ifnet/sys/fs/nfs/nfs_commonport.c projects/ifnet/sys/fs/nfsclient/nfs_clbio.c projects/ifnet/sys/fs/nfsclient/nfs_clvnops.c projects/ifnet/sys/fs/procfs/procfs_ctl.c projects/ifnet/sys/gdb/gdb_cons.c projects/ifnet/sys/geom/gate/g_gate.c projects/ifnet/sys/geom/journal/g_journal.c projects/ifnet/sys/geom/mirror/g_mirror.c projects/ifnet/sys/geom/raid3/g_raid3.c projects/ifnet/sys/geom/sched/gs_rr.c projects/ifnet/sys/geom/uncompress/g_uncompress.c projects/ifnet/sys/i386/acpica/acpi_machdep.c projects/ifnet/sys/i386/conf/GENERIC projects/ifnet/sys/i386/i386/db_disasm.c projects/ifnet/sys/i386/i386/mp_watchdog.c projects/ifnet/sys/i386/ibcs2/ibcs2_misc.c projects/ifnet/sys/i386/include/md_var.h projects/ifnet/sys/i386/linux/linux_machdep.c projects/ifnet/sys/kern/init_main.c projects/ifnet/sys/kern/kern_cons.c projects/ifnet/sys/kern/kern_cpuset.c projects/ifnet/sys/kern/kern_descrip.c projects/ifnet/sys/kern/kern_event.c projects/ifnet/sys/kern/kern_exec.c projects/ifnet/sys/kern/kern_exit.c projects/ifnet/sys/kern/kern_fork.c projects/ifnet/sys/kern/kern_ktr.c projects/ifnet/sys/kern/kern_malloc.c projects/ifnet/sys/kern/kern_racct.c projects/ifnet/sys/kern/kern_shutdown.c projects/ifnet/sys/kern/kern_synch.c projects/ifnet/sys/kern/kern_thread.c projects/ifnet/sys/kern/subr_nvlist.c projects/ifnet/sys/kern/subr_nvpair.c projects/ifnet/sys/kern/subr_turnstile.c projects/ifnet/sys/kern/subr_vmem.c projects/ifnet/sys/kern/subr_witness.c projects/ifnet/sys/kern/uipc_domain.c projects/ifnet/sys/kern/uipc_mbuf.c projects/ifnet/sys/kern/vfs_syscalls.c projects/ifnet/sys/mips/atheros/files.ar71xx projects/ifnet/sys/mips/beri/beri_simplebus.c projects/ifnet/sys/mips/cavium/octe/ethernet.c projects/ifnet/sys/mips/cavium/octeon_rnd.c projects/ifnet/sys/mips/conf/AP135 projects/ifnet/sys/mips/conf/AP135.hints projects/ifnet/sys/mips/conf/QCA955X_BASE projects/ifnet/sys/mips/conf/ROUTERSTATION projects/ifnet/sys/mips/conf/RSPRO projects/ifnet/sys/mips/include/intr_machdep.h projects/ifnet/sys/mips/mips/db_disasm.c projects/ifnet/sys/mips/mips/pmap.c projects/ifnet/sys/mips/mips/vm_machdep.c projects/ifnet/sys/mips/nlm/dev/net/xlpge.c projects/ifnet/sys/mips/rmi/dev/xlr/rge.c projects/ifnet/sys/modules/Makefile projects/ifnet/sys/net/if_bridge.c projects/ifnet/sys/net/if_gif.c projects/ifnet/sys/net/if_gif.h projects/ifnet/sys/net/if_gre.c projects/ifnet/sys/net/if_me.c projects/ifnet/sys/net/if_spppsubr.c projects/ifnet/sys/net/sff8436.h projects/ifnet/sys/net/sff8472.h projects/ifnet/sys/net80211/ieee80211.h projects/ifnet/sys/net80211/ieee80211_adhoc.c projects/ifnet/sys/net80211/ieee80211_freebsd.c projects/ifnet/sys/net80211/ieee80211_hostap.c projects/ifnet/sys/net80211/ieee80211_ht.c projects/ifnet/sys/net80211/ieee80211_hwmp.c projects/ifnet/sys/net80211/ieee80211_input.h projects/ifnet/sys/net80211/ieee80211_mesh.c projects/ifnet/sys/net80211/ieee80211_node.c projects/ifnet/sys/net80211/ieee80211_output.c projects/ifnet/sys/net80211/ieee80211_proto.c projects/ifnet/sys/net80211/ieee80211_scan.c projects/ifnet/sys/net80211/ieee80211_scan.h projects/ifnet/sys/net80211/ieee80211_scan_sta.c projects/ifnet/sys/net80211/ieee80211_scan_sw.c projects/ifnet/sys/net80211/ieee80211_scan_sw.h projects/ifnet/sys/net80211/ieee80211_sta.c projects/ifnet/sys/net80211/ieee80211_wds.c projects/ifnet/sys/netgraph/netflow/ng_netflow.c projects/ifnet/sys/netgraph/netgraph.h projects/ifnet/sys/netinet/in_gif.c projects/ifnet/sys/netinet/in_pcb.c projects/ifnet/sys/netinet/ip_mroute.c projects/ifnet/sys/netinet/sctp_input.c projects/ifnet/sys/netinet/tcp_hostcache.c projects/ifnet/sys/netinet/tcp_input.c projects/ifnet/sys/netinet/tcp_subr.c projects/ifnet/sys/netinet6/in6_gif.c projects/ifnet/sys/netinet6/in6_rmx.c projects/ifnet/sys/netinet6/ip6_ipsec.c projects/ifnet/sys/netinet6/ip6_output.c projects/ifnet/sys/netinet6/nd6.h projects/ifnet/sys/netinet6/nd6_nbr.c projects/ifnet/sys/netipsec/esp.h projects/ifnet/sys/netipsec/key.c projects/ifnet/sys/netipsec/keysock.c projects/ifnet/sys/netpfil/ipfw/dn_sched.h projects/ifnet/sys/netpfil/ipfw/ip_dn_private.h projects/ifnet/sys/netpfil/ipfw/ip_dummynet.c projects/ifnet/sys/netpfil/ipfw/ip_fw2.c projects/ifnet/sys/netpfil/ipfw/ip_fw_dynamic.c projects/ifnet/sys/netpfil/ipfw/ip_fw_pfil.c projects/ifnet/sys/netpfil/ipfw/ip_fw_sockopt.c projects/ifnet/sys/netpfil/ipfw/ip_fw_table.c projects/ifnet/sys/netpfil/ipfw/ip_fw_table_value.c projects/ifnet/sys/netpfil/pf/if_pfsync.c projects/ifnet/sys/netpfil/pf/pf.c projects/ifnet/sys/netpfil/pf/pf_if.c projects/ifnet/sys/netpfil/pf/pf_ioctl.c projects/ifnet/sys/netpfil/pf/pf_norm.c projects/ifnet/sys/ofed/drivers/net/mlx4/en_netdev.c projects/ifnet/sys/ofed/include/linux/bitops.h projects/ifnet/sys/ofed/include/linux/jiffies.h projects/ifnet/sys/ofed/include/linux/timer.h projects/ifnet/sys/ofed/include/linux/workqueue.h projects/ifnet/sys/pc98/conf/GENERIC projects/ifnet/sys/powerpc/conf/GENERIC projects/ifnet/sys/powerpc/mambo/mambo_console.c projects/ifnet/sys/powerpc/mpc85xx/pci_mpc85xx.c projects/ifnet/sys/powerpc/ofw/ofw_pcibus.c projects/ifnet/sys/powerpc/powerpc/db_disasm.c projects/ifnet/sys/powerpc/pseries/phyp_console.c projects/ifnet/sys/powerpc/pseries/vdevice.c projects/ifnet/sys/sparc64/conf/GENERIC projects/ifnet/sys/sparc64/sparc64/db_disasm.c projects/ifnet/sys/sys/callout.h projects/ifnet/sys/sys/cdefs.h projects/ifnet/sys/sys/elf_common.h projects/ifnet/sys/sys/imgact.h projects/ifnet/sys/sys/ktr.h projects/ifnet/sys/sys/malloc.h projects/ifnet/sys/sys/module.h projects/ifnet/sys/sys/mouse.h projects/ifnet/sys/sys/nvpair_impl.h projects/ifnet/sys/sys/param.h projects/ifnet/sys/sys/pmc.h projects/ifnet/sys/sys/proc.h projects/ifnet/sys/sys/sockio.h projects/ifnet/sys/sys/systm.h projects/ifnet/sys/vm/default_pager.c projects/ifnet/sys/vm/device_pager.c projects/ifnet/sys/vm/phys_pager.c projects/ifnet/sys/vm/sg_pager.c projects/ifnet/sys/vm/swap_pager.c projects/ifnet/sys/vm/uma.h projects/ifnet/sys/vm/uma_core.c projects/ifnet/sys/vm/vm_meter.c projects/ifnet/sys/vm/vm_object.c projects/ifnet/sys/vm/vm_page.c projects/ifnet/sys/vm/vm_pageout.c projects/ifnet/sys/vm/vm_phys.c projects/ifnet/sys/vm/vm_phys.h projects/ifnet/sys/vm/vnode_pager.c projects/ifnet/sys/x86/acpica/srat.c projects/ifnet/sys/x86/include/acpica_machdep.h (contents, props changed) projects/ifnet/sys/x86/include/specialreg.h projects/ifnet/sys/x86/x86/cpu_machdep.c projects/ifnet/sys/x86/x86/mca.c projects/ifnet/sys/x86/xen/xen_apic.c projects/ifnet/sys/x86/xen/xenpv.c projects/ifnet/sys/xen/xen-os.h projects/ifnet/tests/Makefile projects/ifnet/tests/sys/kern/Makefile projects/ifnet/tools/bsdbox/Makefile.base projects/ifnet/tools/build/Makefile projects/ifnet/tools/build/mk/OptionalObsoleteFiles.inc projects/ifnet/tools/regression/p1003_1b/main.c projects/ifnet/tools/regression/p1003_1b/prutil.c projects/ifnet/tools/tools/ath/athaggrstats/Makefile projects/ifnet/tools/tools/ath/athstats/Makefile projects/ifnet/tools/tools/mwl/mwlstats/Makefile projects/ifnet/tools/tools/net80211/wlanstats/Makefile projects/ifnet/tools/tools/npe/npestats/Makefile projects/ifnet/usr.bin/Makefile projects/ifnet/usr.bin/bmake/Makefile projects/ifnet/usr.bin/bmake/unit-tests/Makefile projects/ifnet/usr.bin/checknr/checknr.c projects/ifnet/usr.bin/col/col.1 projects/ifnet/usr.bin/col/col.c projects/ifnet/usr.bin/ctlstat/ctlstat.8 projects/ifnet/usr.bin/elfdump/elfdump.c projects/ifnet/usr.bin/m4/extern.h projects/ifnet/usr.bin/m4/gnum4.c projects/ifnet/usr.bin/m4/look.c projects/ifnet/usr.bin/m4/m4.1 projects/ifnet/usr.bin/m4/main.c projects/ifnet/usr.bin/m4/mdef.h projects/ifnet/usr.bin/m4/misc.c projects/ifnet/usr.bin/m4/parser.y projects/ifnet/usr.bin/man/man.sh projects/ifnet/usr.bin/mandoc/Makefile projects/ifnet/usr.bin/netstat/if.c projects/ifnet/usr.bin/netstat/route.c projects/ifnet/usr.bin/procstat/procstat.1 projects/ifnet/usr.bin/rctl/rctl.8 projects/ifnet/usr.bin/soelim/soelim.1 projects/ifnet/usr.bin/soelim/soelim.c projects/ifnet/usr.bin/ssh-copy-id/ssh-copy-id.sh projects/ifnet/usr.bin/tar/Makefile projects/ifnet/usr.bin/time/time.c projects/ifnet/usr.bin/vtfontcvt/vtfontcvt.c projects/ifnet/usr.bin/whois/whois.1 projects/ifnet/usr.bin/whois/whois.c projects/ifnet/usr.sbin/acpi/acpidb/acpidb.c projects/ifnet/usr.sbin/acpi/iasl/Makefile projects/ifnet/usr.sbin/bhyve/bhyve.8 projects/ifnet/usr.sbin/bhyve/block_if.c projects/ifnet/usr.sbin/bhyve/inout.c projects/ifnet/usr.sbin/bhyve/pci_ahci.c projects/ifnet/usr.sbin/bhyve/pci_hostbridge.c projects/ifnet/usr.sbin/bhyve/pci_virtio_block.c projects/ifnet/usr.sbin/bhyve/pci_virtio_net.c projects/ifnet/usr.sbin/bhyve/pci_virtio_rnd.c projects/ifnet/usr.sbin/bhyve/task_switch.c projects/ifnet/usr.sbin/bhyve/virtio.c projects/ifnet/usr.sbin/bhyvectl/bhyvectl.c projects/ifnet/usr.sbin/bhyveload/bhyveload.c projects/ifnet/usr.sbin/bluetooth/bthidd/Makefile projects/ifnet/usr.sbin/bsdinstall/scripts/zfsboot projects/ifnet/usr.sbin/crunch/crunchide/exec_elf32.c projects/ifnet/usr.sbin/ctladm/ctladm.8 projects/ifnet/usr.sbin/ctld/ctld.8 projects/ifnet/usr.sbin/iostat/iostat.8 projects/ifnet/usr.sbin/kbdmap/kbdmap.c projects/ifnet/usr.sbin/mountd/mountd.c projects/ifnet/usr.sbin/pmcstat/pmcstat.8 projects/ifnet/usr.sbin/pmcstat/pmcstat.c projects/ifnet/usr.sbin/pmcstat/pmcstat_log.c projects/ifnet/usr.sbin/pw/Makefile projects/ifnet/usr.sbin/pw/fileupd.c projects/ifnet/usr.sbin/pw/grupd.c projects/ifnet/usr.sbin/pw/pw_conf.c projects/ifnet/usr.sbin/pw/pw_nis.c projects/ifnet/usr.sbin/pw/pw_user.c projects/ifnet/usr.sbin/pw/pwupd.c projects/ifnet/usr.sbin/pw/pwupd.h projects/ifnet/usr.sbin/syslogd/pathnames.h projects/ifnet/usr.sbin/uefisign/pe.c Directory Properties: projects/ifnet/ (props changed) projects/ifnet/cddl/ (props changed) projects/ifnet/cddl/contrib/opensolaris/ (props changed) projects/ifnet/contrib/atf/ (props changed) projects/ifnet/contrib/binutils/ (props changed) projects/ifnet/contrib/bmake/ (props changed) projects/ifnet/contrib/elftoolchain/ (props changed) projects/ifnet/contrib/gcc/ (props changed) projects/ifnet/contrib/gdb/ (props changed) projects/ifnet/contrib/libarchive/ (props changed) projects/ifnet/contrib/libarchive/libarchive/ (props changed) projects/ifnet/contrib/netcat/ (props changed) projects/ifnet/contrib/tzdata/ (props changed) projects/ifnet/etc/ (props changed) projects/ifnet/gnu/lib/ (props changed) projects/ifnet/include/ (props changed) projects/ifnet/lib/libc/ (props changed) projects/ifnet/lib/libvmmapi/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/sbin/ipfw/ (props changed) projects/ifnet/share/ (props changed) projects/ifnet/share/man/man4/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/amd64/vmm/ (props changed) projects/ifnet/sys/boot/ (props changed) projects/ifnet/sys/cddl/contrib/opensolaris/ (props changed) projects/ifnet/sys/conf/ (props changed) projects/ifnet/sys/contrib/dev/acpica/ (props changed) projects/ifnet/sys/contrib/ipfilter/ (props changed) projects/ifnet/sys/dev/hyperv/ (props changed) projects/ifnet/sys/dev/ixl/i40e_adminq.c (props changed) projects/ifnet/sys/dev/ixl/i40e_adminq.h (props changed) projects/ifnet/sys/dev/ixl/i40e_adminq_cmd.h (props changed) projects/ifnet/sys/dev/ixl/i40e_alloc.h (props changed) projects/ifnet/sys/dev/ixl/i40e_common.c (props changed) projects/ifnet/sys/dev/ixl/i40e_hmc.c (props changed) projects/ifnet/sys/dev/ixl/i40e_hmc.h (props changed) projects/ifnet/sys/dev/ixl/i40e_lan_hmc.c (props changed) projects/ifnet/sys/dev/ixl/i40e_lan_hmc.h (props changed) projects/ifnet/sys/dev/ixl/i40e_nvm.c (props changed) projects/ifnet/sys/dev/ixl/i40e_osdep.c (props changed) projects/ifnet/sys/dev/ixl/i40e_osdep.h (props changed) projects/ifnet/sys/dev/ixl/i40e_prototype.h (props changed) projects/ifnet/sys/dev/ixl/i40e_register.h (props changed) projects/ifnet/sys/dev/ixl/i40e_status.h (props changed) projects/ifnet/sys/dev/ixl/i40e_type.h (props changed) projects/ifnet/sys/dev/ixl/i40e_virtchnl.h (props changed) projects/ifnet/sys/dev/ixl/if_ixl.c (props changed) projects/ifnet/sys/dev/ixl/ixl_txrx.c (props changed) projects/ifnet/usr.bin/procstat/ (props changed) projects/ifnet/usr.sbin/bhyve/ (props changed) projects/ifnet/usr.sbin/bhyvectl/ (props changed) projects/ifnet/usr.sbin/bhyveload/ (props changed) Modified: projects/ifnet/Makefile.inc1 ============================================================================== --- projects/ifnet/Makefile.inc1 Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/Makefile.inc1 Fri May 22 18:23:21 2015 (r283294) @@ -1297,7 +1297,9 @@ _cat= bin/cat _lex= usr.bin/lex .endif -.if ${BOOTSTRAPPING} < 1001507 +# r277259 crunchide: Correct 64-bit section header offset +# r281674 crunchide: always include both 32- and 64-bit ELF support +.if ${BOOTSTRAPPING} < 1100071 _crunch= usr.sbin/crunch .endif @@ -1361,6 +1363,9 @@ _kerberos5_bootstrap_tools= \ .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g} .endif +# Rebuild up-to-date libmd for xinstall +${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd + bootstrap-tools: .PHONY # Please document (add comment) why something is in 'bootstrap-tools'. @@ -1463,11 +1468,6 @@ kernel-tools: .MAKE _btxld= usr.sbin/btxld .endif .endif -.if ${TARGET_ARCH} != ${MACHINE_ARCH} -.if ${MK_RESCUE} != "no" -_crunchide= usr.sbin/crunch/crunchide -.endif -.endif # If we're given an XAS, don't build binutils. .if ${XAS:M/*} == "" @@ -1502,6 +1502,9 @@ _clang_libs= lib/clang _cc= gnu/usr.bin/cc .endif .endif +.if ${MK_USB} != "no" +_usb_tools= sys/boot/usb/tools +.endif cross-tools: .MAKE .for _tool in \ @@ -1512,7 +1515,7 @@ cross-tools: .MAKE ${_cc} \ ${_btxld} \ ${_crunchide} \ - sys/boot/usb/tools + ${_usb_tools} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${MAKE} DIRPRFX=${_tool}/ obj && \ @@ -1657,13 +1660,7 @@ _prereq_libs= gnu/lib/libssp/libssp_nons # all shared libraries for ELF. # _startup_libs= gnu/lib/csu -.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) -_startup_libs+= lib/csu/${MACHINE_ARCH}-elf -.elif exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}) -_startup_libs+= lib/csu/${MACHINE_ARCH} -.else -_startup_libs+= lib/csu/${MACHINE_CPUARCH} -.endif +_startup_libs+= lib/csu _startup_libs+= gnu/lib/libgcc _startup_libs+= lib/libcompiler_rt _startup_libs+= lib/libc @@ -1682,7 +1679,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_kerberos5_lib_libhdb} \ ${_kerberos5_lib_libheimbase} \ ${_kerberos5_lib_libheimntlm} \ - ${_kerberos5_lib_libheimsqlite} \ + ${_libsqlite3} \ ${_kerberos5_lib_libheimipcc} \ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ @@ -1758,6 +1755,13 @@ _cddl_lib= cddl/lib cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L cddl/lib/libzfs__L: lib/libgeom__L cddl/lib/libctf__L: lib/libz__L +# cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built +# on select architectures though (see cddl/lib/Makefile) +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ + ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \ + ${MACHINE_CPUARCH} == "arm" +_prebuild_libs+= lib/libproc lib/librtld_db +.endif .endif .if ${MK_CRYPT} != "no" @@ -1789,7 +1793,7 @@ _secure_lib= secure/lib kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L \ - kerberos5/lib/libwind__L kerberos5/lib/libheimsqlite__L + kerberos5/lib/libwind__L lib/libsqlite3__L kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libroken__L lib/libcom_err__L kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ @@ -1802,7 +1806,7 @@ kerberos5/lib/libroken__L: lib/libcrypt_ kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L kerberos5/lib/libheimbase__L: lib/libthr__L kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L -kerberos5/lib/libheimsqlite__L: lib/libthr__L +lib/libsqlite3__L: lib/libthr__L .endif .if ${MK_GSSAPI} != "no" @@ -1818,7 +1822,7 @@ _kerberos5_lib_libkrb5= kerberos5/lib/li _kerberos5_lib_libhx509= kerberos5/lib/libhx509 _kerberos5_lib_libroken= kerberos5/lib/libroken _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm -_kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite +_libsqlite3= lib/libsqlite3 _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc _kerberos5_lib_libwind= kerberos5/lib/libwind _libcom_err= lib/libcom_err @@ -1832,6 +1836,16 @@ _lib_libypclnt= lib/libypclnt lib/libradius__L: lib/libmd__L .endif +lib/libproc__L: \ + ${_cddl_lib_libctf:D${_cddl_lib_libctf}__L} lib/libelf__L lib/librtld_db__L lib/libutil__L +.if ${MK_CXX} != "no" +.if ${MK_LIBCPLUSPLUS} != "no" +lib/libproc__L: lib/libcxxrt__L +.else # This implies MK_GNUCXX != "no"; see lib/libproc +lib/libproc__L: gnu/lib/libsupc++__L +.endif +.endif + gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L .for _lib in ${_prereq_libs} Modified: projects/ifnet/ObsoleteFiles.inc ============================================================================== --- projects/ifnet/ObsoleteFiles.inc Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/ObsoleteFiles.inc Fri May 22 18:23:21 2015 (r283294) @@ -38,6 +38,22 @@ # xargs -n1 | sort | uniq -d; # done +# 20150521 +OLD_FILES+=usr/bin/demandoc +OLD_FILES+=usr/share/man/man1/demandoc.1.gz +OLD_FILES+=usr/share/man/man3/mandoc.3.gz +OLD_FILES+=usr/share/man/man3/mandoc_headers.3.gz +# 20150520 +OLD_FILES+=usr/lib/libheimsqlite.a +OLD_FILES+=usr/lib/libheimsqlite.so +OLD_LIBS+=usr/lib/libheimsqlite.so.11 +OLD_FILES+=usr/lib/libheimsqlite_p.a +OLD_FILES+=usr/lib32/libheimsqlite.a +OLD_FILES+=usr/lib32/libheimsqlite.so +OLD_LIBS+=usr/lib32/libheimsqlite.so.11 +OLD_FILES+=usr/lib32/libheimsqlite_p.a +# 20150506 +OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz # 20150504 OLD_LIBS+=usr/lib32/private/libatf-c++.so.2 OLD_LIBS+=usr/lib32/private/libbsdstat.so.1 @@ -430,10 +446,6 @@ OLD_FILES+=usr/lib/debug/usr/lib32/i18n OLD_FILES+=usr/lib/debug/usr/lib32/private # 20141015: OpenSSL 1.0.1j import OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz -.if ${MK_GCC} == "no" -# 20141009: gperf disabled by default -OLD_FILES+=usr/bin/gperf -.endif # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz @@ -450,6 +462,33 @@ OLD_LIBS+=usr/lib32/libopie.so.7 OLD_FILES+=usr/bin/otp-sha OLD_FILES+=usr/share/man/man1/otp-sha.1.gz # 20140807: Remove private lib files that should not be installed. +OLD_FILES+=usr/lib32/private/libatf-c.a +OLD_FILES+=usr/lib32/private/libatf-c.so +OLD_FILES+=usr/lib32/private/libatf-c_p.a +OLD_FILES+=usr/lib32/private/libatf-c++.a +OLD_FILES+=usr/lib32/private/libatf-c++.so +OLD_FILES+=usr/lib32/private/libatf-c++_p.a +OLD_FILES+=usr/lib32/private/libbsdstat.a +OLD_FILES+=usr/lib32/private/libbsdstat.so +OLD_FILES+=usr/lib32/private/libbsdstat_p.a +OLD_FILES+=usr/lib32/private/libheimipcc.a +OLD_FILES+=usr/lib32/private/libheimipcc.so +OLD_FILES+=usr/lib32/private/libheimipcc_p.a +OLD_FILES+=usr/lib32/private/libheimipcs.a +OLD_FILES+=usr/lib32/private/libheimipcs.so +OLD_FILES+=usr/lib32/private/libheimipcs_p.a +OLD_FILES+=usr/lib32/private/libldns.a +OLD_FILES+=usr/lib32/private/libldns.so +OLD_FILES+=usr/lib32/private/libldns_p.a +OLD_FILES+=usr/lib32/private/libssh.a +OLD_FILES+=usr/lib32/private/libssh.so +OLD_FILES+=usr/lib32/private/libssh_p.a +OLD_FILES+=usr/lib32/private/libunbound.a +OLD_FILES+=usr/lib32/private/libunbound.so +OLD_FILES+=usr/lib32/private/libunbound_p.a +OLD_FILES+=usr/lib32/private/libucl.a +OLD_FILES+=usr/lib32/private/libucl.so +OLD_FILES+=usr/lib32/private/libucl_p.a OLD_FILES+=usr/lib/private/libatf-c.a OLD_FILES+=usr/lib/private/libatf-c.so OLD_FILES+=usr/lib/private/libatf-c_p.a @@ -470,7 +509,7 @@ OLD_FILES+=usr/lib/private/libldns.so OLD_FILES+=usr/lib/private/libldns_p.a OLD_FILES+=usr/lib/private/libssh.a OLD_FILES+=usr/lib/private/libssh.so -OLD_FILES+=usr/lib/private/libssh.p.a +OLD_FILES+=usr/lib/private/libssh_p.a OLD_FILES+=usr/lib/private/libunbound.a OLD_FILES+=usr/lib/private/libunbound.so OLD_FILES+=usr/lib/private/libunbound_p.a @@ -622,8 +661,12 @@ OLD_FILES+=usr/libexec/bsdconfig/070.use # 20140223: Remove libyaml OLD_FILES+=usr/lib/private/libyaml.a OLD_FILES+=usr/lib/private/libyaml.so -OLD_FILES+=usr/lib/private/libyaml.so.1 +OLD_LIBS+=usr/lib/private/libyaml.so.1 OLD_FILES+=usr/lib/private/libyaml_p.a +OLD_FILES+=usr/lib32/private/libyaml.a +OLD_FILES+=usr/lib32/private/libyaml.so +OLD_LIBS+=usr/lib32/private/libyaml.so.1 +OLD_FILES+=usr/lib32/private/libyaml_p.a # 20140216: new clang import which bumps version from 3.3 to 3.4. OLD_FILES+=usr/bin/llvm-prof OLD_FILES+=usr/bin/llvm-ranlib Modified: projects/ifnet/UPDATING ============================================================================== --- projects/ifnet/UPDATING Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/UPDATING Fri May 22 18:23:21 2015 (r283294) @@ -31,6 +31,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150521: + TI platform code switched to using vendor DTS files and this update + may break existing systems running on Beaglebone, Beaglebone Black, + and Pandaboard: + + - dtb files should be regenerated/reinstalled. Filenames are the + same but content is different now + - GPIO addressing was changed, now each GPIO bank (32 pins per bank) + has its own /dev/gpiocX device, e.g. pin 121 on /dev/gpioc0 in old + addressing scheme is now pin 25 on /dev/gpioc3. + - Pandaboard: /etc/ttys should be updated, serial console device is + now /dev/ttyu2, not /dev/ttyu0 + 20150501: soelim(1) from gnu/usr.bin/groff has been replaced by usr.bin/soelim. If you need the GNU extension from groff soelim(1), install groff Modified: projects/ifnet/bin/cp/cp.c ============================================================================== --- projects/ifnet/bin/cp/cp.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/bin/cp/cp.c Fri May 22 18:23:21 2015 (r283294) @@ -90,7 +90,6 @@ volatile sig_atomic_t info; enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE }; static int copy(char *[], enum op, int); -static int mastercmp(const FTSENT * const *, const FTSENT * const *); static void siginfo(int __unused); int @@ -274,7 +273,7 @@ copy(char *argv[], enum op type, int fts mask = ~umask(0777); umask(~mask); - if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL) + if ((ftsp = fts_open(argv, fts_options, NULL)) == NULL) err(1, "fts_open"); for (badcp = rval = 0; (curr = fts_read(ftsp)) != NULL; badcp = 0) { switch (curr->fts_info) { @@ -488,32 +487,6 @@ copy(char *argv[], enum op type, int fts return (rval); } -/* - * mastercmp -- - * The comparison function for the copy order. The order is to copy - * non-directory files before directory files. The reason for this - * is because files tend to be in the same cylinder group as their - * parent directory, whereas directories tend not to be. Copying the - * files first reduces seeking. - */ -static int -mastercmp(const FTSENT * const *a, const FTSENT * const *b) -{ - int a_info, b_info; - - a_info = (*a)->fts_info; - if (a_info == FTS_ERR || a_info == FTS_NS || a_info == FTS_DNR) - return (0); - b_info = (*b)->fts_info; - if (b_info == FTS_ERR || b_info == FTS_NS || b_info == FTS_DNR) - return (0); - if (a_info == FTS_D) - return (-1); - if (b_info == FTS_D) - return (1); - return (0); -} - static void siginfo(int sig __unused) { Modified: projects/ifnet/bin/date/date.1 ============================================================================== --- projects/ifnet/bin/date/date.1 Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/bin/date/date.1 Fri May 22 18:23:21 2015 (r283294) @@ -32,7 +32,7 @@ .\" @(#)date.1 8.3 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd April 26, 2014 +.Dd May 7, 2015 .Dt DATE 1 .Os .Sh NAME @@ -41,7 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl jRu -.Op Fl r Ar seconds +.Op Fl r Ar seconds | Ar filename .Oo .Fl v .Sm off @@ -150,6 +150,9 @@ is the number of seconds since the Epoch see .Xr time 3 ) , and can be specified in decimal, octal, or hex. +.It Fl r Ar filename +Print the date and time of the last modification of +.Ar filename . .It Fl t Ar minutes_west Set the system's value for minutes west of .Tn GMT . Modified: projects/ifnet/bin/date/date.c ============================================================================== --- projects/ifnet/bin/date/date.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/bin/date/date.c Fri May 22 18:23:21 2015 (r283294) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -85,6 +86,7 @@ main(int argc, char *argv[]) struct vary *v; const struct vary *badv; struct tm lt; + struct stat sb; v = NULL; fmt = NULL; @@ -116,8 +118,12 @@ main(int argc, char *argv[]) case 'r': /* user specified seconds */ rflag = 1; tval = strtoq(optarg, &tmp, 0); - if (*tmp != 0) - usage(); + if (*tmp != 0) { + if (stat(optarg, &sb) == 0) + tval = sb.st_mtim.tv_sec; + else + usage(); + } break; case 't': /* minutes west of UTC */ /* error check; don't allow "PST" */ Modified: projects/ifnet/bin/pax/ar_subs.c ============================================================================== --- projects/ifnet/bin/pax/ar_subs.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/bin/pax/ar_subs.c Fri May 22 18:23:21 2015 (r283294) @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "pax.h" #include "extern.h" Modified: projects/ifnet/bin/pax/buf_subs.c ============================================================================== --- projects/ifnet/bin/pax/buf_subs.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/bin/pax/buf_subs.c Fri May 22 18:23:21 2015 (r283294) @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "pax.h" #include "extern.h" Modified: projects/ifnet/bin/pax/cache.c ============================================================================== --- projects/ifnet/bin/pax/cache.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/bin/pax/cache.c Fri May 22 18:23:21 2015 (r283294) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "pax.h" #include "cache.h" Modified: projects/ifnet/bin/pax/cpio.c ============================================================================== --- projects/ifnet/bin/pax/cpio.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/bin/pax/cpio.c Fri May 22 18:23:21 2015 (r283294) @@ -45,8 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include "pax.h" #include "cpio.h" #include "extern.h" Modified: projects/ifnet/bin/pax/file_subs.c ============================================================================== --- projects/ifnet/bin/pax/file_subs.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/bin/pax/file_subs.c Fri May 22 18:23:21 2015 (r283294) @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "pax.h" #include "options.h" #include "extern.h" Modified: projects/ifnet/bin/pax/gen_subs.c ============================================================================== --- projects/ifnet/bin/pax/gen_subs.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/bin/pax/gen_subs.c Fri May 22 18:23:21 2015 (r283294) @@ -45,8 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include #include "pax.h" #include "extern.h" Modified: projects/ifnet/bin/pax/getoldopt.c ============================================================================== --- projects/ifnet/bin/pax/getoldopt.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/bin/pax/getoldopt.c Fri May 22 18:23:21 2015 (r283294) @@ -19,8 +19,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include "pax.h" -#include "extern.h" +int getoldopt(int, char **, const char *); int getoldopt(int argc, char **argv, const char *optstring) Modified: projects/ifnet/bin/pax/pat_rep.c ============================================================================== --- projects/ifnet/bin/pax/pat_rep.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/bin/pax/pat_rep.c Fri May 22 18:23:21 2015 (r283294) @@ -43,9 +43,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include -#include #ifdef NET2_REGEX #include #else Modified: projects/ifnet/bin/pax/pax.c ============================================================================== --- projects/ifnet/bin/pax/pax.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/bin/pax/pax.c Fri May 22 18:23:21 2015 (r283294) @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "pax.h" #include "extern.h" static int gen_init(void); Modified: projects/ifnet/bin/pax/sel_subs.c ============================================================================== --- projects/ifnet/bin/pax/sel_subs.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/bin/pax/sel_subs.c Fri May 22 18:23:21 2015 (r283294) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "pax.h" #include "sel_subs.h" Modified: projects/ifnet/bin/pax/tar.c ============================================================================== --- projects/ifnet/bin/pax/tar.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/bin/pax/tar.c Fri May 22 18:23:21 2015 (r283294) @@ -44,8 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include "pax.h" #include "extern.h" #include "tar.h" Modified: projects/ifnet/bin/pax/tty_subs.c ============================================================================== --- projects/ifnet/bin/pax/tty_subs.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/bin/pax/tty_subs.c Fri May 22 18:23:21 2015 (r283294) @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "pax.h" #include "extern.h" Modified: projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c Fri May 22 18:23:21 2015 (r283294) @@ -1328,15 +1328,28 @@ ctf_add_type(ctf_file_t *dst_fp, ctf_fil * we are looking for. This is necessary to permit ctf_add_type() to * operate recursively on entities such as a struct that contains a * pointer member that refers to the same struct type. + * + * In the case of integer and floating point types, we match using the + * type encoding as well - else we may incorrectly return a bitfield + * type, for instance. */ if (dst_type == CTF_ERR && name[0] != '\0') { for (dtd = ctf_list_prev(&dst_fp->ctf_dtdefs); dtd != NULL && CTF_TYPE_TO_INDEX(dtd->dtd_type) > dst_fp->ctf_dtoldid; dtd = ctf_list_prev(dtd)) { - if (CTF_INFO_KIND(dtd->dtd_data.ctt_info) == kind && - dtd->dtd_name != NULL && - strcmp(dtd->dtd_name, name) == 0) - return (dtd->dtd_type); + if (CTF_INFO_KIND(dtd->dtd_data.ctt_info) != kind || + dtd->dtd_name == NULL || + strcmp(dtd->dtd_name, name) != 0) + continue; + if (kind == CTF_K_INTEGER || kind == CTF_K_FLOAT) { + if (ctf_type_encoding(src_fp, src_type, + &src_en) != 0) + continue; + if (bcmp(&src_en, &dtd->dtd_u.dtu_enc, + sizeof (ctf_encoding_t)) != 0) + continue; + } + return (dtd->dtd_type); } } Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l Fri May 22 18:23:21 2015 (r283294) @@ -743,6 +743,7 @@ yyinit(dt_pcb_t *pcb) #ifdef illumos yysptr = yysbuf; #endif + YY_FLUSH_BUFFER; } /* Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Fri May 22 18:23:21 2015 (r283294) @@ -1785,17 +1785,11 @@ dtrace_program_link(dtrace_hdl_t *dtp, d "failed to open %s: %s", file, strerror(errno))); } #else - if (dtp->dt_lazyload) { - if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0666)) < 0) - return (dt_link_error(dtp, NULL, -1, NULL, - "failed to open %s: %s", file, strerror(errno))); - } else { - snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file); - if ((fd = mkstemp(tfile)) == -1) - return (dt_link_error(dtp, NULL, -1, NULL, - "failed to create temporary file %s: %s", - tfile, strerror(errno))); - } + snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file); + if ((fd = mkostemp(tfile, O_CLOEXEC)) == -1) + return (dt_link_error(dtp, NULL, -1, NULL, + "failed to create temporary file %s: %s", + tfile, strerror(errno))); #endif /* @@ -1868,23 +1862,9 @@ dtrace_program_link(dtrace_hdl_t *dtp, d (void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file, fd, drti); #else const char *fmt = "%s -o %s -r %s %s"; + dt_dirpath_t *dp = dt_list_next(&dtp->dt_lib_path); -#if defined(__amd64__) - /* - * Arches which default to 64-bit need to explicitly use - * the 32-bit library path. - */ - int use_32 = (dtp->dt_oflags & DTRACE_O_ILP32); -#else - /* - * Arches which are 32-bit only just use the normal - * library path. - */ - int use_32 = 0; -#endif - - (void) snprintf(drti, sizeof (drti), "/usr/lib%s/dtrace/drti.o", - use_32 ? "32" : ""); + (void) snprintf(drti, sizeof (drti), "%s/drti.o", dp->dir_path); len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile, drti) + 1; @@ -1951,14 +1931,23 @@ dtrace_program_link(dtrace_hdl_t *dtp, d } #endif } else { +#ifdef __FreeBSD__ + if (rename(tfile, file) != 0) { + ret = dt_link_error(dtp, NULL, fd, NULL, + "failed to rename %s to %s: %s", tfile, file, + strerror(errno)); + goto done; + } +#endif (void) close(fd); } done: dtrace_dof_destroy(dtp, dof); -#ifndef illumos - unlink(tfile); +#ifdef __FreeBSD__ + if (!dtp->dt_lazyload) + (void) unlink(tfile); #endif return (ret); } Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Fri May 22 18:23:21 2015 (r283294) @@ -792,6 +792,7 @@ const char *_dtrace_libdir = "/usr/lib/d #ifdef illumos const char *_dtrace_provdir = "/dev/dtrace/provider"; /* provider directory */ #else +const char *_dtrace_libdir32 = "/usr/lib32/dtrace"; const char *_dtrace_provdir = "/dev/dtrace"; /* provider directory */ #endif @@ -1581,8 +1582,19 @@ alloc: * compile, and to provide better error reporting (because the full * reporting of compiler errors requires dtrace_open() to succeed). */ +#ifdef __FreeBSD__ +#ifdef __LP64__ + if ((dtp->dt_oflags & DTRACE_O_ILP32) != 0) { + if (dtrace_setopt(dtp, "libdir", _dtrace_libdir32) != 0) + return (set_open_errno(dtp, errp, dtp->dt_errno)); + } +#endif if (dtrace_setopt(dtp, "libdir", _dtrace_libdir) != 0) return (set_open_errno(dtp, errp, dtp->dt_errno)); +#else + if (dtrace_setopt(dtp, "libdir", _dtrace_libdir) != 0) + return (set_open_errno(dtp, errp, dtp->dt_errno)); +#endif return (dtp); } Modified: projects/ifnet/cddl/lib/Makefile ============================================================================== --- projects/ifnet/cddl/lib/Makefile Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/lib/Makefile Fri May 22 18:23:21 2015 (r283294) @@ -33,4 +33,11 @@ _drti= drti _libdtrace= libdtrace .endif +SUBDIR_DEPEND_libdtrace= libctf +SUBDIR_DEPEND_libzfs_core= libnvpair +SUBDIR_DEPEND_libzfs= libavl libnvpair libumem libuutil libzfs_core +SUBDIR_DEPEND_libzpool= libavl libnvpair libumem + +SUBDIR_PARALLEL= + .include Modified: projects/ifnet/cddl/lib/libdtrace/Makefile ============================================================================== --- projects/ifnet/cddl/lib/libdtrace/Makefile Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/lib/libdtrace/Makefile Fri May 22 18:23:21 2015 (r283294) @@ -50,6 +50,7 @@ DSRCS= errno.d \ io.d \ ip.d \ psinfo.d \ + siftr.d \ signal.d \ tcp.d \ udp.d \ @@ -103,6 +104,8 @@ LFLAGS+=-l YFLAGS+=-d +LIBADD= ctf elf proc pthread rtld_db + CLEANFILES= dt_errtags.c dt_names.c dt_errtags.c: Copied: projects/ifnet/cddl/lib/libdtrace/siftr.d (from r283293, head/cddl/lib/libdtrace/siftr.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/cddl/lib/libdtrace/siftr.d Fri May 22 18:23:21 2015 (r283294, copy of r283293, head/cddl/lib/libdtrace/siftr.d) @@ -0,0 +1,100 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + * + * $FreeBSD$ + */ + +#pragma D depends_on module siftr +#pragma D depends_on provider tcp + +/* + * Convert a SIFTR direction value to a string + */ +#pragma D binding "1.12.1" SIFTR_IN +inline int SIFTR_IN = 1; +#pragma D binding "1.12.1" SIFTR_OUT +inline int SIFTR_OUT = 2; + +/* SIFTR direction strings. */ +#pragma D binding "1.12.1" siftr_dir_string +inline string siftr_dir_string[uint8_t direction] = + direction == SIFTR_IN ? "in" : + direction == SIFTR_OUT ? "out" : + "unknown" ; + +typedef struct siftrinfo { + struct timeval tval; + uint8_t direction; + uint8_t ipver; + uint32_t hash; + uint16_t tcp_localport; + uint16_t tcp_foreignport; + uint64_t snd_cwnd; + u_long snd_wnd; + u_long rcv_wnd; + u_long snd_bwnd; + u_long snd_ssthresh; + int conn_state; + u_int max_seg_size; + int smoothed_rtt; + u_char sack_enabled; + u_char snd_scale; + u_char rcv_scale; + u_int flags; + int rxt_length; + u_int snd_buf_hiwater; + u_int snd_buf_cc; + u_int rcv_buf_hiwater; + u_int rcv_buf_cc; + u_int sent_inflight_bytes; + int t_segqlen; + u_int flowid; + u_int flowtype; +} siftrinfo_t; + +#pragma D binding "1.12.1" translator +translator siftrinfo_t < struct pkt_node *p > { + direction = p == NULL ? 0 : p->direction; + ipver = p == NULL ? 0 : p->ipver; + hash = p == NULL ? 0 : p->hash; + tcp_localport = p == NULL ? 0 : ntohs(p->tcp_localport); + tcp_foreignport = p == NULL ? 0 : ntohs(p->tcp_foreignport); + snd_cwnd = p == NULL ? 0 : p->snd_cwnd; + snd_wnd = p == NULL ? 0 : p->snd_wnd; + rcv_wnd = p == NULL ? 0 : p->rcv_wnd; + snd_bwnd = p == NULL ? 0 : p->snd_bwnd; + snd_ssthresh = p == NULL ? 0 : p->snd_ssthresh; + conn_state = p == NULL ? 0 : p->conn_state; + max_seg_size = p == NULL ? 0 : p->max_seg_size; + smoothed_rtt = p == NULL ? 0 : p->smoothed_rtt; + sack_enabled = p == NULL ? 0 : p->sack_enabled; + snd_scale = p == NULL ? 0 : p->snd_scale; + rcv_scale = p == NULL ? 0 : p->rcv_scale; + flags = p == NULL ? 0 : p->flags; + rxt_length = p == NULL ? 0 : p->rxt_length; + snd_buf_hiwater = p == NULL ? 0 : p->snd_buf_hiwater; + snd_buf_cc = p == NULL ? 0 : p->snd_buf_cc; + rcv_buf_hiwater = p == NULL ? 0 : p->rcv_buf_hiwater; + rcv_buf_cc = p == NULL ? 0 : p->rcv_buf_cc; + sent_inflight_bytes = p == NULL ? 0 : p->sent_inflight_bytes; + t_segqlen = p == NULL ? 0 : p->t_segqlen; + flowid = p == NULL ? 0 : p->flowid; + flowtype = p == NULL ? 0 : p->flowtype; +}; Modified: projects/ifnet/cddl/lib/libdtrace/tcp.d ============================================================================== --- projects/ifnet/cddl/lib/libdtrace/tcp.d Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/lib/libdtrace/tcp.d Fri May 22 18:23:21 2015 (r283294) @@ -241,78 +241,3 @@ translator tcpinfoh_t < struct tcphdr *p translator tcplsinfo_t < int s > { tcps_state = s; }; - -/* - * Convert a SIFTR direction value to a string - */ -#pragma D binding "1.12.1" SIFTR_IN -inline int SIFTR_IN = 1; -#pragma D binding "1.12.1" SIFTR_OUT -inline int SIFTR_OUT = 2; - -/* SIFTR direction strings. */ -#pragma D binding "1.12.1" siftr_dir_string -inline string siftr_dir_string[uint8_t direction] = - direction == SIFTR_IN ? "in" : - direction == SIFTR_OUT ? "out" : - "unknown" ; - -typedef struct siftrinfo { - struct timeval tval; - uint8_t direction; - uint8_t ipver; - uint32_t hash; - uint16_t tcp_localport; - uint16_t tcp_foreignport; - uint64_t snd_cwnd; - u_long snd_wnd; - u_long rcv_wnd; - u_long snd_bwnd; - u_long snd_ssthresh; - int conn_state; - u_int max_seg_size; - int smoothed_rtt; - u_char sack_enabled; - u_char snd_scale; - u_char rcv_scale; - u_int flags; - int rxt_length; - u_int snd_buf_hiwater; - u_int snd_buf_cc; - u_int rcv_buf_hiwater; - u_int rcv_buf_cc; - u_int sent_inflight_bytes; - int t_segqlen; - u_int flowid; - u_int flowtype; -} siftrinfo_t; - -#pragma D binding "1.12.1" translator -translator siftrinfo_t < struct pkt_node *p > { - direction = p == NULL ? 0 : p->direction; - ipver = p == NULL ? 0 : p->ipver; - hash = p == NULL ? 0 : p->hash; - tcp_localport = p == NULL ? 0 : ntohs(p->tcp_localport); - tcp_foreignport = p == NULL ? 0 : ntohs(p->tcp_foreignport); - snd_cwnd = p == NULL ? 0 : p->snd_cwnd; - snd_wnd = p == NULL ? 0 : p->snd_wnd; - rcv_wnd = p == NULL ? 0 : p->rcv_wnd; - snd_bwnd = p == NULL ? 0 : p->snd_bwnd; - snd_ssthresh = p == NULL ? 0 : p->snd_ssthresh; - conn_state = p == NULL ? 0 : p->conn_state; - max_seg_size = p == NULL ? 0 : p->max_seg_size; - smoothed_rtt = p == NULL ? 0 : p->smoothed_rtt; - sack_enabled = p == NULL ? 0 : p->sack_enabled; - snd_scale = p == NULL ? 0 : p->snd_scale; - rcv_scale = p == NULL ? 0 : p->rcv_scale; - flags = p == NULL ? 0 : p->flags; - rxt_length = p == NULL ? 0 : p->rxt_length; - snd_buf_hiwater = p == NULL ? 0 : p->snd_buf_hiwater; - snd_buf_cc = p == NULL ? 0 : p->snd_buf_cc; - rcv_buf_hiwater = p == NULL ? 0 : p->rcv_buf_hiwater; - rcv_buf_cc = p == NULL ? 0 : p->rcv_buf_cc; - sent_inflight_bytes = p == NULL ? 0 : p->sent_inflight_bytes; - t_segqlen = p == NULL ? 0 : p->t_segqlen; - flowid = p == NULL ? 0 : p->flowid; - flowtype = p == NULL ? 0 : p->flowtype; -}; Modified: projects/ifnet/cddl/sbin/Makefile ============================================================================== --- projects/ifnet/cddl/sbin/Makefile Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/sbin/Makefile Fri May 22 18:23:21 2015 (r283294) @@ -13,4 +13,6 @@ _zfs= zfs _zpool= zpool .endif +SUBDIR_PARALLEL= + .include Modified: projects/ifnet/cddl/usr.bin/Makefile ============================================================================== --- projects/ifnet/cddl/usr.bin/Makefile Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/usr.bin/Makefile Fri May 22 18:23:21 2015 (r283294) @@ -26,4 +26,6 @@ _zstreamdump = zstreamdump .endif .endif +SUBDIR_PARALLEL= + .include Modified: projects/ifnet/cddl/usr.bin/ctfconvert/Makefile ============================================================================== --- projects/ifnet/cddl/usr.bin/ctfconvert/Makefile Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/usr.bin/ctfconvert/Makefile Fri May 22 18:23:21 2015 (r283294) @@ -3,8 +3,6 @@ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt -DEBUG_FLAGS= -g - PROG= ctfconvert SRCS= alist.c \ ctf.c \ @@ -36,7 +34,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -DPADD= ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} -LDADD= -ldwarf -lelf -lz -lpthread +LIBADD= dwarf elf z pthread .include Modified: projects/ifnet/cddl/usr.bin/ctfdump/Makefile ============================================================================== --- projects/ifnet/cddl/usr.bin/ctfdump/Makefile Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/usr.bin/ctfdump/Makefile Fri May 22 18:23:21 2015 (r283294) @@ -17,7 +17,6 @@ CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -DPADD= ${LIBPTHREAD} ${LIBELF} ${LIBZ} -LDADD= -lpthread -lelf -lz +LIBADD= elf z .include Modified: projects/ifnet/cddl/usr.sbin/Makefile ============================================================================== --- projects/ifnet/cddl/usr.sbin/Makefile Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/usr.sbin/Makefile Fri May 22 18:23:21 2015 (r283294) @@ -46,4 +46,6 @@ _dtruss= dtruss _lockstat= lockstat .endif +SUBDIR_PARALLEL= + .include Modified: projects/ifnet/cddl/usr.sbin/dtrace/Makefile ============================================================================== --- projects/ifnet/cddl/usr.sbin/dtrace/Makefile Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/usr.sbin/dtrace/Makefile Fri May 22 18:23:21 2015 (r283294) @@ -20,9 +20,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ #CFLAGS+= -DNEED_ERRLOC #YFLAGS+= -d -DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ - ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB} -LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lutil \ - -lrtld_db +LIBADD= dtrace .include Modified: projects/ifnet/cddl/usr.sbin/dtrace/tests/tools/exclude.sh ============================================================================== --- projects/ifnet/cddl/usr.sbin/dtrace/tests/tools/exclude.sh Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/usr.sbin/dtrace/tests/tools/exclude.sh Fri May 22 18:23:21 2015 (r283294) @@ -38,7 +38,6 @@ exclude EXFAIL common/ip/tst.ipv4localud exclude EXFAIL common/mdb/tst.dtracedcmd.ksh exclude EXFAIL common/misc/tst.dofmax.ksh exclude EXFAIL common/misc/tst.include.ksh -exclude EXFAIL common/pragma/tst.libchain.ksh exclude EXFAIL common/safety/tst.copyin2.d exclude EXFAIL common/safety/tst.msgdsize.d exclude EXFAIL common/safety/tst.msgsize.d Modified: projects/ifnet/cddl/usr.sbin/lockstat/Makefile ============================================================================== --- projects/ifnet/cddl/usr.sbin/lockstat/Makefile Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/usr.sbin/lockstat/Makefile Fri May 22 18:23:21 2015 (r283294) @@ -21,10 +21,6 @@ CFLAGS+= -DNEED_ERRLOC -g #YFLAGS+= -d -DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ - ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBRT} ${LIBUTIL} \ - ${LIBRTLD_DB} -LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt -lutil \ - -lrtld_db +LIBADD= elf dtrace rt .include Modified: projects/ifnet/cddl/usr.sbin/plockstat/Makefile ============================================================================== --- projects/ifnet/cddl/usr.sbin/plockstat/Makefile Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/cddl/usr.sbin/plockstat/Makefile Fri May 22 18:23:21 2015 (r283294) @@ -18,9 +18,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${.CURDIR}/../../../cddl/lib/libdtrace \ -I${.CURDIR}/../../../sys -DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} ${LIBCTF}\ - ${LIBELF} ${LIBZ} ${LIBRT} ${LIBRTLD_DB} ${LIBUTIL} -LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt \ - -lrtld_db -lutil +LIBADD= dtrace proc .include Modified: projects/ifnet/contrib/atf/atf-sh/atf_check_test.sh ============================================================================== --- projects/ifnet/contrib/atf/atf-sh/atf_check_test.sh Fri May 22 17:34:22 2015 (r283293) +++ projects/ifnet/contrib/atf/atf-sh/atf_check_test.sh Fri May 22 18:23:21 2015 (r283294) @@ -164,18 +164,22 @@ equal_body() grep '^failed: \${x} != \${y} (a != b)$' resfile } -atf_test_case flush_stdout_on_timeout -flush_stdout_on_timeout_body() +atf_test_case flush_stdout_on_death +flush_stdout_on_death_body() { - "$(atf_get_srcdir)/misc_helpers" -s "$(atf_get_srcdir)" atf_check_timeout \ - >out 2>err & + CONTROL_FILE="$(pwd)/done" "$(atf_get_srcdir)/misc_helpers" \ + -s "$(atf_get_srcdir)" atf_check_flush_stdout >out 2>err & pid="${!}" - sleep 1 - kill "${pid}" + while [ ! -f ./done ]; do + echo "Still waiting for helper to create control file" + ls + sleep 1 + done + kill -9 "${pid}" grep 'Executing command.*true' out \ || atf_fail 'First command not in output' - grep 'Executing command.*sleep 42' out \ + grep 'Executing command.*false' out \ || atf_fail 'Second command not in output' *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***