From owner-svn-src-projects@FreeBSD.ORG Sun Feb 15 21:59:14 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 A7AA6C63; Sun, 15 Feb 2015 21:59:14 +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 8B83FD42; Sun, 15 Feb 2015 21:59:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1FLxEtR080681; Sun, 15 Feb 2015 21:59:14 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1FLx63v080635; Sun, 15 Feb 2015 21:59:06 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502152159.t1FLx63v080635@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 15 Feb 2015 21:59:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278823 - in projects/building-blocks: bin/sh bin/sh/tests/expansion lib/libc/gen share/man/man4 sys/arm/broadcom/bcm2835 sys/conf sys/contrib/dev/ath/ath_hal/ar9300 sys/dev/atkbdc sys/... 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.18-1 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, 15 Feb 2015 21:59:14 -0000 Author: ngie Date: Sun Feb 15 21:59:05 2015 New Revision: 278823 URL: https://svnweb.freebsd.org/changeset/base/278823 Log: MFhead @ r278819 Added: projects/building-blocks/bin/sh/tests/expansion/ifs5.0 - copied unchanged from r278819, head/bin/sh/tests/expansion/ifs5.0 projects/building-blocks/bin/sh/tests/expansion/pathname5.0 - copied unchanged from r278819, head/bin/sh/tests/expansion/pathname5.0 projects/building-blocks/share/man/man4/udl.4 - copied unchanged from r278819, head/share/man/man4/udl.4 projects/building-blocks/sys/dev/usb/video/ - copied from r278819, head/sys/dev/usb/video/ projects/building-blocks/sys/dev/videomode/ - copied from r278819, head/sys/dev/videomode/ projects/building-blocks/sys/modules/usb/udl/ - copied from r278819, head/sys/modules/usb/udl/ projects/building-blocks/sys/modules/videomode/ - copied from r278819, head/sys/modules/videomode/ Modified: projects/building-blocks/bin/sh/cd.c projects/building-blocks/bin/sh/expand.c projects/building-blocks/bin/sh/memalloc.c projects/building-blocks/bin/sh/memalloc.h projects/building-blocks/bin/sh/tests/expansion/Makefile projects/building-blocks/lib/libc/gen/fstab.c projects/building-blocks/lib/libc/gen/getgrent.c projects/building-blocks/lib/libc/gen/getpwent.c projects/building-blocks/lib/libc/gen/ulimit.c projects/building-blocks/share/man/man4/Makefile projects/building-blocks/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h projects/building-blocks/sys/conf/files projects/building-blocks/sys/conf/options projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c projects/building-blocks/sys/dev/atkbdc/atkbd.c projects/building-blocks/sys/dev/atkbdc/atkbdc.c projects/building-blocks/sys/dev/atkbdc/atkbdcreg.h projects/building-blocks/sys/dev/atkbdc/psm.c projects/building-blocks/sys/dev/usb/usbdevs projects/building-blocks/sys/fs/ext2fs/ext2_htree.c projects/building-blocks/sys/fs/ext2fs/ext2_vfsops.c projects/building-blocks/sys/kern/kern_procctl.c projects/building-blocks/sys/kern/uipc_socket.c projects/building-blocks/usr.bin/timeout/timeout.c projects/building-blocks/usr.bin/touch/touch.c projects/building-blocks/usr.sbin/pw/tests/pw_usernext.sh Directory Properties: projects/building-blocks/ (props changed) projects/building-blocks/lib/libc/ (props changed) projects/building-blocks/share/ (props changed) projects/building-blocks/share/man/man4/ (props changed) projects/building-blocks/sys/ (props changed) projects/building-blocks/sys/conf/ (props changed) Modified: projects/building-blocks/bin/sh/cd.c ============================================================================== --- projects/building-blocks/bin/sh/cd.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/bin/sh/cd.c Sun Feb 15 21:59:05 2015 (r278823) @@ -182,7 +182,6 @@ cdlogical(char *dest) struct stat statb; int first; int badstat; - size_t len; /* * Check each component of the path. If we find a symlink or @@ -190,9 +189,7 @@ cdlogical(char *dest) * next time we get the value of the current directory. */ badstat = 0; - len = strlen(dest); - cdcomppath = stalloc(len + 1); - memcpy(cdcomppath, dest, len + 1); + cdcomppath = stsavestr(dest); STARTSTACKSTR(p); if (*dest == '/') { STPUTC('/', p); @@ -277,7 +274,6 @@ findcwd(char *dir) { char *new; char *p; - size_t len; /* * If our argument is NULL, we don't know the current directory @@ -286,9 +282,7 @@ findcwd(char *dir) */ if (dir == NULL || curdir == NULL) return getpwd2(); - len = strlen(dir); - cdcomppath = stalloc(len + 1); - memcpy(cdcomppath, dir, len + 1); + cdcomppath = stsavestr(dir); STARTSTACKSTR(new); if (*dir != '/') { STPUTS(curdir, new); Modified: projects/building-blocks/bin/sh/expand.c ============================================================================== --- projects/building-blocks/bin/sh/expand.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/bin/sh/expand.c Sun Feb 15 21:59:05 2015 (r278823) @@ -1284,11 +1284,8 @@ addfname(char *name) { char *p; struct strlist *sp; - size_t len; - len = strlen(name); - p = stalloc(len + 1); - memcpy(p, name, len + 1); + p = stsavestr(name); sp = (struct strlist *)stalloc(sizeof *sp); sp->text = p; *exparg.lastp = sp; Modified: projects/building-blocks/bin/sh/memalloc.c ============================================================================== --- projects/building-blocks/bin/sh/memalloc.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/bin/sh/memalloc.c Sun Feb 15 21:59:05 2015 (r278823) @@ -180,6 +180,18 @@ stunalloc(pointer p) } +char * +stsavestr(const char *s) +{ + char *p; + size_t len; + + len = strlen(s); + p = stalloc(len + 1); + memcpy(p, s, len + 1); + return p; +} + void setstackmark(struct stackmark *mark) Modified: projects/building-blocks/bin/sh/memalloc.h ============================================================================== --- projects/building-blocks/bin/sh/memalloc.h Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/bin/sh/memalloc.h Sun Feb 15 21:59:05 2015 (r278823) @@ -52,6 +52,7 @@ void ckfree(pointer); char *savestr(const char *); pointer stalloc(int); void stunalloc(pointer); +char *stsavestr(const char *); void setstackmark(struct stackmark *); void popstackmark(struct stackmark *); char *growstackstr(void); Modified: projects/building-blocks/bin/sh/tests/expansion/Makefile ============================================================================== --- projects/building-blocks/bin/sh/tests/expansion/Makefile Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/bin/sh/tests/expansion/Makefile Sun Feb 15 21:59:05 2015 (r278823) @@ -48,6 +48,7 @@ FILES+= ifs1.0 FILES+= ifs2.0 FILES+= ifs3.0 FILES+= ifs4.0 +FILES+= ifs5.0 FILES+= length1.0 FILES+= length2.0 FILES+= length3.0 @@ -62,6 +63,7 @@ FILES+= pathname1.0 FILES+= pathname2.0 FILES+= pathname3.0 FILES+= pathname4.0 +FILES+= pathname5.0 FILES+= plus-minus1.0 FILES+= plus-minus2.0 FILES+= plus-minus3.0 Copied: projects/building-blocks/bin/sh/tests/expansion/ifs5.0 (from r278819, head/bin/sh/tests/expansion/ifs5.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/bin/sh/tests/expansion/ifs5.0 Sun Feb 15 21:59:05 2015 (r278823, copy of r278819, head/bin/sh/tests/expansion/ifs5.0) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +set -- $(echo a b c d) +[ "$#" = 4 ] Copied: projects/building-blocks/bin/sh/tests/expansion/pathname5.0 (from r278819, head/bin/sh/tests/expansion/pathname5.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/bin/sh/tests/expansion/pathname5.0 Sun Feb 15 21:59:05 2015 (r278823, copy of r278819, head/bin/sh/tests/expansion/pathname5.0) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +[ `echo '/[e]tc'` = /etc ] Modified: projects/building-blocks/lib/libc/gen/fstab.c ============================================================================== --- projects/building-blocks/lib/libc/gen/fstab.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/lib/libc/gen/fstab.c Sun Feb 15 21:59:05 2015 (r278823) @@ -181,7 +181,7 @@ fstabscan(void) if (cp != NULL) _fs_fstab.fs_passno = atoi(cp); } - strcpy(subline, _fs_fstab.fs_mntops); + (void)strlcpy(subline, _fs_fstab.fs_mntops, sizeof(subline)); p = subline; for (typexx = 0, cp = strsep(&p, ","); cp; cp = strsep(&p, ",")) { Modified: projects/building-blocks/lib/libc/gen/getgrent.c ============================================================================== --- projects/building-blocks/lib/libc/gen/getgrent.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/lib/libc/gen/getgrent.c Sun Feb 15 21:59:05 2015 (r278823) @@ -1450,7 +1450,7 @@ docompat: pos = ftello(st->fp); } fin: - if (!stayopen && st->fp != NULL) { + if (st->fp != NULL && !stayopen) { fclose(st->fp); st->fp = NULL; } Modified: projects/building-blocks/lib/libc/gen/getpwent.c ============================================================================== --- projects/building-blocks/lib/libc/gen/getpwent.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/lib/libc/gen/getpwent.c Sun Feb 15 21:59:05 2015 (r278823) @@ -815,7 +815,7 @@ files_passwd(void *retval, void *mdata, size_t bufsize, namesize; uid_t uid; uint32_t store; - int rv, stayopen, *errnop; + int rv, stayopen = 0, *errnop; name = NULL; uid = (uid_t)-1; Modified: projects/building-blocks/lib/libc/gen/ulimit.c ============================================================================== --- projects/building-blocks/lib/libc/gen/ulimit.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/lib/libc/gen/ulimit.c Sun Feb 15 21:59:05 2015 (r278823) @@ -33,6 +33,7 @@ #include #include #include +#include #include long @@ -40,6 +41,7 @@ ulimit(int cmd, ...) { struct rlimit limit; va_list ap; + volatile intmax_t targ; long arg; if (cmd == UL_GETFSIZE) { @@ -51,16 +53,18 @@ ulimit(int cmd, ...) return ((long)limit.rlim_cur); } else if (cmd == UL_SETFSIZE) { va_start(ap, cmd); - arg = va_arg(ap, long); + targ = arg = va_arg(ap, long); va_end(ap); - limit.rlim_max = limit.rlim_cur = (rlim_t)arg * 512; + if (targ < 0) + targ = LONG_MAX; + if (targ > RLIM_INFINITY / 512) + targ = RLIM_INFINITY / 512; + limit.rlim_max = limit.rlim_cur = targ * 512; /* The setrlimit() function sets errno to EPERM if needed. */ if (setrlimit(RLIMIT_FSIZE, &limit) == -1) return (-1); - if (arg * 512 > LONG_MAX) - return (LONG_MAX); - return (arg); + return ((long)targ); } else { errno = EINVAL; return (-1); Modified: projects/building-blocks/share/man/man4/Makefile ============================================================================== --- projects/building-blocks/share/man/man4/Makefile Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/share/man/man4/Makefile Sun Feb 15 21:59:05 2015 (r278823) @@ -849,6 +849,7 @@ MAN+= \ udbp.4 \ udp.4 \ udplite.4 \ + udl.4 \ uep.4 \ ufm.4 \ ufoma.4 \ Copied: projects/building-blocks/share/man/man4/udl.4 (from r278819, head/share/man/man4/udl.4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/share/man/man4/udl.4 Sun Feb 15 21:59:05 2015 (r278823, copy of r278819, head/share/man/man4/udl.4) @@ -0,0 +1,67 @@ +.\" $OpenBSD: udl.4,v 1.20 2012/09/18 17:11:41 jasper Exp $ +.\" $FreeBSD$ +.\" +.\" Copyright (c) 2009 Marcus Glocker +.\" +.\" Permission to use, copy, modify, and distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.Dd February 15, 2015 +.Dt UDL 4 +.Os +.Sh NAME +.Nm udl +.Nd DisplayLink DL-120 / DL-160 USB display devices +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following line in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device udl" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +udl_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver supports USB display devices based on the DisplayLink DL-120 / DL-160 +graphic chip. +.Sh HARDWARE +The following devices should work: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It Century Corp. Japan Plus One LCD-8000U +.It Century Corp. Japan Plus One LCD-4300U +.It DisplayLink USB to DVI +.It ForwardVideo EasyCAP008 USB to DVI +.It HP USB 2.0 Docking Station (FQ834) +.It HP USB Graphics Adapter (NL571) +.It IOGEAR USB 2.0 External DVI (GUC2020) +.It Koenig CMP-USBVGA10 and CMP-USBVGA11 +.It Lenovo 45K5296 USB to DVI +.It Lenovo ThinkVision LT1421 +.It Lilliput UM-70 +.It Nanovision MiMo UM-710 and UM-740 +.It Rextron VCUD60 USB to DVI +.It Samsung LD220 +.It StarTech CONV-USB2DVI +.It Sunweit USB to DVI +.It Unitek Y-2240 USB to DVI +.It VideoHome NBdock1920 +.El +.Sh SEE ALSO +.Xr usb 4 Modified: projects/building-blocks/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h ============================================================================== --- projects/building-blocks/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h Sun Feb 15 21:59:05 2015 (r278823) @@ -52,6 +52,53 @@ struct bcm2835_mbox_tag_hdr { uint32_t val_len; }; +#define BCM2835_MBOX_POWER_ID_EMMC 0x00000000 +#define BCM2835_MBOX_POWER_ID_UART0 0x00000001 +#define BCM2835_MBOX_POWER_ID_UART1 0x00000002 +#define BCM2835_MBOX_POWER_ID_USB_HCD 0x00000003 +#define BCM2835_MBOX_POWER_ID_I2C0 0x00000004 +#define BCM2835_MBOX_POWER_ID_I2C1 0x00000005 +#define BCM2835_MBOX_POWER_ID_I2C2 0x00000006 +#define BCM2835_MBOX_POWER_ID_SPI 0x00000007 +#define BCM2835_MBOX_POWER_ID_CCP2TX 0x00000008 + +#define BCM2835_MBOX_POWER_ON (1 << 0) +#define BCM2835_MBOX_POWER_WAIT (1 << 1) + +#define BCM2835_MBOX_TAG_GET_POWER_STATE 0x00020001 +#define BCM2835_MBOX_TAG_SET_POWER_STATE 0x00028001 + +struct msg_get_power_state { + struct bcm2835_mbox_hdr hdr; + struct bcm2835_mbox_tag_hdr tag_hdr; + union { + struct { + uint32_t device_id; + } req; + struct { + uint32_t device_id; + uint32_t state; + } resp; + } body; + uint32_t end_tag; +}; + +struct msg_set_power_state { + struct bcm2835_mbox_hdr hdr; + struct bcm2835_mbox_tag_hdr tag_hdr; + union { + struct { + uint32_t device_id; + uint32_t state; + } req; + struct { + uint32_t device_id; + uint32_t state; + } resp; + } body; + uint32_t end_tag; +}; + #define BCM2835_MBOX_CLOCK_ID_EMMC 0x00000001 #define BCM2835_MBOX_CLOCK_ID_UART 0x00000002 #define BCM2835_MBOX_CLOCK_ID_ARM 0x00000003 Modified: projects/building-blocks/sys/conf/files ============================================================================== --- projects/building-blocks/sys/conf/files Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/sys/conf/files Sun Feb 15 21:59:05 2015 (r278823) @@ -2563,8 +2563,16 @@ dev/usb/template/usb_template_mtp.c opti dev/usb/template/usb_template_phone.c optional usb_template dev/usb/template/usb_template_serialnet.c optional usb_template # +# USB video drivers +# +dev/usb/video/udl.c optional udl +# # USB END # +dev/videomode/videomode.c optional videomode +dev/videomode/edid.c optional videomode +dev/videomode/pickmode.c optional videomode +dev/videomode/vesagtf.c optional videomode dev/utopia/idtphy.c optional utopia dev/utopia/suni.c optional utopia dev/utopia/utopia.c optional utopia Modified: projects/building-blocks/sys/conf/options ============================================================================== --- projects/building-blocks/sys/conf/options Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/sys/conf/options Sun Feb 15 21:59:05 2015 (r278823) @@ -889,6 +889,9 @@ TDMA_TXRATE_QUARTER_DEFAULT opt_tdma.h TDMA_TXRATE_11NA_DEFAULT opt_tdma.h TDMA_TXRATE_11NG_DEFAULT opt_tdma.h +# VideoMode +PICKMODE_DEBUG opt_videomode.h + # Network stack virtualization options VIMAGE opt_global.h VNET_DEBUG opt_global.h Modified: projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c ============================================================================== --- projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c Sun Feb 15 21:59:05 2015 (r278823) @@ -57,6 +57,9 @@ ar9300_beacon_init(struct ath_hal *ah, /* Add the fraction adjustment lost due to unit conversions. */ beacon_period_usec += beacon_period_fraction; + HALDEBUG(ah, HAL_DEBUG_BEACON, + "%s: next_beacon=0x%08x, beacon_period=%d, opmode=%d, beacon_period_usec=%d\n", + __func__, next_beacon, beacon_period, opmode, beacon_period_usec); OS_REG_WRITE(ah, AR_BEACON_PERIOD, beacon_period_usec); OS_REG_WRITE(ah, AR_DMA_BEACON_PERIOD, beacon_period_usec); Modified: projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c ============================================================================== --- projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c Sun Feb 15 21:59:05 2015 (r278823) @@ -36,6 +36,9 @@ static HAL_BOOL ar9300ClrMulticastFilterIndex(struct ath_hal *ah, uint32_t ix); static HAL_BOOL ar9300SetMulticastFilterIndex(struct ath_hal *ah, uint32_t ix); +static void ar9300_beacon_set_beacon_timers(struct ath_hal *ah, + const HAL_BEACON_TIMERS *bt); + static void ar9300SetChainMasks(struct ath_hal *ah, uint32_t tx_chainmask, uint32_t rx_chainmask) @@ -193,10 +196,9 @@ ar9300_attach_freebsd_ops(struct ath_hal /* Beacon functions */ /* ah_setBeaconTimers */ ah->ah_beaconInit = ar9300_freebsd_beacon_init; - /* ah_setBeaconTimers */ + ah->ah_setBeaconTimers = ar9300_beacon_set_beacon_timers; ah->ah_setStationBeaconTimers = ar9300_set_sta_beacon_timers; /* ah_resetStationBeaconTimers */ - /* ah_getNextTBTT */ ah->ah_getNextTBTT = ar9300_get_next_tbtt; /* Interrupt functions */ @@ -669,6 +671,55 @@ ar9300SetMulticastFilterIndex(struct ath return (AH_TRUE); } +#define TU_TO_USEC(_tu) ((_tu) << 10) +#define ONE_EIGHTH_TU_TO_USEC(_tu8) ((_tu8) << 7) + +/* + * Initializes all of the hardware registers used to + * send beacons. Note that for station operation the + * driver calls ar9300_set_sta_beacon_timers instead. + */ +static void +ar9300_beacon_set_beacon_timers(struct ath_hal *ah, + const HAL_BEACON_TIMERS *bt) +{ + uint32_t bperiod; + +#if 0 + HALASSERT(opmode == HAL_M_IBSS || opmode == HAL_M_HOSTAP); + if (opmode == HAL_M_IBSS) { + OS_REG_SET_BIT(ah, AR_TXCFG, AR_TXCFG_ADHOC_BEACON_ATIM_TX_POLICY); + } +#endif + + /* XXX TODO: should migrate the HAL code to always use ONE_EIGHTH_TU */ + OS_REG_WRITE(ah, AR_NEXT_TBTT_TIMER, TU_TO_USEC(bt->bt_nexttbtt)); + OS_REG_WRITE(ah, AR_NEXT_DMA_BEACON_ALERT, ONE_EIGHTH_TU_TO_USEC(bt->bt_nextdba)); + OS_REG_WRITE(ah, AR_NEXT_SWBA, ONE_EIGHTH_TU_TO_USEC(bt->bt_nextswba)); + OS_REG_WRITE(ah, AR_NEXT_NDP_TIMER, TU_TO_USEC(bt->bt_nextatim)); + + bperiod = TU_TO_USEC(bt->bt_intval & HAL_BEACON_PERIOD); + /* XXX TODO! */ +// ahp->ah_beaconInterval = bt->bt_intval & HAL_BEACON_PERIOD; + OS_REG_WRITE(ah, AR_BEACON_PERIOD, bperiod); + OS_REG_WRITE(ah, AR_DMA_BEACON_PERIOD, bperiod); + OS_REG_WRITE(ah, AR_SWBA_PERIOD, bperiod); + OS_REG_WRITE(ah, AR_NDP_PERIOD, bperiod); + + /* + * Reset TSF if required. + */ + if (bt->bt_intval & HAL_BEACON_RESET_TSF) + ar9300_reset_tsf(ah); + + /* enable timers */ + /* NB: flags == 0 handled specially for backwards compatibility */ + OS_REG_SET_BIT(ah, AR_TIMER_MODE, + bt->bt_flags != 0 ? bt->bt_flags : + AR_TBTT_TIMER_EN | AR_DBA_TIMER_EN | AR_SWBA_TIMER_EN); +} + + /* * RF attach stubs */ Modified: projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c ============================================================================== --- projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c Sun Feb 15 21:59:05 2015 (r278823) @@ -683,6 +683,7 @@ ar9300_get_capability(struct ath_hal *ah { struct ath_hal_9300 *ahp = AH9300(ah); const HAL_CAPABILITIES *p_cap = &AH_PRIVATE(ah)->ah_caps; + struct ar9300_ani_state *ani; switch (type) { case HAL_CAP_CIPHER: /* cipher handled in hardware */ @@ -911,6 +912,34 @@ ar9300_get_capability(struct ath_hal *ah return HAL_ENOTSUPP; } #endif + + /* FreeBSD ANI */ + case HAL_CAP_INTMIT: /* interference mitigation */ + switch (capability) { + case HAL_CAP_INTMIT_PRESENT: /* hardware capability */ + return HAL_OK; + case HAL_CAP_INTMIT_ENABLE: + return (ahp->ah_proc_phy_err & HAL_PROCESS_ANI) ? + HAL_OK : HAL_ENXIO; + case HAL_CAP_INTMIT_NOISE_IMMUNITY_LEVEL: + case HAL_CAP_INTMIT_OFDM_WEAK_SIGNAL_LEVEL: +// case HAL_CAP_INTMIT_CCK_WEAK_SIGNAL_THR: + case HAL_CAP_INTMIT_FIRSTEP_LEVEL: + case HAL_CAP_INTMIT_SPUR_IMMUNITY_LEVEL: + ani = ar9300_ani_get_current_state(ah); + if (ani == AH_NULL) + return HAL_ENXIO; + switch (capability) { + /* XXX AR9300 HAL has OFDM/CCK noise immunity level params? */ + case 2: *result = ani->ofdm_noise_immunity_level; break; + case 3: *result = !ani->ofdm_weak_sig_detect_off; break; + // case 4: *result = ani->cck_weak_sig_threshold; break; + case 5: *result = ani->firstep_level; break; + case 6: *result = ani->spur_immunity_level; break; + } + return HAL_OK; + } + return HAL_EINVAL; default: return ath_hal_getcapability(ah, type, capability, result); } @@ -986,6 +1015,27 @@ ar9300_set_capability(struct ath_hal *ah return AH_TRUE; } return AH_FALSE; + + /* FreeBSD interrupt mitigation / ANI */ + case HAL_CAP_INTMIT: { /* interference mitigation */ + /* This maps the public ANI commands to the internal ANI commands */ + /* Private: HAL_ANI_CMD; Public: HAL_CAP_INTMIT_CMD */ + static const HAL_ANI_CMD cmds[] = { + HAL_ANI_PRESENT, + HAL_ANI_MODE, + HAL_ANI_NOISE_IMMUNITY_LEVEL, + HAL_ANI_OFDM_WEAK_SIGNAL_DETECTION, + HAL_ANI_CCK_WEAK_SIGNAL_THR, + HAL_ANI_FIRSTEP_LEVEL, + HAL_ANI_SPUR_IMMUNITY_LEVEL, + }; +#define N(a) (sizeof(a) / sizeof(a[0])) + return capability < N(cmds) ? + ar9300_ani_control(ah, cmds[capability], setting) : + AH_FALSE; +#undef N + } + case HAL_CAP_RXBUFSIZE: /* set MAC receive buffer size */ ahp->rx_buf_size = setting & AR_DATABUF_MASK; OS_REG_WRITE(ah, AR_DATABUF, ahp->rx_buf_size); Modified: projects/building-blocks/sys/dev/atkbdc/atkbd.c ============================================================================== --- projects/building-blocks/sys/dev/atkbdc/atkbd.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/sys/dev/atkbdc/atkbd.c Sun Feb 15 21:59:05 2015 (r278823) @@ -77,6 +77,10 @@ typedef struct atkbd_state { static void atkbd_timeout(void *arg); static void atkbd_shutdown_final(void *v); +static int atkbd_reset(KBDC kbdc, int flags, int c); + +#define HAS_QUIRK(p, q) (((atkbdc_softc_t *)(p))->quirks & q) +#define ALLOW_DISABLE_KBD(kbdc) !HAS_QUIRK(kbdc, KBDC_QUIRK_KEEP_ACTIVATED) int atkbd_probe_unit(device_t dev, int irq, int flags) @@ -1095,6 +1099,39 @@ atkbd_shutdown_final(void *v) #endif } +static int +atkbd_reset(KBDC kbdc, int flags, int c) +{ + /* reset keyboard hardware */ + if (!(flags & KB_CONF_NO_RESET) && !reset_kbd(kbdc)) { + /* + * KEYBOARD ERROR + * Keyboard reset may fail either because the keyboard + * doen't exist, or because the keyboard doesn't pass + * the self-test, or the keyboard controller on the + * motherboard and the keyboard somehow fail to shake hands. + * It is just possible, particularly in the last case, + * that the keyboard controller may be left in a hung state. + * test_controller() and test_kbd_port() appear to bring + * the keyboard controller back (I don't know why and how, + * though.) + */ + empty_both_buffers(kbdc, 10); + test_controller(kbdc); + test_kbd_port(kbdc); + /* + * We could disable the keyboard port and interrupt... but, + * the keyboard may still exist (see above). + */ + set_controller_command_byte(kbdc, + ALLOW_DISABLE_KBD(kbdc) ? 0xff : KBD_KBD_CONTROL_BITS, c); + if (bootverbose) + printf("atkbd: failed to reset the keyboard.\n"); + return (EIO); + } + return (0); +} + /* local functions */ static int @@ -1250,13 +1287,14 @@ probe_keyboard(KBDC kbdc, int flags) kbdc_set_device_mask(kbdc, m | KBD_KBD_CONTROL_BITS); } else { /* try to restore the command byte as before */ - set_controller_command_byte(kbdc, 0xff, c); + set_controller_command_byte(kbdc, + ALLOW_DISABLE_KBD(kbdc) ? 0xff : KBD_KBD_CONTROL_BITS, c); kbdc_set_device_mask(kbdc, m); } #endif kbdc_lock(kbdc, FALSE); - return err; + return (HAS_QUIRK(kbdc, KBDC_QUIRK_IGNORE_PROBE_RESULT) ? 0 : err); } static int @@ -1299,6 +1337,12 @@ init_keyboard(KBDC kbdc, int *type, int return EIO; } + if (HAS_QUIRK(kbdc, KBDC_QUIRK_RESET_AFTER_PROBE) && + atkbd_reset(kbdc, flags, c)) { + kbdc_lock(kbdc, FALSE); + return EIO; + } + /* * Check if we have an XT keyboard before we attempt to reset it. * The procedure assumes that the keyboard and the controller have @@ -1343,31 +1387,9 @@ init_keyboard(KBDC kbdc, int *type, int if (bootverbose) printf("atkbd: keyboard ID 0x%x (%d)\n", id, *type); - /* reset keyboard hardware */ - if (!(flags & KB_CONF_NO_RESET) && !reset_kbd(kbdc)) { - /* - * KEYBOARD ERROR - * Keyboard reset may fail either because the keyboard - * doen't exist, or because the keyboard doesn't pass - * the self-test, or the keyboard controller on the - * motherboard and the keyboard somehow fail to shake hands. - * It is just possible, particularly in the last case, - * that the keyboard controller may be left in a hung state. - * test_controller() and test_kbd_port() appear to bring - * the keyboard controller back (I don't know why and how, - * though.) - */ - empty_both_buffers(kbdc, 10); - test_controller(kbdc); - test_kbd_port(kbdc); - /* - * We could disable the keyboard port and interrupt... but, - * the keyboard may still exist (see above). - */ - set_controller_command_byte(kbdc, 0xff, c); + if (!HAS_QUIRK(kbdc, KBDC_QUIRK_RESET_AFTER_PROBE) && + atkbd_reset(kbdc, flags, c)) { kbdc_lock(kbdc, FALSE); - if (bootverbose) - printf("atkbd: failed to reset the keyboard.\n"); return EIO; } @@ -1387,7 +1409,8 @@ init_keyboard(KBDC kbdc, int *type, int * The XT kbd isn't usable unless the proper scan * code set is selected. */ - set_controller_command_byte(kbdc, 0xff, c); + set_controller_command_byte(kbdc, ALLOW_DISABLE_KBD(kbdc) + ? 0xff : KBD_KBD_CONTROL_BITS, c); kbdc_lock(kbdc, FALSE); printf("atkbd: unable to set the XT keyboard mode.\n"); return EIO; @@ -1402,6 +1425,17 @@ init_keyboard(KBDC kbdc, int *type, int c |= KBD_TRANSLATION; #endif + /* + * Some keyboards require a SETLEDS command to be sent after + * the reset command before they will send keystrokes to us + */ + if (HAS_QUIRK(kbdc, KBDC_QUIRK_SETLEDS_ON_INIT) && + send_kbd_command_and_data(kbdc, KBDC_SET_LEDS, 0) != KBD_ACK) { + printf("atkbd: setleds failed\n"); + } + if (!ALLOW_DISABLE_KBD(kbdc)) + send_kbd_command(kbdc, KBDC_ENABLE_KBD); + /* enable the keyboard port and intr. */ if (!set_controller_command_byte(kbdc, KBD_KBD_CONTROL_BITS | KBD_TRANSLATION | KBD_OVERRIDE_KBD_LOCK, @@ -1412,7 +1446,9 @@ init_keyboard(KBDC kbdc, int *type, int * This is serious; we are left with the disabled * keyboard intr. */ - set_controller_command_byte(kbdc, 0xff, c); + set_controller_command_byte(kbdc, ALLOW_DISABLE_KBD(kbdc) + ? 0xff : (KBD_KBD_CONTROL_BITS | KBD_TRANSLATION | + KBD_OVERRIDE_KBD_LOCK), c); kbdc_lock(kbdc, FALSE); printf("atkbd: unable to enable the keyboard port and intr.\n"); return EIO; Modified: projects/building-blocks/sys/dev/atkbdc/atkbdc.c ============================================================================== --- projects/building-blocks/sys/dev/atkbdc/atkbdc.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/sys/dev/atkbdc/atkbdc.c Sun Feb 15 21:59:05 2015 (r278823) @@ -114,6 +114,41 @@ static int wait_for_kbd_ack(atkbdc_softc static int wait_for_aux_data(atkbdc_softc_t *kbdc); static int wait_for_aux_ack(atkbdc_softc_t *kbdc); +struct atkbdc_quirks { + const char* bios_vendor; + const char* maker; + const char* product; + int quirk; +}; + +static struct atkbdc_quirks quirks[] = { + {"coreboot", "Acer", "Peppy", + KBDC_QUIRK_KEEP_ACTIVATED | KBDC_QUIRK_IGNORE_PROBE_RESULT | + KBDC_QUIRK_RESET_AFTER_PROBE | KBDC_QUIRK_SETLEDS_ON_INIT}, + + {NULL, NULL, NULL, 0} +}; + +#define QUIRK_STR_MATCH(s1, s2) (s1 == NULL || \ + (s2 != NULL && !strcmp(s1, s2))) + +static int +atkbdc_getquirks(void) +{ + int i; + char* bios_vendor = kern_getenv("smbios.bios.vendor"); + char* maker = kern_getenv("smbios.system.maker"); + char* product = kern_getenv("smbios.system.product"); + + for (i=0; quirks[i].quirk != 0; ++i) + if (QUIRK_STR_MATCH(quirks[i].bios_vendor, bios_vendor) && + QUIRK_STR_MATCH(quirks[i].maker, maker) && + QUIRK_STR_MATCH(quirks[i].product, product)) + return (quirks[i].quirk); + + return (0); +} + atkbdc_softc_t *atkbdc_get_softc(int unit) { @@ -295,6 +330,7 @@ atkbdc_setup(atkbdc_softc_t *sc, bus_spa #else sc->retry = 5000; #endif + sc->quirks = atkbdc_getquirks(); return 0; } @@ -1124,7 +1160,8 @@ void kbdc_set_device_mask(KBDC p, int mask) { kbdcp(p)->command_mask = - mask & (KBD_KBD_CONTROL_BITS | KBD_AUX_CONTROL_BITS); + mask & (((kbdcp(p)->quirks & KBDC_QUIRK_KEEP_ACTIVATED) + ? 0 : KBD_KBD_CONTROL_BITS) | KBD_AUX_CONTROL_BITS); } int Modified: projects/building-blocks/sys/dev/atkbdc/atkbdcreg.h ============================================================================== --- projects/building-blocks/sys/dev/atkbdc/atkbdcreg.h Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/sys/dev/atkbdc/atkbdcreg.h Sun Feb 15 21:59:05 2015 (r278823) @@ -202,6 +202,11 @@ typedef struct atkbdc_softc { kqueue kbd; /* keyboard data queue */ kqueue aux; /* auxiliary data queue */ int retry; + int quirks; /* controller doesn't like deactivate */ +#define KBDC_QUIRK_KEEP_ACTIVATED (1 << 0) +#define KBDC_QUIRK_IGNORE_PROBE_RESULT (1 << 1) +#define KBDC_QUIRK_RESET_AFTER_PROBE (1 << 2) +#define KBDC_QUIRK_SETLEDS_ON_INIT (1 << 3) } atkbdc_softc_t; enum kbdc_device_ivar { Modified: projects/building-blocks/sys/dev/atkbdc/psm.c ============================================================================== --- projects/building-blocks/sys/dev/atkbdc/psm.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/sys/dev/atkbdc/psm.c Sun Feb 15 21:59:05 2015 (r278823) @@ -371,6 +371,10 @@ static devclass_t psm_devclass; /* other flags (flags) */ #define PSM_FLAGS_FINGERDOWN 0x0001 /* VersaPad finger down */ +#define kbdcp(p) ((atkbdc_softc_t *)(p)) +#define ALWAYS_RESTORE_CONTROLLER(kbdc) !(kbdcp(kbdc)->quirks \ + & KBDC_QUIRK_KEEP_ACTIVATED) + /* Tunables */ static int tap_enabled = -1; TUNABLE_INT("hw.psm.tap_enabled", &tap_enabled); @@ -1231,7 +1235,8 @@ psmprobe(device_t dev) * this is CONTROLLER ERROR; I don't know how to recover * from this error... */ - restore_controller(sc->kbdc, command_byte); + if (ALWAYS_RESTORE_CONTROLLER(sc->kbdc)) + restore_controller(sc->kbdc, command_byte); printf("psm%d: unable to set the command byte.\n", unit); endprobe(ENXIO); } @@ -1270,7 +1275,8 @@ psmprobe(device_t dev) recover_from_error(sc->kbdc); if (sc->config & PSM_CONFIG_IGNPORTERROR) break; - restore_controller(sc->kbdc, command_byte); + if (ALWAYS_RESTORE_CONTROLLER(sc->kbdc)) + restore_controller(sc->kbdc, command_byte); if (verbose) printf("psm%d: the aux port is not functioning (%d).\n", unit, i); @@ -1293,7 +1299,8 @@ psmprobe(device_t dev) */ if (!reset_aux_dev(sc->kbdc)) { recover_from_error(sc->kbdc); - restore_controller(sc->kbdc, command_byte); + if (ALWAYS_RESTORE_CONTROLLER(sc->kbdc)) + restore_controller(sc->kbdc, command_byte); if (verbose) printf("psm%d: failed to reset the aux " "device.\n", unit); @@ -1315,7 +1322,8 @@ psmprobe(device_t dev) if (!enable_aux_dev(sc->kbdc) || !disable_aux_dev(sc->kbdc)) { /* MOUSE ERROR */ recover_from_error(sc->kbdc); - restore_controller(sc->kbdc, command_byte); + if (ALWAYS_RESTORE_CONTROLLER(sc->kbdc)) + restore_controller(sc->kbdc, command_byte); if (verbose) printf("psm%d: failed to enable the aux device.\n", unit); @@ -1337,7 +1345,8 @@ psmprobe(device_t dev) /* verify the device is a mouse */ sc->hw.hwid = get_aux_id(sc->kbdc); if (!is_a_mouse(sc->hw.hwid)) { - restore_controller(sc->kbdc, command_byte); + if (ALWAYS_RESTORE_CONTROLLER(sc->kbdc)) + restore_controller(sc->kbdc, command_byte); if (verbose) printf("psm%d: unknown device type (%d).\n", unit, sc->hw.hwid); @@ -1443,7 +1452,8 @@ psmprobe(device_t dev) * this is CONTROLLER ERROR; I don't know the proper way to * recover from this error... */ - restore_controller(sc->kbdc, command_byte); + if (ALWAYS_RESTORE_CONTROLLER(sc->kbdc)) + restore_controller(sc->kbdc, command_byte); printf("psm%d: unable to set the command byte.\n", unit); endprobe(ENXIO); } Modified: projects/building-blocks/sys/dev/usb/usbdevs ============================================================================== --- projects/building-blocks/sys/dev/usb/usbdevs Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/sys/dev/usb/usbdevs Sun Feb 15 21:59:05 2015 (r278823) @@ -686,6 +686,7 @@ vendor ASUS2 0x1761 ASUS vendor SWEEX2 0x177f Sweex vendor METAGEEK 0x1781 MetaGeek vendor KAMSTRUP 0x17a8 Kamstrup A/S +vendor DISPLAYLINK 0x17e9 DisplayLink vendor LENOVO 0x17ef Lenovo vendor WAVESENSE 0x17f4 WaveSense vendor VAISALA 0x1843 Vaisala @@ -1655,6 +1656,27 @@ product DLINK2 RT3070_4 0x3c15 RT3070 product DLINK2 RT3070_5 0x3c16 RT3070 product DLINK3 DWM652 0x3e04 DWM-652 +/* DisplayLink products */ +product DISPLAYLINK LCD4300U 0x01ba LCD-4300U +product DISPLAYLINK LCD8000U 0x01bb LCD-8000U +product DISPLAYLINK LD220 0x0100 Samsung LD220 +product DISPLAYLINK GUC2020 0x0059 IOGEAR DVI GUC2020 +product DISPLAYLINK VCUD60 0x0136 Rextron DVI +product DISPLAYLINK CONV 0x0138 StarTech CONV-USB2DVI +product DISPLAYLINK DLDVI 0x0141 DisplayLink DVI +product DISPLAYLINK VGA10 0x015a CMP-USBVGA10 +product DISPLAYLINK WSDVI 0x0198 WS Tech DVI +product DISPLAYLINK EC008 0x019b EasyCAP008 DVI +product DISPLAYLINK HPDOCK 0x01d4 HP USB Docking +product DISPLAYLINK NL571 0x01d7 HP USB DVI +product DISPLAYLINK M01061 0x01e2 Lenovo DVI +product DISPLAYLINK SWDVI 0x024c SUNWEIT DVI +product DISPLAYLINK NBDOCK 0x0215 VideoHome NBdock1920 +product DISPLAYLINK LUM70 0x02a9 Lilliput UM-70 +product DISPLAYLINK UM7X0 0x401a nanovision MiMo +product DISPLAYLINK LT1421 0x03e0 Lenovo ThinkVision LT1421 +product DISPLAYLINK POLARIS2 0x0117 Polaris2 USB dock + /* DMI products */ product DMI CFSM_RW 0xa109 CF/SM Reader/Writer product DMI DISK 0x2bcf Generic Disk Modified: projects/building-blocks/sys/fs/ext2fs/ext2_htree.c ============================================================================== --- projects/building-blocks/sys/fs/ext2fs/ext2_htree.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/sys/fs/ext2fs/ext2_htree.c Sun Feb 15 21:59:05 2015 (r278823) @@ -861,7 +861,7 @@ ext2_htree_add_entry(struct vnode *dvp, ext2_htree_split_dirblock((char *)bp->b_data, newdirblock, blksize, fs->e3fs_hash_seed, hash_version, &split_hash, entry); cursize = roundup(ip->i_size, blksize); - dirsize = roundup(ip->i_size, blksize) + blksize; + dirsize = cursize + blksize; blknum = dirsize / blksize - 1; /* Add index entry for the new directory block */ Modified: projects/building-blocks/sys/fs/ext2fs/ext2_vfsops.c ============================================================================== --- projects/building-blocks/sys/fs/ext2fs/ext2_vfsops.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/sys/fs/ext2fs/ext2_vfsops.c Sun Feb 15 21:59:05 2015 (r278823) @@ -355,7 +355,7 @@ compute_sb_data(struct vnode *devvp, str } fs->e2fs_ipb = fs->e2fs_bsize / EXT2_INODE_SIZE(fs); - fs->e2fs_itpg = fs->e2fs_ipg /fs->e2fs_ipb; + fs->e2fs_itpg = fs->e2fs_ipg / fs->e2fs_ipb; /* s_resuid / s_resgid ? */ fs->e2fs_gcount = (es->e2fs_bcount - es->e2fs_first_dblock + EXT2_BLOCKS_PER_GROUP(fs) - 1) / EXT2_BLOCKS_PER_GROUP(fs); @@ -365,7 +365,7 @@ compute_sb_data(struct vnode *devvp, str fs->e2fs_gd = malloc(db_count * fs->e2fs_bsize, M_EXT2MNT, M_WAITOK); fs->e2fs_contigdirs = malloc(fs->e2fs_gcount * - sizeof(*fs->e2fs_contigdirs), M_EXT2MNT, M_WAITOK); + sizeof(*fs->e2fs_contigdirs), M_EXT2MNT, M_WAITOK | M_ZERO); /* * Adjust logic_sb_block. @@ -379,6 +379,7 @@ compute_sb_data(struct vnode *devvp, str fsbtodb(fs, logic_sb_block + i + 1 ), fs->e2fs_bsize, NOCRED, &bp); if (error) { + free(fs->e2fs_contigdirs, M_EXT2MNT); free(fs->e2fs_gd, M_EXT2MNT); brelse(bp); return (error); @@ -390,11 +391,11 @@ compute_sb_data(struct vnode *devvp, str brelse(bp); bp = NULL; } + /* Initialization for the ext2 Orlov allocator variant. */ fs->e2fs_total_dir = 0; - for (i=0; i < fs->e2fs_gcount; i++){ + for (i = 0; i < fs->e2fs_gcount; i++) fs->e2fs_total_dir += fs->e2fs_gd[i].ext2bgd_ndirs; - fs->e2fs_contigdirs[i] = 0; - } + if (es->e2fs_rev == E2FS_REV0 || !EXT2_HAS_RO_COMPAT_FEATURE(fs, EXT2F_ROCOMPAT_LARGEFILE)) fs->e2fs_maxfilesize = 0x7fffffff; Modified: projects/building-blocks/sys/kern/kern_procctl.c ============================================================================== --- projects/building-blocks/sys/kern/kern_procctl.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/sys/kern/kern_procctl.c Sun Feb 15 21:59:05 2015 (r278823) @@ -160,7 +160,7 @@ static int reap_status(struct thread *td, struct proc *p, struct procctl_reaper_status *rs) { - struct proc *reap, *p2; + struct proc *reap, *p2, *first_p; sx_assert(&proctree_lock, SX_LOCKED); bzero(rs, sizeof(*rs)); @@ -176,8 +176,10 @@ reap_status(struct thread *td, struct pr rs->rs_descendants = 0; rs->rs_children = 0; if (!LIST_EMPTY(&reap->p_reaplist)) { - KASSERT(!LIST_EMPTY(&reap->p_children), ("no children")); - rs->rs_pid = LIST_FIRST(&reap->p_children)->p_pid; + first_p = LIST_FIRST(&reap->p_children); + if (first_p == NULL) + first_p = LIST_FIRST(&reap->p_reaplist); + rs->rs_pid = first_p->p_pid; LIST_FOREACH(p2, &reap->p_reaplist, p_reapsibling) { if (proc_realparent(p2) == reap) rs->rs_children++; @@ -239,13 +241,13 @@ reap_kill(struct thread *td, struct proc int error, error1; sx_assert(&proctree_lock, SX_LOCKED); - PROC_UNLOCK(p); if (IN_CAPABILITY_MODE(td)) return (ECAPMODE); if (rk->rk_sig <= 0 || rk->rk_sig > _SIG_MAXSIG) return (EINVAL); if ((rk->rk_flags & ~REAPER_KILL_CHILDREN) != 0) return (EINVAL); + PROC_UNLOCK(p); reap = (p->p_treeflag & P_TREE_REAPER) == 0 ? p->p_reaper : p; ksiginfo_init(&ksi); ksi.ksi_signo = rk->rk_sig; Modified: projects/building-blocks/sys/kern/uipc_socket.c ============================================================================== --- projects/building-blocks/sys/kern/uipc_socket.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/sys/kern/uipc_socket.c Sun Feb 15 21:59:05 2015 (r278823) @@ -3439,11 +3439,9 @@ soisdisconnecting(struct socket *so) SOCKBUF_LOCK(&so->so_rcv); so->so_state &= ~SS_ISCONNECTING; so->so_state |= SS_ISDISCONNECTING; - so->so_rcv.sb_state |= SBS_CANTRCVMORE; - sorwakeup_locked(so); + socantrcvmore_locked(so); SOCKBUF_LOCK(&so->so_snd); - so->so_snd.sb_state |= SBS_CANTSENDMORE; - sowwakeup_locked(so); + socantsendmore_locked(so); wakeup(&so->so_timeo); } @@ -3458,12 +3456,10 @@ soisdisconnected(struct socket *so) SOCKBUF_LOCK(&so->so_rcv); so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING); so->so_state |= SS_ISDISCONNECTED; - so->so_rcv.sb_state |= SBS_CANTRCVMORE; - sorwakeup_locked(so); + socantrcvmore_locked(so); SOCKBUF_LOCK(&so->so_snd); - so->so_snd.sb_state |= SBS_CANTSENDMORE; sbdrop_locked(&so->so_snd, sbused(&so->so_snd)); - sowwakeup_locked(so); + socantsendmore_locked(so); wakeup(&so->so_timeo); } Modified: projects/building-blocks/usr.bin/timeout/timeout.c ============================================================================== --- projects/building-blocks/usr.bin/timeout/timeout.c Sun Feb 15 21:52:41 2015 (r278822) +++ projects/building-blocks/usr.bin/timeout/timeout.c Sun Feb 15 21:59:05 2015 (r278823) @@ -172,6 +172,7 @@ main(int argc, char **argv) double second_kill; bool timedout = false; bool do_second_kill = false; + bool child_done = false; struct sigaction signals; struct procctl_reaper_status info; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Feb 17 19:53:54 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 4A8B2BDB; Tue, 17 Feb 2015 19:53:54 +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 31E5BABC; Tue, 17 Feb 2015 19:53:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1HJrshu002495; Tue, 17 Feb 2015 19:53:54 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1HJrgtt002312; Tue, 17 Feb 2015 19:53:42 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502171953.t1HJrgtt002312@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 17 Feb 2015 19:53:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278916 - in projects/clang360-import: . bin/ln bin/pkill/tests bin/sh bin/sh/tests/expansion contrib/elftoolchain/addr2line contrib/elftoolchain/common contrib/elftoolchain/elfcopy con... 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.18-1 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: Tue, 17 Feb 2015 19:53:54 -0000 Author: dim Date: Tue Feb 17 19:53:41 2015 New Revision: 278916 URL: https://svnweb.freebsd.org/changeset/base/278916 Log: Merge ^/head r278756 through r278915. Added: projects/clang360-import/bin/sh/tests/expansion/ifs5.0 - copied unchanged from r278915, head/bin/sh/tests/expansion/ifs5.0 projects/clang360-import/bin/sh/tests/expansion/pathname5.0 - copied unchanged from r278915, head/bin/sh/tests/expansion/pathname5.0 projects/clang360-import/lib/libc/sparc64/sys/sigaction1.S - copied unchanged from r278915, head/lib/libc/sparc64/sys/sigaction1.S projects/clang360-import/share/man/man4/udl.4 - copied unchanged from r278915, head/share/man/man4/udl.4 projects/clang360-import/sys/arm/arm/unwind.c - copied unchanged from r278915, head/sys/arm/arm/unwind.c projects/clang360-import/sys/dev/usb/video/ - copied from r278915, head/sys/dev/usb/video/ projects/clang360-import/sys/dev/videomode/ - copied from r278915, head/sys/dev/videomode/ projects/clang360-import/sys/modules/usb/udl/ - copied from r278915, head/sys/modules/usb/udl/ projects/clang360-import/sys/modules/videomode/ - copied from r278915, head/sys/modules/videomode/ projects/clang360-import/sys/ofed/drivers/infiniband/core/peer_mem.c - copied unchanged from r278915, head/sys/ofed/drivers/infiniband/core/peer_mem.c projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.c - copied unchanged from r278915, head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.c projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.h - copied unchanged from r278915, head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.h projects/clang360-import/sys/ofed/include/linux/printk.h - copied unchanged from r278915, head/sys/ofed/include/linux/printk.h projects/clang360-import/sys/ofed/include/rdma/ib_peer_mem.h - copied unchanged from r278915, head/sys/ofed/include/rdma/ib_peer_mem.h projects/clang360-import/sys/ofed/include/rdma/ib_user_verbs_exp.h - copied unchanged from r278915, head/sys/ofed/include/rdma/ib_user_verbs_exp.h projects/clang360-import/sys/ofed/include/rdma/ib_verbs_exp.h - copied unchanged from r278915, head/sys/ofed/include/rdma/ib_verbs_exp.h projects/clang360-import/sys/ofed/include/rdma/peer_mem.h - copied unchanged from r278915, head/sys/ofed/include/rdma/peer_mem.h Deleted: projects/clang360-import/lib/libc/sparc64/sys/sigaction.S projects/clang360-import/sys/dev/ic/hd64570.h projects/clang360-import/sys/ofed/drivers/infiniband/core/Makefile projects/clang360-import/sys/ofed/drivers/infiniband/core/local_sa.c projects/clang360-import/sys/ofed/drivers/infiniband/core/notice.c projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/Makefile projects/clang360-import/sys/ofed/drivers/infiniband/ulp/ipoib/Makefile Modified: projects/clang360-import/Makefile.inc1 projects/clang360-import/ObsoleteFiles.inc projects/clang360-import/bin/ln/symlink.7 projects/clang360-import/bin/pkill/tests/pkill-j_test.sh projects/clang360-import/bin/sh/cd.c projects/clang360-import/bin/sh/eval.c projects/clang360-import/bin/sh/expand.c projects/clang360-import/bin/sh/mail.c projects/clang360-import/bin/sh/memalloc.c projects/clang360-import/bin/sh/memalloc.h projects/clang360-import/bin/sh/miscbltin.c projects/clang360-import/bin/sh/nodetypes projects/clang360-import/bin/sh/parser.c projects/clang360-import/bin/sh/tests/expansion/Makefile projects/clang360-import/bin/sh/var.c projects/clang360-import/contrib/elftoolchain/addr2line/addr2line.c projects/clang360-import/contrib/elftoolchain/common/_elftc.h projects/clang360-import/contrib/elftoolchain/common/elfdefinitions.h projects/clang360-import/contrib/elftoolchain/elfcopy/main.c projects/clang360-import/contrib/elftoolchain/elfcopy/sections.c projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_attrval.c projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3 projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_hasattr.3 projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_whatattr.3 projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c projects/clang360-import/contrib/elftoolchain/libelf/_libelf_config.h projects/clang360-import/contrib/elftoolchain/libelf/elf.3 projects/clang360-import/contrib/elftoolchain/libelf/elf_scn.c projects/clang360-import/contrib/elftoolchain/libelf/libelf_ar_util.c projects/clang360-import/contrib/elftoolchain/libelf/libelf_convert.m4 projects/clang360-import/contrib/elftoolchain/nm/nm.1 projects/clang360-import/contrib/elftoolchain/nm/nm.c projects/clang360-import/contrib/elftoolchain/readelf/readelf.c projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp projects/clang360-import/lib/libc/gen/dlopen.3 projects/clang360-import/lib/libc/gen/fstab.c projects/clang360-import/lib/libc/gen/getgrent.c projects/clang360-import/lib/libc/gen/getpwent.c projects/clang360-import/lib/libc/gen/ulimit.c projects/clang360-import/lib/libc/include/libc_private.h projects/clang360-import/lib/libc/sparc64/sys/Makefile.inc projects/clang360-import/lib/libc/sys/Makefile.inc projects/clang360-import/lib/libcompat/4.3/rexec.c projects/clang360-import/lib/libelftc/elftc_version.c projects/clang360-import/lib/liblzma/config.h projects/clang360-import/share/man/man4/Makefile projects/clang360-import/share/man/man4/wlan.4 projects/clang360-import/sys/amd64/amd64/mp_machdep.c projects/clang360-import/sys/arm/arm/cpuinfo.c projects/clang360-import/sys/arm/arm/db_trace.c projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h projects/clang360-import/sys/arm/include/stack.h projects/clang360-import/sys/boot/fdt/dts/arm/bcm2835.dtsi projects/clang360-import/sys/conf/files projects/clang360-import/sys/conf/files.arm projects/clang360-import/sys/conf/kern.mk projects/clang360-import/sys/conf/kern.pre.mk projects/clang360-import/sys/conf/kmod.mk projects/clang360-import/sys/conf/options projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_gpio.c projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c projects/clang360-import/sys/contrib/rdma/krping/krping.c projects/clang360-import/sys/dev/acpica/acpi_pcib.c projects/clang360-import/sys/dev/ath/if_ath_pci.c projects/clang360-import/sys/dev/atkbdc/atkbd.c projects/clang360-import/sys/dev/atkbdc/atkbdc.c projects/clang360-import/sys/dev/atkbdc/atkbdcreg.h projects/clang360-import/sys/dev/atkbdc/psm.c projects/clang360-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/clang360-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c projects/clang360-import/sys/dev/cxgbe/iw_cxgbe/cq.c projects/clang360-import/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h projects/clang360-import/sys/dev/cxgbe/iw_cxgbe/mem.c projects/clang360-import/sys/dev/fb/fbd.c projects/clang360-import/sys/dev/lmc/if_lmc.h projects/clang360-import/sys/dev/netmap/netmap.c projects/clang360-import/sys/dev/pci/pci.c projects/clang360-import/sys/dev/random/dummy_rng.c projects/clang360-import/sys/dev/random/random_adaptors.c projects/clang360-import/sys/dev/random/randomdev.c projects/clang360-import/sys/dev/random/randomdev.h projects/clang360-import/sys/dev/sfxge/common/efx_ev.c projects/clang360-import/sys/dev/sfxge/common/efx_mac.c projects/clang360-import/sys/dev/sfxge/common/efx_mcdi.c projects/clang360-import/sys/dev/sfxge/common/efx_nic.c projects/clang360-import/sys/dev/sfxge/common/efx_rx.c projects/clang360-import/sys/dev/sfxge/common/efx_tx.c projects/clang360-import/sys/dev/sfxge/common/siena_mon.c projects/clang360-import/sys/dev/sfxge/common/siena_nic.c projects/clang360-import/sys/dev/sfxge/common/siena_vpd.c projects/clang360-import/sys/dev/sfxge/sfxge_port.c projects/clang360-import/sys/dev/sfxge/sfxge_rx.c projects/clang360-import/sys/dev/sfxge/sfxge_tx.c projects/clang360-import/sys/dev/usb/controller/musb_otg.c projects/clang360-import/sys/dev/usb/controller/uhci.c projects/clang360-import/sys/dev/usb/usbdevs projects/clang360-import/sys/dev/vt/vt_core.c projects/clang360-import/sys/dev/wpi/if_wpi.c projects/clang360-import/sys/dev/wpi/if_wpireg.h projects/clang360-import/sys/dev/xen/xenstore/xenstore_dev.c projects/clang360-import/sys/fs/ext2fs/ext2_htree.c projects/clang360-import/sys/fs/ext2fs/ext2_vfsops.c projects/clang360-import/sys/i386/i386/mp_machdep.c projects/clang360-import/sys/kern/imgact_elf.c projects/clang360-import/sys/kern/kern_procctl.c projects/clang360-import/sys/kern/subr_taskqueue.c projects/clang360-import/sys/kern/uipc_mbuf.c projects/clang360-import/sys/kern/uipc_socket.c projects/clang360-import/sys/kern/vfs_subr.c projects/clang360-import/sys/mips/conf/AR71XX_BASE projects/clang360-import/sys/modules/cxgbe/if_cxgbe/Makefile projects/clang360-import/sys/modules/drm2/radeonkms/Makefile projects/clang360-import/sys/modules/ibcore/Makefile projects/clang360-import/sys/modules/ipoib/Makefile projects/clang360-import/sys/modules/mlx4/Makefile projects/clang360-import/sys/modules/mlx4ib/Makefile projects/clang360-import/sys/modules/mlxen/Makefile projects/clang360-import/sys/modules/mthca/Makefile projects/clang360-import/sys/net/if_bridge.c projects/clang360-import/sys/net/pfvar.h projects/clang360-import/sys/netinet6/frag6.c projects/clang360-import/sys/netinet6/ip6_output.c projects/clang360-import/sys/netinet6/ip6_var.h projects/clang360-import/sys/netpfil/pf/pf.c projects/clang360-import/sys/netpfil/pf/pf.h projects/clang360-import/sys/netpfil/pf/pf_mtag.h projects/clang360-import/sys/netpfil/pf/pf_norm.c projects/clang360-import/sys/ofed/drivers/infiniband/core/addr.c projects/clang360-import/sys/ofed/drivers/infiniband/core/cache.c projects/clang360-import/sys/ofed/drivers/infiniband/core/cm.c projects/clang360-import/sys/ofed/drivers/infiniband/core/cm_msgs.h projects/clang360-import/sys/ofed/drivers/infiniband/core/cma.c projects/clang360-import/sys/ofed/drivers/infiniband/core/core_priv.h projects/clang360-import/sys/ofed/drivers/infiniband/core/device.c projects/clang360-import/sys/ofed/drivers/infiniband/core/fmr_pool.c projects/clang360-import/sys/ofed/drivers/infiniband/core/iwcm.c projects/clang360-import/sys/ofed/drivers/infiniband/core/mad.c projects/clang360-import/sys/ofed/drivers/infiniband/core/mad_priv.h projects/clang360-import/sys/ofed/drivers/infiniband/core/mad_rmpp.c projects/clang360-import/sys/ofed/drivers/infiniband/core/multicast.c projects/clang360-import/sys/ofed/drivers/infiniband/core/packer.c projects/clang360-import/sys/ofed/drivers/infiniband/core/sa.h projects/clang360-import/sys/ofed/drivers/infiniband/core/sa_query.c projects/clang360-import/sys/ofed/drivers/infiniband/core/smi.c projects/clang360-import/sys/ofed/drivers/infiniband/core/sysfs.c projects/clang360-import/sys/ofed/drivers/infiniband/core/ucm.c projects/clang360-import/sys/ofed/drivers/infiniband/core/ucma.c projects/clang360-import/sys/ofed/drivers/infiniband/core/ud_header.c projects/clang360-import/sys/ofed/drivers/infiniband/core/umem.c projects/clang360-import/sys/ofed/drivers/infiniband/core/user_mad.c projects/clang360-import/sys/ofed/drivers/infiniband/core/uverbs.h projects/clang360-import/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/clang360-import/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/clang360-import/sys/ofed/drivers/infiniband/core/uverbs_marshall.c projects/clang360-import/sys/ofed/drivers/infiniband/core/verbs.c projects/clang360-import/sys/ofed/drivers/infiniband/debug/memtrack.c projects/clang360-import/sys/ofed/drivers/infiniband/debug/memtrack.h projects/clang360-import/sys/ofed/drivers/infiniband/debug/mtrack.h projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/cq.c projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/doorbell.c projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/clang360-import/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/clang360-import/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/clang360-import/sys/ofed/drivers/infiniband/hw/mthca/mthca_qp.c projects/clang360-import/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/clang360-import/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c projects/clang360-import/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/clang360-import/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c projects/clang360-import/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c projects/clang360-import/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c projects/clang360-import/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c projects/clang360-import/sys/ofed/drivers/net/mlx4/Makefile projects/clang360-import/sys/ofed/drivers/net/mlx4/en_rx.c projects/clang360-import/sys/ofed/include/linux/device.h projects/clang360-import/sys/ofed/include/linux/linux_compat.c projects/clang360-import/sys/ofed/include/rdma/ib_addr.h projects/clang360-import/sys/ofed/include/rdma/ib_cache.h projects/clang360-import/sys/ofed/include/rdma/ib_cm.h projects/clang360-import/sys/ofed/include/rdma/ib_mad.h projects/clang360-import/sys/ofed/include/rdma/ib_pack.h projects/clang360-import/sys/ofed/include/rdma/ib_sa.h projects/clang360-import/sys/ofed/include/rdma/ib_umem.h projects/clang360-import/sys/ofed/include/rdma/ib_user_verbs.h projects/clang360-import/sys/ofed/include/rdma/ib_verbs.h projects/clang360-import/sys/ofed/include/rdma/iw_cm.h projects/clang360-import/sys/ofed/include/rdma/rdma_cm.h projects/clang360-import/sys/ofed/include/rdma/rdma_user_cm.h projects/clang360-import/sys/powerpc/powerpc/db_trace.c projects/clang360-import/sys/sparc64/include/asm.h projects/clang360-import/sys/sys/fbio.h projects/clang360-import/sys/sys/mbuf.h projects/clang360-import/sys/sys/param.h projects/clang360-import/sys/sys/taskqueue.h projects/clang360-import/sys/vm/memguard.c projects/clang360-import/sys/x86/acpica/acpi_wakeup.c projects/clang360-import/sys/x86/x86/local_apic.c projects/clang360-import/sys/x86/xen/pvcpu_enum.c projects/clang360-import/sys/x86/xen/xen_intr.c projects/clang360-import/usr.bin/compress/compress.c projects/clang360-import/usr.bin/gcore/elfcore.c projects/clang360-import/usr.bin/gzip/gzip.c projects/clang360-import/usr.bin/kdump/kdump.c projects/clang360-import/usr.bin/timeout/timeout.c projects/clang360-import/usr.bin/touch/touch.c projects/clang360-import/usr.sbin/binmiscctl/binmiscctl.8 projects/clang360-import/usr.sbin/binmiscctl/binmiscctl.c projects/clang360-import/usr.sbin/devctl/Makefile projects/clang360-import/usr.sbin/pw/tests/pw_useradd.sh projects/clang360-import/usr.sbin/pw/tests/pw_usernext.sh Directory Properties: projects/clang360-import/ (props changed) projects/clang360-import/contrib/elftoolchain/ (props changed) projects/clang360-import/contrib/llvm/ (props changed) projects/clang360-import/contrib/llvm/tools/lldb/ (props changed) projects/clang360-import/lib/libc/ (props changed) projects/clang360-import/share/ (props changed) projects/clang360-import/share/man/man4/ (props changed) projects/clang360-import/sys/ (props changed) projects/clang360-import/sys/boot/ (props changed) projects/clang360-import/sys/conf/ (props changed) Modified: projects/clang360-import/Makefile.inc1 ============================================================================== --- projects/clang360-import/Makefile.inc1 Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/Makefile.inc1 Tue Feb 17 19:53:41 2015 (r278916) @@ -929,7 +929,7 @@ packageworld: @${DESTDIR}/${DISTDIR}/${dist}.debug.meta . else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \ + tar cvJLf ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \ usr/lib/debug . endif .endfor Modified: projects/clang360-import/ObsoleteFiles.inc ============================================================================== --- projects/clang360-import/ObsoleteFiles.inc Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/ObsoleteFiles.inc Tue Feb 17 19:53:41 2015 (r278916) @@ -93,6 +93,8 @@ OLD_FILES+=usr/lib/clang/3.5.1/lib/freeb OLD_DIRS+=usr/lib/clang/3.5.1/lib/freebsd OLD_DIRS+=usr/lib/clang/3.5.1/lib OLD_DIRS+=usr/lib/clang/3.5.1 +# 20150217: Removed remnants of ar(4) driver +OLD_FILES+=usr/include/sys/dev/ic/hd64570.h # 20150212: /usr/games moving into /usr/bin OLD_FILES+=usr/games/bcd OLD_FILES+=usr/games/caesar Modified: projects/clang360-import/bin/ln/symlink.7 ============================================================================== --- projects/clang360-import/bin/ln/symlink.7 Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/bin/ln/symlink.7 Tue Feb 17 19:53:41 2015 (r278916) @@ -29,7 +29,7 @@ .\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 .\" $FreeBSD$ .\" -.Dd January 23, 2015 +.Dd February 16, 2015 .Dt SYMLINK 7 .Os .Sh NAME @@ -146,6 +146,7 @@ The following system calls follow symbol unless given the .Dv AT_SYMLINK_NOFOLLOW flag: +.Xr chflagsat 2 , .Xr fchmodat 2 , .Xr fchownat 2 , .Xr fstatat 2 Modified: projects/clang360-import/bin/pkill/tests/pkill-j_test.sh ============================================================================== --- projects/clang360-import/bin/pkill/tests/pkill-j_test.sh Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/bin/pkill/tests/pkill-j_test.sh Tue Feb 17 19:53:41 2015 (r278916) @@ -4,99 +4,90 @@ jail_name_to_jid() { local check_name="$1" - ( - line="$(jls -n 2> /dev/null | grep name=$check_name )" - for nv in $line; do - local name="${nv%=*}" - if [ "${name}" = "jid" ]; then - eval $nv - echo $jid - break - fi - done - ) + jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g' } base=pkill_j_test +if [ `id -u` -ne 0 ]; then + echo "1..0 # skip Test needs uid 0." + exit 0 +fi + echo "1..3" +sleep=$(pwd)/sleep.txt +ln -sf /bin/sleep $sleep + name="pkill -j " -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 & +sleep_amount=5 +jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount & - jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 & +$sleep $sleep_amount & - $sleep 5 & - sleep 0.5 +for i in `seq 1 10`; do jid1=$(jail_name_to_jid ${base}_1_1) jid2=$(jail_name_to_jid ${base}_1_2) jid="${jid1},${jid2}" - if pkill -f -j "$jid" $sleep && sleep 0.5 && - ! -f ${PWD}/${base}_1_1.pid && - ! -f ${PWD}/${base}_1_2.pid ; then - echo "ok 1 - $name" - else - echo "not ok 1 - $name" - fi 2>/dev/null - rm -f $sleep - [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) - [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) - wait + case "$jid" in + [0-9]+,[0-9]+) + break + ;; + esac + sleep 0.1 +done + +if pkill -f -j "$jid" $sleep && sleep 0.5 && + ! -f ${PWD}/${base}_1_1.pid && + ! -f ${PWD}/${base}_1_2.pid ; then + echo "ok 1 - $name" else - echo "ok 1 - $name # skip Test needs uid 0." -fi + echo "not ok 1 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) +[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) +wait name="pkill -j any" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 & - - jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 & - - $sleep 5 & - sleep 0.5 - chpid3=$! - if pkill -f -j any $sleep && sleep 0.5 && - [ ! -f ${PWD}/${base}_2_1.pid -a - ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then - echo "ok 2 - $name" - else - echo "not ok 2 - $name" - fi 2>/dev/null - rm -f $sleep - [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) - [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) - wait +sleep_amount=6 +jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_2.pid $sleep $sleep_amount & + +$sleep $sleep_amount & +chpid3=$! +sleep 0.5 +if pkill -f -j any $sleep && sleep 0.5 && + [ ! -f ${PWD}/${base}_2_1.pid -a + ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then + echo "ok 2 - $name" else - echo "ok 2 - $name # skip Test needs uid 0." -fi + echo "not ok 2 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) +[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) +wait name="pkill -j none" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - daemon -p ${PWD}/${base}_3_1.pid $sleep 5 - jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 & - sleep 1 - if pkill -f -j none "$sleep 5" && sleep 1 && - [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then - echo "ok 3 - $name" - else - ls ${PWD}/*.pid - echo "not ok 3 - $name" - fi 2>/dev/null - rm -f $sleep - [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid) - [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid) +sleep_amount=7 +daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount +jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount & +sleep 1 +if pkill -f -j none "$sleep $sleep_amount" && sleep 1 && + [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then + echo "ok 3 - $name" else - echo "ok 3 - $name # skip Test needs uid 0." -fi + ls ${PWD}/*.pid + echo "not ok 3 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid) +[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid) + +rm -f $sleep Modified: projects/clang360-import/bin/sh/cd.c ============================================================================== --- projects/clang360-import/bin/sh/cd.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/bin/sh/cd.c Tue Feb 17 19:53:41 2015 (r278916) @@ -122,7 +122,7 @@ cdcmd(int argc __unused, char **argv __u (dest[0] == '.' && (dest[1] == '/' || dest[1] == '\0')) || (dest[0] == '.' && dest[1] == '.' && (dest[2] == '/' || dest[2] == '\0')) || (path = bltinlookup("CDPATH", 1)) == NULL) - path = nullstr; + path = ""; while ((p = padvance(&path, dest)) != NULL) { if (stat(p, &statb) < 0) { if (errno != ENOENT) @@ -182,7 +182,6 @@ cdlogical(char *dest) struct stat statb; int first; int badstat; - size_t len; /* * Check each component of the path. If we find a symlink or @@ -190,9 +189,7 @@ cdlogical(char *dest) * next time we get the value of the current directory. */ badstat = 0; - len = strlen(dest); - cdcomppath = stalloc(len + 1); - memcpy(cdcomppath, dest, len + 1); + cdcomppath = stsavestr(dest); STARTSTACKSTR(p); if (*dest == '/') { STPUTC('/', p); @@ -277,7 +274,6 @@ findcwd(char *dir) { char *new; char *p; - size_t len; /* * If our argument is NULL, we don't know the current directory @@ -286,9 +282,7 @@ findcwd(char *dir) */ if (dir == NULL || curdir == NULL) return getpwd2(); - len = strlen(dir); - cdcomppath = stalloc(len + 1); - memcpy(cdcomppath, dir, len + 1); + cdcomppath = stsavestr(dir); STARTSTACKSTR(new); if (*dir != '/') { STPUTS(curdir, new); Modified: projects/clang360-import/bin/sh/eval.c ============================================================================== --- projects/clang360-import/bin/sh/eval.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/bin/sh/eval.c Tue Feb 17 19:53:41 2015 (r278916) @@ -498,7 +498,7 @@ exphere(union node *redir, struct arglis struct localvar *savelocalvars; int need_longjmp = 0; - redir->nhere.expdoc = nullstr; + redir->nhere.expdoc = ""; savelocalvars = localvars; localvars = NULL; forcelocal++; Modified: projects/clang360-import/bin/sh/expand.c ============================================================================== --- projects/clang360-import/bin/sh/expand.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/bin/sh/expand.c Tue Feb 17 19:53:41 2015 (r278916) @@ -105,11 +105,12 @@ static void expbackq(union node *, int, static int subevalvar(char *, char *, int, int, int, int, int); static char *evalvar(char *, int); static int varisset(const char *, int); +static void strtodest(const char *, int, int, int); static void varvalue(const char *, int, int, int); static void recordregion(int, int, int); static void removerecordregions(int); static void ifsbreakup(char *, struct arglist *); -static void expandmeta(struct strlist *, int); +static void expandmeta(struct strlist *); static void expmeta(char *, char *); static void addfname(char *); static struct strlist *expsort(struct strlist *); @@ -175,7 +176,7 @@ expandarg(union node *arg, struct arglis ifsbreakup(p, &exparg); *exparg.lastp = NULL; exparg.lastp = &exparg.list; - expandmeta(exparg.list, flag); + expandmeta(exparg.list); } else { sp = (struct strlist *)stalloc(sizeof (struct strlist)); sp->text = p; @@ -298,9 +299,9 @@ exptilde(char *p, int flag) char c, *startp = p; struct passwd *pw; char *home; - int quotes = flag & (EXP_FULL | EXP_CASE); - while ((c = *p) != '\0') { + for (;;) { + c = *p; switch(c) { case CTLESC: /* This means CTL* are always considered quoted. */ case CTLVAR: @@ -311,31 +312,27 @@ exptilde(char *p, int flag) case CTLQUOTEMARK: return (startp); case ':': - if (flag & EXP_VARTILDE) - goto done; - break; + if ((flag & EXP_VARTILDE) == 0) + break; + /* FALLTHROUGH */ + case '\0': case '/': case CTLENDVAR: - goto done; + *p = '\0'; + if (*(startp+1) == '\0') { + home = lookupvar("HOME"); + } else { + pw = getpwnam(startp+1); + home = pw != NULL ? pw->pw_dir : NULL; + } + *p = c; + if (home == NULL || *home == '\0') + return (startp); + strtodest(home, flag, VSNORMAL, 1); + return (p); } p++; } -done: - *p = '\0'; - if (*(startp+1) == '\0') { - home = lookupvar("HOME"); - } else { - pw = getpwnam(startp+1); - home = pw != NULL ? pw->pw_dir : NULL; - } - *p = c; - if (home == NULL || *home == '\0') - return (startp); - if (quotes) - STPUTS_QUOTES(home, DQSYNTAX, expdest); - else - STPUTS(home, expdest); - return (p); } @@ -496,6 +493,17 @@ expbackq(union node *cmd, int quoted, in +static void +recordleft(const char *str, const char *loc, char *startp) +{ + int amount; + + amount = ((str - 1) - (loc - startp)) - expdest; + STADJUST(amount, expdest); + while (loc != str - 1) + *startp++ = *loc++; +} + static int subevalvar(char *p, char *str, int strloc, int subtype, int startloc, int varflags, int quotes) @@ -530,8 +538,7 @@ subevalvar(char *p, char *str, int strlo error((char *)NULL); } error("%.*s: parameter %snot set", (int)(p - str - 1), - str, (varflags & VSNUL) ? "null or " - : nullstr); + str, (varflags & VSNUL) ? "null or " : ""); return 0; case VSTRIMLEFT: @@ -540,7 +547,8 @@ subevalvar(char *p, char *str, int strlo *loc = '\0'; if (patmatch(str, startp, quotes)) { *loc = c; - goto recordleft; + recordleft(str, loc, startp); + return 1; } *loc = c; if (quotes && *loc == CTLESC) @@ -554,7 +562,8 @@ subevalvar(char *p, char *str, int strlo *loc = '\0'; if (patmatch(str, startp, quotes)) { *loc = c; - goto recordleft; + recordleft(str, loc, startp); + return 1; } *loc = c; loc--; @@ -602,13 +611,6 @@ subevalvar(char *p, char *str, int strlo default: abort(); } - -recordleft: - amount = ((str - 1) - (loc - startp)) - expdest; - STADJUST(amount, expdest); - while (loc != str - 1) - *startp++ = *loc++; - return 1; } @@ -633,6 +635,7 @@ evalvar(char *p, int flag) int varlenb; int easy; int quotes = flag & (EXP_FULL | EXP_CASE); + int record; varflags = (unsigned char)*p++; subtype = varflags & VSTYPE; @@ -690,22 +693,15 @@ again: /* jump here after setting a vari STADJUST(-varlenb, expdest); } } else { - char const *syntax = (varflags & VSQUOTE) ? DQSYNTAX - : BASESYNTAX; - if (subtype == VSLENGTH) { for (;*val; val++) if (!localeisutf8 || (*val & 0xC0) != 0x80) varlen++; } - else { - if (quotes) - STPUTS_QUOTES(val, syntax, expdest); - else - STPUTS(val, expdest); - - } + else + strtodest(val, flag, subtype, + varflags & VSQUOTE); } } @@ -719,15 +715,11 @@ again: /* jump here after setting a vari switch (subtype) { case VSLENGTH: expdest = cvtnum(varlen, expdest); - goto record; + record = 1; + break; case VSNORMAL: - if (!easy) - break; -record: - recordregion(startloc, expdest - stackblock(), - varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' && - (*var == '@' || *var == '*'))); + record = easy; break; case VSPLUS: @@ -737,8 +729,7 @@ record: (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0)); break; } - if (easy) - goto record; + record = easy; break; case VSTRIMLEFT: @@ -760,7 +751,8 @@ record: } /* Remove any recorded regions beyond start of variable */ removerecordregions(startloc); - goto record; + record = 1; + break; case VSASSIGN: case VSQUESTION: @@ -777,8 +769,7 @@ record: } break; } - if (easy) - goto record; + record = easy; break; case VSERROR: @@ -790,6 +781,11 @@ record: abort(); } + if (record) + recordregion(startloc, expdest - stackblock(), + varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' && + (*var == '@' || *var == '*'))); + if (subtype != VSNORMAL) { /* skip to end of alternative */ int nesting = 1; for (;;) { @@ -1093,7 +1089,7 @@ static char expdir[PATH_MAX]; * The results are stored in the list exparg. */ static void -expandmeta(struct strlist *str, int flag __unused) +expandmeta(struct strlist *str) { char *p; struct strlist **savelastp; @@ -1284,11 +1280,8 @@ addfname(char *name) { char *p; struct strlist *sp; - size_t len; - len = strlen(name); - p = stalloc(len + 1); - memcpy(p, name, len + 1); + p = stsavestr(name); sp = (struct strlist *)stalloc(sizeof *sp); sp->text = p; *exparg.lastp = sp; @@ -1478,16 +1471,14 @@ patmatch(const char *pattern, const char endp = p; if (*endp == '!' || *endp == '^') endp++; - for (;;) { + do { while (*endp == CTLQUOTEMARK) endp++; if (*endp == 0) goto dft; /* no matching ] */ if (*endp == CTLESC) endp++; - if (*++endp == ']') - break; - } + } while (*++endp != ']'); invert = 0; if (*p == '!' || *p == '^') { invert++; Modified: projects/clang360-import/bin/sh/mail.c ============================================================================== --- projects/clang360-import/bin/sh/mail.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/bin/sh/mail.c Tue Feb 17 19:53:41 2015 (r278916) @@ -85,7 +85,7 @@ chkmail(int silent) setstackmark(&smark); mpath = mpathset()? mpathval() : mailval(); for (i = 0 ; i < nmboxes ; i++) { - p = padvance(&mpath, nullstr); + p = padvance(&mpath, ""); if (p == NULL) break; if (*p == '\0') Modified: projects/clang360-import/bin/sh/memalloc.c ============================================================================== --- projects/clang360-import/bin/sh/memalloc.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/bin/sh/memalloc.c Tue Feb 17 19:53:41 2015 (r278916) @@ -180,6 +180,18 @@ stunalloc(pointer p) } +char * +stsavestr(const char *s) +{ + char *p; + size_t len; + + len = strlen(s); + p = stalloc(len + 1); + memcpy(p, s, len + 1); + return p; +} + void setstackmark(struct stackmark *mark) Modified: projects/clang360-import/bin/sh/memalloc.h ============================================================================== --- projects/clang360-import/bin/sh/memalloc.h Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/bin/sh/memalloc.h Tue Feb 17 19:53:41 2015 (r278916) @@ -52,6 +52,7 @@ void ckfree(pointer); char *savestr(const char *); pointer stalloc(int); void stunalloc(pointer); +char *stsavestr(const char *); void setstackmark(struct stackmark *); void popstackmark(struct stackmark *); char *growstackstr(void); Modified: projects/clang360-import/bin/sh/miscbltin.c ============================================================================== --- projects/clang360-import/bin/sh/miscbltin.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/bin/sh/miscbltin.c Tue Feb 17 19:53:41 2015 (r278916) @@ -265,7 +265,7 @@ readcmd(int argc __unused, char **argv _ /* Set any remaining args to "" */ while (*++ap != NULL) - setvar(*ap, nullstr, 0); + setvar(*ap, "", 0); return status; } Modified: projects/clang360-import/bin/sh/nodetypes ============================================================================== --- projects/clang360-import/bin/sh/nodetypes Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/bin/sh/nodetypes Tue Feb 17 19:53:41 2015 (r278916) @@ -138,7 +138,7 @@ NXHERE nhere # fd<flags & VREADONLY) return (1); if (vp->text[vp->name_len + 1] != '\0') - setvar(s, nullstr, 0); + setvar(s, "", 0); if ((vp->flags & VEXPORT) && localevar(vp->text)) { change_env(s, 0); setlocale(LC_ALL, ""); Modified: projects/clang360-import/contrib/elftoolchain/addr2line/addr2line.c ============================================================================== --- projects/clang360-import/contrib/elftoolchain/addr2line/addr2line.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/addr2line/addr2line.c Tue Feb 17 19:53:41 2015 (r278916) @@ -40,7 +40,7 @@ #include "_elftc.h" -ELFTC_VCSID("$Id: addr2line.c 2185 2011-11-19 16:07:16Z jkoshy $"); +ELFTC_VCSID("$Id: addr2line.c 3148 2015-02-15 18:47:39Z emaste $"); static struct option longopts[] = { {"target" , required_argument, NULL, 'b'}, Modified: projects/clang360-import/contrib/elftoolchain/common/_elftc.h ============================================================================== --- projects/clang360-import/contrib/elftoolchain/common/_elftc.h Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/common/_elftc.h Tue Feb 17 19:53:41 2015 (r278916) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: _elftc.h 2922 2013-03-17 22:53:15Z kaiwang27 $ + * $Id: _elftc.h 3139 2015-01-05 03:17:06Z kaiwang27 $ */ /** @@ -76,10 +76,17 @@ * SUCH DAMAGE. */ +#ifndef LIST_FOREACH_SAFE +#define LIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = LIST_FIRST((head)); \ + (var) && ((tvar) = LIST_NEXT((var), field), 1); \ + (var) = (tvar)) +#endif + #ifndef SLIST_FOREACH_SAFE -#define SLIST_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = SLIST_FIRST((head)); \ - (var) && ((tvar) = SLIST_NEXT((var), field), 1); \ +#define SLIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = SLIST_FIRST((head)); \ + (var) && ((tvar) = SLIST_NEXT((var), field), 1); \ (var) = (tvar)) #endif Modified: projects/clang360-import/contrib/elftoolchain/common/elfdefinitions.h ============================================================================== --- projects/clang360-import/contrib/elftoolchain/common/elfdefinitions.h Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/common/elfdefinitions.h Tue Feb 17 19:53:41 2015 (r278916) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: elfdefinitions.h 3110 2014-12-20 08:32:46Z kaiwang27 $ + * $Id: elfdefinitions.h 3149 2015-02-15 19:00:06Z emaste $ */ /* @@ -1396,6 +1396,12 @@ _ELF_DEFINE_RELOC(R_386_8, 22) \ _ELF_DEFINE_RELOC(R_386_PC8, 23) /* + */ +#define _ELF_DEFINE_AARCH64_RELOCATIONS() \ +_ELF_DEFINE_RELOC(R_AARCH64_ABS64, 257) \ +_ELF_DEFINE_RELOC(R_AARCH64_ABS32, 258) \ + +/* * These are the symbols used in the Sun ``Linkers and Loaders * Guide'', Document No: 817-1984-17. See the X86_64 relocations list * below for the spellings used in the ELF specification. @@ -1962,6 +1968,7 @@ _ELF_DEFINE_RELOC(R_X86_64_IRELATIVE, 37 #define _ELF_DEFINE_RELOCATIONS() \ _ELF_DEFINE_386_RELOCATIONS() \ +_ELF_DEFINE_AARCH64_RELOCATIONS() \ _ELF_DEFINE_AMD64_RELOCATIONS() \ _ELF_DEFINE_ARM_RELOCATIONS() \ _ELF_DEFINE_IA64_RELOCATIONS() \ Modified: projects/clang360-import/contrib/elftoolchain/elfcopy/main.c ============================================================================== --- projects/clang360-import/contrib/elftoolchain/elfcopy/main.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/elfcopy/main.c Tue Feb 17 19:53:41 2015 (r278916) @@ -40,7 +40,7 @@ #include "elfcopy.h" -ELFTC_VCSID("$Id: main.c 3111 2014-12-20 08:33:01Z kaiwang27 $"); +ELFTC_VCSID("$Id: main.c 3156 2015-02-15 21:40:01Z emaste $"); enum options { Modified: projects/clang360-import/contrib/elftoolchain/elfcopy/sections.c ============================================================================== --- projects/clang360-import/contrib/elftoolchain/elfcopy/sections.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/elfcopy/sections.c Tue Feb 17 19:53:41 2015 (r278916) @@ -35,7 +35,7 @@ #include "elfcopy.h" -ELFTC_VCSID("$Id: sections.c 3134 2014-12-23 10:43:59Z kaiwang27 $"); +ELFTC_VCSID("$Id: sections.c 3150 2015-02-15 19:07:46Z emaste $"); static void add_gnu_debuglink(struct elfcopy *ecp); static uint32_t calc_crc32(const char *p, size_t len, uint32_t crc); Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h Tue Feb 17 19:53:41 2015 (r278916) @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: _libdwarf.h 3106 2014-12-19 16:00:58Z kaiwang27 $ + * $Id: _libdwarf.h 3161 2015-02-15 21:43:36Z emaste $ */ #ifndef __LIBDWARF_H_ Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_attrval.c ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_attrval.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_attrval.c Tue Feb 17 19:53:41 2015 (r278916) @@ -26,7 +26,7 @@ #include "_libdwarf.h" -ELFTC_VCSID("$Id: dwarf_attrval.c 2977 2014-01-21 20:13:31Z kaiwang27 $"); +ELFTC_VCSID("$Id: dwarf_attrval.c 3159 2015-02-15 21:43:27Z emaste $"); int dwarf_attrval_flag(Dwarf_Die die, Dwarf_Half attr, Dwarf_Bool *valp, Dwarf_Error *err) Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 Tue Feb 17 19:53:41 2015 (r278916) @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: dwarf_get_AT_name.3 2071 2011-10-27 03:20:00Z jkoshy $ +.\" $Id: dwarf_get_AT_name.3 3142 2015-01-29 23:11:14Z jkoshy $ .\" .Dd April 22, 2011 .Os Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 Tue Feb 17 19:53:41 2015 (r278916) @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: dwarf_get_arange_info.3 2134 2011-11-10 08:40:14Z jkoshy $ +.\" $Id: dwarf_get_arange_info.3 3142 2015-01-29 23:11:14Z jkoshy $ .\" .Dd April 16, 2011 .Os Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3 ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3 Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3 Tue Feb 17 19:53:41 2015 (r278916) @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: dwarf_get_section_max_offsets.3 3098 2014-09-02 22:18:29Z kaiwang27 $ +.\" $Id: dwarf_get_section_max_offsets.3 3141 2015-01-29 23:11:10Z jkoshy $ .\" -.Dd July 27, 2014 +.Dd December 21, 2014 .Os .Dt DWARF_GET_SECTION_MAX_OFFSETS .Sh NAME @@ -101,7 +101,7 @@ is identical to function .Fn dwarf_get_section_max_offsets_b except that it does not provide argument .Ar debug_types , -thus it can not retrieve the size of the +and thus cannot return the size of the .Dq \&.debug_types section. .Sh RETURN VALUES Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_hasattr.3 ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_hasattr.3 Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_hasattr.3 Tue Feb 17 19:53:41 2015 (r278916) @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: dwarf_hasattr.3 2073 2011-10-27 03:30:47Z jkoshy $ +.\" $Id: dwarf_hasattr.3 3142 2015-01-29 23:11:14Z jkoshy $ .\" .Dd April 17, 2010 .Os Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c Tue Feb 17 19:53:41 2015 (r278916) @@ -26,7 +26,7 @@ #include "_libdwarf.h" -ELFTC_VCSID("$Id: dwarf_reloc.c 2075 2011-10-27 03:47:28Z jkoshy $"); +ELFTC_VCSID("$Id: dwarf_reloc.c 3161 2015-02-15 21:43:36Z emaste $"); int dwarf_set_reloc_application(int apply) Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 Tue Feb 17 19:53:41 2015 (r278916) @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: dwarf_set_reloc_application.3 2075 2011-10-27 03:47:28Z jkoshy $ +.\" $Id: dwarf_set_reloc_application.3 3161 2015-02-15 21:43:36Z emaste $ .\" .Dd February 11, 2015 .Os Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_whatattr.3 ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_whatattr.3 Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_whatattr.3 Tue Feb 17 19:53:41 2015 (r278916) @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: dwarf_whatattr.3 2075 2011-10-27 03:47:28Z jkoshy $ +.\" $Id: dwarf_whatattr.3 3142 2015-01-29 23:11:14Z jkoshy $ .\" .Dd May 22, 2010 .Os Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c Tue Feb 17 19:53:41 2015 (r278916) @@ -26,7 +26,7 @@ #include "_libdwarf.h" -ELFTC_VCSID("$Id: libdwarf.c 2070 2011-10-27 03:05:32Z jkoshy $"); +ELFTC_VCSID("$Id: libdwarf.c 3161 2015-02-15 21:43:36Z emaste $"); struct _libdwarf_globals _libdwarf = { .errhand = NULL, Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h Tue Feb 17 19:53:41 2015 (r278916) @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: libdwarf.h 3064 2014-06-06 19:35:55Z kaiwang27 $ + * $Id: libdwarf.h 3149 2015-02-15 19:00:06Z emaste $ */ #ifndef _LIBDWARF_H_ Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Tue Feb 17 19:53:41 2015 (r278916) @@ -26,7 +26,7 @@ #include "_libdwarf.h" -ELFTC_VCSID("$Id: libdwarf_elf_init.c 2972 2013-12-23 06:46:04Z kaiwang27 $"); +ELFTC_VCSID("$Id: libdwarf_elf_init.c 3161 2015-02-15 21:43:36Z emaste $"); static const char *debug_name[] = { ".debug_abbrev", Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Tue Feb 17 19:53:41 2015 (r278916) @@ -26,7 +26,7 @@ #include "_libdwarf.h" -ELFTC_VCSID("$Id: libdwarf_reloc.c 2948 2013-05-30 21:25:52Z kaiwang27 $"); +ELFTC_VCSID("$Id: libdwarf_reloc.c 3149 2015-02-15 19:00:06Z emaste $"); Dwarf_Unsigned _dwarf_get_reloc_type(Dwarf_P_Debug dbg, int is64) Modified: projects/clang360-import/contrib/elftoolchain/libelf/_libelf_config.h ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libelf/_libelf_config.h Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libelf/_libelf_config.h Tue Feb 17 19:53:41 2015 (r278916) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: _libelf_config.h 2287 2011-12-04 06:45:47Z jkoshy $ + * $Id: _libelf_config.h 3143 2015-02-15 17:57:38Z emaste $ */ #ifdef __DragonFly__ Modified: projects/clang360-import/contrib/elftoolchain/libelf/elf.3 ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libelf/elf.3 Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libelf/elf.3 Tue Feb 17 19:53:41 2015 (r278916) @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $Id: elf.3 3082 2014-07-28 09:13:33Z jkoshy $ +.\" $Id: elf.3 3142 2015-01-29 23:11:14Z jkoshy $ .\" .Dd July 28, 2014 .Os Modified: projects/clang360-import/contrib/elftoolchain/libelf/elf_scn.c ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libelf/elf_scn.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libelf/elf_scn.c Tue Feb 17 19:53:41 2015 (r278916) @@ -37,7 +37,7 @@ #include "_libelf.h" -ELFTC_VCSID("$Id: elf_scn.c 3013 2014-03-23 06:16:59Z jkoshy $"); +ELFTC_VCSID("$Id: elf_scn.c 3147 2015-02-15 18:45:23Z emaste $"); /* * Load an ELF section table and create a list of Elf_Scn structures. Modified: projects/clang360-import/contrib/elftoolchain/libelf/libelf_ar_util.c ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libelf/libelf_ar_util.c Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libelf/libelf_ar_util.c Tue Feb 17 19:53:41 2015 (r278916) @@ -34,7 +34,7 @@ #include "_libelf.h" #include "_libelf_ar.h" -ELFTC_VCSID("$Id: libelf_ar_util.c 3013 2014-03-23 06:16:59Z jkoshy $"); +ELFTC_VCSID("$Id: libelf_ar_util.c 3157 2015-02-15 21:42:02Z emaste $"); /* * Convert a string bounded by `start' and `start+sz' (exclusive) to a @@ -278,7 +278,6 @@ _libelf_ar_open(Elf *e, int reporterror) * Handle special archive members for the SVR4 format. */ if (arh.ar_name[0] == '/') { - if (sz == 0) goto error; Modified: projects/clang360-import/contrib/elftoolchain/libelf/libelf_convert.m4 ============================================================================== --- projects/clang360-import/contrib/elftoolchain/libelf/libelf_convert.m4 Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/libelf/libelf_convert.m4 Tue Feb 17 19:53:41 2015 (r278916) @@ -32,7 +32,7 @@ #include "_libelf.h" -ELFTC_VCSID("$Id: libelf_convert.m4 3009 2014-03-23 01:49:59Z jkoshy $"); +ELFTC_VCSID("$Id: libelf_convert.m4 3158 2015-02-15 21:42:07Z emaste $"); /* WARNING: GENERATED FROM __file__. */ Modified: projects/clang360-import/contrib/elftoolchain/nm/nm.1 ============================================================================== --- projects/clang360-import/contrib/elftoolchain/nm/nm.1 Tue Feb 17 19:38:16 2015 (r278915) +++ projects/clang360-import/contrib/elftoolchain/nm/nm.1 Tue Feb 17 19:53:41 2015 (r278916) @@ -22,9 +22,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Id: nm.1 2377 2012-01-03 07:10:59Z jkoshy $ +.\" $Id: nm.1 3145 2015-02-15 18:04:37Z emaste $ .\" -.Dd January 8, 2015 +.Dd February 15, 2015 .Os .Dt NM 1 .Sh NAME *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Feb 18 03:02:09 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 D662D862; Wed, 18 Feb 2015 03:02:09 +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 BC927F99; Wed, 18 Feb 2015 03:02:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1I329l0009470; Wed, 18 Feb 2015 03:02:09 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1I326eT009455; Wed, 18 Feb 2015 03:02:06 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201502180302.t1I326eT009455@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 18 Feb 2015 03:02:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278931 - in projects/ifnet: . bin/cp bin/expr bin/ln bin/mv bin/pkill/tests bin/ps bin/sh bin/sh/tests/expansion cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts cddl/contrib/opens... 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.18-1 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: Wed, 18 Feb 2015 03:02:09 -0000 Author: glebius Date: Wed Feb 18 03:02:03 2015 New Revision: 278931 URL: https://svnweb.freebsd.org/changeset/base/278931 Log: Merge head r257698 through r278930. Added: projects/ifnet/bin/sh/tests/expansion/ifs5.0 - copied unchanged from r278930, head/bin/sh/tests/expansion/ifs5.0 projects/ifnet/bin/sh/tests/expansion/pathname5.0 - copied unchanged from r278930, head/bin/sh/tests/expansion/pathname5.0 projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/arm/ - copied from r278930, head/cddl/contrib/opensolaris/lib/libdtrace/arm/ projects/ifnet/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff - copied unchanged from r278930, head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff projects/ifnet/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff - copied unchanged from r278930, head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff projects/ifnet/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff - copied unchanged from r278930, head/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff projects/ifnet/contrib/xz/src/liblzma/api/lzma/lzma12.h - copied unchanged from r278930, head/contrib/xz/src/liblzma/api/lzma/lzma12.h projects/ifnet/contrib/xz/src/liblzma/common/block_buffer_encoder.h - copied unchanged from r278930, head/contrib/xz/src/liblzma/common/block_buffer_encoder.h projects/ifnet/contrib/xz/src/liblzma/common/hardware_cputhreads.c - copied unchanged from r278930, head/contrib/xz/src/liblzma/common/hardware_cputhreads.c projects/ifnet/contrib/xz/src/liblzma/common/memcmplen.h - copied unchanged from r278930, head/contrib/xz/src/liblzma/common/memcmplen.h projects/ifnet/contrib/xz/src/liblzma/common/outqueue.c - copied unchanged from r278930, head/contrib/xz/src/liblzma/common/outqueue.c projects/ifnet/contrib/xz/src/liblzma/common/outqueue.h - copied unchanged from r278930, head/contrib/xz/src/liblzma/common/outqueue.h projects/ifnet/contrib/xz/src/liblzma/common/stream_encoder_mt.c - copied unchanged from r278930, head/contrib/xz/src/liblzma/common/stream_encoder_mt.c projects/ifnet/contrib/xz/src/liblzma/liblzma.map - copied unchanged from r278930, head/contrib/xz/src/liblzma/liblzma.map projects/ifnet/contrib/xz/src/liblzma/validate_map.sh - copied unchanged from r278930, head/contrib/xz/src/liblzma/validate_map.sh projects/ifnet/contrib/xz/src/xz/mytime.c - copied unchanged from r278930, head/contrib/xz/src/xz/mytime.c projects/ifnet/contrib/xz/src/xz/mytime.h - copied unchanged from r278930, head/contrib/xz/src/xz/mytime.h projects/ifnet/etc/tests/rc.d/ - copied from r278930, head/etc/tests/rc.d/ projects/ifnet/lib/libc/sparc64/sys/sigaction1.S - copied unchanged from r278930, head/lib/libc/sparc64/sys/sigaction1.S projects/ifnet/lib/libdevctl/ - copied from r278930, head/lib/libdevctl/ projects/ifnet/release/doc/share/xml/errata.xml - copied unchanged from r278930, head/release/doc/share/xml/errata.xml projects/ifnet/release/doc/share/xml/security.xml - copied unchanged from r278930, head/release/doc/share/xml/security.xml projects/ifnet/share/man/man4/udl.4 - copied unchanged from r278930, head/share/man/man4/udl.4 projects/ifnet/sys/amd64/include/pvclock.h - copied unchanged from r278930, head/sys/amd64/include/pvclock.h projects/ifnet/sys/arm/arm/pmu.c - copied unchanged from r278930, head/sys/arm/arm/pmu.c projects/ifnet/sys/arm/arm/unwind.c - copied unchanged from r278930, head/sys/arm/arm/unwind.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_audio.c - copied unchanged from r278930, head/sys/arm/broadcom/bcm2835/bcm2835_audio.c projects/ifnet/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h - copied unchanged from r278930, head/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h projects/ifnet/sys/arm/freescale/imx/imx6_audmux.c - copied unchanged from r278930, head/sys/arm/freescale/imx/imx6_audmux.c projects/ifnet/sys/arm/freescale/imx/imx6_sdma.c - copied unchanged from r278930, head/sys/arm/freescale/imx/imx6_sdma.c projects/ifnet/sys/arm/freescale/imx/imx6_sdma.h - copied unchanged from r278930, head/sys/arm/freescale/imx/imx6_sdma.h projects/ifnet/sys/arm/freescale/imx/imx6_ssi.c - copied unchanged from r278930, head/sys/arm/freescale/imx/imx6_ssi.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/arm/ - copied from r278930, head/sys/cddl/contrib/opensolaris/uts/arm/ projects/ifnet/sys/cddl/dev/dtrace/arm/ - copied from r278930, head/sys/cddl/dev/dtrace/arm/ projects/ifnet/sys/cddl/dev/fbt/arm/ - copied from r278930, head/sys/cddl/dev/fbt/arm/ projects/ifnet/sys/contrib/vchiq/ - copied from r278930, head/sys/contrib/vchiq/ projects/ifnet/sys/dev/cxgbe/if_cxl.c - copied unchanged from r278930, head/sys/dev/cxgbe/if_cxl.c projects/ifnet/sys/dev/hwpmc/hwpmc_armv7.c - copied unchanged from r278930, head/sys/dev/hwpmc/hwpmc_armv7.c projects/ifnet/sys/dev/hwpmc/hwpmc_armv7.h - copied unchanged from r278930, head/sys/dev/hwpmc/hwpmc_armv7.h projects/ifnet/sys/dev/iscsi/icl_conn_if.m - copied unchanged from r278930, head/sys/dev/iscsi/icl_conn_if.m projects/ifnet/sys/dev/iscsi/icl_soft.c - copied unchanged from r278930, head/sys/dev/iscsi/icl_soft.c projects/ifnet/sys/dev/iscsi/icl_wrappers.h - copied unchanged from r278930, head/sys/dev/iscsi/icl_wrappers.h projects/ifnet/sys/dev/usb/video/ - copied from r278930, head/sys/dev/usb/video/ projects/ifnet/sys/dev/videomode/ - copied from r278930, head/sys/dev/videomode/ projects/ifnet/sys/dev/wpi/if_wpi_debug.h - copied unchanged from r278930, head/sys/dev/wpi/if_wpi_debug.h projects/ifnet/sys/i386/include/pvclock.h - copied unchanged from r278930, head/sys/i386/include/pvclock.h projects/ifnet/sys/modules/cxgbe/if_cxl/ - copied from r278930, head/sys/modules/cxgbe/if_cxl/ projects/ifnet/sys/modules/dtb/rpi/ - copied from r278930, head/sys/modules/dtb/rpi/ projects/ifnet/sys/modules/usb/udl/ - copied from r278930, head/sys/modules/usb/udl/ projects/ifnet/sys/modules/videomode/ - copied from r278930, head/sys/modules/videomode/ projects/ifnet/sys/ofed/drivers/infiniband/core/peer_mem.c - copied unchanged from r278930, head/sys/ofed/drivers/infiniband/core/peer_mem.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.c - copied unchanged from r278930, head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.h - copied unchanged from r278930, head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.h projects/ifnet/sys/ofed/include/linux/printk.h - copied unchanged from r278930, head/sys/ofed/include/linux/printk.h projects/ifnet/sys/ofed/include/rdma/ib_peer_mem.h - copied unchanged from r278930, head/sys/ofed/include/rdma/ib_peer_mem.h projects/ifnet/sys/ofed/include/rdma/ib_user_verbs_exp.h - copied unchanged from r278930, head/sys/ofed/include/rdma/ib_user_verbs_exp.h projects/ifnet/sys/ofed/include/rdma/ib_verbs_exp.h - copied unchanged from r278930, head/sys/ofed/include/rdma/ib_verbs_exp.h projects/ifnet/sys/ofed/include/rdma/peer_mem.h - copied unchanged from r278930, head/sys/ofed/include/rdma/peer_mem.h projects/ifnet/sys/x86/include/pvclock.h - copied unchanged from r278930, head/sys/x86/include/pvclock.h projects/ifnet/sys/x86/x86/pvclock.c - copied unchanged from r278930, head/sys/x86/x86/pvclock.c projects/ifnet/tools/build/options/WITHOUT_AUTOFS - copied unchanged from r278930, head/tools/build/options/WITHOUT_AUTOFS projects/ifnet/tools/build/options/WITHOUT_BHYVE - copied unchanged from r278930, head/tools/build/options/WITHOUT_BHYVE projects/ifnet/tools/build/options/WITHOUT_BOOTPARAMD - copied unchanged from r278930, head/tools/build/options/WITHOUT_BOOTPARAMD projects/ifnet/tools/build/options/WITHOUT_BOOTPD - copied unchanged from r278930, head/tools/build/options/WITHOUT_BOOTPD projects/ifnet/tools/build/options/WITHOUT_BSDINSTALL - copied unchanged from r278930, head/tools/build/options/WITHOUT_BSDINSTALL projects/ifnet/tools/build/options/WITHOUT_CCD - copied unchanged from r278930, head/tools/build/options/WITHOUT_CCD projects/ifnet/tools/build/options/WITHOUT_EE - copied unchanged from r278930, head/tools/build/options/WITHOUT_EE projects/ifnet/tools/build/options/WITHOUT_FILE - copied unchanged from r278930, head/tools/build/options/WITHOUT_FILE projects/ifnet/tools/build/options/WITHOUT_FINGER - copied unchanged from r278930, head/tools/build/options/WITHOUT_FINGER projects/ifnet/tools/build/options/WITHOUT_FTP - copied unchanged from r278930, head/tools/build/options/WITHOUT_FTP projects/ifnet/tools/build/options/WITHOUT_HAST - copied unchanged from r278930, head/tools/build/options/WITHOUT_HAST projects/ifnet/tools/build/options/WITHOUT_INETD - copied unchanged from r278930, head/tools/build/options/WITHOUT_INETD projects/ifnet/tools/build/options/WITHOUT_ISCSI - copied unchanged from r278930, head/tools/build/options/WITHOUT_ISCSI projects/ifnet/tools/build/options/WITHOUT_RADIUS_SUPPORT - copied unchanged from r278930, head/tools/build/options/WITHOUT_RADIUS_SUPPORT projects/ifnet/tools/build/options/WITHOUT_RBOOTD - copied unchanged from r278930, head/tools/build/options/WITHOUT_RBOOTD projects/ifnet/tools/build/options/WITHOUT_TALK - copied unchanged from r278930, head/tools/build/options/WITHOUT_TALK projects/ifnet/tools/build/options/WITHOUT_TCP_WRAPPERS - copied unchanged from r278930, head/tools/build/options/WITHOUT_TCP_WRAPPERS projects/ifnet/tools/build/options/WITHOUT_TFTP - copied unchanged from r278930, head/tools/build/options/WITHOUT_TFTP projects/ifnet/tools/build/options/WITHOUT_TIMED - copied unchanged from r278930, head/tools/build/options/WITHOUT_TIMED projects/ifnet/tools/tools/qrndtest/ - copied from r278930, head/tools/tools/qrndtest/ projects/ifnet/usr.sbin/devctl/ - copied from r278930, head/usr.sbin/devctl/ projects/ifnet/usr.sbin/pw/tests/pw_usernext.sh - copied unchanged from r278930, head/usr.sbin/pw/tests/pw_usernext.sh Replaced: projects/ifnet/sys/dev/iscsi/icl.c - copied unchanged from r278930, head/sys/dev/iscsi/icl.c Deleted: projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile projects/ifnet/contrib/xz/src/liblzma/api/lzma/lzma.h projects/ifnet/contrib/xz/src/liblzma/common/stream_encoder.h projects/ifnet/lib/libc/sparc64/sys/sigaction.S projects/ifnet/lib/libiconv/ projects/ifnet/share/info/ projects/ifnet/share/man/man9/spl.9 projects/ifnet/sys/dev/ic/hd64570.h projects/ifnet/sys/ofed/drivers/infiniband/core/Makefile projects/ifnet/sys/ofed/drivers/infiniband/core/local_sa.c projects/ifnet/sys/ofed/drivers/infiniband/core/notice.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/Makefile projects/ifnet/sys/ofed/drivers/infiniband/ulp/ipoib/Makefile projects/ifnet/sys/powerpc/conf/WII projects/ifnet/sys/powerpc/wii/ Modified: projects/ifnet/Makefile.inc1 projects/ifnet/ObsoleteFiles.inc projects/ifnet/UPDATING projects/ifnet/bin/cp/utils.c projects/ifnet/bin/expr/expr.y projects/ifnet/bin/ln/symlink.7 projects/ifnet/bin/mv/mv.c projects/ifnet/bin/pkill/tests/pgrep-j_test.sh projects/ifnet/bin/pkill/tests/pkill-j_test.sh projects/ifnet/bin/ps/ps.c projects/ifnet/bin/sh/cd.c projects/ifnet/bin/sh/eval.c projects/ifnet/bin/sh/expand.c projects/ifnet/bin/sh/jobs.c projects/ifnet/bin/sh/mail.c projects/ifnet/bin/sh/memalloc.c projects/ifnet/bin/sh/memalloc.h projects/ifnet/bin/sh/miscbltin.c projects/ifnet/bin/sh/nodetypes projects/ifnet/bin/sh/parser.c projects/ifnet/bin/sh/tests/expansion/Makefile projects/ifnet/bin/sh/trap.c projects/ifnet/bin/sh/var.c projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe (contents, props changed) projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe (contents, props changed) projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c projects/ifnet/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c projects/ifnet/cddl/lib/Makefile projects/ifnet/cddl/lib/libdtrace/Makefile projects/ifnet/cddl/usr.sbin/Makefile projects/ifnet/contrib/amd/amd/amfs_generic.c projects/ifnet/contrib/amd/amd/amfs_program.c projects/ifnet/contrib/amd/amd/readdir.c projects/ifnet/contrib/amd/hlfsd/homedir.c projects/ifnet/contrib/amd/hlfsd/stubs.c projects/ifnet/contrib/binutils/ld/scripttempl/elf.sc projects/ifnet/contrib/elftoolchain/addr2line/addr2line.c projects/ifnet/contrib/elftoolchain/common/_elftc.h projects/ifnet/contrib/elftoolchain/common/elfdefinitions.h projects/ifnet/contrib/elftoolchain/elfcopy/main.c projects/ifnet/contrib/elftoolchain/elfcopy/sections.c projects/ifnet/contrib/elftoolchain/libdwarf/_libdwarf.h projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_attrval.c projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_hasattr.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_reloc.c projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 projects/ifnet/contrib/elftoolchain/libdwarf/dwarf_whatattr.3 projects/ifnet/contrib/elftoolchain/libdwarf/libdwarf.c projects/ifnet/contrib/elftoolchain/libdwarf/libdwarf.h projects/ifnet/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c projects/ifnet/contrib/elftoolchain/libdwarf/libdwarf_reloc.c projects/ifnet/contrib/elftoolchain/libelf/_libelf_config.h projects/ifnet/contrib/elftoolchain/libelf/elf.3 projects/ifnet/contrib/elftoolchain/libelf/elf_scn.c projects/ifnet/contrib/elftoolchain/libelf/libelf_ar_util.c projects/ifnet/contrib/elftoolchain/libelf/libelf_convert.m4 projects/ifnet/contrib/elftoolchain/nm/nm.1 projects/ifnet/contrib/elftoolchain/nm/nm.c projects/ifnet/contrib/elftoolchain/readelf/readelf.c projects/ifnet/contrib/gcc/config/arm/unwind-arm.c projects/ifnet/contrib/gcc/config/arm/unwind-arm.h projects/ifnet/contrib/gdb/gdb/corelow.c projects/ifnet/contrib/gdb/gdb/dwarf2expr.c projects/ifnet/contrib/libcxxrt/exception.cc projects/ifnet/contrib/libcxxrt/stdexcept.cc projects/ifnet/contrib/libcxxrt/typeinfo.cc projects/ifnet/contrib/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp projects/ifnet/contrib/llvm/tools/clang/include/clang/Driver/Options.td projects/ifnet/contrib/llvm/tools/clang/lib/Driver/Tools.cpp projects/ifnet/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp projects/ifnet/contrib/mdocml/lib.in projects/ifnet/contrib/netbsd-tests/bin/expr/t_expr.sh projects/ifnet/contrib/netbsd-tests/games/t_factor.sh projects/ifnet/contrib/netbsd-tests/lib/libc/c063/t_utimensat.c projects/ifnet/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c projects/ifnet/contrib/sendmail/cf/m4/cfhead.m4 projects/ifnet/contrib/tcpdump/print-atm.c projects/ifnet/contrib/tcpdump/print-ip.c projects/ifnet/contrib/tcpdump/print-llc.c projects/ifnet/contrib/tcpdump/print-sl.c projects/ifnet/contrib/tcpdump/tcpdump.c projects/ifnet/contrib/top/utils.c projects/ifnet/contrib/xz/ChangeLog projects/ifnet/contrib/xz/FREEBSD-upgrade projects/ifnet/contrib/xz/THANKS projects/ifnet/contrib/xz/TODO projects/ifnet/contrib/xz/src/common/mythread.h projects/ifnet/contrib/xz/src/common/sysdefs.h projects/ifnet/contrib/xz/src/common/tuklib_cpucores.c projects/ifnet/contrib/xz/src/common/tuklib_physmem.c projects/ifnet/contrib/xz/src/liblzma/api/lzma.h projects/ifnet/contrib/xz/src/liblzma/api/lzma/base.h projects/ifnet/contrib/xz/src/liblzma/api/lzma/block.h projects/ifnet/contrib/xz/src/liblzma/api/lzma/container.h projects/ifnet/contrib/xz/src/liblzma/api/lzma/filter.h projects/ifnet/contrib/xz/src/liblzma/api/lzma/hardware.h projects/ifnet/contrib/xz/src/liblzma/api/lzma/index.h projects/ifnet/contrib/xz/src/liblzma/api/lzma/index_hash.h projects/ifnet/contrib/xz/src/liblzma/api/lzma/version.h projects/ifnet/contrib/xz/src/liblzma/check/check.h projects/ifnet/contrib/xz/src/liblzma/check/sha256.c projects/ifnet/contrib/xz/src/liblzma/common/alone_decoder.c projects/ifnet/contrib/xz/src/liblzma/common/alone_decoder.h projects/ifnet/contrib/xz/src/liblzma/common/alone_encoder.c projects/ifnet/contrib/xz/src/liblzma/common/auto_decoder.c projects/ifnet/contrib/xz/src/liblzma/common/block_buffer_decoder.c projects/ifnet/contrib/xz/src/liblzma/common/block_buffer_encoder.c projects/ifnet/contrib/xz/src/liblzma/common/block_decoder.c projects/ifnet/contrib/xz/src/liblzma/common/block_decoder.h projects/ifnet/contrib/xz/src/liblzma/common/block_encoder.c projects/ifnet/contrib/xz/src/liblzma/common/block_encoder.h projects/ifnet/contrib/xz/src/liblzma/common/block_header_decoder.c projects/ifnet/contrib/xz/src/liblzma/common/block_header_encoder.c projects/ifnet/contrib/xz/src/liblzma/common/block_util.c projects/ifnet/contrib/xz/src/liblzma/common/common.c projects/ifnet/contrib/xz/src/liblzma/common/common.h projects/ifnet/contrib/xz/src/liblzma/common/easy_buffer_encoder.c projects/ifnet/contrib/xz/src/liblzma/common/easy_encoder.c projects/ifnet/contrib/xz/src/liblzma/common/filter_buffer_decoder.c projects/ifnet/contrib/xz/src/liblzma/common/filter_buffer_encoder.c projects/ifnet/contrib/xz/src/liblzma/common/filter_common.c projects/ifnet/contrib/xz/src/liblzma/common/filter_common.h projects/ifnet/contrib/xz/src/liblzma/common/filter_decoder.c projects/ifnet/contrib/xz/src/liblzma/common/filter_decoder.h projects/ifnet/contrib/xz/src/liblzma/common/filter_encoder.c projects/ifnet/contrib/xz/src/liblzma/common/filter_encoder.h projects/ifnet/contrib/xz/src/liblzma/common/filter_flags_decoder.c projects/ifnet/contrib/xz/src/liblzma/common/index.c projects/ifnet/contrib/xz/src/liblzma/common/index_decoder.c projects/ifnet/contrib/xz/src/liblzma/common/index_encoder.c projects/ifnet/contrib/xz/src/liblzma/common/index_encoder.h projects/ifnet/contrib/xz/src/liblzma/common/index_hash.c projects/ifnet/contrib/xz/src/liblzma/common/stream_buffer_decoder.c projects/ifnet/contrib/xz/src/liblzma/common/stream_buffer_encoder.c projects/ifnet/contrib/xz/src/liblzma/common/stream_decoder.c projects/ifnet/contrib/xz/src/liblzma/common/stream_decoder.h projects/ifnet/contrib/xz/src/liblzma/common/stream_encoder.c projects/ifnet/contrib/xz/src/liblzma/delta/delta_common.c projects/ifnet/contrib/xz/src/liblzma/delta/delta_decoder.c projects/ifnet/contrib/xz/src/liblzma/delta/delta_decoder.h projects/ifnet/contrib/xz/src/liblzma/delta/delta_encoder.c projects/ifnet/contrib/xz/src/liblzma/delta/delta_encoder.h projects/ifnet/contrib/xz/src/liblzma/delta/delta_private.h projects/ifnet/contrib/xz/src/liblzma/liblzma.pc.in projects/ifnet/contrib/xz/src/liblzma/lz/lz_decoder.c projects/ifnet/contrib/xz/src/liblzma/lz/lz_decoder.h projects/ifnet/contrib/xz/src/liblzma/lz/lz_encoder.c projects/ifnet/contrib/xz/src/liblzma/lz/lz_encoder.h projects/ifnet/contrib/xz/src/liblzma/lz/lz_encoder_mf.c projects/ifnet/contrib/xz/src/liblzma/lzma/fastpos.h projects/ifnet/contrib/xz/src/liblzma/lzma/lzma2_decoder.c projects/ifnet/contrib/xz/src/liblzma/lzma/lzma2_decoder.h projects/ifnet/contrib/xz/src/liblzma/lzma/lzma2_encoder.c projects/ifnet/contrib/xz/src/liblzma/lzma/lzma2_encoder.h projects/ifnet/contrib/xz/src/liblzma/lzma/lzma_common.h projects/ifnet/contrib/xz/src/liblzma/lzma/lzma_decoder.c projects/ifnet/contrib/xz/src/liblzma/lzma/lzma_decoder.h projects/ifnet/contrib/xz/src/liblzma/lzma/lzma_encoder.c projects/ifnet/contrib/xz/src/liblzma/lzma/lzma_encoder.h projects/ifnet/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c projects/ifnet/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c projects/ifnet/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h projects/ifnet/contrib/xz/src/liblzma/rangecoder/range_decoder.h projects/ifnet/contrib/xz/src/liblzma/simple/arm.c projects/ifnet/contrib/xz/src/liblzma/simple/armthumb.c projects/ifnet/contrib/xz/src/liblzma/simple/ia64.c projects/ifnet/contrib/xz/src/liblzma/simple/powerpc.c projects/ifnet/contrib/xz/src/liblzma/simple/simple_coder.c projects/ifnet/contrib/xz/src/liblzma/simple/simple_coder.h projects/ifnet/contrib/xz/src/liblzma/simple/simple_decoder.c projects/ifnet/contrib/xz/src/liblzma/simple/simple_decoder.h projects/ifnet/contrib/xz/src/liblzma/simple/simple_private.h projects/ifnet/contrib/xz/src/liblzma/simple/sparc.c projects/ifnet/contrib/xz/src/liblzma/simple/x86.c projects/ifnet/contrib/xz/src/xz/args.c projects/ifnet/contrib/xz/src/xz/args.h projects/ifnet/contrib/xz/src/xz/coder.c projects/ifnet/contrib/xz/src/xz/coder.h projects/ifnet/contrib/xz/src/xz/file_io.c projects/ifnet/contrib/xz/src/xz/file_io.h projects/ifnet/contrib/xz/src/xz/hardware.c projects/ifnet/contrib/xz/src/xz/hardware.h projects/ifnet/contrib/xz/src/xz/list.c projects/ifnet/contrib/xz/src/xz/main.c projects/ifnet/contrib/xz/src/xz/message.c projects/ifnet/contrib/xz/src/xz/options.c projects/ifnet/contrib/xz/src/xz/private.h projects/ifnet/contrib/xz/src/xz/signals.c projects/ifnet/contrib/xz/src/xz/suffix.c projects/ifnet/contrib/xz/src/xz/xz.1 projects/ifnet/etc/Makefile projects/ifnet/etc/defaults/Makefile projects/ifnet/etc/devd.conf projects/ifnet/etc/devd/Makefile projects/ifnet/etc/login.conf projects/ifnet/etc/master.passwd projects/ifnet/etc/mtree/BSD.debug.dist projects/ifnet/etc/mtree/BSD.tests.dist projects/ifnet/etc/mtree/BSD.usr.dist projects/ifnet/etc/pam.d/Makefile projects/ifnet/etc/rc.d/LOGIN projects/ifnet/etc/rc.d/Makefile projects/ifnet/etc/rc.d/NETWORKING projects/ifnet/etc/rc.d/ipfilter projects/ifnet/etc/rc.d/jail projects/ifnet/etc/rc.d/local_unbound projects/ifnet/etc/rc.d/netif projects/ifnet/etc/rc.d/routing projects/ifnet/etc/rc.d/utx projects/ifnet/etc/root/dot.cshrc projects/ifnet/etc/root/dot.login projects/ifnet/etc/root/dot.profile projects/ifnet/etc/sendmail/Makefile projects/ifnet/etc/tests/Makefile projects/ifnet/games/Makefile.inc projects/ifnet/games/caesar/rot13.sh projects/ifnet/games/fortune/datfiles/Makefile projects/ifnet/games/fortune/datfiles/freebsd-tips projects/ifnet/games/fortune/fortune/fortune.6 projects/ifnet/include/Makefile projects/ifnet/include/semaphore.h projects/ifnet/include/stdio.h projects/ifnet/lib/Makefile projects/ifnet/lib/clang/clang.build.mk projects/ifnet/lib/csu/powerpc64/Makefile projects/ifnet/lib/libc/gen/_spinlock_stub.c projects/ifnet/lib/libc/gen/disklabel.c projects/ifnet/lib/libc/gen/dlopen.3 projects/ifnet/lib/libc/gen/fstab.c projects/ifnet/lib/libc/gen/getgrent.c projects/ifnet/lib/libc/gen/getpwent.c projects/ifnet/lib/libc/gen/sem_new.c projects/ifnet/lib/libc/gen/sem_post.3 projects/ifnet/lib/libc/gen/ttyname.c projects/ifnet/lib/libc/gen/ulimit.c projects/ifnet/lib/libc/include/libc_private.h projects/ifnet/lib/libc/mips/gen/sigsetjmp.S projects/ifnet/lib/libc/nls/msgcat.c projects/ifnet/lib/libc/regex/regcomp.c projects/ifnet/lib/libc/rpc/crypt_client.c projects/ifnet/lib/libc/rpc/svc_vc.c projects/ifnet/lib/libc/sparc64/sys/Makefile.inc projects/ifnet/lib/libc/stdlib/tdelete.c projects/ifnet/lib/libc/sys/Makefile.inc projects/ifnet/lib/libc/sys/interposing_table.c projects/ifnet/lib/libc/sys/setresuid.2 projects/ifnet/lib/libc/tests/c063/Makefile projects/ifnet/lib/libcompat/4.3/rexec.c projects/ifnet/lib/libdevinfo/devinfo.h projects/ifnet/lib/libelftc/elftc_version.c projects/ifnet/lib/liblzma/Makefile projects/ifnet/lib/liblzma/Symbol.map projects/ifnet/lib/liblzma/Versions.def projects/ifnet/lib/liblzma/config.h projects/ifnet/lib/libnetgraph/debug.c projects/ifnet/lib/libnv/Makefile projects/ifnet/lib/libnv/nv.3 projects/ifnet/lib/libnv/nv.h projects/ifnet/lib/libnv/nvlist.c projects/ifnet/lib/libnv/nvpair.c projects/ifnet/lib/libpam/modules/modules.inc projects/ifnet/lib/libpmc/libpmc.c projects/ifnet/lib/libproc/proc_bkpt.c projects/ifnet/lib/libproc/proc_regs.c projects/ifnet/lib/libproc/proc_sym.c projects/ifnet/lib/libproc/tests/proc_test.c projects/ifnet/lib/libthr/libthr.3 projects/ifnet/lib/libthr/thread/thr_barrier.c projects/ifnet/lib/libthr/thread/thr_private.h projects/ifnet/lib/libthr/thread/thr_spinlock.c projects/ifnet/lib/libthr/thread/thr_syscalls.c projects/ifnet/lib/libthread_db/arch/i386/libpthread_md.c projects/ifnet/lib/libutil/gr_util.c projects/ifnet/lib/msun/src/s_scalbln.c projects/ifnet/libexec/Makefile projects/ifnet/libexec/rtld-elf/rtld.c projects/ifnet/release/Makefile projects/ifnet/release/Makefile.vm projects/ifnet/release/doc/en_US.ISO8859-1/errata/article.xml projects/ifnet/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/ifnet/release/doc/share/mk/doc.relnotes.mk projects/ifnet/release/doc/share/xml/release.ent projects/ifnet/release/picobsd/build/picobsd projects/ifnet/release/release.sh projects/ifnet/release/scripts/make-manifest.sh projects/ifnet/release/scripts/mk-vmimage.sh projects/ifnet/release/tools/gce.conf projects/ifnet/rescue/rescue/Makefile projects/ifnet/sbin/Makefile projects/ifnet/sbin/geom/class/mountver/gmountver.8 projects/ifnet/sbin/ifconfig/af_inet6.c projects/ifnet/sbin/ifconfig/ifconfig.c projects/ifnet/sbin/ipfw/ipfw2.c projects/ifnet/sbin/ipfw/nat.c projects/ifnet/sbin/rcorder/Makefile projects/ifnet/sbin/rcorder/rcorder.c projects/ifnet/sbin/sysctl/sysctl.8 projects/ifnet/sbin/sysctl/sysctl.c projects/ifnet/share/Makefile projects/ifnet/share/examples/Makefile projects/ifnet/share/man/man3/tree.3 projects/ifnet/share/man/man4/Makefile projects/ifnet/share/man/man4/led.4 projects/ifnet/share/man/man4/ral.4 projects/ifnet/share/man/man4/sfxge.4 projects/ifnet/share/man/man4/witness.4 projects/ifnet/share/man/man4/wlan.4 projects/ifnet/share/man/man5/Makefile projects/ifnet/share/man/man5/nullfs.5 projects/ifnet/share/man/man5/src.conf.5 projects/ifnet/share/man/man6/intro.6 projects/ifnet/share/man/man7/hier.7 projects/ifnet/share/man/man7/release.7 projects/ifnet/share/man/man9/Makefile projects/ifnet/share/man/man9/SYSCALL_MODULE.9 projects/ifnet/share/man/man9/contigmalloc.9 projects/ifnet/share/man/man9/pmap_enter.9 projects/ifnet/share/misc/Makefile projects/ifnet/share/misc/committers-src.dot projects/ifnet/share/mk/bsd.lib.mk projects/ifnet/share/mk/bsd.libnames.mk projects/ifnet/share/mk/bsd.mkopt.mk projects/ifnet/share/mk/bsd.own.mk projects/ifnet/share/mk/bsd.prog.mk projects/ifnet/share/mk/src.libnames.mk projects/ifnet/share/mk/src.opts.mk projects/ifnet/share/skel/dot.cshrc projects/ifnet/share/skel/dot.login projects/ifnet/share/skel/dot.profile projects/ifnet/sys/amd64/amd64/apic_vector.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/conf/GENERIC projects/ifnet/sys/amd64/ia32/ia32_signal.c projects/ifnet/sys/amd64/include/cpufunc.h projects/ifnet/sys/amd64/vmm/amd/svm.c projects/ifnet/sys/amd64/vmm/vmm_support.S projects/ifnet/sys/arm/allwinner/a10_gpio.c projects/ifnet/sys/arm/altera/socfpga/socfpga_gpio.c projects/ifnet/sys/arm/arm/busdma_machdep-v6.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_trace.c projects/ifnet/sys/arm/arm/elf_trampoline.c projects/ifnet/sys/arm/arm/exception.S projects/ifnet/sys/arm/arm/identcpu.c projects/ifnet/sys/arm/arm/intr.c projects/ifnet/sys/arm/arm/machdep.c projects/ifnet/sys/arm/arm/mem.c projects/ifnet/sys/arm/arm/trap.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/ifnet/sys/arm/broadcom/bcm2835/files.bcm2835 projects/ifnet/sys/arm/conf/BEAGLEBONE projects/ifnet/sys/arm/conf/RPI-B projects/ifnet/sys/arm/freescale/imx/files.imx6 projects/ifnet/sys/arm/freescale/imx/imx6_anatop.c projects/ifnet/sys/arm/freescale/imx/imx6_anatopreg.h projects/ifnet/sys/arm/freescale/imx/imx6_anatopvar.h 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_gpio.c projects/ifnet/sys/arm/freescale/vybrid/vf_gpio.c projects/ifnet/sys/arm/include/armreg.h projects/ifnet/sys/arm/include/cpufunc.h projects/ifnet/sys/arm/include/pmc_mdep.h projects/ifnet/sys/arm/include/profile.h projects/ifnet/sys/arm/include/stack.h projects/ifnet/sys/arm/lpc/lpc_gpio.c projects/ifnet/sys/arm/rockchip/rk30xx_gpio.c projects/ifnet/sys/arm/samsung/exynos/exynos5_pad.c projects/ifnet/sys/arm/ti/am335x/am335x_lcd.c projects/ifnet/sys/arm/ti/am335x/am335x_prcm.c projects/ifnet/sys/arm/ti/am335x/files.am335x projects/ifnet/sys/arm/ti/files.ti 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_pruss.c projects/ifnet/sys/arm/xilinx/zy7_gpio.c projects/ifnet/sys/arm/xscale/ixp425/avila_gpio.c projects/ifnet/sys/arm/xscale/ixp425/cambria_gpio.c projects/ifnet/sys/arm/xscale/ixp425/if_npe.c projects/ifnet/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu projects/ifnet/sys/boot/amd64/boot1.efi/generate-fat.sh projects/ifnet/sys/boot/amd64/efi/main.c projects/ifnet/sys/boot/arm/ixp425/boot2/ixp425_board.c projects/ifnet/sys/boot/common/load_elf.c projects/ifnet/sys/boot/efi/include/efiapi.h projects/ifnet/sys/boot/efi/libefi/efinet.c projects/ifnet/sys/boot/fdt/dts/arm/am335x.dtsi projects/ifnet/sys/boot/fdt/dts/arm/apalis-imx6.dts projects/ifnet/sys/boot/fdt/dts/arm/bcm2835.dtsi projects/ifnet/sys/boot/fdt/dts/arm/imx6.dtsi projects/ifnet/sys/boot/fdt/fdt_loader_cmd.c projects/ifnet/sys/boot/i386/libfirewire/firewire.c projects/ifnet/sys/boot/i386/libi386/libi386.h projects/ifnet/sys/boot/i386/libi386/smbios.c projects/ifnet/sys/boot/pc98/boot2/Makefile projects/ifnet/sys/boot/powerpc/kboot/conf.c projects/ifnet/sys/boot/powerpc/kboot/host_syscall.S projects/ifnet/sys/boot/powerpc/kboot/host_syscall.h projects/ifnet/sys/boot/powerpc/kboot/hostdisk.c projects/ifnet/sys/boot/powerpc/kboot/kbootfdt.c projects/ifnet/sys/boot/powerpc/kboot/kerneltramp.S projects/ifnet/sys/boot/powerpc/kboot/main.c projects/ifnet/sys/boot/powerpc/kboot/ppc64_elf_freebsd.c projects/ifnet/sys/cam/cam.h projects/ifnet/sys/cam/cam_ccb.h projects/ifnet/sys/cam/cam_periph.c projects/ifnet/sys/cam/cam_xpt.c projects/ifnet/sys/cam/cam_xpt_internal.h projects/ifnet/sys/cam/ctl/ctl.c projects/ifnet/sys/cam/ctl/ctl.h projects/ifnet/sys/cam/ctl/ctl_backend_block.c projects/ifnet/sys/cam/ctl/ctl_backend_ramdisk.c projects/ifnet/sys/cam/ctl/ctl_frontend.c projects/ifnet/sys/cam/ctl/ctl_frontend.h projects/ifnet/sys/cam/ctl/ctl_frontend_iscsi.c projects/ifnet/sys/cam/ctl/ctl_frontend_iscsi.h projects/ifnet/sys/cam/ctl/ctl_ioctl.h projects/ifnet/sys/cam/ctl/ctl_private.h projects/ifnet/sys/cam/ctl/ctl_tpc.c projects/ifnet/sys/cam/ctl/ctl_tpc.h projects/ifnet/sys/cam/ctl/ctl_tpc_local.c projects/ifnet/sys/cam/scsi/scsi_all.h projects/ifnet/sys/cam/scsi/scsi_cd.c projects/ifnet/sys/cam/scsi/scsi_da.c projects/ifnet/sys/cam/scsi/scsi_xpt.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/ifnet/sys/cddl/dev/dtrace/dtrace_load.c projects/ifnet/sys/cddl/dev/dtrace/dtrace_unload.c projects/ifnet/sys/cddl/dev/lockstat/lockstat.c projects/ifnet/sys/cddl/dev/profile/profile.c projects/ifnet/sys/conf/Makefile.powerpc projects/ifnet/sys/conf/dtb.mk projects/ifnet/sys/conf/files projects/ifnet/sys/conf/files.amd64 projects/ifnet/sys/conf/files.arm projects/ifnet/sys/conf/files.i386 projects/ifnet/sys/conf/files.powerpc projects/ifnet/sys/conf/kern.mk projects/ifnet/sys/conf/kern.opts.mk projects/ifnet/sys/conf/kern.pre.mk projects/ifnet/sys/conf/kmod.mk projects/ifnet/sys/conf/options projects/ifnet/sys/conf/options.powerpc projects/ifnet/sys/contrib/dev/acpica/include/actbl2.h projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_gpio.c projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_keycache.c projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_osprey22.ini projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.c projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9340.ini projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9580.ini projects/ifnet/sys/contrib/dev/ral/microcode.h projects/ifnet/sys/contrib/dev/ral/rt2860.fw.uu projects/ifnet/sys/contrib/rdma/krping/krping.c projects/ifnet/sys/dev/acpica/acpi.c projects/ifnet/sys/dev/acpica/acpi_pcib.c projects/ifnet/sys/dev/ahci/ahci.h projects/ifnet/sys/dev/ahci/ahci_pci.c projects/ifnet/sys/dev/alc/if_alc.c projects/ifnet/sys/dev/ath/ath_hal/ah_internal.h projects/ifnet/sys/dev/ath/ath_rate/sample/sample.c projects/ifnet/sys/dev/ath/ath_rate/sample/sample.h projects/ifnet/sys/dev/ath/if_ath_pci.c projects/ifnet/sys/dev/atkbdc/atkbd.c projects/ifnet/sys/dev/atkbdc/atkbdc.c projects/ifnet/sys/dev/atkbdc/atkbdcreg.h projects/ifnet/sys/dev/atkbdc/psm.c projects/ifnet/sys/dev/cxgb/cxgb_osdep.h projects/ifnet/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/ifnet/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c projects/ifnet/sys/dev/cxgbe/adapter.h projects/ifnet/sys/dev/cxgbe/common/t4_hw.c projects/ifnet/sys/dev/cxgbe/iw_cxgbe/cq.c projects/ifnet/sys/dev/cxgbe/iw_cxgbe/device.c projects/ifnet/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h projects/ifnet/sys/dev/cxgbe/iw_cxgbe/mem.c projects/ifnet/sys/dev/cxgbe/offload.h projects/ifnet/sys/dev/cxgbe/t4_main.c projects/ifnet/sys/dev/cxgbe/tom/t4_ddp.c projects/ifnet/sys/dev/cxgbe/tom/t4_listen.c projects/ifnet/sys/dev/cxgbe/tom/t4_tom.c projects/ifnet/sys/dev/drm2/i915/i915_drv.c projects/ifnet/sys/dev/drm2/i915/i915_drv.h projects/ifnet/sys/dev/drm2/i915/intel_display.c projects/ifnet/sys/dev/drm2/i915/intel_dp.c projects/ifnet/sys/dev/drm2/i915/intel_iic.c projects/ifnet/sys/dev/drm2/radeon/ni.c projects/ifnet/sys/dev/drm2/radeon/si.c projects/ifnet/sys/dev/drm2/ttm/ttm_bo.c projects/ifnet/sys/dev/drm2/ttm/ttm_page_alloc.c projects/ifnet/sys/dev/dwc/if_dwc.c projects/ifnet/sys/dev/ed/if_ed.c projects/ifnet/sys/dev/fb/fbd.c projects/ifnet/sys/dev/fdt/fdt_clock.c projects/ifnet/sys/dev/fe/if_fe_isa.c projects/ifnet/sys/dev/gpio/gpio_if.m projects/ifnet/sys/dev/gpio/gpiobus.c projects/ifnet/sys/dev/gpio/gpiobusvar.h projects/ifnet/sys/dev/gpio/ofw_gpiobus.c projects/ifnet/sys/dev/hwpmc/hwpmc_arm.c projects/ifnet/sys/dev/hwpmc/pmc_events.h projects/ifnet/sys/dev/iicbus/lm75.c projects/ifnet/sys/dev/ipmi/ipmi.c projects/ifnet/sys/dev/ipmi/ipmi_kcs.c projects/ifnet/sys/dev/ipmi/ipmi_smic.c projects/ifnet/sys/dev/ipmi/ipmi_ssif.c projects/ifnet/sys/dev/ipmi/ipmivars.h projects/ifnet/sys/dev/iscsi/icl.h projects/ifnet/sys/dev/iscsi/iscsi.c projects/ifnet/sys/dev/iscsi/iscsi.h projects/ifnet/sys/dev/iscsi/iscsi_ioctl.h projects/ifnet/sys/dev/iscsi/iscsi_proto.h projects/ifnet/sys/dev/lmc/if_lmc.h projects/ifnet/sys/dev/malo/if_malo.c projects/ifnet/sys/dev/mem/memdev.c projects/ifnet/sys/dev/mps/mps.c projects/ifnet/sys/dev/mps/mps_user.c projects/ifnet/sys/dev/mwl/if_mwl.c projects/ifnet/sys/dev/netmap/netmap.c projects/ifnet/sys/dev/oce/oce_mbox.c projects/ifnet/sys/dev/ofw/openfirm.c projects/ifnet/sys/dev/pci/pci.c projects/ifnet/sys/dev/pci/pci_pci.c projects/ifnet/sys/dev/ral/if_ral_pci.c projects/ifnet/sys/dev/ral/rt2860.c projects/ifnet/sys/dev/ral/rt2860reg.h projects/ifnet/sys/dev/random/dummy_rng.c projects/ifnet/sys/dev/random/random_adaptors.c projects/ifnet/sys/dev/random/randomdev.c projects/ifnet/sys/dev/random/randomdev.h projects/ifnet/sys/dev/random/yarrow.c projects/ifnet/sys/dev/sfxge/common/efsys.h projects/ifnet/sys/dev/sfxge/common/efx_ev.c projects/ifnet/sys/dev/sfxge/common/efx_mac.c projects/ifnet/sys/dev/sfxge/common/efx_mcdi.c projects/ifnet/sys/dev/sfxge/common/efx_nic.c projects/ifnet/sys/dev/sfxge/common/efx_rx.c projects/ifnet/sys/dev/sfxge/common/efx_tx.c projects/ifnet/sys/dev/sfxge/common/siena_mon.c projects/ifnet/sys/dev/sfxge/common/siena_nic.c projects/ifnet/sys/dev/sfxge/common/siena_vpd.c projects/ifnet/sys/dev/sfxge/sfxge.c projects/ifnet/sys/dev/sfxge/sfxge.h projects/ifnet/sys/dev/sfxge/sfxge_dma.c projects/ifnet/sys/dev/sfxge/sfxge_ev.c projects/ifnet/sys/dev/sfxge/sfxge_intr.c projects/ifnet/sys/dev/sfxge/sfxge_mcdi.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/smc/if_smc.c projects/ifnet/sys/dev/sound/usb/uaudio.c projects/ifnet/sys/dev/syscons/syscons.c projects/ifnet/sys/dev/uart/uart_bus_pci.c projects/ifnet/sys/dev/usb/controller/musb_otg.c projects/ifnet/sys/dev/usb/controller/uhci.c projects/ifnet/sys/dev/usb/controller/xhci.c projects/ifnet/sys/dev/usb/input/uhid.c projects/ifnet/sys/dev/usb/serial/u3g.c projects/ifnet/sys/dev/usb/usb_core.h projects/ifnet/sys/dev/usb/usb_msctest.c projects/ifnet/sys/dev/usb/usb_transfer.c projects/ifnet/sys/dev/usb/usbdevs projects/ifnet/sys/dev/virtio/block/virtio_blk.c projects/ifnet/sys/dev/vt/font/vt_mouse_cursor.c projects/ifnet/sys/dev/vt/hw/fb/vt_fb.c projects/ifnet/sys/dev/vt/hw/fb/vt_fb.h projects/ifnet/sys/dev/vt/hw/vga/vt_vga.c projects/ifnet/sys/dev/vt/vt.h projects/ifnet/sys/dev/vt/vt_core.c projects/ifnet/sys/dev/wpi/if_wpi.c projects/ifnet/sys/dev/wpi/if_wpireg.h projects/ifnet/sys/dev/wpi/if_wpivar.h projects/ifnet/sys/dev/xen/timer/timer.c projects/ifnet/sys/dev/xen/xenstore/xenstore_dev.c projects/ifnet/sys/fs/autofs/autofs.c projects/ifnet/sys/fs/autofs/autofs_ioctl.h projects/ifnet/sys/fs/cd9660/cd9660_util.c projects/ifnet/sys/fs/ext2fs/ext2_htree.c projects/ifnet/sys/fs/ext2fs/ext2_vfsops.c projects/ifnet/sys/fs/fdescfs/fdesc_vfsops.c projects/ifnet/sys/fs/msdosfs/msdosfs_conv.c projects/ifnet/sys/fs/smbfs/smbfs_subr.c projects/ifnet/sys/fs/tmpfs/tmpfs.h projects/ifnet/sys/fs/tmpfs/tmpfs_subr.c projects/ifnet/sys/fs/tmpfs/tmpfs_vfsops.c projects/ifnet/sys/fs/tmpfs/tmpfs_vnops.c projects/ifnet/sys/fs/udf/udf_vnops.c projects/ifnet/sys/i386/i386/apic_vector.s projects/ifnet/sys/i386/i386/db_disasm.c projects/ifnet/sys/i386/i386/genassym.c projects/ifnet/sys/i386/i386/machdep.c projects/ifnet/sys/i386/i386/mem.c projects/ifnet/sys/i386/i386/mp_machdep.c projects/ifnet/sys/i386/include/cpufunc.h projects/ifnet/sys/i386/xen/clock.c projects/ifnet/sys/kern/imgact_elf.c projects/ifnet/sys/kern/init_main.c projects/ifnet/sys/kern/kern_clock.c projects/ifnet/sys/kern/kern_clocksource.c projects/ifnet/sys/kern/kern_descrip.c projects/ifnet/sys/kern/kern_jail.c projects/ifnet/sys/kern/kern_procctl.c projects/ifnet/sys/kern/kern_sig.c projects/ifnet/sys/kern/kern_timeout.c projects/ifnet/sys/kern/kern_umtx.c projects/ifnet/sys/kern/subr_bus.c projects/ifnet/sys/kern/subr_hints.c projects/ifnet/sys/kern/subr_sglist.c projects/ifnet/sys/kern/subr_taskqueue.c projects/ifnet/sys/kern/sys_generic.c projects/ifnet/sys/kern/sys_pipe.c projects/ifnet/sys/kern/sysv_shm.c projects/ifnet/sys/kern/tty.c projects/ifnet/sys/kern/uipc_mbuf.c projects/ifnet/sys/kern/uipc_shm.c projects/ifnet/sys/kern/uipc_socket.c projects/ifnet/sys/kern/uipc_syscalls.c projects/ifnet/sys/kern/vfs_mount.c projects/ifnet/sys/kern/vfs_subr.c projects/ifnet/sys/kern/vfs_syscalls.c projects/ifnet/sys/libkern/strtol.c projects/ifnet/sys/libkern/strtoq.c projects/ifnet/sys/libkern/strtoul.c projects/ifnet/sys/libkern/strtouq.c projects/ifnet/sys/mips/atheros/ar71xx_gpio.c projects/ifnet/sys/mips/atheros/ar71xx_gpiovar.h projects/ifnet/sys/mips/atheros/if_argevar.h projects/ifnet/sys/mips/cavium/octeon_gpio.c projects/ifnet/sys/mips/cavium/octeon_gpiovar.h projects/ifnet/sys/mips/conf/AR71XX_BASE projects/ifnet/sys/mips/mips/freebsd32_machdep.c projects/ifnet/sys/mips/mips/mem.c projects/ifnet/sys/mips/mips/pm_machdep.c projects/ifnet/sys/mips/rt305x/rt305x_gpio.c projects/ifnet/sys/mips/rt305x/rt305x_gpiovar.h projects/ifnet/sys/modules/Makefile projects/ifnet/sys/modules/aesni/Makefile projects/ifnet/sys/modules/ctl/Makefile projects/ifnet/sys/modules/cxgbe/Makefile projects/ifnet/sys/modules/cxgbe/if_cxgbe/Makefile projects/ifnet/sys/modules/drm2/radeonkms/Makefile projects/ifnet/sys/modules/dtrace/Makefile projects/ifnet/sys/modules/dtrace/dtrace/Makefile projects/ifnet/sys/modules/geom/Makefile projects/ifnet/sys/modules/ibcore/Makefile projects/ifnet/sys/modules/ipoib/Makefile projects/ifnet/sys/modules/iscsi/Makefile projects/ifnet/sys/modules/mlx4/Makefile projects/ifnet/sys/modules/mlx4ib/Makefile projects/ifnet/sys/modules/mlxen/Makefile projects/ifnet/sys/modules/mthca/Makefile projects/ifnet/sys/modules/wpi/Makefile projects/ifnet/sys/net/if_bridge.c projects/ifnet/sys/net/pfvar.h projects/ifnet/sys/netgraph/ng_base.c projects/ifnet/sys/netgraph/ng_parse.c projects/ifnet/sys/netinet/if_ether.c projects/ifnet/sys/netinet/in.c projects/ifnet/sys/netinet/ip_output.c projects/ifnet/sys/netinet/sctp_input.c projects/ifnet/sys/netinet/sctp_usrreq.c projects/ifnet/sys/netinet/tcp_hostcache.c projects/ifnet/sys/netinet/tcp_syncache.c projects/ifnet/sys/netinet6/frag6.c projects/ifnet/sys/netinet6/in6.c projects/ifnet/sys/netinet6/ip6_output.c projects/ifnet/sys/netinet6/ip6_var.h projects/ifnet/sys/netinet6/nd6.c projects/ifnet/sys/netipsec/key.c projects/ifnet/sys/netpfil/ipfw/ip_fw_iface.c (contents, props changed) projects/ifnet/sys/netpfil/ipfw/ip_fw_nat.c projects/ifnet/sys/netpfil/ipfw/ip_fw_private.h projects/ifnet/sys/netpfil/ipfw/ip_fw_table.c projects/ifnet/sys/netpfil/ipfw/ip_fw_table_algo.c projects/ifnet/sys/netpfil/pf/pf.c projects/ifnet/sys/netpfil/pf/pf.h projects/ifnet/sys/netpfil/pf/pf_mtag.h projects/ifnet/sys/netpfil/pf/pf_norm.c projects/ifnet/sys/ofed/drivers/infiniband/core/addr.c projects/ifnet/sys/ofed/drivers/infiniband/core/cache.c projects/ifnet/sys/ofed/drivers/infiniband/core/cm.c projects/ifnet/sys/ofed/drivers/infiniband/core/cm_msgs.h projects/ifnet/sys/ofed/drivers/infiniband/core/cma.c projects/ifnet/sys/ofed/drivers/infiniband/core/core_priv.h projects/ifnet/sys/ofed/drivers/infiniband/core/device.c projects/ifnet/sys/ofed/drivers/infiniband/core/fmr_pool.c projects/ifnet/sys/ofed/drivers/infiniband/core/iwcm.c projects/ifnet/sys/ofed/drivers/infiniband/core/mad.c projects/ifnet/sys/ofed/drivers/infiniband/core/mad_priv.h projects/ifnet/sys/ofed/drivers/infiniband/core/mad_rmpp.c projects/ifnet/sys/ofed/drivers/infiniband/core/multicast.c projects/ifnet/sys/ofed/drivers/infiniband/core/packer.c projects/ifnet/sys/ofed/drivers/infiniband/core/sa.h projects/ifnet/sys/ofed/drivers/infiniband/core/sa_query.c projects/ifnet/sys/ofed/drivers/infiniband/core/smi.c projects/ifnet/sys/ofed/drivers/infiniband/core/sysfs.c projects/ifnet/sys/ofed/drivers/infiniband/core/ucm.c projects/ifnet/sys/ofed/drivers/infiniband/core/ucma.c projects/ifnet/sys/ofed/drivers/infiniband/core/ud_header.c projects/ifnet/sys/ofed/drivers/infiniband/core/umem.c projects/ifnet/sys/ofed/drivers/infiniband/core/user_mad.c projects/ifnet/sys/ofed/drivers/infiniband/core/uverbs.h projects/ifnet/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/ifnet/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/ifnet/sys/ofed/drivers/infiniband/core/uverbs_marshall.c projects/ifnet/sys/ofed/drivers/infiniband/core/verbs.c projects/ifnet/sys/ofed/drivers/infiniband/debug/memtrack.c projects/ifnet/sys/ofed/drivers/infiniband/debug/memtrack.h projects/ifnet/sys/ofed/drivers/infiniband/debug/mtrack.h projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/cq.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/doorbell.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mthca/mthca_qp.c projects/ifnet/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/ifnet/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c projects/ifnet/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/ifnet/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c projects/ifnet/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c projects/ifnet/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c projects/ifnet/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c projects/ifnet/sys/ofed/drivers/net/mlx4/Makefile projects/ifnet/sys/ofed/drivers/net/mlx4/en_rx.c projects/ifnet/sys/ofed/include/linux/device.h projects/ifnet/sys/ofed/include/linux/file.h projects/ifnet/sys/ofed/include/linux/gfp.h projects/ifnet/sys/ofed/include/linux/kernel.h projects/ifnet/sys/ofed/include/linux/kref.h projects/ifnet/sys/ofed/include/linux/linux_compat.c projects/ifnet/sys/ofed/include/linux/linux_idr.c projects/ifnet/sys/ofed/include/linux/pci.h projects/ifnet/sys/ofed/include/net/ip.h projects/ifnet/sys/ofed/include/rdma/ib_addr.h projects/ifnet/sys/ofed/include/rdma/ib_cache.h projects/ifnet/sys/ofed/include/rdma/ib_cm.h projects/ifnet/sys/ofed/include/rdma/ib_mad.h projects/ifnet/sys/ofed/include/rdma/ib_pack.h projects/ifnet/sys/ofed/include/rdma/ib_sa.h projects/ifnet/sys/ofed/include/rdma/ib_umem.h projects/ifnet/sys/ofed/include/rdma/ib_user_verbs.h projects/ifnet/sys/ofed/include/rdma/ib_verbs.h projects/ifnet/sys/ofed/include/rdma/iw_cm.h projects/ifnet/sys/ofed/include/rdma/rdma_cm.h projects/ifnet/sys/ofed/include/rdma/rdma_user_cm.h projects/ifnet/sys/powerpc/aim/locore32.S projects/ifnet/sys/powerpc/aim/machdep.c projects/ifnet/sys/powerpc/aim/mmu_oea.c projects/ifnet/sys/powerpc/conf/NOTES projects/ifnet/sys/powerpc/include/cpu.h projects/ifnet/sys/powerpc/ofw/ofw_machdep.c projects/ifnet/sys/powerpc/ofw/ofw_syscons.c projects/ifnet/sys/powerpc/powerpc/db_trace.c projects/ifnet/sys/powerpc/powerpc/exec_machdep.c projects/ifnet/sys/powerpc/powerpc/swtch64.S projects/ifnet/sys/powerpc/pseries/mmu_phyp.c projects/ifnet/sys/powerpc/pseries/platform_chrp.c projects/ifnet/sys/powerpc/pseries/plpar_iommu.c projects/ifnet/sys/powerpc/pseries/xics.c projects/ifnet/sys/rpc/svc_vc.c projects/ifnet/sys/sparc64/include/asm.h projects/ifnet/sys/sparc64/sparc64/machdep.c projects/ifnet/sys/sparc64/sparc64/mem.c projects/ifnet/sys/sys/bitset.h projects/ifnet/sys/sys/bus.h projects/ifnet/sys/sys/callout.h projects/ifnet/sys/sys/cdefs.h projects/ifnet/sys/sys/conf.h projects/ifnet/sys/sys/copyright.h projects/ifnet/sys/sys/cpuset.h projects/ifnet/sys/sys/disk.h projects/ifnet/sys/sys/eventhandler.h projects/ifnet/sys/sys/fbio.h projects/ifnet/sys/sys/file.h projects/ifnet/sys/sys/filedesc.h projects/ifnet/sys/sys/jail.h projects/ifnet/sys/sys/mbuf.h projects/ifnet/sys/sys/param.h projects/ifnet/sys/sys/pmc.h projects/ifnet/sys/sys/proc.h projects/ifnet/sys/sys/sockbuf.h projects/ifnet/sys/sys/systm.h projects/ifnet/sys/sys/taskqueue.h projects/ifnet/sys/sys/tree.h projects/ifnet/sys/sys/ucontext.h projects/ifnet/sys/ufs/ffs/ffs_softdep.c projects/ifnet/sys/ufs/ffs/softdep.h projects/ifnet/sys/ufs/ufs/ufs_quota.c projects/ifnet/sys/ufs/ufs/ufs_vfsops.c projects/ifnet/sys/vm/memguard.c projects/ifnet/sys/vm/vm_fault.c projects/ifnet/sys/vm/vm_map.c projects/ifnet/sys/vm/vm_object.c projects/ifnet/sys/vm/vm_object.h projects/ifnet/sys/vm/vm_pageout.c projects/ifnet/sys/x86/acpica/acpi_wakeup.c projects/ifnet/sys/x86/acpica/madt.c projects/ifnet/sys/x86/include/apicreg.h projects/ifnet/sys/x86/include/apicvar.h projects/ifnet/sys/x86/include/specialreg.h projects/ifnet/sys/x86/include/vmware.h projects/ifnet/sys/x86/iommu/intel_drv.c projects/ifnet/sys/x86/iommu/intel_reg.h projects/ifnet/sys/x86/iommu/intel_utils.c projects/ifnet/sys/x86/x86/io_apic.c projects/ifnet/sys/x86/x86/local_apic.c projects/ifnet/sys/x86/x86/tsc.c projects/ifnet/sys/x86/xen/pvcpu_enum.c projects/ifnet/sys/x86/xen/xen_apic.c projects/ifnet/sys/x86/xen/xen_intr.c projects/ifnet/tools/build/mk/OptionalObsoleteFiles.inc projects/ifnet/tools/tools/makeroot/makeroot.8 projects/ifnet/tools/tools/makeroot/makeroot.sh projects/ifnet/tools/tools/nanobsd/gateworks/Files/root/.profile projects/ifnet/tools/tools/nanobsd/pcengines/Files/root/.cshrc projects/ifnet/tools/tools/nanobsd/pcengines/Files/root/.login projects/ifnet/tools/tools/nanobsd/rescue/Files/root/.cshrc projects/ifnet/tools/tools/nanobsd/rescue/build.sh projects/ifnet/tools/tools/nanobsd/rescue/common projects/ifnet/tools/tools/netmap/pkt-gen.c projects/ifnet/usr.bin/Makefile projects/ifnet/usr.bin/compress/compress.c projects/ifnet/usr.bin/ctlstat/ctlstat.c projects/ifnet/usr.bin/du/du.c projects/ifnet/usr.bin/gcore/elfcore.c projects/ifnet/usr.bin/grep/Makefile projects/ifnet/usr.bin/gzip/gzip.c projects/ifnet/usr.bin/iscsictl/iscsi.conf.5 projects/ifnet/usr.bin/iscsictl/iscsictl.c projects/ifnet/usr.bin/iscsictl/iscsictl.h projects/ifnet/usr.bin/iscsictl/parse.y projects/ifnet/usr.bin/iscsictl/token.l projects/ifnet/usr.bin/kdump/kdump.c projects/ifnet/usr.bin/ktrdump/ktrdump.8 projects/ifnet/usr.bin/ktrdump/ktrdump.c projects/ifnet/usr.bin/ministat/ministat.c projects/ifnet/usr.bin/sed/main.c projects/ifnet/usr.bin/sed/process.c projects/ifnet/usr.bin/svn/svn/Makefile projects/ifnet/usr.bin/timeout/timeout.c projects/ifnet/usr.bin/touch/touch.c projects/ifnet/usr.bin/w/w.c projects/ifnet/usr.bin/wc/wc.c projects/ifnet/usr.bin/whereis/pathnames.h projects/ifnet/usr.bin/whereis/whereis.1 projects/ifnet/usr.bin/whereis/whereis.c projects/ifnet/usr.bin/xz/Makefile projects/ifnet/usr.sbin/Makefile projects/ifnet/usr.sbin/Makefile.amd64 projects/ifnet/usr.sbin/autofs/autounmountd.c projects/ifnet/usr.sbin/binmiscctl/binmiscctl.8 projects/ifnet/usr.sbin/binmiscctl/binmiscctl.c projects/ifnet/usr.sbin/bluetooth/hccontrol/hccontrol.8 projects/ifnet/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 projects/ifnet/usr.sbin/bsdconfig/console/INDEX projects/ifnet/usr.sbin/bsdconfig/include/messages.subr projects/ifnet/usr.sbin/bsdconfig/includes/INDEX projects/ifnet/usr.sbin/bsdconfig/networking/share/device.subr projects/ifnet/usr.sbin/bsdconfig/share/dialog.subr projects/ifnet/usr.sbin/bsdconfig/share/keymap.subr projects/ifnet/usr.sbin/bsdconfig/timezone/share/continents.subr projects/ifnet/usr.sbin/bsdconfig/timezone/share/countries.subr projects/ifnet/usr.sbin/bsdconfig/timezone/timezone projects/ifnet/usr.sbin/bsdconfig/usermgmt/share/user.subr projects/ifnet/usr.sbin/bsdinstall/partedit/partedit_x86.c projects/ifnet/usr.sbin/config/config.8 projects/ifnet/usr.sbin/config/configvers.h projects/ifnet/usr.sbin/config/main.c projects/ifnet/usr.sbin/ctladm/ctladm.8 projects/ifnet/usr.sbin/ctladm/ctladm.c projects/ifnet/usr.sbin/ctld/ctl.conf.5 projects/ifnet/usr.sbin/ctld/ctld.c projects/ifnet/usr.sbin/ctld/ctld.h projects/ifnet/usr.sbin/ctld/discovery.c projects/ifnet/usr.sbin/ctld/kernel.c projects/ifnet/usr.sbin/ctld/keys.c projects/ifnet/usr.sbin/ctld/login.c projects/ifnet/usr.sbin/ctld/parse.y projects/ifnet/usr.sbin/ctld/token.l projects/ifnet/usr.sbin/devinfo/devinfo.c projects/ifnet/usr.sbin/flowctl/flowctl.c projects/ifnet/usr.sbin/freebsd-update/freebsd-update.sh projects/ifnet/usr.sbin/gssd/Makefile projects/ifnet/usr.sbin/gssd/gssd.c projects/ifnet/usr.sbin/iscsid/iscsid.c projects/ifnet/usr.sbin/iscsid/iscsid.h projects/ifnet/usr.sbin/iscsid/keys.c projects/ifnet/usr.sbin/iscsid/login.c projects/ifnet/usr.sbin/jail/command.c projects/ifnet/usr.sbin/jail/config.c projects/ifnet/usr.sbin/jail/jail.8 projects/ifnet/usr.sbin/jail/jail.c projects/ifnet/usr.sbin/jail/jailp.h projects/ifnet/usr.sbin/mountd/mountd.c projects/ifnet/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh projects/ifnet/usr.sbin/pciconf/pciconf.c projects/ifnet/usr.sbin/pkg/pkg.c projects/ifnet/usr.sbin/pmcstudy/pmcstudy.c projects/ifnet/usr.sbin/ppp/Makefile projects/ifnet/usr.sbin/ppp/command.c projects/ifnet/usr.sbin/ppp/ipcp.c projects/ifnet/usr.sbin/ppp/ipv6cp.c projects/ifnet/usr.sbin/ppp/radius.c projects/ifnet/usr.sbin/ppp/server.c projects/ifnet/usr.sbin/pw/tests/Makefile projects/ifnet/usr.sbin/pw/tests/pw_useradd.sh projects/ifnet/usr.sbin/sa/db.c projects/ifnet/usr.sbin/syslogd/syslogd.c Directory Properties: projects/ifnet/ (props changed) projects/ifnet/cddl/ (props changed) projects/ifnet/cddl/contrib/opensolaris/ (props changed) projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) projects/ifnet/contrib/amd/ (props changed) projects/ifnet/contrib/binutils/ (props changed) projects/ifnet/contrib/elftoolchain/ (props changed) projects/ifnet/contrib/gcc/ (props changed) projects/ifnet/contrib/gdb/ (props changed) projects/ifnet/contrib/libcxxrt/ (props changed) projects/ifnet/contrib/llvm/ (props changed) projects/ifnet/contrib/llvm/tools/clang/ (props changed) projects/ifnet/contrib/llvm/tools/lldb/ (props changed) projects/ifnet/contrib/mdocml/ (props changed) projects/ifnet/contrib/sendmail/ (props changed) projects/ifnet/contrib/tcpdump/ (props changed) projects/ifnet/contrib/top/ (props changed) projects/ifnet/contrib/xz/ (props changed) projects/ifnet/etc/ (props changed) projects/ifnet/include/ (props changed) projects/ifnet/lib/libc/ (props changed) projects/ifnet/lib/libutil/ (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/boot/powerpc/kboot/ (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/dev/acpica/include/ (props changed) projects/ifnet/usr.sbin/jail/ (props changed) Modified: projects/ifnet/Makefile.inc1 ============================================================================== --- projects/ifnet/Makefile.inc1 Tue Feb 17 23:54:06 2015 (r278930) +++ projects/ifnet/Makefile.inc1 Wed Feb 18 03:02:03 2015 (r278931) @@ -50,10 +50,6 @@ .include .include -# We must do share/info early so that installation of info `dir' -# entries works correctly. Do it first since it is less likely to -# grow dependencies on include and lib than vice versa. -# # We must do lib/ and libexec/ before bin/, because if installworld # installs a new /bin/sh, the 'make' command will *immediately* # use that new version. And the new (dynamically-linked) /bin/sh @@ -63,7 +59,7 @@ SRCDIR?= ${.CURDIR} .if defined(SUBDIR_OVERRIDE) SUBDIR= ${SUBDIR_OVERRIDE} .else -SUBDIR= share/info lib libexec +SUBDIR= lib libexec SUBDIR+=bin .if ${MK_GAMES} != "no" SUBDIR+=games @@ -193,9 +189,8 @@ OBJTREE= ${MAKEOBJDIRPREFIX} OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/tmp -# /usr/games added for fortune which depend on strfile -BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin -XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games +BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin +XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} @@ -811,9 +806,6 @@ ITOOLS+=makewhatis # Non-base distributions produced by the base system EXTRA_DISTRIBUTIONS= doc -.if ${MK_GAMES} != "no" -EXTRA_DISTRIBUTIONS+= games -.endif .if defined(LIB32TMP) && ${MK_LIB32} != "no" EXTRA_DISTRIBUTIONS+= lib32 .endif @@ -823,7 +815,7 @@ EXTRA_DISTRIBUTIONS+= tests DEBUG_DISTRIBUTIONS= .if ${MK_DEBUG_FILES} != "no" -DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,doc,,} +DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,doc,,:S,tests,,} .endif MTREE_MAGIC?= mtree 2.0 @@ -920,25 +912,25 @@ packageworld: .for dist in base ${EXTRA_DISTRIBUTIONS} .if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ - --exclude usr/lib/debug \ - @${DESTDIR}/${DISTDIR}/${dist}.meta + tar cvf - --exclude usr/lib/debug \ + @${DESTDIR}/${DISTDIR}/${dist}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz .else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ - --exclude usr/lib/debug . + tar cvf - --exclude usr/lib/debug . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz .endif .endfor .for dist in ${DEBUG_DISTRIBUTIONS} . if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \ - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta + tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz . else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \ - usr/lib/debug + tar cvLf - usr/lib/debug | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz . endif .endfor @@ -1146,19 +1138,21 @@ distributekernel distributekernel.debug: packagekernel: .if defined(NO_ROOT) cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \ - @${DESTDIR}/${DISTDIR}/kernel.meta + tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \ - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta + tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .endfor .else cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz . + tar cvf - . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz . + tar cvf - . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .endfor .endif @@ -1634,7 +1628,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_lib_libcapsicum} \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ - lib/libradius lib/libsbuf lib/libtacplus \ + ${_lib_libradius} lib/libsbuf lib/libtacplus \ lib/libgeom \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ ${_cddl_lib_libuutil} \ @@ -1657,6 +1651,10 @@ lib/libgeom__L: lib/libexpat__L _lib_libthr= lib/libthr .endif +.if ${MK_RADIUS_SUPPORT} != "no" +_lib_libradius= lib/libradius +.endif + .if ${MK_OFED} != "no" _ofed_lib= contrib/ofed/usr.lib/ .endif @@ -1667,6 +1665,7 @@ _lib_libcapsicum=lib/libcapsicum lib/libcapsicum__L: lib/libnv__L lib/libpjdlog__L: lib/libutil__L +lib/liblzma__L: lib/libthr__L _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib} .for _DIR in ${LOCAL_LIB_DIRS} Modified: projects/ifnet/ObsoleteFiles.inc ============================================================================== --- projects/ifnet/ObsoleteFiles.inc Tue Feb 17 23:54:06 2015 (r278930) +++ projects/ifnet/ObsoleteFiles.inc Wed Feb 18 03:02:03 2015 (r278931) @@ -38,6 +38,40 @@ # xargs -n1 | sort | uniq -d; # done +# 20150217: Removed remnants of ar(4) driver +OLD_FILES+=usr/include/sys/dev/ic/hd64570.h +# 20150212: /usr/games moving into /usr/bin +OLD_FILES+=usr/games/bcd +OLD_FILES+=usr/games/caesar +OLD_FILES+=usr/games/factor +OLD_FILES+=usr/games/fortune +OLD_FILES+=usr/games/grdc +OLD_FILES+=usr/games/morse +OLD_FILES+=usr/games/number +OLD_FILES+=usr/games/pom +OLD_FILES+=usr/games/ppt +OLD_FILES+=usr/games/primes +OLD_FILES+=usr/games/random +OLD_FILES+=usr/games/rot13 +OLD_FILES+=usr/games/strfile +OLD_FILES+=usr/games/unstr +OLD_DIRS+=usr/games +# 20150209: liblzma header +OLD_FILES+=usr/include/lzma/lzma.h +# 20150124: spl.9 and friends +OLD_FILES+=usr/share/man/man9/spl.9 +OLD_FILES+=usr/share/man/man9/spl0.9 +OLD_FILES+=usr/share/man/man9/splbio.9 +OLD_FILES+=usr/share/man/man9/splclock.9 +OLD_FILES+=usr/share/man/man9/splhigh.9 +OLD_FILES+=usr/share/man/man9/splimp.9 +OLD_FILES+=usr/share/man/man9/splnet.9 +OLD_FILES+=usr/share/man/man9/splsoftclock.9 +OLD_FILES+=usr/share/man/man9/splsofttty.9 +OLD_FILES+=usr/share/man/man9/splstatclock.9 +OLD_FILES+=usr/share/man/man9/spltty.9 +OLD_FILES+=usr/share/man/man9/splvm.9 +OLD_FILES+=usr/share/man/man9/splx.9 # 20150118: new clang import which bumps version from 3.5.0 to 3.5.1. OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h Modified: projects/ifnet/UPDATING ============================================================================== --- projects/ifnet/UPDATING Tue Feb 17 23:54:06 2015 (r278930) +++ projects/ifnet/UPDATING Wed Feb 18 03:02:03 2015 (r278931) @@ -31,6 +31,24 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150217: + If you are running a -CURRENT kernel since r273872 (Oct 30th, 2014), + but before r278927, the RNG was not seeded properly. Immediately + upgrade the kernel to r278927 or later and regenerate any keys (e.g. + ssh keys or openssl keys) that were generated w/ a kernel from that + range. This does not effect programs that directly used /dev/random + or /dev/urandom. All userland uses of arc4random(3) are effected. + +20150210: + The autofs(4) ABI was changed in order to restore binary compatibility + with 10.1-RELEASE. The automountd(8) daemon needs to be rebuilt to work + with the new kernel. + +20150131: + The powerpc64 kernel has been changed to a position-independent + executable. This can only be booted with a new version of loader(8), + so make sure to update both world and kernel before rebooting. + 20150118: Clang and llvm have been upgraded to 3.5.1 release. This is a bugfix only release, no new features have been added. Please see the 20141231 @@ -282,6 +300,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 The lindev device has been removed since /dev/full has been made a standard device. __FreeBSD_version has been bumped. +20140424: + The knob WITHOUT_VI was added to the base system, which controls + building ex(1), vi(1), etc. Older releases of FreeBSD required ex(1) + in order to reorder files share/termcap and didn't build ex(1) as a + build tool, so building/installing with WITH_VI is highly advised for + build hosts for older releases. + + This issue has been fixed in stable/9 and stable/10 in r277022 and + r276991, respectively. + 20140418: The YES_HESIOD knob has been removed. It has been obsolete for a decade. Please move to using WITH_HESIOD instead or your builds Modified: projects/ifnet/bin/cp/utils.c ============================================================================== --- projects/ifnet/bin/cp/utils.c Tue Feb 17 23:54:06 2015 (r278930) +++ projects/ifnet/bin/cp/utils.c Wed Feb 18 03:02:03 2015 (r278931) @@ -330,7 +330,7 @@ copy_special(struct stat *from_stat, int int setfile(struct stat *fs, int fd) { - static struct timeval tv[2]; + static struct timespec tspec[2]; struct stat ts; int rval, gotstat, islink, fdval; @@ -340,10 +340,11 @@ setfile(struct stat *fs, int fd) fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO; - TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atim); - TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtim); - if (islink ? lutimes(to.p_path, tv) : utimes(to.p_path, tv)) { - warn("%sutimes: %s", islink ? "l" : "", to.p_path); + tspec[0] = fs->st_atim; + tspec[1] = fs->st_mtim; + if (utimensat(AT_FDCWD, to.p_path, tspec, + islink ? AT_SYMLINK_NOFOLLOW : 0)) { + warn("utimensat: %s", to.p_path); rval = 1; } if (fdval ? fstat(fd, &ts) : Modified: projects/ifnet/bin/expr/expr.y ============================================================================== --- projects/ifnet/bin/expr/expr.y Tue Feb 17 23:54:06 2015 (r278930) +++ projects/ifnet/bin/expr/expr.y Wed Feb 18 03:02:03 2015 (r278931) @@ -444,14 +444,26 @@ op_minus(struct val *a, struct val *b) return (r); } +/* + * We depend on undefined behaviour giving a result (in r). + * To test this result, pass it as volatile. This prevents + * optimizing away of the test based on the undefined behaviour. + */ void -assert_times(intmax_t a, intmax_t b, intmax_t r) +assert_times(intmax_t a, intmax_t b, volatile intmax_t r) { /* - * if first operand is 0, no overflow is possible, - * else result of division test must match second operand + * If the first operand is 0, no overflow is possible, + * else the result of the division test must match the + * second operand. + * + * Be careful to avoid overflow in the overflow test, as + * in assert_div(). Overflow in division would kill us + * with a SIGFPE before getting the test wrong. In old + * buggy versions, optimization used to give a null test + * instead of a SIGFPE. */ - if (a != 0 && r / a != b) + if ((a == -1 && b == INTMAX_MIN) || (a != 0 && r / a != b)) errx(ERR_EXIT, "overflow"); } Modified: projects/ifnet/bin/ln/symlink.7 ============================================================================== --- projects/ifnet/bin/ln/symlink.7 Tue Feb 17 23:54:06 2015 (r278930) +++ projects/ifnet/bin/ln/symlink.7 Wed Feb 18 03:02:03 2015 (r278931) @@ -29,7 +29,7 @@ .\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 .\" $FreeBSD$ .\" -.Dd January 23, 2015 +.Dd February 16, 2015 .Dt SYMLINK 7 .Os .Sh NAME @@ -146,6 +146,7 @@ The following system calls follow symbol unless given the .Dv AT_SYMLINK_NOFOLLOW flag: +.Xr chflagsat 2 , .Xr fchmodat 2 , .Xr fchownat 2 , .Xr fstatat 2 Modified: projects/ifnet/bin/mv/mv.c ============================================================================== --- projects/ifnet/bin/mv/mv.c Tue Feb 17 23:54:06 2015 (r278930) +++ projects/ifnet/bin/mv/mv.c Wed Feb 18 03:02:03 2015 (r278931) @@ -273,7 +273,7 @@ do_move(const char *from, const char *to static int fastcopy(const char *from, const char *to, struct stat *sbp) { - struct timeval tval[2]; + struct timespec ts[2]; static u_int blen = MAXPHYS; static char *bp = NULL; mode_t oldmode; @@ -350,10 +350,9 @@ err: if (unlink(to)) } else warn("%s: cannot stat", to); - tval[0].tv_sec = sbp->st_atime; - tval[1].tv_sec = sbp->st_mtime; - tval[0].tv_usec = tval[1].tv_usec = 0; - if (utimes(to, tval)) + ts[0] = sbp->st_atim; + ts[1] = sbp->st_mtim; + if (utimensat(AT_FDCWD, to, ts, 0)) warn("%s: set times", to); if (close(to_fd)) { Modified: projects/ifnet/bin/pkill/tests/pgrep-j_test.sh ============================================================================== --- projects/ifnet/bin/pkill/tests/pgrep-j_test.sh Tue Feb 17 23:54:06 2015 (r278930) +++ projects/ifnet/bin/pkill/tests/pgrep-j_test.sh Wed Feb 18 03:02:03 2015 (r278931) @@ -4,94 +4,87 @@ jail_name_to_jid() { local check_name="$1" - ( - line="$(jls -n 2> /dev/null | grep name=$check_name )" - for nv in $line; do - local name="${nv%=*}" - if [ "${name}" = "jid" ]; then - eval $nv - echo $jid - break - fi - done - ) + jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g' } base=pgrep_j_test +if [ `id -u` -ne 0 ]; then + echo "1..0 # skip Test needs uid 0." + exit 0 +fi + echo "1..3" +sleep=$(pwd)/sleep.txt +ln -sf /bin/sleep $sleep + name="pgrep -j " -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 & +sleep_amount=5 +jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount & - jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 & +jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount & +for i in `seq 1 10`; do jid1=$(jail_name_to_jid ${base}_1_1) jid2=$(jail_name_to_jid ${base}_1_2) jid="${jid1},${jid2}" - pid1="$(pgrep -f -x -j $jid "$sleep 5" | sort)" - pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \ - $(cat ${PWD}/${base}_1_2.pid) | sort) - if [ "$pid1" = "$pid2" ]; then - echo "ok 1 - $name" - else - echo "not ok 1 - $name" - fi - [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) - [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) - rm -f $sleep + case "$jid" in + [0-9]+,[0-9]+) + break + ;; + esac + sleep 0.1 +done + +pid1="$(pgrep -f -x -j "$jid" "$sleep $sleep_amount" | sort)" +pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \ + $(cat ${PWD}/${base}_1_2.pid) | sort) +if [ "$pid1" = "$pid2" ]; then + echo "ok 1 - $name" else - echo "ok 1 - $name # skip Test needs uid 0." + echo "not ok 1 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'" fi +[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) +[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) +wait name="pgrep -j any" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 & - - jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 & - - sleep 2 - pid1="$(pgrep -f -x -j any "$sleep 5" | sort)" - pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \ - $(cat ${PWD}/${base}_2_2.pid) | sort) - if [ "$pid1" = "$pid2" ]; then - echo "ok 2 - $name" - else - echo "not ok 2 - $name" - fi - [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) - [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) - rm -f $sleep +sleep_amount=6 +jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_2.pid $sleep $sleep_amount & + +sleep 2 +pid1="$(pgrep -f -x -j any "$sleep $sleep_amount" | sort)" +pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \ + $(cat ${PWD}/${base}_2_2.pid) | sort) +if [ "$pid1" = "$pid2" ]; then + echo "ok 2 - $name" else - echo "ok 2 - $name # skip Test needs uid 0." + echo "not ok 2 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'" fi +[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) +[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) +wait name="pgrep -j none" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - daemon -p ${PWD}/${base}_3_1.pid $sleep 5 & - jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 & - sleep 2 - pid="$(pgrep -f -x -j none "$sleep 5")" - if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then - echo "ok 3 - $name" - else - echo "not ok 3 - $name" - fi - rm -f $sleep - [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) - [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) +sleep_amount=7 +daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount & +jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount & +sleep 2 +pid="$(pgrep -f -x -j none "$sleep $sleep_amount")" +if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then + echo "ok 3 - $name" else - echo "ok 3 - $name # skip Test needs uid 0." + echo "not ok 3 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'" fi +[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) +[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) + +rm -f $sleep Modified: projects/ifnet/bin/pkill/tests/pkill-j_test.sh ============================================================================== --- projects/ifnet/bin/pkill/tests/pkill-j_test.sh Tue Feb 17 23:54:06 2015 (r278930) +++ projects/ifnet/bin/pkill/tests/pkill-j_test.sh Wed Feb 18 03:02:03 2015 (r278931) @@ -4,99 +4,90 @@ jail_name_to_jid() { local check_name="$1" - ( - line="$(jls -n 2> /dev/null | grep name=$check_name )" - for nv in $line; do - local name="${nv%=*}" - if [ "${name}" = "jid" ]; then - eval $nv - echo $jid - break - fi - done - ) + jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g' } base=pkill_j_test +if [ `id -u` -ne 0 ]; then + echo "1..0 # skip Test needs uid 0." + exit 0 +fi + echo "1..3" +sleep=$(pwd)/sleep.txt +ln -sf /bin/sleep $sleep + name="pkill -j " -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 & +sleep_amount=5 +jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount & - jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 & +$sleep $sleep_amount & - $sleep 5 & - sleep 0.5 +for i in `seq 1 10`; do jid1=$(jail_name_to_jid ${base}_1_1) jid2=$(jail_name_to_jid ${base}_1_2) jid="${jid1},${jid2}" - if pkill -f -j "$jid" $sleep && sleep 0.5 && - ! -f ${PWD}/${base}_1_1.pid && - ! -f ${PWD}/${base}_1_2.pid ; then - echo "ok 1 - $name" - else - echo "not ok 1 - $name" - fi 2>/dev/null - rm -f $sleep - [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) - [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) - wait + case "$jid" in + [0-9]+,[0-9]+) + break + ;; + esac + sleep 0.1 +done + +if pkill -f -j "$jid" $sleep && sleep 0.5 && + ! -f ${PWD}/${base}_1_1.pid && + ! -f ${PWD}/${base}_1_2.pid ; then + echo "ok 1 - $name" else - echo "ok 1 - $name # skip Test needs uid 0." -fi + echo "not ok 1 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) +[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) +wait name="pkill -j any" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 & - - jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 & - - $sleep 5 & - sleep 0.5 - chpid3=$! - if pkill -f -j any $sleep && sleep 0.5 && - [ ! -f ${PWD}/${base}_2_1.pid -a - ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then - echo "ok 2 - $name" - else - echo "not ok 2 - $name" - fi 2>/dev/null - rm -f $sleep - [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) - [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) - wait +sleep_amount=6 +jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_2.pid $sleep $sleep_amount & + +$sleep $sleep_amount & +chpid3=$! +sleep 0.5 +if pkill -f -j any $sleep && sleep 0.5 && + [ ! -f ${PWD}/${base}_2_1.pid -a + ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then + echo "ok 2 - $name" else - echo "ok 2 - $name # skip Test needs uid 0." -fi + echo "not ok 2 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) +[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) +wait name="pkill -j none" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - daemon -p ${PWD}/${base}_3_1.pid $sleep 5 - jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 & - sleep 1 - if pkill -f -j none "$sleep 5" && sleep 1 && - [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then - echo "ok 3 - $name" - else - ls ${PWD}/*.pid - echo "not ok 3 - $name" - fi 2>/dev/null - rm -f $sleep - [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid) - [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid) +sleep_amount=7 +daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount +jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount & +sleep 1 +if pkill -f -j none "$sleep $sleep_amount" && sleep 1 && + [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then + echo "ok 3 - $name" else - echo "ok 3 - $name # skip Test needs uid 0." -fi + ls ${PWD}/*.pid + echo "not ok 3 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid) +[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid) + +rm -f $sleep Modified: projects/ifnet/bin/ps/ps.c ============================================================================== --- projects/ifnet/bin/ps/ps.c Tue Feb 17 23:54:06 2015 (r278930) +++ projects/ifnet/bin/ps/ps.c Wed Feb 18 03:02:03 2015 (r278931) @@ -178,7 +178,7 @@ main(int argc, char *argv[]) KINFO *kinfo = NULL, *next_KINFO; KINFO_STR *ks; struct varent *vent; - struct winsize ws; + struct winsize ws = { .ws_row = 0 }; const char *nlistf, *memf, *fmtstr, *str; char *cols; int all, ch, elem, flag, _fmt, i, lineno, linelen, left; Modified: projects/ifnet/bin/sh/cd.c ============================================================================== --- projects/ifnet/bin/sh/cd.c Tue Feb 17 23:54:06 2015 (r278930) +++ projects/ifnet/bin/sh/cd.c Wed Feb 18 03:02:03 2015 (r278931) @@ -122,7 +122,7 @@ cdcmd(int argc __unused, char **argv __u (dest[0] == '.' && (dest[1] == '/' || dest[1] == '\0')) || (dest[0] == '.' && dest[1] == '.' && (dest[2] == '/' || dest[2] == '\0')) || (path = bltinlookup("CDPATH", 1)) == NULL) - path = nullstr; + path = ""; while ((p = padvance(&path, dest)) != NULL) { if (stat(p, &statb) < 0) { if (errno != ENOENT) @@ -182,7 +182,6 @@ cdlogical(char *dest) struct stat statb; int first; int badstat; - size_t len; /* * Check each component of the path. If we find a symlink or @@ -190,9 +189,7 @@ cdlogical(char *dest) * next time we get the value of the current directory. */ badstat = 0; - len = strlen(dest); - cdcomppath = stalloc(len + 1); - memcpy(cdcomppath, dest, len + 1); + cdcomppath = stsavestr(dest); STARTSTACKSTR(p); if (*dest == '/') { STPUTC('/', p); @@ -277,7 +274,6 @@ findcwd(char *dir) { char *new; char *p; - size_t len; /* * If our argument is NULL, we don't know the current directory @@ -286,9 +282,7 @@ findcwd(char *dir) */ if (dir == NULL || curdir == NULL) return getpwd2(); - len = strlen(dir); - cdcomppath = stalloc(len + 1); - memcpy(cdcomppath, dir, len + 1); + cdcomppath = stsavestr(dir); STARTSTACKSTR(new); if (*dir != '/') { STPUTS(curdir, new); Modified: projects/ifnet/bin/sh/eval.c ============================================================================== --- projects/ifnet/bin/sh/eval.c Tue Feb 17 23:54:06 2015 (r278930) +++ projects/ifnet/bin/sh/eval.c Wed Feb 18 03:02:03 2015 (r278931) @@ -498,7 +498,7 @@ exphere(union node *redir, struct arglis struct localvar *savelocalvars; int need_longjmp = 0; - redir->nhere.expdoc = nullstr; + redir->nhere.expdoc = ""; savelocalvars = localvars; localvars = NULL; forcelocal++; Modified: projects/ifnet/bin/sh/expand.c ============================================================================== --- projects/ifnet/bin/sh/expand.c Tue Feb 17 23:54:06 2015 (r278930) +++ projects/ifnet/bin/sh/expand.c Wed Feb 18 03:02:03 2015 (r278931) @@ -105,11 +105,12 @@ static void expbackq(union node *, int, static int subevalvar(char *, char *, int, int, int, int, int); static char *evalvar(char *, int); static int varisset(const char *, int); +static void strtodest(const char *, int, int, int); static void varvalue(const char *, int, int, int); static void recordregion(int, int, int); static void removerecordregions(int); static void ifsbreakup(char *, struct arglist *); -static void expandmeta(struct strlist *, int); +static void expandmeta(struct strlist *); static void expmeta(char *, char *); static void addfname(char *); static struct strlist *expsort(struct strlist *); @@ -175,7 +176,7 @@ expandarg(union node *arg, struct arglis ifsbreakup(p, &exparg); *exparg.lastp = NULL; exparg.lastp = &exparg.list; - expandmeta(exparg.list, flag); + expandmeta(exparg.list); } else { sp = (struct strlist *)stalloc(sizeof (struct strlist)); sp->text = p; @@ -298,9 +299,9 @@ exptilde(char *p, int flag) char c, *startp = p; struct passwd *pw; char *home; - int quotes = flag & (EXP_FULL | EXP_CASE); - while ((c = *p) != '\0') { + for (;;) { + c = *p; switch(c) { case CTLESC: /* This means CTL* are always considered quoted. */ case CTLVAR: @@ -311,31 +312,27 @@ exptilde(char *p, int flag) case CTLQUOTEMARK: return (startp); case ':': - if (flag & EXP_VARTILDE) - goto done; - break; + if ((flag & EXP_VARTILDE) == 0) + break; + /* FALLTHROUGH */ + case '\0': case '/': case CTLENDVAR: - goto done; + *p = '\0'; + if (*(startp+1) == '\0') { + home = lookupvar("HOME"); + } else { + pw = getpwnam(startp+1); + home = pw != NULL ? pw->pw_dir : NULL; + } + *p = c; + if (home == NULL || *home == '\0') + return (startp); + strtodest(home, flag, VSNORMAL, 1); + return (p); } p++; } -done: - *p = '\0'; - if (*(startp+1) == '\0') { - home = lookupvar("HOME"); - } else { - pw = getpwnam(startp+1); - home = pw != NULL ? pw->pw_dir : NULL; - } - *p = c; - if (home == NULL || *home == '\0') - return (startp); - if (quotes) - STPUTS_QUOTES(home, DQSYNTAX, expdest); - else - STPUTS(home, expdest); - return (p); } @@ -496,6 +493,17 @@ expbackq(union node *cmd, int quoted, in +static void +recordleft(const char *str, const char *loc, char *startp) +{ + int amount; + + amount = ((str - 1) - (loc - startp)) - expdest; + STADJUST(amount, expdest); + while (loc != str - 1) + *startp++ = *loc++; +} + static int subevalvar(char *p, char *str, int strloc, int subtype, int startloc, int varflags, int quotes) @@ -530,8 +538,7 @@ subevalvar(char *p, char *str, int strlo error((char *)NULL); } error("%.*s: parameter %snot set", (int)(p - str - 1), - str, (varflags & VSNUL) ? "null or " - : nullstr); + str, (varflags & VSNUL) ? "null or " : ""); return 0; case VSTRIMLEFT: @@ -540,7 +547,8 @@ subevalvar(char *p, char *str, int strlo *loc = '\0'; if (patmatch(str, startp, quotes)) { *loc = c; - goto recordleft; + recordleft(str, loc, startp); + return 1; } *loc = c; if (quotes && *loc == CTLESC) @@ -554,7 +562,8 @@ subevalvar(char *p, char *str, int strlo *loc = '\0'; if (patmatch(str, startp, quotes)) { *loc = c; - goto recordleft; + recordleft(str, loc, startp); + return 1; } *loc = c; loc--; @@ -602,13 +611,6 @@ subevalvar(char *p, char *str, int strlo default: abort(); } - -recordleft: - amount = ((str - 1) - (loc - startp)) - expdest; - STADJUST(amount, expdest); - while (loc != str - 1) - *startp++ = *loc++; - return 1; } @@ -633,6 +635,7 @@ evalvar(char *p, int flag) int varlenb; int easy; int quotes = flag & (EXP_FULL | EXP_CASE); + int record; varflags = (unsigned char)*p++; subtype = varflags & VSTYPE; @@ -690,22 +693,15 @@ again: /* jump here after setting a vari STADJUST(-varlenb, expdest); } } else { - char const *syntax = (varflags & VSQUOTE) ? DQSYNTAX - : BASESYNTAX; - if (subtype == VSLENGTH) { for (;*val; val++) if (!localeisutf8 || (*val & 0xC0) != 0x80) varlen++; } - else { - if (quotes) - STPUTS_QUOTES(val, syntax, expdest); - else - STPUTS(val, expdest); - - } + else + strtodest(val, flag, subtype, + varflags & VSQUOTE); } } @@ -719,15 +715,11 @@ again: /* jump here after setting a vari switch (subtype) { case VSLENGTH: expdest = cvtnum(varlen, expdest); - goto record; + record = 1; + break; case VSNORMAL: - if (!easy) - break; -record: - recordregion(startloc, expdest - stackblock(), - varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' && - (*var == '@' || *var == '*'))); + record = easy; break; case VSPLUS: @@ -737,8 +729,7 @@ record: (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0)); break; } - if (easy) - goto record; + record = easy; break; case VSTRIMLEFT: @@ -760,7 +751,8 @@ record: } /* Remove any recorded regions beyond start of variable */ removerecordregions(startloc); - goto record; + record = 1; + break; case VSASSIGN: case VSQUESTION: @@ -777,8 +769,7 @@ record: } break; } - if (easy) - goto record; + record = easy; break; case VSERROR: @@ -790,6 +781,11 @@ record: abort(); } + if (record) + recordregion(startloc, expdest - stackblock(), + varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' && + (*var == '@' || *var == '*'))); + if (subtype != VSNORMAL) { /* skip to end of alternative */ int nesting = 1; for (;;) { @@ -1093,7 +1089,7 @@ static char expdir[PATH_MAX]; * The results are stored in the list exparg. */ static void -expandmeta(struct strlist *str, int flag __unused) +expandmeta(struct strlist *str) { char *p; struct strlist **savelastp; @@ -1284,11 +1280,8 @@ addfname(char *name) { char *p; struct strlist *sp; - size_t len; - len = strlen(name); - p = stalloc(len + 1); - memcpy(p, name, len + 1); + p = stsavestr(name); sp = (struct strlist *)stalloc(sizeof *sp); sp->text = p; *exparg.lastp = sp; @@ -1478,16 +1471,14 @@ patmatch(const char *pattern, const char *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Feb 18 19:31:08 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 004366F4; Wed, 18 Feb 2015 19:31:07 +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 DB3E4BE2; Wed, 18 Feb 2015 19:31:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1IJV7dd057812; Wed, 18 Feb 2015 19:31:07 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1IJV1k1057777; Wed, 18 Feb 2015 19:31:01 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201502181931.t1IJV1k1057777@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 18 Feb 2015 19:31:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278966 - in projects/release-install-debug: . bin/ln bin/pkill/tests bin/sh bin/sh/tests/expansion cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io cddl/contrib/opensolaris/lib/l... 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.18-1 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: Wed, 18 Feb 2015 19:31:08 -0000 Author: gjb Date: Wed Feb 18 19:31:00 2015 New Revision: 278966 URL: https://svnweb.freebsd.org/changeset/base/278966 Log: MFH: r278710-r278965 Sponsored by: The FreeBSD Foundation Added: projects/release-install-debug/bin/sh/tests/expansion/ifs5.0 - copied unchanged from r278964, head/bin/sh/tests/expansion/ifs5.0 projects/release-install-debug/bin/sh/tests/expansion/pathname5.0 - copied unchanged from r278964, head/bin/sh/tests/expansion/pathname5.0 projects/release-install-debug/lib/libc/sparc64/sys/sigaction1.S - copied unchanged from r278964, head/lib/libc/sparc64/sys/sigaction1.S projects/release-install-debug/share/man/man4/udl.4 - copied unchanged from r278964, head/share/man/man4/udl.4 projects/release-install-debug/sys/arm/arm/unwind.c - copied unchanged from r278964, head/sys/arm/arm/unwind.c projects/release-install-debug/sys/conf/config.mk - copied unchanged from r278964, head/sys/conf/config.mk projects/release-install-debug/sys/dev/usb/video/ - copied from r278964, head/sys/dev/usb/video/ projects/release-install-debug/sys/dev/videomode/ - copied from r278964, head/sys/dev/videomode/ projects/release-install-debug/sys/modules/usb/udl/ - copied from r278964, head/sys/modules/usb/udl/ projects/release-install-debug/sys/modules/videomode/ - copied from r278964, head/sys/modules/videomode/ projects/release-install-debug/sys/ofed/drivers/infiniband/core/peer_mem.c - copied unchanged from r278964, head/sys/ofed/drivers/infiniband/core/peer_mem.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.c - copied unchanged from r278964, head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.h - copied unchanged from r278964, head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.h projects/release-install-debug/sys/ofed/include/linux/printk.h - copied unchanged from r278964, head/sys/ofed/include/linux/printk.h projects/release-install-debug/sys/ofed/include/rdma/ib_peer_mem.h - copied unchanged from r278964, head/sys/ofed/include/rdma/ib_peer_mem.h projects/release-install-debug/sys/ofed/include/rdma/ib_user_verbs_exp.h - copied unchanged from r278964, head/sys/ofed/include/rdma/ib_user_verbs_exp.h projects/release-install-debug/sys/ofed/include/rdma/ib_verbs_exp.h - copied unchanged from r278964, head/sys/ofed/include/rdma/ib_verbs_exp.h projects/release-install-debug/sys/ofed/include/rdma/peer_mem.h - copied unchanged from r278964, head/sys/ofed/include/rdma/peer_mem.h Deleted: projects/release-install-debug/lib/libc/sparc64/sys/sigaction.S projects/release-install-debug/lib/libiconv/ projects/release-install-debug/sys/dev/ic/hd64570.h projects/release-install-debug/sys/ofed/drivers/infiniband/core/Makefile projects/release-install-debug/sys/ofed/drivers/infiniband/core/local_sa.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/notice.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/Makefile projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/ipoib/Makefile Modified: projects/release-install-debug/Makefile.inc1 projects/release-install-debug/ObsoleteFiles.inc projects/release-install-debug/UPDATING projects/release-install-debug/bin/ln/symlink.7 projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh projects/release-install-debug/bin/pkill/tests/pkill-j_test.sh projects/release-install-debug/bin/sh/cd.c projects/release-install-debug/bin/sh/eval.c projects/release-install-debug/bin/sh/expand.c projects/release-install-debug/bin/sh/mail.c projects/release-install-debug/bin/sh/memalloc.c projects/release-install-debug/bin/sh/memalloc.h projects/release-install-debug/bin/sh/miscbltin.c projects/release-install-debug/bin/sh/nodetypes projects/release-install-debug/bin/sh/parser.c projects/release-install-debug/bin/sh/tests/expansion/Makefile projects/release-install-debug/bin/sh/var.c projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c projects/release-install-debug/contrib/elftoolchain/addr2line/addr2line.c projects/release-install-debug/contrib/elftoolchain/common/_elftc.h projects/release-install-debug/contrib/elftoolchain/common/elfdefinitions.h projects/release-install-debug/contrib/elftoolchain/elfcopy/main.c projects/release-install-debug/contrib/elftoolchain/elfcopy/sections.c projects/release-install-debug/contrib/elftoolchain/libdwarf/_libdwarf.h projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_attrval.c projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3 projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_hasattr.3 projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_reloc.c projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_whatattr.3 projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.c projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.h projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_reloc.c projects/release-install-debug/contrib/elftoolchain/libelf/_libelf_config.h projects/release-install-debug/contrib/elftoolchain/libelf/elf.3 projects/release-install-debug/contrib/elftoolchain/libelf/elf_scn.c projects/release-install-debug/contrib/elftoolchain/libelf/libelf_ar_util.c projects/release-install-debug/contrib/elftoolchain/libelf/libelf_convert.m4 projects/release-install-debug/contrib/elftoolchain/nm/nm.1 projects/release-install-debug/contrib/elftoolchain/nm/nm.c projects/release-install-debug/contrib/elftoolchain/readelf/readelf.c projects/release-install-debug/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp projects/release-install-debug/etc/network.subr projects/release-install-debug/lib/libc/gen/_spinlock_stub.c projects/release-install-debug/lib/libc/gen/dlopen.3 projects/release-install-debug/lib/libc/gen/fstab.c projects/release-install-debug/lib/libc/gen/getgrent.c projects/release-install-debug/lib/libc/gen/getpwent.c projects/release-install-debug/lib/libc/gen/ulimit.c projects/release-install-debug/lib/libc/include/libc_private.h projects/release-install-debug/lib/libc/regex/regcomp.c projects/release-install-debug/lib/libc/rpc/clnt_dg.c projects/release-install-debug/lib/libc/rpc/rpc_soc.c projects/release-install-debug/lib/libc/sparc64/sys/Makefile.inc projects/release-install-debug/lib/libc/stdio/xprintf_float.c projects/release-install-debug/lib/libc/sys/Makefile.inc projects/release-install-debug/lib/libc/sys/interposing_table.c projects/release-install-debug/lib/libcompat/4.3/rexec.c projects/release-install-debug/lib/libelftc/elftc_version.c projects/release-install-debug/lib/liblzma/config.h projects/release-install-debug/lib/libthr/thread/thr_private.h projects/release-install-debug/lib/libthr/thread/thr_spinlock.c projects/release-install-debug/lib/libthr/thread/thr_syscalls.c projects/release-install-debug/release/Makefile projects/release-install-debug/release/Makefile.vm projects/release-install-debug/sbin/camcontrol/camcontrol.c projects/release-install-debug/share/man/man4/Makefile projects/release-install-debug/share/man/man4/wlan.4 projects/release-install-debug/share/mk/bsd.dep.mk projects/release-install-debug/share/mk/bsd.libnames.mk projects/release-install-debug/share/mk/bsd.own.mk projects/release-install-debug/sys/amd64/amd64/mp_machdep.c projects/release-install-debug/sys/arm/arm/cpuinfo.c projects/release-install-debug/sys/arm/arm/db_trace.c projects/release-install-debug/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/release-install-debug/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h projects/release-install-debug/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/release-install-debug/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h projects/release-install-debug/sys/arm/include/stack.h projects/release-install-debug/sys/boot/fdt/dts/arm/bcm2835.dtsi projects/release-install-debug/sys/cam/cam_ccb.h projects/release-install-debug/sys/cam/scsi/scsi_da.c projects/release-install-debug/sys/cam/scsi/scsi_enc_ses.c projects/release-install-debug/sys/conf/files projects/release-install-debug/sys/conf/files.arm projects/release-install-debug/sys/conf/kern.mk projects/release-install-debug/sys/conf/kern.pre.mk projects/release-install-debug/sys/conf/kmod.mk projects/release-install-debug/sys/conf/options projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_gpio.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_keycache.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_osprey22.ini projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9340.ini projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9580.ini projects/release-install-debug/sys/contrib/rdma/krping/krping.c projects/release-install-debug/sys/dev/acpica/acpi_pcib.c projects/release-install-debug/sys/dev/ath/if_ath_pci.c projects/release-install-debug/sys/dev/atkbdc/atkbd.c projects/release-install-debug/sys/dev/atkbdc/atkbdc.c projects/release-install-debug/sys/dev/atkbdc/atkbdcreg.h projects/release-install-debug/sys/dev/atkbdc/psm.c projects/release-install-debug/sys/dev/cardbus/cardbus.c projects/release-install-debug/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/release-install-debug/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c projects/release-install-debug/sys/dev/cxgbe/iw_cxgbe/cq.c projects/release-install-debug/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h projects/release-install-debug/sys/dev/cxgbe/iw_cxgbe/mem.c projects/release-install-debug/sys/dev/fb/fbd.c projects/release-install-debug/sys/dev/iicbus/lm75.c projects/release-install-debug/sys/dev/lmc/if_lmc.h projects/release-install-debug/sys/dev/mpr/mpr_sas.c projects/release-install-debug/sys/dev/mps/mps_sas.c projects/release-install-debug/sys/dev/netmap/netmap.c projects/release-install-debug/sys/dev/pccbb/pccbb.c projects/release-install-debug/sys/dev/pci/pci.c projects/release-install-debug/sys/dev/random/dummy_rng.c projects/release-install-debug/sys/dev/random/fortuna.c projects/release-install-debug/sys/dev/random/random_adaptors.c projects/release-install-debug/sys/dev/random/randomdev.c projects/release-install-debug/sys/dev/random/randomdev.h projects/release-install-debug/sys/dev/random/yarrow.c projects/release-install-debug/sys/dev/sfxge/common/efx_ev.c projects/release-install-debug/sys/dev/sfxge/common/efx_mac.c projects/release-install-debug/sys/dev/sfxge/common/efx_mcdi.c projects/release-install-debug/sys/dev/sfxge/common/efx_mcdi.h projects/release-install-debug/sys/dev/sfxge/common/efx_nic.c projects/release-install-debug/sys/dev/sfxge/common/efx_regs_mcdi.h projects/release-install-debug/sys/dev/sfxge/common/efx_rx.c projects/release-install-debug/sys/dev/sfxge/common/efx_tx.c projects/release-install-debug/sys/dev/sfxge/common/siena_mon.c projects/release-install-debug/sys/dev/sfxge/common/siena_nic.c projects/release-install-debug/sys/dev/sfxge/common/siena_nvram.c projects/release-install-debug/sys/dev/sfxge/common/siena_phy.c projects/release-install-debug/sys/dev/sfxge/common/siena_vpd.c projects/release-install-debug/sys/dev/sfxge/sfxge.h projects/release-install-debug/sys/dev/sfxge/sfxge_ev.c projects/release-install-debug/sys/dev/sfxge/sfxge_port.c projects/release-install-debug/sys/dev/sfxge/sfxge_rx.c projects/release-install-debug/sys/dev/sfxge/sfxge_tx.c projects/release-install-debug/sys/dev/sfxge/sfxge_tx.h projects/release-install-debug/sys/dev/spibus/spi.h projects/release-install-debug/sys/dev/spibus/spibus.c projects/release-install-debug/sys/dev/spibus/spibusvar.h projects/release-install-debug/sys/dev/usb/controller/musb_otg.c projects/release-install-debug/sys/dev/usb/controller/uhci.c projects/release-install-debug/sys/dev/usb/usbdevs projects/release-install-debug/sys/dev/vt/vt_core.c projects/release-install-debug/sys/dev/wpi/if_wpi.c projects/release-install-debug/sys/dev/wpi/if_wpireg.h projects/release-install-debug/sys/dev/xen/xenstore/xenstore_dev.c projects/release-install-debug/sys/fs/ext2fs/ext2_htree.c projects/release-install-debug/sys/fs/ext2fs/ext2_vfsops.c projects/release-install-debug/sys/i386/i386/mp_machdep.c projects/release-install-debug/sys/kern/imgact_elf.c projects/release-install-debug/sys/kern/kern_descrip.c projects/release-install-debug/sys/kern/kern_procctl.c projects/release-install-debug/sys/kern/subr_taskqueue.c projects/release-install-debug/sys/kern/sys_generic.c projects/release-install-debug/sys/kern/sysv_shm.c projects/release-install-debug/sys/kern/tty.c projects/release-install-debug/sys/kern/uipc_mbuf.c projects/release-install-debug/sys/kern/uipc_socket.c projects/release-install-debug/sys/kern/uipc_syscalls.c projects/release-install-debug/sys/kern/vfs_subr.c projects/release-install-debug/sys/kern/vfs_syscalls.c projects/release-install-debug/sys/mips/conf/AR71XX_BASE projects/release-install-debug/sys/modules/Makefile projects/release-install-debug/sys/modules/cxgbe/if_cxgbe/Makefile projects/release-install-debug/sys/modules/dpt/Makefile projects/release-install-debug/sys/modules/drm2/radeonkms/Makefile projects/release-install-debug/sys/modules/ed/Makefile projects/release-install-debug/sys/modules/ep/Makefile projects/release-install-debug/sys/modules/ibcore/Makefile projects/release-install-debug/sys/modules/if_gif/Makefile projects/release-install-debug/sys/modules/if_gre/Makefile projects/release-install-debug/sys/modules/ipoib/Makefile projects/release-install-debug/sys/modules/mlx4/Makefile projects/release-install-debug/sys/modules/mlx4ib/Makefile projects/release-install-debug/sys/modules/mlxen/Makefile projects/release-install-debug/sys/modules/mthca/Makefile projects/release-install-debug/sys/modules/si/Makefile projects/release-install-debug/sys/modules/vx/Makefile projects/release-install-debug/sys/net/if_bridge.c projects/release-install-debug/sys/net/pfvar.h projects/release-install-debug/sys/netinet6/frag6.c projects/release-install-debug/sys/netinet6/ip6_output.c projects/release-install-debug/sys/netinet6/ip6_var.h projects/release-install-debug/sys/netpfil/pf/pf.c projects/release-install-debug/sys/netpfil/pf/pf.h projects/release-install-debug/sys/netpfil/pf/pf_mtag.h projects/release-install-debug/sys/netpfil/pf/pf_norm.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/addr.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/cache.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/cm.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/cm_msgs.h projects/release-install-debug/sys/ofed/drivers/infiniband/core/cma.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/core_priv.h projects/release-install-debug/sys/ofed/drivers/infiniband/core/device.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/fmr_pool.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/iwcm.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/mad.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/mad_priv.h projects/release-install-debug/sys/ofed/drivers/infiniband/core/mad_rmpp.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/multicast.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/packer.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/sa.h projects/release-install-debug/sys/ofed/drivers/infiniband/core/sa_query.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/smi.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/sysfs.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/ucm.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/ucma.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/ud_header.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/umem.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/user_mad.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/uverbs.h projects/release-install-debug/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/uverbs_marshall.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/verbs.c projects/release-install-debug/sys/ofed/drivers/infiniband/debug/memtrack.c projects/release-install-debug/sys/ofed/drivers/infiniband/debug/memtrack.h projects/release-install-debug/sys/ofed/drivers/infiniband/debug/mtrack.h projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/cq.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/doorbell.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mthca/mthca_qp.c projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c projects/release-install-debug/sys/ofed/drivers/net/mlx4/Makefile projects/release-install-debug/sys/ofed/drivers/net/mlx4/en_rx.c projects/release-install-debug/sys/ofed/include/linux/device.h projects/release-install-debug/sys/ofed/include/linux/file.h projects/release-install-debug/sys/ofed/include/linux/linux_compat.c projects/release-install-debug/sys/ofed/include/net/ip.h projects/release-install-debug/sys/ofed/include/rdma/ib_addr.h projects/release-install-debug/sys/ofed/include/rdma/ib_cache.h projects/release-install-debug/sys/ofed/include/rdma/ib_cm.h projects/release-install-debug/sys/ofed/include/rdma/ib_mad.h projects/release-install-debug/sys/ofed/include/rdma/ib_pack.h projects/release-install-debug/sys/ofed/include/rdma/ib_sa.h projects/release-install-debug/sys/ofed/include/rdma/ib_umem.h projects/release-install-debug/sys/ofed/include/rdma/ib_user_verbs.h projects/release-install-debug/sys/ofed/include/rdma/ib_verbs.h projects/release-install-debug/sys/ofed/include/rdma/iw_cm.h projects/release-install-debug/sys/ofed/include/rdma/rdma_cm.h projects/release-install-debug/sys/ofed/include/rdma/rdma_user_cm.h projects/release-install-debug/sys/powerpc/powermac/atibl.c projects/release-install-debug/sys/powerpc/powermac/nvbl.c projects/release-install-debug/sys/powerpc/powerpc/db_trace.c projects/release-install-debug/sys/sparc64/include/asm.h projects/release-install-debug/sys/sys/fbio.h projects/release-install-debug/sys/sys/file.h projects/release-install-debug/sys/sys/filedesc.h projects/release-install-debug/sys/sys/mbuf.h projects/release-install-debug/sys/sys/param.h projects/release-install-debug/sys/sys/sockbuf.h projects/release-install-debug/sys/sys/taskqueue.h projects/release-install-debug/sys/vm/memguard.c projects/release-install-debug/sys/x86/acpica/acpi_wakeup.c projects/release-install-debug/sys/x86/acpica/madt.c projects/release-install-debug/sys/x86/include/vmware.h projects/release-install-debug/sys/x86/x86/local_apic.c projects/release-install-debug/sys/x86/xen/pvcpu_enum.c projects/release-install-debug/sys/x86/xen/xen_intr.c projects/release-install-debug/usr.bin/compress/compress.c projects/release-install-debug/usr.bin/du/du.c projects/release-install-debug/usr.bin/gcore/elfcore.c projects/release-install-debug/usr.bin/gzip/gzip.c projects/release-install-debug/usr.bin/kdump/kdump.c projects/release-install-debug/usr.bin/ministat/ministat.c projects/release-install-debug/usr.bin/timeout/timeout.c projects/release-install-debug/usr.bin/touch/touch.c projects/release-install-debug/usr.sbin/binmiscctl/binmiscctl.8 projects/release-install-debug/usr.sbin/binmiscctl/binmiscctl.c projects/release-install-debug/usr.sbin/devctl/Makefile projects/release-install-debug/usr.sbin/flowctl/flowctl.c projects/release-install-debug/usr.sbin/freebsd-update/freebsd-update.sh projects/release-install-debug/usr.sbin/pw/tests/pw_useradd.sh projects/release-install-debug/usr.sbin/pw/tests/pw_usernext.sh Directory Properties: projects/release-install-debug/ (props changed) projects/release-install-debug/cddl/ (props changed) projects/release-install-debug/cddl/contrib/opensolaris/ (props changed) projects/release-install-debug/contrib/elftoolchain/ (props changed) projects/release-install-debug/contrib/llvm/ (props changed) projects/release-install-debug/contrib/llvm/tools/lldb/ (props changed) projects/release-install-debug/etc/ (props changed) projects/release-install-debug/lib/libc/ (props changed) projects/release-install-debug/sbin/ (props changed) projects/release-install-debug/share/ (props changed) projects/release-install-debug/share/man/man4/ (props changed) projects/release-install-debug/sys/ (props changed) projects/release-install-debug/sys/boot/ (props changed) projects/release-install-debug/sys/conf/ (props changed) Modified: projects/release-install-debug/Makefile.inc1 ============================================================================== --- projects/release-install-debug/Makefile.inc1 Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/Makefile.inc1 Wed Feb 18 19:31:00 2015 (r278966) @@ -343,16 +343,15 @@ WMAKEENV+= CC="${XCC} ${XCFLAGS}" CXX="$ SIZE="${XSIZE}" .if ${XCC:M/*} -XFLAGS= --sysroot=${WORLDTMP} .if defined(CROSS_BINUTILS_PREFIX) # In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a # directory, but the compiler will look in the right place for it's # tools so we don't need to tell it where to look. .if exists(${CROSS_BINUTILS_PREFIX}) -XFLAGS+= -B${CROSS_BINUTILS_PREFIX} +BFLAGS+= -B${CROSS_BINUTILS_PREFIX} .endif .else -XFLAGS+= -B${WORLDTMP}/usr/bin +BFLAGS+= -B${WORLDTMP}/usr/bin .endif .if ${TARGET} == "arm" .if ${TARGET_ARCH:M*hf*} != "" @@ -369,6 +368,8 @@ DEPFLAGS+= -I${WORLDTMP}/usr/include/c++ TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XCFLAGS+= -target ${TARGET_TRIPLE} +XCFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} +XCXXFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} .endif .endif @@ -912,25 +913,25 @@ packageworld: .for dist in base ${EXTRA_DISTRIBUTIONS} .if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ - --exclude usr/lib/debug \ - @${DESTDIR}/${DISTDIR}/${dist}.meta + tar cvf - --exclude usr/lib/debug \ + @${DESTDIR}/${DISTDIR}/${dist}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz .else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ - --exclude usr/lib/debug . + tar cvf - --exclude usr/lib/debug . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz .endif .endfor .for dist in ${DEBUG_DISTRIBUTIONS} . if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \ - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta + tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz . else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \ - usr/lib/debug + tar cvLf - usr/lib/debug | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz . endif .endfor @@ -1138,41 +1139,37 @@ distributekernel distributekernel.debug: packagekernel: .if defined(NO_ROOT) cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \ - --exclude '*.symbols' \ - @${DESTDIR}/${DISTDIR}/kernel.meta + tar cvf - --exclude '*.symbols' \ + @${DESTDIR}/${DISTDIR}/kernel.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel-dbg.txz \ - --include '*/*/*.symbols' \ - @${DESTDIR}/${DISTDIR}/kernel.meta + tar cvf - --include '*/*/*.symbols' \ + @${DESTDIR}/${DISTDIR}/kernel.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \ - --exclude '*.symbols' \ - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta + tar cvf - --exclude '*.symbols' \ + @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz \ - --include '*/*/*.symbols' \ - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta + tar cvf - --include '*/*/*.symbols' \ + @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz .endfor .else cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \ - --exclude '*.symbols' \ - . + tar cvf - --exclude '*.symbols' . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel-dbg.txz \ - --include '*/*/*.symbols' \ - $$(eval find .) + tar cvf - --include '*/*/*.symbols' $$(eval find .) | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \ - --exclude '*.symbols' \ - . + tar cvf - --exclude '*.symbols' . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz \ - --include '*/*/*.symbols' \ - $$(eval find .) + tar cvf - --include '*/*/*.symbols' $$(eval find .) \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz .endfor .endif Modified: projects/release-install-debug/ObsoleteFiles.inc ============================================================================== --- projects/release-install-debug/ObsoleteFiles.inc Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/ObsoleteFiles.inc Wed Feb 18 19:31:00 2015 (r278966) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20150217: Removed remnants of ar(4) driver +OLD_FILES+=usr/include/sys/dev/ic/hd64570.h # 20150212: /usr/games moving into /usr/bin OLD_FILES+=usr/games/bcd OLD_FILES+=usr/games/caesar Modified: projects/release-install-debug/UPDATING ============================================================================== --- projects/release-install-debug/UPDATING Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/UPDATING Wed Feb 18 19:31:00 2015 (r278966) @@ -31,6 +31,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150217: + If you are running a -CURRENT kernel since r273872 (Oct 30th, 2014), + but before r278950, the RNG was not seeded properly. Immediately + upgrade the kernel to r278950 or later and regenerate any keys (e.g. + ssh keys or openssl keys) that were generated w/ a kernel from that + range. This does not effect programs that directly used /dev/random + or /dev/urandom. All userland uses of arc4random(3) are effected. + 20150210: The autofs(4) ABI was changed in order to restore binary compatibility with 10.1-RELEASE. The automountd(8) daemon needs to be rebuilt to work Modified: projects/release-install-debug/bin/ln/symlink.7 ============================================================================== --- projects/release-install-debug/bin/ln/symlink.7 Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/ln/symlink.7 Wed Feb 18 19:31:00 2015 (r278966) @@ -29,7 +29,7 @@ .\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 .\" $FreeBSD$ .\" -.Dd January 23, 2015 +.Dd February 16, 2015 .Dt SYMLINK 7 .Os .Sh NAME @@ -146,6 +146,7 @@ The following system calls follow symbol unless given the .Dv AT_SYMLINK_NOFOLLOW flag: +.Xr chflagsat 2 , .Xr fchmodat 2 , .Xr fchownat 2 , .Xr fstatat 2 Modified: projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh ============================================================================== --- projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh Wed Feb 18 19:31:00 2015 (r278966) @@ -4,17 +4,7 @@ jail_name_to_jid() { local check_name="$1" - ( - line="$(jls -n 2> /dev/null | grep name=$check_name )" - for nv in $line; do - local name="${nv%=*}" - if [ "${name}" = "jid" ]; then - eval $nv - echo $jid - break - fi - done - ) + jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g' } base=pgrep_j_test @@ -37,10 +27,19 @@ jail -c path=/ name=${base}_1_1 ip4.addr jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount & -jid1=$(jail_name_to_jid ${base}_1_1) -jid2=$(jail_name_to_jid ${base}_1_2) -jid="${jid1},${jid2}" -pid1="$(pgrep -f -x -j $jid "$sleep $sleep_amount" | sort)" +for i in `seq 1 10`; do + jid1=$(jail_name_to_jid ${base}_1_1) + jid2=$(jail_name_to_jid ${base}_1_2) + jid="${jid1},${jid2}" + case "$jid" in + [0-9]+,[0-9]+) + break + ;; + esac + sleep 0.1 +done + +pid1="$(pgrep -f -x -j "$jid" "$sleep $sleep_amount" | sort)" pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \ $(cat ${PWD}/${base}_1_2.pid) | sort) if [ "$pid1" = "$pid2" ]; then Modified: projects/release-install-debug/bin/pkill/tests/pkill-j_test.sh ============================================================================== --- projects/release-install-debug/bin/pkill/tests/pkill-j_test.sh Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/pkill/tests/pkill-j_test.sh Wed Feb 18 19:31:00 2015 (r278966) @@ -4,99 +4,90 @@ jail_name_to_jid() { local check_name="$1" - ( - line="$(jls -n 2> /dev/null | grep name=$check_name )" - for nv in $line; do - local name="${nv%=*}" - if [ "${name}" = "jid" ]; then - eval $nv - echo $jid - break - fi - done - ) + jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g' } base=pkill_j_test +if [ `id -u` -ne 0 ]; then + echo "1..0 # skip Test needs uid 0." + exit 0 +fi + echo "1..3" +sleep=$(pwd)/sleep.txt +ln -sf /bin/sleep $sleep + name="pkill -j " -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 & +sleep_amount=5 +jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount & - jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 & +$sleep $sleep_amount & - $sleep 5 & - sleep 0.5 +for i in `seq 1 10`; do jid1=$(jail_name_to_jid ${base}_1_1) jid2=$(jail_name_to_jid ${base}_1_2) jid="${jid1},${jid2}" - if pkill -f -j "$jid" $sleep && sleep 0.5 && - ! -f ${PWD}/${base}_1_1.pid && - ! -f ${PWD}/${base}_1_2.pid ; then - echo "ok 1 - $name" - else - echo "not ok 1 - $name" - fi 2>/dev/null - rm -f $sleep - [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) - [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) - wait + case "$jid" in + [0-9]+,[0-9]+) + break + ;; + esac + sleep 0.1 +done + +if pkill -f -j "$jid" $sleep && sleep 0.5 && + ! -f ${PWD}/${base}_1_1.pid && + ! -f ${PWD}/${base}_1_2.pid ; then + echo "ok 1 - $name" else - echo "ok 1 - $name # skip Test needs uid 0." -fi + echo "not ok 1 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) +[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) +wait name="pkill -j any" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 & - - jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 & - - $sleep 5 & - sleep 0.5 - chpid3=$! - if pkill -f -j any $sleep && sleep 0.5 && - [ ! -f ${PWD}/${base}_2_1.pid -a - ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then - echo "ok 2 - $name" - else - echo "not ok 2 - $name" - fi 2>/dev/null - rm -f $sleep - [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) - [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) - wait +sleep_amount=6 +jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_2.pid $sleep $sleep_amount & + +$sleep $sleep_amount & +chpid3=$! +sleep 0.5 +if pkill -f -j any $sleep && sleep 0.5 && + [ ! -f ${PWD}/${base}_2_1.pid -a + ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then + echo "ok 2 - $name" else - echo "ok 2 - $name # skip Test needs uid 0." -fi + echo "not ok 2 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) +[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) +wait name="pkill -j none" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - daemon -p ${PWD}/${base}_3_1.pid $sleep 5 - jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 & - sleep 1 - if pkill -f -j none "$sleep 5" && sleep 1 && - [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then - echo "ok 3 - $name" - else - ls ${PWD}/*.pid - echo "not ok 3 - $name" - fi 2>/dev/null - rm -f $sleep - [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid) - [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid) +sleep_amount=7 +daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount +jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount & +sleep 1 +if pkill -f -j none "$sleep $sleep_amount" && sleep 1 && + [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then + echo "ok 3 - $name" else - echo "ok 3 - $name # skip Test needs uid 0." -fi + ls ${PWD}/*.pid + echo "not ok 3 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid) +[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid) + +rm -f $sleep Modified: projects/release-install-debug/bin/sh/cd.c ============================================================================== --- projects/release-install-debug/bin/sh/cd.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/cd.c Wed Feb 18 19:31:00 2015 (r278966) @@ -122,7 +122,7 @@ cdcmd(int argc __unused, char **argv __u (dest[0] == '.' && (dest[1] == '/' || dest[1] == '\0')) || (dest[0] == '.' && dest[1] == '.' && (dest[2] == '/' || dest[2] == '\0')) || (path = bltinlookup("CDPATH", 1)) == NULL) - path = nullstr; + path = ""; while ((p = padvance(&path, dest)) != NULL) { if (stat(p, &statb) < 0) { if (errno != ENOENT) @@ -182,7 +182,6 @@ cdlogical(char *dest) struct stat statb; int first; int badstat; - size_t len; /* * Check each component of the path. If we find a symlink or @@ -190,9 +189,7 @@ cdlogical(char *dest) * next time we get the value of the current directory. */ badstat = 0; - len = strlen(dest); - cdcomppath = stalloc(len + 1); - memcpy(cdcomppath, dest, len + 1); + cdcomppath = stsavestr(dest); STARTSTACKSTR(p); if (*dest == '/') { STPUTC('/', p); @@ -277,7 +274,6 @@ findcwd(char *dir) { char *new; char *p; - size_t len; /* * If our argument is NULL, we don't know the current directory @@ -286,9 +282,7 @@ findcwd(char *dir) */ if (dir == NULL || curdir == NULL) return getpwd2(); - len = strlen(dir); - cdcomppath = stalloc(len + 1); - memcpy(cdcomppath, dir, len + 1); + cdcomppath = stsavestr(dir); STARTSTACKSTR(new); if (*dir != '/') { STPUTS(curdir, new); Modified: projects/release-install-debug/bin/sh/eval.c ============================================================================== --- projects/release-install-debug/bin/sh/eval.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/eval.c Wed Feb 18 19:31:00 2015 (r278966) @@ -498,7 +498,7 @@ exphere(union node *redir, struct arglis struct localvar *savelocalvars; int need_longjmp = 0; - redir->nhere.expdoc = nullstr; + redir->nhere.expdoc = ""; savelocalvars = localvars; localvars = NULL; forcelocal++; Modified: projects/release-install-debug/bin/sh/expand.c ============================================================================== --- projects/release-install-debug/bin/sh/expand.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/expand.c Wed Feb 18 19:31:00 2015 (r278966) @@ -105,11 +105,12 @@ static void expbackq(union node *, int, static int subevalvar(char *, char *, int, int, int, int, int); static char *evalvar(char *, int); static int varisset(const char *, int); +static void strtodest(const char *, int, int, int); static void varvalue(const char *, int, int, int); static void recordregion(int, int, int); static void removerecordregions(int); static void ifsbreakup(char *, struct arglist *); -static void expandmeta(struct strlist *, int); +static void expandmeta(struct strlist *); static void expmeta(char *, char *); static void addfname(char *); static struct strlist *expsort(struct strlist *); @@ -175,7 +176,7 @@ expandarg(union node *arg, struct arglis ifsbreakup(p, &exparg); *exparg.lastp = NULL; exparg.lastp = &exparg.list; - expandmeta(exparg.list, flag); + expandmeta(exparg.list); } else { sp = (struct strlist *)stalloc(sizeof (struct strlist)); sp->text = p; @@ -298,9 +299,9 @@ exptilde(char *p, int flag) char c, *startp = p; struct passwd *pw; char *home; - int quotes = flag & (EXP_FULL | EXP_CASE); - while ((c = *p) != '\0') { + for (;;) { + c = *p; switch(c) { case CTLESC: /* This means CTL* are always considered quoted. */ case CTLVAR: @@ -311,31 +312,27 @@ exptilde(char *p, int flag) case CTLQUOTEMARK: return (startp); case ':': - if (flag & EXP_VARTILDE) - goto done; - break; + if ((flag & EXP_VARTILDE) == 0) + break; + /* FALLTHROUGH */ + case '\0': case '/': case CTLENDVAR: - goto done; + *p = '\0'; + if (*(startp+1) == '\0') { + home = lookupvar("HOME"); + } else { + pw = getpwnam(startp+1); + home = pw != NULL ? pw->pw_dir : NULL; + } + *p = c; + if (home == NULL || *home == '\0') + return (startp); + strtodest(home, flag, VSNORMAL, 1); + return (p); } p++; } -done: - *p = '\0'; - if (*(startp+1) == '\0') { - home = lookupvar("HOME"); - } else { - pw = getpwnam(startp+1); - home = pw != NULL ? pw->pw_dir : NULL; - } - *p = c; - if (home == NULL || *home == '\0') - return (startp); - if (quotes) - STPUTS_QUOTES(home, DQSYNTAX, expdest); - else - STPUTS(home, expdest); - return (p); } @@ -496,6 +493,17 @@ expbackq(union node *cmd, int quoted, in +static void +recordleft(const char *str, const char *loc, char *startp) +{ + int amount; + + amount = ((str - 1) - (loc - startp)) - expdest; + STADJUST(amount, expdest); + while (loc != str - 1) + *startp++ = *loc++; +} + static int subevalvar(char *p, char *str, int strloc, int subtype, int startloc, int varflags, int quotes) @@ -530,8 +538,7 @@ subevalvar(char *p, char *str, int strlo error((char *)NULL); } error("%.*s: parameter %snot set", (int)(p - str - 1), - str, (varflags & VSNUL) ? "null or " - : nullstr); + str, (varflags & VSNUL) ? "null or " : ""); return 0; case VSTRIMLEFT: @@ -540,7 +547,8 @@ subevalvar(char *p, char *str, int strlo *loc = '\0'; if (patmatch(str, startp, quotes)) { *loc = c; - goto recordleft; + recordleft(str, loc, startp); + return 1; } *loc = c; if (quotes && *loc == CTLESC) @@ -554,7 +562,8 @@ subevalvar(char *p, char *str, int strlo *loc = '\0'; if (patmatch(str, startp, quotes)) { *loc = c; - goto recordleft; + recordleft(str, loc, startp); + return 1; } *loc = c; loc--; @@ -602,13 +611,6 @@ subevalvar(char *p, char *str, int strlo default: abort(); } - -recordleft: - amount = ((str - 1) - (loc - startp)) - expdest; - STADJUST(amount, expdest); - while (loc != str - 1) - *startp++ = *loc++; - return 1; } @@ -633,6 +635,7 @@ evalvar(char *p, int flag) int varlenb; int easy; int quotes = flag & (EXP_FULL | EXP_CASE); + int record; varflags = (unsigned char)*p++; subtype = varflags & VSTYPE; @@ -690,22 +693,15 @@ again: /* jump here after setting a vari STADJUST(-varlenb, expdest); } } else { - char const *syntax = (varflags & VSQUOTE) ? DQSYNTAX - : BASESYNTAX; - if (subtype == VSLENGTH) { for (;*val; val++) if (!localeisutf8 || (*val & 0xC0) != 0x80) varlen++; } - else { - if (quotes) - STPUTS_QUOTES(val, syntax, expdest); - else - STPUTS(val, expdest); - - } + else + strtodest(val, flag, subtype, + varflags & VSQUOTE); } } @@ -719,15 +715,11 @@ again: /* jump here after setting a vari switch (subtype) { case VSLENGTH: expdest = cvtnum(varlen, expdest); - goto record; + record = 1; + break; case VSNORMAL: - if (!easy) - break; -record: - recordregion(startloc, expdest - stackblock(), - varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' && - (*var == '@' || *var == '*'))); + record = easy; break; case VSPLUS: @@ -737,8 +729,7 @@ record: (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0)); break; } - if (easy) - goto record; + record = easy; break; case VSTRIMLEFT: @@ -760,7 +751,8 @@ record: } /* Remove any recorded regions beyond start of variable */ removerecordregions(startloc); - goto record; + record = 1; + break; case VSASSIGN: case VSQUESTION: @@ -777,8 +769,7 @@ record: } break; } - if (easy) - goto record; + record = easy; break; case VSERROR: @@ -790,6 +781,11 @@ record: abort(); } + if (record) + recordregion(startloc, expdest - stackblock(), + varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' && + (*var == '@' || *var == '*'))); + if (subtype != VSNORMAL) { /* skip to end of alternative */ int nesting = 1; for (;;) { @@ -1093,7 +1089,7 @@ static char expdir[PATH_MAX]; * The results are stored in the list exparg. */ static void -expandmeta(struct strlist *str, int flag __unused) +expandmeta(struct strlist *str) { char *p; struct strlist **savelastp; @@ -1284,11 +1280,8 @@ addfname(char *name) { char *p; struct strlist *sp; - size_t len; - len = strlen(name); - p = stalloc(len + 1); - memcpy(p, name, len + 1); + p = stsavestr(name); sp = (struct strlist *)stalloc(sizeof *sp); sp->text = p; *exparg.lastp = sp; @@ -1478,16 +1471,14 @@ patmatch(const char *pattern, const char endp = p; if (*endp == '!' || *endp == '^') endp++; - for (;;) { + do { while (*endp == CTLQUOTEMARK) endp++; if (*endp == 0) goto dft; /* no matching ] */ if (*endp == CTLESC) endp++; - if (*++endp == ']') - break; - } + } while (*++endp != ']'); invert = 0; if (*p == '!' || *p == '^') { invert++; Modified: projects/release-install-debug/bin/sh/mail.c ============================================================================== --- projects/release-install-debug/bin/sh/mail.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/mail.c Wed Feb 18 19:31:00 2015 (r278966) @@ -85,7 +85,7 @@ chkmail(int silent) setstackmark(&smark); mpath = mpathset()? mpathval() : mailval(); for (i = 0 ; i < nmboxes ; i++) { - p = padvance(&mpath, nullstr); + p = padvance(&mpath, ""); if (p == NULL) break; if (*p == '\0') Modified: projects/release-install-debug/bin/sh/memalloc.c ============================================================================== --- projects/release-install-debug/bin/sh/memalloc.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/memalloc.c Wed Feb 18 19:31:00 2015 (r278966) @@ -180,6 +180,18 @@ stunalloc(pointer p) } +char * +stsavestr(const char *s) +{ + char *p; + size_t len; + + len = strlen(s); + p = stalloc(len + 1); + memcpy(p, s, len + 1); + return p; +} + void setstackmark(struct stackmark *mark) Modified: projects/release-install-debug/bin/sh/memalloc.h ============================================================================== --- projects/release-install-debug/bin/sh/memalloc.h Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/memalloc.h Wed Feb 18 19:31:00 2015 (r278966) @@ -52,6 +52,7 @@ void ckfree(pointer); char *savestr(const char *); pointer stalloc(int); void stunalloc(pointer); +char *stsavestr(const char *); void setstackmark(struct stackmark *); void popstackmark(struct stackmark *); char *growstackstr(void); Modified: projects/release-install-debug/bin/sh/miscbltin.c ============================================================================== --- projects/release-install-debug/bin/sh/miscbltin.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/miscbltin.c Wed Feb 18 19:31:00 2015 (r278966) @@ -265,7 +265,7 @@ readcmd(int argc __unused, char **argv _ /* Set any remaining args to "" */ while (*++ap != NULL) - setvar(*ap, nullstr, 0); + setvar(*ap, "", 0); return status; } Modified: projects/release-install-debug/bin/sh/nodetypes ============================================================================== --- projects/release-install-debug/bin/sh/nodetypes Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/nodetypes Wed Feb 18 19:31:00 2015 (r278966) @@ -138,7 +138,7 @@ NXHERE nhere # fd<flags & VREADONLY) return (1); if (vp->text[vp->name_len + 1] != '\0') - setvar(s, nullstr, 0); + setvar(s, "", 0); if ((vp->flags & VEXPORT) && localevar(vp->text)) { change_env(s, 0); setlocale(LC_ALL, ""); Modified: projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c ============================================================================== --- projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Wed Feb 18 19:31:00 2015 (r278966) @@ -26,6 +26,8 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include + #include #include #include @@ -69,7 +71,7 @@ main(int argc, char *argv[]) */ if (sigsetjmp(env, 1) == 0) { for (;;) - (void) ioctl(-1, -1, NULL); + (void) ioctl(-1, 0, NULL); } /* @@ -80,20 +82,19 @@ main(int argc, char *argv[]) fds[n++] = open(file, O_WRONLY); fds[n++] = open(file, O_RDWR); - fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | O_DSYNC | - O_LARGEFILE | O_NOCTTY | O_NONBLOCK | O_NDELAY | O_RSYNC | - O_SYNC | O_TRUNC | O_XATTR, 0666); + fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | + O_NOCTTY | O_NONBLOCK | O_NDELAY | O_SYNC | O_TRUNC | 0666); fds[n++] = open(file, O_RDWR); (void) lseek(fds[n - 1], 123, SEEK_SET); /* * Once we have all the file descriptors in the state we want to test, - * issue a bogus ioctl() on each fd with cmd -1 and arg NULL to whack + * issue a bogus ioctl() on each fd with cmd 0 and arg NULL to whack * our DTrace script into recording the content of the fds[] array. */ for (i = 0; i < n; i++) - (void) ioctl(fds[i], -1, NULL); + (void) ioctl(fds[i], 0, NULL); assert(n <= sizeof (fds) / sizeof (fds[0])); exit(0); Modified: projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d ============================================================================== --- projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d Wed Feb 18 19:31:00 2015 (r278966) @@ -36,7 +36,7 @@ syscall::ioctl:entry } syscall::ioctl:entry -/pid == $1 && arg0 != -1u && arg1 == -1u && arg2 == NULL/ +/pid == $1 && arg0 != -1u && arg1 == 0 && arg2 == NULL/ { printf("fds[%d] fi_name = %s\n", arg0, fds[arg0].fi_name); printf("fds[%d] fi_dirname = %s\n", arg0, fds[arg0].fi_dirname); Modified: projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Wed Feb 18 19:31:00 2015 (r278966) @@ -36,7 +36,6 @@ #include #include #include -#include /* * In Solaris 10 GA, the only mechanism for communicating helper information @@ -62,9 +61,7 @@ static const char *olddevname = "/device static const char *modname; /* Name of this load object */ static int gen; /* DOF helper generation */ -#ifdef illumos extern dof_hdr_t __SUNW_dof; /* DOF defined in the .SUNW_dof section */ -#endif static boolean_t dof_init_debug = B_FALSE; /* From DTRACE_DOF_INIT_DEBUG */ static void @@ -99,11 +96,7 @@ static void dtrace_dof_init(void) __attr static void dtrace_dof_init(void) { -#ifdef illumos dof_hdr_t *dof = &__SUNW_dof; -#else - dof_hdr_t *dof = NULL; -#endif #ifdef _LP64 Elf64_Ehdr *elf; #else @@ -118,17 +111,6 @@ dtrace_dof_init(void) #endif int fd; const char *p; -#ifndef illumos - Elf *e; - Elf_Scn *scn = NULL; - Elf_Data *dofdata = NULL; - dof_hdr_t *dof_next = NULL; - GElf_Shdr shdr; - int efd; - char *s; - size_t shstridx; - uint64_t aligned_filesz; -#endif if (getenv("DTRACE_DOF_INIT_DISABLE") != NULL) return; @@ -152,42 +134,6 @@ dtrace_dof_init(void) modname = lmp->l_name; else modname++; -#ifndef illumos - elf_version(EV_CURRENT); - if ((efd = open(lmp->l_name, O_RDONLY, 0)) < 0) { - dprintf(1, "couldn't open file for reading\n"); - return; - } - if ((e = elf_begin(efd, ELF_C_READ, NULL)) == NULL) { - dprintf(1, "elf_begin failed\n"); - close(efd); - return; - } - elf_getshdrstrndx(e, &shstridx); - dof = NULL; - while ((scn = elf_nextscn(e, scn)) != NULL) { - gelf_getshdr(scn, &shdr); - if (shdr.sh_type == SHT_SUNW_dof) { - s = elf_strptr(e, shstridx, shdr.sh_name); - if (s != NULL && strcmp(s, ".SUNW_dof") == 0) { - dofdata = elf_getdata(scn, NULL); - dof = dofdata->d_buf; - break; - } - } - } - if (dof == NULL) { - dprintf(1, "SUNW_dof section not found\n"); - elf_end(e); - close(efd); - return; - } - - while ((char *) dof < (char *) dofdata->d_buf + dofdata->d_size) { - aligned_filesz = (shdr.sh_addralign == 0 ? dof->dofh_filesz : - roundup2(dof->dofh_filesz, shdr.sh_addralign)); - dof_next = (void *) ((char *) dof + aligned_filesz); -#endif if (dof->dofh_ident[DOF_ID_MAG0] != DOF_MAG_MAG0 || dof->dofh_ident[DOF_ID_MAG1] != DOF_MAG_MAG1 || @@ -237,21 +183,12 @@ dtrace_dof_init(void) dprintf(1, "DTrace ioctl failed for DOF at %p", dof); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Feb 18 19:35:39 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 4AADF8AE; Wed, 18 Feb 2015 19:35:39 +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 312EBC29; Wed, 18 Feb 2015 19:35:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1IJZdbV060918; Wed, 18 Feb 2015 19:35:39 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1IJZXax060894; Wed, 18 Feb 2015 19:35:33 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201502181935.t1IJZXax060894@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 18 Feb 2015 19:35:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278967 - in projects/release-arm-redux: . bin/ln bin/pkill/tests bin/sh bin/sh/tests/expansion cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io cddl/contrib/opensolaris/lib/libdt... 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.18-1 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: Wed, 18 Feb 2015 19:35:39 -0000 Author: gjb Date: Wed Feb 18 19:35:32 2015 New Revision: 278967 URL: https://svnweb.freebsd.org/changeset/base/278967 Log: MFH: r278593-r278966 Sponsored by: The FreeBSD Foundation Added: projects/release-arm-redux/bin/sh/tests/expansion/ifs5.0 - copied unchanged from r278966, head/bin/sh/tests/expansion/ifs5.0 projects/release-arm-redux/bin/sh/tests/expansion/pathname5.0 - copied unchanged from r278966, head/bin/sh/tests/expansion/pathname5.0 projects/release-arm-redux/lib/libc/sparc64/sys/sigaction1.S - copied unchanged from r278966, head/lib/libc/sparc64/sys/sigaction1.S projects/release-arm-redux/share/man/man4/udl.4 - copied unchanged from r278966, head/share/man/man4/udl.4 projects/release-arm-redux/sys/arm/arm/unwind.c - copied unchanged from r278966, head/sys/arm/arm/unwind.c projects/release-arm-redux/sys/conf/config.mk - copied unchanged from r278966, head/sys/conf/config.mk projects/release-arm-redux/sys/dev/usb/video/ - copied from r278966, head/sys/dev/usb/video/ projects/release-arm-redux/sys/dev/videomode/ - copied from r278966, head/sys/dev/videomode/ projects/release-arm-redux/sys/modules/usb/udl/ - copied from r278966, head/sys/modules/usb/udl/ projects/release-arm-redux/sys/modules/videomode/ - copied from r278966, head/sys/modules/videomode/ projects/release-arm-redux/sys/ofed/drivers/infiniband/core/peer_mem.c - copied unchanged from r278966, head/sys/ofed/drivers/infiniband/core/peer_mem.c projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.c - copied unchanged from r278966, head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.c projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.h - copied unchanged from r278966, head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.h projects/release-arm-redux/sys/ofed/include/linux/printk.h - copied unchanged from r278966, head/sys/ofed/include/linux/printk.h projects/release-arm-redux/sys/ofed/include/rdma/ib_peer_mem.h - copied unchanged from r278966, head/sys/ofed/include/rdma/ib_peer_mem.h projects/release-arm-redux/sys/ofed/include/rdma/ib_user_verbs_exp.h - copied unchanged from r278966, head/sys/ofed/include/rdma/ib_user_verbs_exp.h projects/release-arm-redux/sys/ofed/include/rdma/ib_verbs_exp.h - copied unchanged from r278966, head/sys/ofed/include/rdma/ib_verbs_exp.h projects/release-arm-redux/sys/ofed/include/rdma/peer_mem.h - copied unchanged from r278966, head/sys/ofed/include/rdma/peer_mem.h Deleted: projects/release-arm-redux/lib/libc/sparc64/sys/sigaction.S projects/release-arm-redux/lib/libiconv/ projects/release-arm-redux/sys/dev/ic/hd64570.h projects/release-arm-redux/sys/ofed/drivers/infiniband/core/Makefile projects/release-arm-redux/sys/ofed/drivers/infiniband/core/local_sa.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/notice.c projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mlx4/Makefile projects/release-arm-redux/sys/ofed/drivers/infiniband/ulp/ipoib/Makefile Modified: projects/release-arm-redux/Makefile.inc1 projects/release-arm-redux/ObsoleteFiles.inc projects/release-arm-redux/UPDATING projects/release-arm-redux/bin/ln/symlink.7 projects/release-arm-redux/bin/pkill/tests/pgrep-j_test.sh projects/release-arm-redux/bin/pkill/tests/pkill-j_test.sh projects/release-arm-redux/bin/sh/cd.c projects/release-arm-redux/bin/sh/eval.c projects/release-arm-redux/bin/sh/expand.c projects/release-arm-redux/bin/sh/mail.c projects/release-arm-redux/bin/sh/memalloc.c projects/release-arm-redux/bin/sh/memalloc.h projects/release-arm-redux/bin/sh/miscbltin.c projects/release-arm-redux/bin/sh/nodetypes projects/release-arm-redux/bin/sh/parser.c projects/release-arm-redux/bin/sh/tests/expansion/Makefile projects/release-arm-redux/bin/sh/var.c projects/release-arm-redux/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c projects/release-arm-redux/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d projects/release-arm-redux/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/release-arm-redux/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h projects/release-arm-redux/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/release-arm-redux/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/release-arm-redux/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c projects/release-arm-redux/contrib/elftoolchain/addr2line/addr2line.c projects/release-arm-redux/contrib/elftoolchain/common/_elftc.h projects/release-arm-redux/contrib/elftoolchain/common/elfdefinitions.h projects/release-arm-redux/contrib/elftoolchain/elfcopy/main.c projects/release-arm-redux/contrib/elftoolchain/elfcopy/sections.c projects/release-arm-redux/contrib/elftoolchain/libdwarf/_libdwarf.h projects/release-arm-redux/contrib/elftoolchain/libdwarf/dwarf_attrval.c projects/release-arm-redux/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 projects/release-arm-redux/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 projects/release-arm-redux/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3 projects/release-arm-redux/contrib/elftoolchain/libdwarf/dwarf_hasattr.3 projects/release-arm-redux/contrib/elftoolchain/libdwarf/dwarf_reloc.c projects/release-arm-redux/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 projects/release-arm-redux/contrib/elftoolchain/libdwarf/dwarf_whatattr.3 projects/release-arm-redux/contrib/elftoolchain/libdwarf/libdwarf.c projects/release-arm-redux/contrib/elftoolchain/libdwarf/libdwarf.h projects/release-arm-redux/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c projects/release-arm-redux/contrib/elftoolchain/libdwarf/libdwarf_reloc.c projects/release-arm-redux/contrib/elftoolchain/libelf/_libelf_config.h projects/release-arm-redux/contrib/elftoolchain/libelf/elf.3 projects/release-arm-redux/contrib/elftoolchain/libelf/elf_scn.c projects/release-arm-redux/contrib/elftoolchain/libelf/libelf_ar_util.c projects/release-arm-redux/contrib/elftoolchain/libelf/libelf_convert.m4 projects/release-arm-redux/contrib/elftoolchain/nm/nm.1 projects/release-arm-redux/contrib/elftoolchain/nm/nm.c projects/release-arm-redux/contrib/elftoolchain/readelf/readelf.c projects/release-arm-redux/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp projects/release-arm-redux/contrib/netbsd-tests/games/t_factor.sh projects/release-arm-redux/etc/login.conf projects/release-arm-redux/etc/master.passwd projects/release-arm-redux/etc/mtree/BSD.debug.dist projects/release-arm-redux/etc/mtree/BSD.usr.dist projects/release-arm-redux/etc/network.subr projects/release-arm-redux/etc/rc.d/LOGIN projects/release-arm-redux/etc/rc.d/NETWORKING projects/release-arm-redux/etc/rc.d/local_unbound projects/release-arm-redux/etc/rc.d/utx projects/release-arm-redux/etc/root/dot.cshrc projects/release-arm-redux/etc/root/dot.login projects/release-arm-redux/etc/root/dot.profile projects/release-arm-redux/games/Makefile.inc projects/release-arm-redux/games/caesar/rot13.sh projects/release-arm-redux/games/fortune/datfiles/Makefile projects/release-arm-redux/include/stdio.h projects/release-arm-redux/lib/libc/gen/_spinlock_stub.c projects/release-arm-redux/lib/libc/gen/dlopen.3 projects/release-arm-redux/lib/libc/gen/fstab.c projects/release-arm-redux/lib/libc/gen/getgrent.c projects/release-arm-redux/lib/libc/gen/getpwent.c projects/release-arm-redux/lib/libc/gen/ulimit.c projects/release-arm-redux/lib/libc/include/libc_private.h projects/release-arm-redux/lib/libc/regex/regcomp.c projects/release-arm-redux/lib/libc/rpc/clnt_dg.c projects/release-arm-redux/lib/libc/rpc/rpc_soc.c projects/release-arm-redux/lib/libc/sparc64/sys/Makefile.inc projects/release-arm-redux/lib/libc/stdio/xprintf_float.c projects/release-arm-redux/lib/libc/sys/Makefile.inc projects/release-arm-redux/lib/libc/sys/interposing_table.c projects/release-arm-redux/lib/libcompat/4.3/rexec.c projects/release-arm-redux/lib/libelftc/elftc_version.c projects/release-arm-redux/lib/liblzma/config.h projects/release-arm-redux/lib/libproc/proc_sym.c projects/release-arm-redux/lib/libthr/libthr.3 projects/release-arm-redux/lib/libthr/thread/thr_private.h projects/release-arm-redux/lib/libthr/thread/thr_spinlock.c projects/release-arm-redux/lib/libthr/thread/thr_syscalls.c projects/release-arm-redux/release/Makefile projects/release-arm-redux/release/Makefile.vm projects/release-arm-redux/release/scripts/make-manifest.sh projects/release-arm-redux/sbin/camcontrol/camcontrol.c projects/release-arm-redux/sbin/sysctl/sysctl.8 projects/release-arm-redux/sbin/sysctl/sysctl.c projects/release-arm-redux/share/man/man4/Makefile projects/release-arm-redux/share/man/man4/led.4 projects/release-arm-redux/share/man/man4/wlan.4 projects/release-arm-redux/share/man/man6/intro.6 projects/release-arm-redux/share/man/man7/hier.7 projects/release-arm-redux/share/mk/bsd.dep.mk projects/release-arm-redux/share/mk/bsd.lib.mk projects/release-arm-redux/share/mk/bsd.libnames.mk projects/release-arm-redux/share/mk/bsd.own.mk projects/release-arm-redux/share/mk/bsd.prog.mk projects/release-arm-redux/share/skel/dot.cshrc projects/release-arm-redux/share/skel/dot.login projects/release-arm-redux/share/skel/dot.profile projects/release-arm-redux/sys/amd64/amd64/db_disasm.c projects/release-arm-redux/sys/amd64/amd64/mp_machdep.c projects/release-arm-redux/sys/arm/arm/cpuinfo.c projects/release-arm-redux/sys/arm/arm/db_trace.c projects/release-arm-redux/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/release-arm-redux/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h projects/release-arm-redux/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/release-arm-redux/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h projects/release-arm-redux/sys/arm/include/stack.h projects/release-arm-redux/sys/boot/fdt/dts/arm/bcm2835.dtsi projects/release-arm-redux/sys/cam/cam_ccb.h projects/release-arm-redux/sys/cam/ctl/ctl.c projects/release-arm-redux/sys/cam/ctl/ctl_backend_block.c projects/release-arm-redux/sys/cam/ctl/ctl_backend_ramdisk.c projects/release-arm-redux/sys/cam/ctl/ctl_tpc.c projects/release-arm-redux/sys/cam/ctl/ctl_tpc.h projects/release-arm-redux/sys/cam/ctl/ctl_tpc_local.c projects/release-arm-redux/sys/cam/scsi/scsi_da.c projects/release-arm-redux/sys/cam/scsi/scsi_enc_ses.c projects/release-arm-redux/sys/conf/files projects/release-arm-redux/sys/conf/files.arm projects/release-arm-redux/sys/conf/kern.mk projects/release-arm-redux/sys/conf/kern.pre.mk projects/release-arm-redux/sys/conf/kmod.mk projects/release-arm-redux/sys/conf/options projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_gpio.c projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_keycache.c projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_osprey22.ini projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.c projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9340.ini projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9580.ini projects/release-arm-redux/sys/contrib/rdma/krping/krping.c projects/release-arm-redux/sys/contrib/vchiq/interface/compat/vchi_bsd.h projects/release-arm-redux/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c projects/release-arm-redux/sys/dev/acpica/acpi_pcib.c projects/release-arm-redux/sys/dev/ath/if_ath_pci.c projects/release-arm-redux/sys/dev/atkbdc/atkbd.c projects/release-arm-redux/sys/dev/atkbdc/atkbdc.c projects/release-arm-redux/sys/dev/atkbdc/atkbdcreg.h projects/release-arm-redux/sys/dev/atkbdc/psm.c projects/release-arm-redux/sys/dev/cardbus/cardbus.c projects/release-arm-redux/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/release-arm-redux/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c projects/release-arm-redux/sys/dev/cxgbe/iw_cxgbe/cq.c projects/release-arm-redux/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h projects/release-arm-redux/sys/dev/cxgbe/iw_cxgbe/mem.c projects/release-arm-redux/sys/dev/dwc/if_dwc.c projects/release-arm-redux/sys/dev/fb/fbd.c projects/release-arm-redux/sys/dev/iicbus/lm75.c projects/release-arm-redux/sys/dev/lmc/if_lmc.h projects/release-arm-redux/sys/dev/mpr/mpr_sas.c projects/release-arm-redux/sys/dev/mps/mps_sas.c projects/release-arm-redux/sys/dev/netmap/netmap.c projects/release-arm-redux/sys/dev/oce/oce_mbox.c projects/release-arm-redux/sys/dev/pccbb/pccbb.c projects/release-arm-redux/sys/dev/pci/pci.c projects/release-arm-redux/sys/dev/random/dummy_rng.c projects/release-arm-redux/sys/dev/random/fortuna.c projects/release-arm-redux/sys/dev/random/random_adaptors.c projects/release-arm-redux/sys/dev/random/randomdev.c projects/release-arm-redux/sys/dev/random/randomdev.h projects/release-arm-redux/sys/dev/random/yarrow.c projects/release-arm-redux/sys/dev/sfxge/common/efx_ev.c projects/release-arm-redux/sys/dev/sfxge/common/efx_mac.c projects/release-arm-redux/sys/dev/sfxge/common/efx_mcdi.c projects/release-arm-redux/sys/dev/sfxge/common/efx_mcdi.h projects/release-arm-redux/sys/dev/sfxge/common/efx_nic.c projects/release-arm-redux/sys/dev/sfxge/common/efx_regs_mcdi.h projects/release-arm-redux/sys/dev/sfxge/common/efx_rx.c projects/release-arm-redux/sys/dev/sfxge/common/efx_tx.c projects/release-arm-redux/sys/dev/sfxge/common/siena_mon.c projects/release-arm-redux/sys/dev/sfxge/common/siena_nic.c projects/release-arm-redux/sys/dev/sfxge/common/siena_nvram.c projects/release-arm-redux/sys/dev/sfxge/common/siena_phy.c projects/release-arm-redux/sys/dev/sfxge/common/siena_vpd.c projects/release-arm-redux/sys/dev/sfxge/sfxge.h projects/release-arm-redux/sys/dev/sfxge/sfxge_ev.c projects/release-arm-redux/sys/dev/sfxge/sfxge_port.c projects/release-arm-redux/sys/dev/sfxge/sfxge_rx.c projects/release-arm-redux/sys/dev/sfxge/sfxge_tx.c projects/release-arm-redux/sys/dev/sfxge/sfxge_tx.h projects/release-arm-redux/sys/dev/smc/if_smc.c projects/release-arm-redux/sys/dev/spibus/spi.h projects/release-arm-redux/sys/dev/spibus/spibus.c projects/release-arm-redux/sys/dev/spibus/spibusvar.h projects/release-arm-redux/sys/dev/usb/controller/musb_otg.c projects/release-arm-redux/sys/dev/usb/controller/uhci.c projects/release-arm-redux/sys/dev/usb/usbdevs projects/release-arm-redux/sys/dev/vt/font/vt_mouse_cursor.c projects/release-arm-redux/sys/dev/vt/vt_core.c projects/release-arm-redux/sys/dev/wpi/if_wpi.c projects/release-arm-redux/sys/dev/wpi/if_wpireg.h projects/release-arm-redux/sys/dev/xen/xenstore/xenstore_dev.c projects/release-arm-redux/sys/fs/ext2fs/ext2_htree.c projects/release-arm-redux/sys/fs/ext2fs/ext2_vfsops.c projects/release-arm-redux/sys/i386/i386/db_disasm.c projects/release-arm-redux/sys/i386/i386/mp_machdep.c projects/release-arm-redux/sys/kern/imgact_elf.c projects/release-arm-redux/sys/kern/kern_descrip.c projects/release-arm-redux/sys/kern/kern_procctl.c projects/release-arm-redux/sys/kern/kern_timeout.c projects/release-arm-redux/sys/kern/subr_taskqueue.c projects/release-arm-redux/sys/kern/sys_generic.c projects/release-arm-redux/sys/kern/sysv_shm.c projects/release-arm-redux/sys/kern/tty.c projects/release-arm-redux/sys/kern/uipc_mbuf.c projects/release-arm-redux/sys/kern/uipc_socket.c projects/release-arm-redux/sys/kern/uipc_syscalls.c projects/release-arm-redux/sys/kern/vfs_subr.c projects/release-arm-redux/sys/kern/vfs_syscalls.c projects/release-arm-redux/sys/mips/conf/AR71XX_BASE projects/release-arm-redux/sys/modules/Makefile projects/release-arm-redux/sys/modules/cxgbe/if_cxgbe/Makefile projects/release-arm-redux/sys/modules/dpt/Makefile projects/release-arm-redux/sys/modules/drm2/radeonkms/Makefile projects/release-arm-redux/sys/modules/ed/Makefile projects/release-arm-redux/sys/modules/ep/Makefile projects/release-arm-redux/sys/modules/ibcore/Makefile projects/release-arm-redux/sys/modules/if_gif/Makefile projects/release-arm-redux/sys/modules/if_gre/Makefile projects/release-arm-redux/sys/modules/ipoib/Makefile projects/release-arm-redux/sys/modules/mlx4/Makefile projects/release-arm-redux/sys/modules/mlx4ib/Makefile projects/release-arm-redux/sys/modules/mlxen/Makefile projects/release-arm-redux/sys/modules/mthca/Makefile projects/release-arm-redux/sys/modules/si/Makefile projects/release-arm-redux/sys/modules/vx/Makefile projects/release-arm-redux/sys/net/if_bridge.c projects/release-arm-redux/sys/net/pfvar.h projects/release-arm-redux/sys/netgraph/ng_base.c projects/release-arm-redux/sys/netinet6/frag6.c projects/release-arm-redux/sys/netinet6/ip6_output.c projects/release-arm-redux/sys/netinet6/ip6_var.h projects/release-arm-redux/sys/netpfil/pf/pf.c projects/release-arm-redux/sys/netpfil/pf/pf.h projects/release-arm-redux/sys/netpfil/pf/pf_mtag.h projects/release-arm-redux/sys/netpfil/pf/pf_norm.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/addr.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/cache.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/cm.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/cm_msgs.h projects/release-arm-redux/sys/ofed/drivers/infiniband/core/cma.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/core_priv.h projects/release-arm-redux/sys/ofed/drivers/infiniband/core/device.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/fmr_pool.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/iwcm.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/mad.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/mad_priv.h projects/release-arm-redux/sys/ofed/drivers/infiniband/core/mad_rmpp.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/multicast.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/packer.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/sa.h projects/release-arm-redux/sys/ofed/drivers/infiniband/core/sa_query.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/smi.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/sysfs.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/ucm.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/ucma.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/ud_header.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/umem.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/user_mad.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/uverbs.h projects/release-arm-redux/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/uverbs_marshall.c projects/release-arm-redux/sys/ofed/drivers/infiniband/core/verbs.c projects/release-arm-redux/sys/ofed/drivers/infiniband/debug/memtrack.c projects/release-arm-redux/sys/ofed/drivers/infiniband/debug/memtrack.h projects/release-arm-redux/sys/ofed/drivers/infiniband/debug/mtrack.h projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mlx4/cq.c projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mlx4/doorbell.c projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/release-arm-redux/sys/ofed/drivers/infiniband/hw/mthca/mthca_qp.c projects/release-arm-redux/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/release-arm-redux/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c projects/release-arm-redux/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/release-arm-redux/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c projects/release-arm-redux/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c projects/release-arm-redux/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c projects/release-arm-redux/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c projects/release-arm-redux/sys/ofed/drivers/net/mlx4/Makefile projects/release-arm-redux/sys/ofed/drivers/net/mlx4/en_rx.c projects/release-arm-redux/sys/ofed/include/linux/device.h projects/release-arm-redux/sys/ofed/include/linux/file.h projects/release-arm-redux/sys/ofed/include/linux/gfp.h projects/release-arm-redux/sys/ofed/include/linux/kernel.h projects/release-arm-redux/sys/ofed/include/linux/kref.h projects/release-arm-redux/sys/ofed/include/linux/linux_compat.c projects/release-arm-redux/sys/ofed/include/linux/pci.h projects/release-arm-redux/sys/ofed/include/net/ip.h projects/release-arm-redux/sys/ofed/include/rdma/ib_addr.h projects/release-arm-redux/sys/ofed/include/rdma/ib_cache.h projects/release-arm-redux/sys/ofed/include/rdma/ib_cm.h projects/release-arm-redux/sys/ofed/include/rdma/ib_mad.h projects/release-arm-redux/sys/ofed/include/rdma/ib_pack.h projects/release-arm-redux/sys/ofed/include/rdma/ib_sa.h projects/release-arm-redux/sys/ofed/include/rdma/ib_umem.h projects/release-arm-redux/sys/ofed/include/rdma/ib_user_verbs.h projects/release-arm-redux/sys/ofed/include/rdma/ib_verbs.h projects/release-arm-redux/sys/ofed/include/rdma/iw_cm.h projects/release-arm-redux/sys/ofed/include/rdma/rdma_cm.h projects/release-arm-redux/sys/ofed/include/rdma/rdma_user_cm.h projects/release-arm-redux/sys/powerpc/powermac/atibl.c projects/release-arm-redux/sys/powerpc/powermac/nvbl.c projects/release-arm-redux/sys/powerpc/powerpc/db_trace.c projects/release-arm-redux/sys/sparc64/include/asm.h projects/release-arm-redux/sys/sys/disk.h projects/release-arm-redux/sys/sys/fbio.h projects/release-arm-redux/sys/sys/file.h projects/release-arm-redux/sys/sys/filedesc.h projects/release-arm-redux/sys/sys/mbuf.h projects/release-arm-redux/sys/sys/param.h projects/release-arm-redux/sys/sys/sockbuf.h projects/release-arm-redux/sys/sys/taskqueue.h projects/release-arm-redux/sys/vm/memguard.c projects/release-arm-redux/sys/x86/acpica/acpi_wakeup.c projects/release-arm-redux/sys/x86/acpica/madt.c projects/release-arm-redux/sys/x86/include/vmware.h projects/release-arm-redux/sys/x86/iommu/intel_drv.c projects/release-arm-redux/sys/x86/iommu/intel_reg.h projects/release-arm-redux/sys/x86/iommu/intel_utils.c projects/release-arm-redux/sys/x86/x86/local_apic.c projects/release-arm-redux/sys/x86/xen/pvcpu_enum.c projects/release-arm-redux/sys/x86/xen/xen_intr.c projects/release-arm-redux/tools/build/mk/OptionalObsoleteFiles.inc projects/release-arm-redux/tools/tools/nanobsd/gateworks/Files/root/.profile projects/release-arm-redux/tools/tools/nanobsd/pcengines/Files/root/.cshrc projects/release-arm-redux/tools/tools/nanobsd/pcengines/Files/root/.login projects/release-arm-redux/tools/tools/nanobsd/rescue/Files/root/.cshrc projects/release-arm-redux/tools/tools/netmap/pkt-gen.c projects/release-arm-redux/usr.bin/compress/compress.c projects/release-arm-redux/usr.bin/du/du.c projects/release-arm-redux/usr.bin/gcore/elfcore.c projects/release-arm-redux/usr.bin/gzip/gzip.c projects/release-arm-redux/usr.bin/kdump/kdump.c projects/release-arm-redux/usr.bin/ministat/ministat.c projects/release-arm-redux/usr.bin/svn/svn/Makefile projects/release-arm-redux/usr.bin/timeout/timeout.c projects/release-arm-redux/usr.bin/touch/touch.c projects/release-arm-redux/usr.bin/whereis/pathnames.h projects/release-arm-redux/usr.bin/whereis/whereis.1 projects/release-arm-redux/usr.bin/whereis/whereis.c projects/release-arm-redux/usr.sbin/binmiscctl/binmiscctl.8 projects/release-arm-redux/usr.sbin/binmiscctl/binmiscctl.c projects/release-arm-redux/usr.sbin/bsdconfig/include/messages.subr projects/release-arm-redux/usr.sbin/ctladm/ctladm.8 projects/release-arm-redux/usr.sbin/ctld/ctld.c projects/release-arm-redux/usr.sbin/ctld/ctld.h projects/release-arm-redux/usr.sbin/ctld/keys.c projects/release-arm-redux/usr.sbin/devctl/Makefile projects/release-arm-redux/usr.sbin/flowctl/flowctl.c projects/release-arm-redux/usr.sbin/freebsd-update/freebsd-update.sh projects/release-arm-redux/usr.sbin/gssd/Makefile projects/release-arm-redux/usr.sbin/gssd/gssd.c projects/release-arm-redux/usr.sbin/iscsid/iscsid.h projects/release-arm-redux/usr.sbin/iscsid/keys.c projects/release-arm-redux/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh projects/release-arm-redux/usr.sbin/pw/tests/pw_useradd.sh projects/release-arm-redux/usr.sbin/pw/tests/pw_usernext.sh Directory Properties: projects/release-arm-redux/ (props changed) projects/release-arm-redux/cddl/ (props changed) projects/release-arm-redux/cddl/contrib/opensolaris/ (props changed) projects/release-arm-redux/contrib/elftoolchain/ (props changed) projects/release-arm-redux/contrib/llvm/ (props changed) projects/release-arm-redux/contrib/llvm/tools/lldb/ (props changed) projects/release-arm-redux/etc/ (props changed) projects/release-arm-redux/include/ (props changed) projects/release-arm-redux/lib/libc/ (props changed) projects/release-arm-redux/sbin/ (props changed) projects/release-arm-redux/share/ (props changed) projects/release-arm-redux/share/man/man4/ (props changed) projects/release-arm-redux/sys/ (props changed) projects/release-arm-redux/sys/boot/ (props changed) projects/release-arm-redux/sys/conf/ (props changed) Modified: projects/release-arm-redux/Makefile.inc1 ============================================================================== --- projects/release-arm-redux/Makefile.inc1 Wed Feb 18 19:31:00 2015 (r278966) +++ projects/release-arm-redux/Makefile.inc1 Wed Feb 18 19:35:32 2015 (r278967) @@ -189,9 +189,8 @@ OBJTREE= ${MAKEOBJDIRPREFIX} OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/tmp -# /usr/games added for fortune which depend on strfile -BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin -XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games +BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin +XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} @@ -344,16 +343,15 @@ WMAKEENV+= CC="${XCC} ${XCFLAGS}" CXX="$ SIZE="${XSIZE}" .if ${XCC:M/*} -XFLAGS= --sysroot=${WORLDTMP} .if defined(CROSS_BINUTILS_PREFIX) # In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a # directory, but the compiler will look in the right place for it's # tools so we don't need to tell it where to look. .if exists(${CROSS_BINUTILS_PREFIX}) -XFLAGS+= -B${CROSS_BINUTILS_PREFIX} +BFLAGS+= -B${CROSS_BINUTILS_PREFIX} .endif .else -XFLAGS+= -B${WORLDTMP}/usr/bin +BFLAGS+= -B${WORLDTMP}/usr/bin .endif .if ${TARGET} == "arm" .if ${TARGET_ARCH:M*hf*} != "" @@ -370,6 +368,8 @@ DEPFLAGS+= -I${WORLDTMP}/usr/include/c++ TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XCFLAGS+= -target ${TARGET_TRIPLE} +XCFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} +XCXXFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} .endif .endif @@ -807,9 +807,6 @@ ITOOLS+=makewhatis # Non-base distributions produced by the base system EXTRA_DISTRIBUTIONS= doc -.if ${MK_GAMES} != "no" -EXTRA_DISTRIBUTIONS+= games -.endif .if defined(LIB32TMP) && ${MK_LIB32} != "no" EXTRA_DISTRIBUTIONS+= lib32 .endif @@ -916,25 +913,25 @@ packageworld: .for dist in base ${EXTRA_DISTRIBUTIONS} .if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ - --exclude usr/lib/debug \ - @${DESTDIR}/${DISTDIR}/${dist}.meta + tar cvf - --exclude usr/lib/debug \ + @${DESTDIR}/${DISTDIR}/${dist}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz .else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ - --exclude usr/lib/debug . + tar cvf - --exclude usr/lib/debug . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz .endif .endfor .for dist in ${DEBUG_DISTRIBUTIONS} . if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \ - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta + tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz . else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \ - usr/lib/debug + tar cvLf - usr/lib/debug | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz . endif .endfor @@ -1142,19 +1139,21 @@ distributekernel distributekernel.debug: packagekernel: .if defined(NO_ROOT) cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \ - @${DESTDIR}/${DISTDIR}/kernel.meta + tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \ - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta + tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .endfor .else cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz . + tar cvf - . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz . + tar cvf - . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .endfor .endif Modified: projects/release-arm-redux/ObsoleteFiles.inc ============================================================================== --- projects/release-arm-redux/ObsoleteFiles.inc Wed Feb 18 19:31:00 2015 (r278966) +++ projects/release-arm-redux/ObsoleteFiles.inc Wed Feb 18 19:35:32 2015 (r278967) @@ -38,6 +38,24 @@ # xargs -n1 | sort | uniq -d; # done +# 20150217: Removed remnants of ar(4) driver +OLD_FILES+=usr/include/sys/dev/ic/hd64570.h +# 20150212: /usr/games moving into /usr/bin +OLD_FILES+=usr/games/bcd +OLD_FILES+=usr/games/caesar +OLD_FILES+=usr/games/factor +OLD_FILES+=usr/games/fortune +OLD_FILES+=usr/games/grdc +OLD_FILES+=usr/games/morse +OLD_FILES+=usr/games/number +OLD_FILES+=usr/games/pom +OLD_FILES+=usr/games/ppt +OLD_FILES+=usr/games/primes +OLD_FILES+=usr/games/random +OLD_FILES+=usr/games/rot13 +OLD_FILES+=usr/games/strfile +OLD_FILES+=usr/games/unstr +OLD_DIRS+=usr/games # 20150209: liblzma header OLD_FILES+=usr/include/lzma/lzma.h # 20150124: spl.9 and friends Modified: projects/release-arm-redux/UPDATING ============================================================================== --- projects/release-arm-redux/UPDATING Wed Feb 18 19:31:00 2015 (r278966) +++ projects/release-arm-redux/UPDATING Wed Feb 18 19:35:32 2015 (r278967) @@ -31,6 +31,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150217: + If you are running a -CURRENT kernel since r273872 (Oct 30th, 2014), + but before r278950, the RNG was not seeded properly. Immediately + upgrade the kernel to r278950 or later and regenerate any keys (e.g. + ssh keys or openssl keys) that were generated w/ a kernel from that + range. This does not effect programs that directly used /dev/random + or /dev/urandom. All userland uses of arc4random(3) are effected. + 20150210: The autofs(4) ABI was changed in order to restore binary compatibility with 10.1-RELEASE. The automountd(8) daemon needs to be rebuilt to work Modified: projects/release-arm-redux/bin/ln/symlink.7 ============================================================================== --- projects/release-arm-redux/bin/ln/symlink.7 Wed Feb 18 19:31:00 2015 (r278966) +++ projects/release-arm-redux/bin/ln/symlink.7 Wed Feb 18 19:35:32 2015 (r278967) @@ -29,7 +29,7 @@ .\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 .\" $FreeBSD$ .\" -.Dd January 23, 2015 +.Dd February 16, 2015 .Dt SYMLINK 7 .Os .Sh NAME @@ -146,6 +146,7 @@ The following system calls follow symbol unless given the .Dv AT_SYMLINK_NOFOLLOW flag: +.Xr chflagsat 2 , .Xr fchmodat 2 , .Xr fchownat 2 , .Xr fstatat 2 Modified: projects/release-arm-redux/bin/pkill/tests/pgrep-j_test.sh ============================================================================== --- projects/release-arm-redux/bin/pkill/tests/pgrep-j_test.sh Wed Feb 18 19:31:00 2015 (r278966) +++ projects/release-arm-redux/bin/pkill/tests/pgrep-j_test.sh Wed Feb 18 19:35:32 2015 (r278967) @@ -4,94 +4,87 @@ jail_name_to_jid() { local check_name="$1" - ( - line="$(jls -n 2> /dev/null | grep name=$check_name )" - for nv in $line; do - local name="${nv%=*}" - if [ "${name}" = "jid" ]; then - eval $nv - echo $jid - break - fi - done - ) + jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g' } base=pgrep_j_test +if [ `id -u` -ne 0 ]; then + echo "1..0 # skip Test needs uid 0." + exit 0 +fi + echo "1..3" +sleep=$(pwd)/sleep.txt +ln -sf /bin/sleep $sleep + name="pgrep -j " -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 & +sleep_amount=5 +jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount & - jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 & +jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount & +for i in `seq 1 10`; do jid1=$(jail_name_to_jid ${base}_1_1) jid2=$(jail_name_to_jid ${base}_1_2) jid="${jid1},${jid2}" - pid1="$(pgrep -f -x -j $jid "$sleep 5" | sort)" - pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \ - $(cat ${PWD}/${base}_1_2.pid) | sort) - if [ "$pid1" = "$pid2" ]; then - echo "ok 1 - $name" - else - echo "not ok 1 - $name" - fi - [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) - [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) - rm -f $sleep + case "$jid" in + [0-9]+,[0-9]+) + break + ;; + esac + sleep 0.1 +done + +pid1="$(pgrep -f -x -j "$jid" "$sleep $sleep_amount" | sort)" +pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \ + $(cat ${PWD}/${base}_1_2.pid) | sort) +if [ "$pid1" = "$pid2" ]; then + echo "ok 1 - $name" else - echo "ok 1 - $name # skip Test needs uid 0." + echo "not ok 1 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'" fi +[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) +[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) +wait name="pgrep -j any" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 & - - jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 & - - sleep 2 - pid1="$(pgrep -f -x -j any "$sleep 5" | sort)" - pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \ - $(cat ${PWD}/${base}_2_2.pid) | sort) - if [ "$pid1" = "$pid2" ]; then - echo "ok 2 - $name" - else - echo "not ok 2 - $name" - fi - [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) - [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) - rm -f $sleep +sleep_amount=6 +jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_2.pid $sleep $sleep_amount & + +sleep 2 +pid1="$(pgrep -f -x -j any "$sleep $sleep_amount" | sort)" +pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \ + $(cat ${PWD}/${base}_2_2.pid) | sort) +if [ "$pid1" = "$pid2" ]; then + echo "ok 2 - $name" else - echo "ok 2 - $name # skip Test needs uid 0." + echo "not ok 2 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'" fi +[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) +[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) +wait name="pgrep -j none" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - daemon -p ${PWD}/${base}_3_1.pid $sleep 5 & - jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 & - sleep 2 - pid="$(pgrep -f -x -j none "$sleep 5")" - if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then - echo "ok 3 - $name" - else - echo "not ok 3 - $name" - fi - rm -f $sleep - [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) - [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) +sleep_amount=7 +daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount & +jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount & +sleep 2 +pid="$(pgrep -f -x -j none "$sleep $sleep_amount")" +if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then + echo "ok 3 - $name" else - echo "ok 3 - $name # skip Test needs uid 0." + echo "not ok 3 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'" fi +[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) +[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) + +rm -f $sleep Modified: projects/release-arm-redux/bin/pkill/tests/pkill-j_test.sh ============================================================================== --- projects/release-arm-redux/bin/pkill/tests/pkill-j_test.sh Wed Feb 18 19:31:00 2015 (r278966) +++ projects/release-arm-redux/bin/pkill/tests/pkill-j_test.sh Wed Feb 18 19:35:32 2015 (r278967) @@ -4,99 +4,90 @@ jail_name_to_jid() { local check_name="$1" - ( - line="$(jls -n 2> /dev/null | grep name=$check_name )" - for nv in $line; do - local name="${nv%=*}" - if [ "${name}" = "jid" ]; then - eval $nv - echo $jid - break - fi - done - ) + jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g' } base=pkill_j_test +if [ `id -u` -ne 0 ]; then + echo "1..0 # skip Test needs uid 0." + exit 0 +fi + echo "1..3" +sleep=$(pwd)/sleep.txt +ln -sf /bin/sleep $sleep + name="pkill -j " -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 & +sleep_amount=5 +jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount & - jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 & +$sleep $sleep_amount & - $sleep 5 & - sleep 0.5 +for i in `seq 1 10`; do jid1=$(jail_name_to_jid ${base}_1_1) jid2=$(jail_name_to_jid ${base}_1_2) jid="${jid1},${jid2}" - if pkill -f -j "$jid" $sleep && sleep 0.5 && - ! -f ${PWD}/${base}_1_1.pid && - ! -f ${PWD}/${base}_1_2.pid ; then - echo "ok 1 - $name" - else - echo "not ok 1 - $name" - fi 2>/dev/null - rm -f $sleep - [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) - [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) - wait + case "$jid" in + [0-9]+,[0-9]+) + break + ;; + esac + sleep 0.1 +done + +if pkill -f -j "$jid" $sleep && sleep 0.5 && + ! -f ${PWD}/${base}_1_1.pid && + ! -f ${PWD}/${base}_1_2.pid ; then + echo "ok 1 - $name" else - echo "ok 1 - $name # skip Test needs uid 0." -fi + echo "not ok 1 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) +[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) +wait name="pkill -j any" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 & - - jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 & - - $sleep 5 & - sleep 0.5 - chpid3=$! - if pkill -f -j any $sleep && sleep 0.5 && - [ ! -f ${PWD}/${base}_2_1.pid -a - ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then - echo "ok 2 - $name" - else - echo "not ok 2 - $name" - fi 2>/dev/null - rm -f $sleep - [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) - [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) - wait +sleep_amount=6 +jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_2.pid $sleep $sleep_amount & + +$sleep $sleep_amount & +chpid3=$! +sleep 0.5 +if pkill -f -j any $sleep && sleep 0.5 && + [ ! -f ${PWD}/${base}_2_1.pid -a + ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then + echo "ok 2 - $name" else - echo "ok 2 - $name # skip Test needs uid 0." -fi + echo "not ok 2 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) +[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) +wait name="pkill -j none" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - daemon -p ${PWD}/${base}_3_1.pid $sleep 5 - jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 & - sleep 1 - if pkill -f -j none "$sleep 5" && sleep 1 && - [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then - echo "ok 3 - $name" - else - ls ${PWD}/*.pid - echo "not ok 3 - $name" - fi 2>/dev/null - rm -f $sleep - [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid) - [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid) +sleep_amount=7 +daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount +jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount & +sleep 1 +if pkill -f -j none "$sleep $sleep_amount" && sleep 1 && + [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then + echo "ok 3 - $name" else - echo "ok 3 - $name # skip Test needs uid 0." -fi + ls ${PWD}/*.pid + echo "not ok 3 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid) +[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid) + +rm -f $sleep Modified: projects/release-arm-redux/bin/sh/cd.c ============================================================================== --- projects/release-arm-redux/bin/sh/cd.c Wed Feb 18 19:31:00 2015 (r278966) +++ projects/release-arm-redux/bin/sh/cd.c Wed Feb 18 19:35:32 2015 (r278967) @@ -122,7 +122,7 @@ cdcmd(int argc __unused, char **argv __u (dest[0] == '.' && (dest[1] == '/' || dest[1] == '\0')) || (dest[0] == '.' && dest[1] == '.' && (dest[2] == '/' || dest[2] == '\0')) || (path = bltinlookup("CDPATH", 1)) == NULL) - path = nullstr; + path = ""; while ((p = padvance(&path, dest)) != NULL) { if (stat(p, &statb) < 0) { if (errno != ENOENT) @@ -182,7 +182,6 @@ cdlogical(char *dest) struct stat statb; int first; int badstat; - size_t len; /* * Check each component of the path. If we find a symlink or @@ -190,9 +189,7 @@ cdlogical(char *dest) * next time we get the value of the current directory. */ badstat = 0; - len = strlen(dest); - cdcomppath = stalloc(len + 1); - memcpy(cdcomppath, dest, len + 1); + cdcomppath = stsavestr(dest); STARTSTACKSTR(p); if (*dest == '/') { STPUTC('/', p); @@ -277,7 +274,6 @@ findcwd(char *dir) { char *new; char *p; - size_t len; /* * If our argument is NULL, we don't know the current directory @@ -286,9 +282,7 @@ findcwd(char *dir) */ if (dir == NULL || curdir == NULL) return getpwd2(); - len = strlen(dir); - cdcomppath = stalloc(len + 1); - memcpy(cdcomppath, dir, len + 1); + cdcomppath = stsavestr(dir); STARTSTACKSTR(new); if (*dir != '/') { STPUTS(curdir, new); Modified: projects/release-arm-redux/bin/sh/eval.c ============================================================================== --- projects/release-arm-redux/bin/sh/eval.c Wed Feb 18 19:31:00 2015 (r278966) +++ projects/release-arm-redux/bin/sh/eval.c Wed Feb 18 19:35:32 2015 (r278967) @@ -498,7 +498,7 @@ exphere(union node *redir, struct arglis struct localvar *savelocalvars; int need_longjmp = 0; - redir->nhere.expdoc = nullstr; + redir->nhere.expdoc = ""; savelocalvars = localvars; localvars = NULL; forcelocal++; Modified: projects/release-arm-redux/bin/sh/expand.c ============================================================================== --- projects/release-arm-redux/bin/sh/expand.c Wed Feb 18 19:31:00 2015 (r278966) +++ projects/release-arm-redux/bin/sh/expand.c Wed Feb 18 19:35:32 2015 (r278967) @@ -105,11 +105,12 @@ static void expbackq(union node *, int, static int subevalvar(char *, char *, int, int, int, int, int); static char *evalvar(char *, int); static int varisset(const char *, int); +static void strtodest(const char *, int, int, int); static void varvalue(const char *, int, int, int); static void recordregion(int, int, int); static void removerecordregions(int); static void ifsbreakup(char *, struct arglist *); -static void expandmeta(struct strlist *, int); +static void expandmeta(struct strlist *); static void expmeta(char *, char *); static void addfname(char *); static struct strlist *expsort(struct strlist *); @@ -175,7 +176,7 @@ expandarg(union node *arg, struct arglis ifsbreakup(p, &exparg); *exparg.lastp = NULL; exparg.lastp = &exparg.list; - expandmeta(exparg.list, flag); + expandmeta(exparg.list); } else { sp = (struct strlist *)stalloc(sizeof (struct strlist)); sp->text = p; @@ -298,9 +299,9 @@ exptilde(char *p, int flag) char c, *startp = p; struct passwd *pw; char *home; - int quotes = flag & (EXP_FULL | EXP_CASE); - while ((c = *p) != '\0') { + for (;;) { + c = *p; switch(c) { case CTLESC: /* This means CTL* are always considered quoted. */ case CTLVAR: @@ -311,31 +312,27 @@ exptilde(char *p, int flag) case CTLQUOTEMARK: return (startp); case ':': - if (flag & EXP_VARTILDE) - goto done; - break; + if ((flag & EXP_VARTILDE) == 0) + break; + /* FALLTHROUGH */ + case '\0': case '/': case CTLENDVAR: - goto done; + *p = '\0'; + if (*(startp+1) == '\0') { + home = lookupvar("HOME"); + } else { + pw = getpwnam(startp+1); + home = pw != NULL ? pw->pw_dir : NULL; + } + *p = c; + if (home == NULL || *home == '\0') + return (startp); + strtodest(home, flag, VSNORMAL, 1); + return (p); } p++; } -done: - *p = '\0'; - if (*(startp+1) == '\0') { - home = lookupvar("HOME"); - } else { - pw = getpwnam(startp+1); - home = pw != NULL ? pw->pw_dir : NULL; - } - *p = c; - if (home == NULL || *home == '\0') - return (startp); - if (quotes) - STPUTS_QUOTES(home, DQSYNTAX, expdest); - else - STPUTS(home, expdest); - return (p); } @@ -496,6 +493,17 @@ expbackq(union node *cmd, int quoted, in +static void +recordleft(const char *str, const char *loc, char *startp) +{ + int amount; + + amount = ((str - 1) - (loc - startp)) - expdest; + STADJUST(amount, expdest); + while (loc != str - 1) + *startp++ = *loc++; +} + static int subevalvar(char *p, char *str, int strloc, int subtype, int startloc, int varflags, int quotes) @@ -530,8 +538,7 @@ subevalvar(char *p, char *str, int strlo error((char *)NULL); } error("%.*s: parameter %snot set", (int)(p - str - 1), - str, (varflags & VSNUL) ? "null or " - : nullstr); + str, (varflags & VSNUL) ? "null or " : ""); return 0; case VSTRIMLEFT: @@ -540,7 +547,8 @@ subevalvar(char *p, char *str, int strlo *loc = '\0'; if (patmatch(str, startp, quotes)) { *loc = c; - goto recordleft; + recordleft(str, loc, startp); + return 1; } *loc = c; if (quotes && *loc == CTLESC) @@ -554,7 +562,8 @@ subevalvar(char *p, char *str, int strlo *loc = '\0'; if (patmatch(str, startp, quotes)) { *loc = c; - goto recordleft; + recordleft(str, loc, startp); + return 1; } *loc = c; loc--; @@ -602,13 +611,6 @@ subevalvar(char *p, char *str, int strlo default: abort(); } - -recordleft: - amount = ((str - 1) - (loc - startp)) - expdest; - STADJUST(amount, expdest); - while (loc != str - 1) - *startp++ = *loc++; - return 1; } @@ -633,6 +635,7 @@ evalvar(char *p, int flag) int varlenb; int easy; int quotes = flag & (EXP_FULL | EXP_CASE); + int record; varflags = (unsigned char)*p++; subtype = varflags & VSTYPE; @@ -690,22 +693,15 @@ again: /* jump here after setting a vari STADJUST(-varlenb, expdest); } } else { - char const *syntax = (varflags & VSQUOTE) ? DQSYNTAX - : BASESYNTAX; - if (subtype == VSLENGTH) { for (;*val; val++) if (!localeisutf8 || (*val & 0xC0) != 0x80) varlen++; } - else { - if (quotes) - STPUTS_QUOTES(val, syntax, expdest); - else - STPUTS(val, expdest); - - } + else + strtodest(val, flag, subtype, + varflags & VSQUOTE); } } @@ -719,15 +715,11 @@ again: /* jump here after setting a vari switch (subtype) { case VSLENGTH: expdest = cvtnum(varlen, expdest); - goto record; + record = 1; + break; case VSNORMAL: - if (!easy) - break; -record: - recordregion(startloc, expdest - stackblock(), - varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' && - (*var == '@' || *var == '*'))); + record = easy; break; case VSPLUS: @@ -737,8 +729,7 @@ record: (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0)); break; } - if (easy) - goto record; + record = easy; break; case VSTRIMLEFT: @@ -760,7 +751,8 @@ record: } /* Remove any recorded regions beyond start of variable */ removerecordregions(startloc); - goto record; + record = 1; + break; case VSASSIGN: case VSQUESTION: @@ -777,8 +769,7 @@ record: } break; } - if (easy) - goto record; + record = easy; break; case VSERROR: @@ -790,6 +781,11 @@ record: abort(); } + if (record) + recordregion(startloc, expdest - stackblock(), + varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' && + (*var == '@' || *var == '*'))); + if (subtype != VSNORMAL) { /* skip to end of alternative */ int nesting = 1; for (;;) { @@ -1093,7 +1089,7 @@ static char expdir[PATH_MAX]; * The results are stored in the list exparg. */ static void -expandmeta(struct strlist *str, int flag __unused) +expandmeta(struct strlist *str) { char *p; struct strlist **savelastp; @@ -1284,11 +1280,8 @@ addfname(char *name) { char *p; struct strlist *sp; - size_t len; - len = strlen(name); - p = stalloc(len + 1); - memcpy(p, name, len + 1); + p = stsavestr(name); sp = (struct strlist *)stalloc(sizeof *sp); sp->text = p; *exparg.lastp = sp; @@ -1478,16 +1471,14 @@ patmatch(const char *pattern, const char endp = p; if (*endp == '!' || *endp == '^') endp++; - for (;;) { + do { while (*endp == CTLQUOTEMARK) endp++; if (*endp == 0) goto dft; /* no matching ] */ if (*endp == CTLESC) endp++; - if (*++endp == ']') - break; - } + } while (*++endp != ']'); invert = 0; if (*p == '!' || *p == '^') { invert++; Modified: projects/release-arm-redux/bin/sh/mail.c ============================================================================== --- projects/release-arm-redux/bin/sh/mail.c Wed Feb 18 19:31:00 2015 (r278966) +++ projects/release-arm-redux/bin/sh/mail.c Wed Feb 18 19:35:32 2015 (r278967) @@ -85,7 +85,7 @@ chkmail(int silent) setstackmark(&smark); mpath = mpathset()? mpathval() : mailval(); for (i = 0 ; i < nmboxes ; i++) { - p = padvance(&mpath, nullstr); + p = padvance(&mpath, ""); if (p == NULL) break; if (*p == '\0') Modified: projects/release-arm-redux/bin/sh/memalloc.c ============================================================================== --- projects/release-arm-redux/bin/sh/memalloc.c Wed Feb 18 19:31:00 2015 (r278966) +++ projects/release-arm-redux/bin/sh/memalloc.c Wed Feb 18 19:35:32 2015 (r278967) @@ -180,6 +180,18 @@ stunalloc(pointer p) } +char * +stsavestr(const char *s) +{ + char *p; + size_t len; + + len = strlen(s); + p = stalloc(len + 1); + memcpy(p, s, len + 1); + return p; +} + void setstackmark(struct stackmark *mark) Modified: projects/release-arm-redux/bin/sh/memalloc.h ============================================================================== --- projects/release-arm-redux/bin/sh/memalloc.h Wed Feb 18 19:31:00 2015 (r278966) +++ projects/release-arm-redux/bin/sh/memalloc.h Wed Feb 18 19:35:32 2015 (r278967) @@ -52,6 +52,7 @@ void ckfree(pointer); char *savestr(const char *); pointer stalloc(int); void stunalloc(pointer); +char *stsavestr(const char *); void setstackmark(struct stackmark *); void popstackmark(struct stackmark *); char *growstackstr(void); Modified: projects/release-arm-redux/bin/sh/miscbltin.c ============================================================================== --- projects/release-arm-redux/bin/sh/miscbltin.c Wed Feb 18 19:31:00 2015 (r278966) +++ projects/release-arm-redux/bin/sh/miscbltin.c Wed Feb 18 19:35:32 2015 (r278967) @@ -265,7 +265,7 @@ readcmd(int argc __unused, char **argv _ /* Set any remaining args to "" */ while (*++ap != NULL) - setvar(*ap, nullstr, 0); + setvar(*ap, "", 0); return status; } Modified: projects/release-arm-redux/bin/sh/nodetypes ============================================================================== --- projects/release-arm-redux/bin/sh/nodetypes Wed Feb 18 19:31:00 2015 (r278966) +++ projects/release-arm-redux/bin/sh/nodetypes Wed Feb 18 19:35:32 2015 (r278967) @@ -138,7 +138,7 @@ NXHERE nhere # fd<flags & VREADONLY) return (1); if (vp->text[vp->name_len + 1] != '\0') - setvar(s, nullstr, 0); + setvar(s, "", 0); if ((vp->flags & VEXPORT) && localevar(vp->text)) { change_env(s, 0); setlocale(LC_ALL, ""); Modified: projects/release-arm-redux/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c ============================================================================== --- projects/release-arm-redux/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Wed Feb 18 19:31:00 2015 (r278966) +++ projects/release-arm-redux/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Wed Feb 18 19:35:32 2015 (r278967) @@ -26,6 +26,8 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include + #include #include #include @@ -69,7 +71,7 @@ main(int argc, char *argv[]) */ if (sigsetjmp(env, 1) == 0) { for (;;) - (void) ioctl(-1, -1, NULL); + (void) ioctl(-1, 0, NULL); } /* @@ -80,20 +82,19 @@ main(int argc, char *argv[]) fds[n++] = open(file, O_WRONLY); fds[n++] = open(file, O_RDWR); - fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | O_DSYNC | - O_LARGEFILE | O_NOCTTY | O_NONBLOCK | O_NDELAY | O_RSYNC | - O_SYNC | O_TRUNC | O_XATTR, 0666); + fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | + O_NOCTTY | O_NONBLOCK | O_NDELAY | O_SYNC | O_TRUNC | 0666); fds[n++] = open(file, O_RDWR); (void) lseek(fds[n - 1], 123, SEEK_SET); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Thu Feb 19 01:29:32 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 A052DB9C; Thu, 19 Feb 2015 01:29:32 +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 86B411DD; Thu, 19 Feb 2015 01:29:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1J1TW0c030553; Thu, 19 Feb 2015 01:29:32 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1J1TP4w030449; Thu, 19 Feb 2015 01:29:25 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201502190129.t1J1TP4w030449@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Thu, 19 Feb 2015 01:29:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278980 - in projects/ifnet: . cddl/contrib/opensolaris/lib/libdtrace/common etc lib/libc/rpc lib/libc/stdio sbin/camcontrol share/mk sys/amd64/amd64 sys/cam sys/cam/scsi sys/conf sys/c... 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.18-1 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: Thu, 19 Feb 2015 01:29:32 -0000 Author: glebius Date: Thu Feb 19 01:29:24 2015 New Revision: 278980 URL: https://svnweb.freebsd.org/changeset/base/278980 Log: Merge head r257698 through r278979. Added: projects/ifnet/sys/conf/config.mk - copied unchanged from r278979, head/sys/conf/config.mk projects/ifnet/sys/contrib/dev/acpica/compiler/aslprintf.c - copied unchanged from r278979, head/sys/contrib/dev/acpica/compiler/aslprintf.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslprune.c - copied unchanged from r278979, head/sys/contrib/dev/acpica/compiler/aslprune.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c - copied unchanged from r278979, head/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c Deleted: projects/ifnet/sys/dev/cxgb/sys/mbufq.h projects/ifnet/sys/dev/xen/netfront/mbufq.h Modified: projects/ifnet/Makefile.inc1 projects/ifnet/UPDATING projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h 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/contrib/opensolaris/lib/libdtrace/common/dt_options.c projects/ifnet/etc/network.subr projects/ifnet/lib/libc/rpc/clnt_dg.c projects/ifnet/lib/libc/rpc/rpc_soc.c projects/ifnet/lib/libc/stdio/xprintf_float.c projects/ifnet/sbin/camcontrol/camcontrol.c projects/ifnet/share/mk/bsd.dep.mk projects/ifnet/share/mk/bsd.libnames.mk projects/ifnet/sys/amd64/amd64/ptrace_machdep.c projects/ifnet/sys/cam/cam_ccb.h projects/ifnet/sys/cam/scsi/scsi_da.c projects/ifnet/sys/cam/scsi/scsi_enc_ses.c projects/ifnet/sys/conf/files projects/ifnet/sys/conf/kmod.mk projects/ifnet/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/ifnet/sys/contrib/dev/acpica/common/acgetline.c projects/ifnet/sys/contrib/dev/acpica/common/adfile.c projects/ifnet/sys/contrib/dev/acpica/common/adisasm.c projects/ifnet/sys/contrib/dev/acpica/common/adwalk.c projects/ifnet/sys/contrib/dev/acpica/common/ahids.c projects/ifnet/sys/contrib/dev/acpica/common/ahpredef.c projects/ifnet/sys/contrib/dev/acpica/common/ahuuids.c projects/ifnet/sys/contrib/dev/acpica/common/cmfsize.c projects/ifnet/sys/contrib/dev/acpica/common/dmextern.c projects/ifnet/sys/contrib/dev/acpica/common/dmrestag.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/common/getopt.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslanalyze.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslascii.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslbtypes.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslcompile.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/aslerror.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslfileio.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslfiles.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslfold.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslglobal.h projects/ifnet/sys/contrib/dev/acpica/compiler/aslhex.c projects/ifnet/sys/contrib/dev/acpica/compiler/asllength.c projects/ifnet/sys/contrib/dev/acpica/compiler/asllisting.c projects/ifnet/sys/contrib/dev/acpica/compiler/asllistsup.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslload.c projects/ifnet/sys/contrib/dev/acpica/compiler/asllookup.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmain.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmap.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmapenter.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmapoutput.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmaputils.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/aslmethod.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslnamesp.c projects/ifnet/sys/contrib/dev/acpica/compiler/asloffset.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslopcodes.c projects/ifnet/sys/contrib/dev/acpica/compiler/asloperands.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslopt.c projects/ifnet/sys/contrib/dev/acpica/compiler/asloptions.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslparser.y projects/ifnet/sys/contrib/dev/acpica/compiler/aslpredef.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslprepkg.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslresource.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype1.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype1i.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype2.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype2d.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype2e.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype2q.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype2s.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrestype2w.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrules.y projects/ifnet/sys/contrib/dev/acpica/compiler/aslstartup.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslstubs.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslsupport.l projects/ifnet/sys/contrib/dev/acpica/compiler/aslsupport.y projects/ifnet/sys/contrib/dev/acpica/compiler/asltokens.y projects/ifnet/sys/contrib/dev/acpica/compiler/asltransform.c projects/ifnet/sys/contrib/dev/acpica/compiler/asltree.c projects/ifnet/sys/contrib/dev/acpica/compiler/asltypes.h projects/ifnet/sys/contrib/dev/acpica/compiler/asltypes.y projects/ifnet/sys/contrib/dev/acpica/compiler/aslutils.c projects/ifnet/sys/contrib/dev/acpica/compiler/asluuid.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslwalks.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslxref.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/dtexpress.c projects/ifnet/sys/contrib/dev/acpica/compiler/dtfield.c projects/ifnet/sys/contrib/dev/acpica/compiler/dtio.c projects/ifnet/sys/contrib/dev/acpica/compiler/dtparser.l projects/ifnet/sys/contrib/dev/acpica/compiler/dtparser.y 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/prexpress.c projects/ifnet/sys/contrib/dev/acpica/compiler/prmacros.c projects/ifnet/sys/contrib/dev/acpica/compiler/prparser.l projects/ifnet/sys/contrib/dev/acpica/compiler/prparser.y 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/dbcmds.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbconvert.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbexec.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbfileio.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbhistry.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbmethod.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbnames.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbstats.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbtest.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbutils.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbxface.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmnames.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmobject.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmresrc.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmutils.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsargs.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsfield.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsinit.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsobject.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsutils.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dswexec.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dswload.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dswload2.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dswscope.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dswstate.c projects/ifnet/sys/contrib/dev/acpica/components/events/evevent.c projects/ifnet/sys/contrib/dev/acpica/components/events/evglock.c projects/ifnet/sys/contrib/dev/acpica/components/events/evgpe.c projects/ifnet/sys/contrib/dev/acpica/components/events/evgpeblk.c projects/ifnet/sys/contrib/dev/acpica/components/events/evgpeinit.c projects/ifnet/sys/contrib/dev/acpica/components/events/evgpeutil.c projects/ifnet/sys/contrib/dev/acpica/components/events/evhandler.c projects/ifnet/sys/contrib/dev/acpica/components/events/evmisc.c projects/ifnet/sys/contrib/dev/acpica/components/events/evregion.c projects/ifnet/sys/contrib/dev/acpica/components/events/evrgnini.c projects/ifnet/sys/contrib/dev/acpica/components/events/evsci.c projects/ifnet/sys/contrib/dev/acpica/components/events/evxface.c projects/ifnet/sys/contrib/dev/acpica/components/events/evxfevnt.c projects/ifnet/sys/contrib/dev/acpica/components/events/evxfgpe.c projects/ifnet/sys/contrib/dev/acpica/components/events/evxfregn.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exconfig.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exconvrt.c projects/ifnet/sys/contrib/dev/acpica/components/executer/excreate.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exdebug.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exdump.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exfield.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exfldio.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exmisc.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exmutex.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exnames.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exoparg1.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exoparg2.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exoparg3.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exoparg6.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exprep.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exregion.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exresnte.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exresolv.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exresop.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exstore.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exstoren.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exstorob.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exsystem.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exutils.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwacpi.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwesleep.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwgpe.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwpci.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwregs.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwsleep.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwtimer.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwvalid.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwxface.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsaccess.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsalloc.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsarguments.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsconvert.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nseval.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsinit.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsload.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsnames.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsobject.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsparse.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nspredef.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/namespace/nsrepair2.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nssearch.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsutils.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nswalk.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsxfeval.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsxfname.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsxfobj.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psargs.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psloop.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psobject.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psopcode.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psopinfo.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psparse.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psscope.c projects/ifnet/sys/contrib/dev/acpica/components/parser/pstree.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psutils.c projects/ifnet/sys/contrib/dev/acpica/components/parser/pswalk.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psxface.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsaddr.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rscalc.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rscreate.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsdump.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsinfo.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsio.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsirq.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rslist.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsmemory.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsmisc.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsserial.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsutils.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsxface.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbdata.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbfadt.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbfind.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbprint.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbutils.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbxface.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbxfload.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbxfroot.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utaddress.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utalloc.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utbuffer.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utcache.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utcopy.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utdebug.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utdecode.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utdelete.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/uterror.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/uteval.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utexcep.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utfileio.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utglobal.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/uthex.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utids.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utinit.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utlock.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utmath.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utmutex.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utobject.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utosi.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utownerid.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utpredef.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utprint.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utresrc.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utstate.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utstring.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/uttrack.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utuuid.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utxface.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utxferror.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utxfinit.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utxfmutex.c projects/ifnet/sys/contrib/dev/acpica/include/acapps.h projects/ifnet/sys/contrib/dev/acpica/include/acbuffer.h projects/ifnet/sys/contrib/dev/acpica/include/accommon.h projects/ifnet/sys/contrib/dev/acpica/include/acconfig.h 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/acdispat.h projects/ifnet/sys/contrib/dev/acpica/include/acevents.h projects/ifnet/sys/contrib/dev/acpica/include/acexcep.h projects/ifnet/sys/contrib/dev/acpica/include/acglobal.h projects/ifnet/sys/contrib/dev/acpica/include/achware.h projects/ifnet/sys/contrib/dev/acpica/include/acinterp.h projects/ifnet/sys/contrib/dev/acpica/include/aclocal.h projects/ifnet/sys/contrib/dev/acpica/include/acmacros.h projects/ifnet/sys/contrib/dev/acpica/include/acnames.h projects/ifnet/sys/contrib/dev/acpica/include/acnamesp.h projects/ifnet/sys/contrib/dev/acpica/include/acobject.h projects/ifnet/sys/contrib/dev/acpica/include/acopcode.h projects/ifnet/sys/contrib/dev/acpica/include/acoutput.h projects/ifnet/sys/contrib/dev/acpica/include/acparser.h projects/ifnet/sys/contrib/dev/acpica/include/acpi.h projects/ifnet/sys/contrib/dev/acpica/include/acpiosxf.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/acresrc.h projects/ifnet/sys/contrib/dev/acpica/include/acrestyp.h projects/ifnet/sys/contrib/dev/acpica/include/acstruct.h projects/ifnet/sys/contrib/dev/acpica/include/actables.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/amlcode.h projects/ifnet/sys/contrib/dev/acpica/include/amlresrc.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/dev/acpica/include/platform/acfreebsd.h projects/ifnet/sys/contrib/dev/acpica/include/platform/acgcc.h projects/ifnet/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c projects/ifnet/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c projects/ifnet/sys/dev/cardbus/cardbus.c projects/ifnet/sys/dev/cxgb/cxgb_adapter.h projects/ifnet/sys/dev/cxgb/cxgb_sge.c projects/ifnet/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/ifnet/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h projects/ifnet/sys/dev/mpr/mpr_sas.c projects/ifnet/sys/dev/mps/mps_sas.c projects/ifnet/sys/dev/pccbb/pccbb.c projects/ifnet/sys/dev/random/fortuna.c projects/ifnet/sys/dev/random/yarrow.c projects/ifnet/sys/dev/sfxge/common/efx_ev.c projects/ifnet/sys/dev/sfxge/common/efx_mcdi.h projects/ifnet/sys/dev/sfxge/common/efx_regs_mcdi.h projects/ifnet/sys/dev/sfxge/common/siena_nic.c projects/ifnet/sys/dev/sfxge/common/siena_nvram.c projects/ifnet/sys/dev/sfxge/common/siena_phy.c projects/ifnet/sys/dev/sfxge/sfxge.h projects/ifnet/sys/dev/sfxge/sfxge_ev.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/spibus/spi.h projects/ifnet/sys/dev/spibus/spibus.c projects/ifnet/sys/dev/spibus/spibusvar.h projects/ifnet/sys/dev/xen/netfront/netfront.c projects/ifnet/sys/i386/i386/ptrace_machdep.c projects/ifnet/sys/kern/kern_descrip.c projects/ifnet/sys/kern/sysv_shm.c projects/ifnet/sys/modules/Makefile projects/ifnet/sys/modules/dpt/Makefile projects/ifnet/sys/modules/ed/Makefile projects/ifnet/sys/modules/ep/Makefile projects/ifnet/sys/modules/if_gif/Makefile projects/ifnet/sys/modules/if_gre/Makefile projects/ifnet/sys/modules/si/Makefile projects/ifnet/sys/modules/vx/Makefile projects/ifnet/sys/netinet/igmp.c projects/ifnet/sys/netinet6/mld6.c projects/ifnet/sys/powerpc/powermac/atibl.c projects/ifnet/sys/powerpc/powermac/nvbl.c projects/ifnet/sys/sys/mbuf.h projects/ifnet/sys/sys/param.h projects/ifnet/sys/x86/acpica/acpi_wakeup.c projects/ifnet/usr.sbin/acpi/acpidb/Makefile projects/ifnet/usr.sbin/acpi/acpidb/acpidb.c projects/ifnet/usr.sbin/acpi/iasl/Makefile Directory Properties: projects/ifnet/ (props changed) projects/ifnet/cddl/ (props changed) projects/ifnet/cddl/contrib/opensolaris/ (props changed) projects/ifnet/etc/ (props changed) projects/ifnet/lib/libc/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/share/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/conf/ (props changed) projects/ifnet/sys/contrib/dev/acpica/ (props changed) projects/ifnet/sys/contrib/dev/acpica/common/ (props changed) projects/ifnet/sys/contrib/dev/acpica/compiler/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/events/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/executer/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/hardware/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/namespace/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/parser/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/resources/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/tables/ (props changed) projects/ifnet/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/ifnet/sys/contrib/dev/acpica/include/ (props changed) projects/ifnet/sys/contrib/dev/acpica/os_specific/ (props changed) Modified: projects/ifnet/Makefile.inc1 ============================================================================== --- projects/ifnet/Makefile.inc1 Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/Makefile.inc1 Thu Feb 19 01:29:24 2015 (r278980) @@ -343,16 +343,15 @@ WMAKEENV+= CC="${XCC} ${XCFLAGS}" CXX="$ SIZE="${XSIZE}" .if ${XCC:M/*} -XFLAGS= --sysroot=${WORLDTMP} .if defined(CROSS_BINUTILS_PREFIX) # In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a # directory, but the compiler will look in the right place for it's # tools so we don't need to tell it where to look. .if exists(${CROSS_BINUTILS_PREFIX}) -XFLAGS+= -B${CROSS_BINUTILS_PREFIX} +BFLAGS+= -B${CROSS_BINUTILS_PREFIX} .endif .else -XFLAGS+= -B${WORLDTMP}/usr/bin +BFLAGS+= -B${WORLDTMP}/usr/bin .endif .if ${TARGET} == "arm" .if ${TARGET_ARCH:M*hf*} != "" @@ -369,6 +368,8 @@ DEPFLAGS+= -I${WORLDTMP}/usr/include/c++ TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XCFLAGS+= -target ${TARGET_TRIPLE} +XCFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} +XCXXFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} .endif .endif @@ -1246,11 +1247,6 @@ _m4= lib/libohash \ usr.bin/m4 .endif -.if ${BOOTSTRAPPING} < 1000013 -_yacc= lib/liby \ - usr.bin/yacc -.endif - .if ${BOOTSTRAPPING} < 1000014 _crunch= usr.sbin/crunch .endif @@ -1272,6 +1268,11 @@ _lex= usr.bin/lex _awk= usr.bin/awk .endif +.if ${BOOTSTRAPPING} < 1001506 +_yacc= lib/liby \ + usr.bin/yacc +.endif + .if ${MK_BSNMP} != "no" _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif Modified: projects/ifnet/UPDATING ============================================================================== --- projects/ifnet/UPDATING Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/UPDATING Thu Feb 19 01:29:24 2015 (r278980) @@ -33,8 +33,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 20150217: If you are running a -CURRENT kernel since r273872 (Oct 30th, 2014), - but before r278927, the RNG was not seeded properly. Immediately - upgrade the kernel to r278927 or later and regenerate any keys (e.g. + but before r278950, the RNG was not seeded properly. Immediately + upgrade the kernel to r278950 or later and regenerate any keys (e.g. ssh keys or openssl keys) that were generated w/ a kernel from that range. This does not effect programs that directly used /dev/random or /dev/urandom. All userland uses of arc4random(3) are effected. Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Thu Feb 19 01:29:24 2015 (r278980) @@ -36,7 +36,6 @@ #include #include #include -#include /* * In Solaris 10 GA, the only mechanism for communicating helper information @@ -62,9 +61,7 @@ static const char *olddevname = "/device static const char *modname; /* Name of this load object */ static int gen; /* DOF helper generation */ -#ifdef illumos extern dof_hdr_t __SUNW_dof; /* DOF defined in the .SUNW_dof section */ -#endif static boolean_t dof_init_debug = B_FALSE; /* From DTRACE_DOF_INIT_DEBUG */ static void @@ -99,11 +96,7 @@ static void dtrace_dof_init(void) __attr static void dtrace_dof_init(void) { -#ifdef illumos dof_hdr_t *dof = &__SUNW_dof; -#else - dof_hdr_t *dof = NULL; -#endif #ifdef _LP64 Elf64_Ehdr *elf; #else @@ -118,17 +111,6 @@ dtrace_dof_init(void) #endif int fd; const char *p; -#ifndef illumos - Elf *e; - Elf_Scn *scn = NULL; - Elf_Data *dofdata = NULL; - dof_hdr_t *dof_next = NULL; - GElf_Shdr shdr; - int efd; - char *s; - size_t shstridx; - uint64_t aligned_filesz; -#endif if (getenv("DTRACE_DOF_INIT_DISABLE") != NULL) return; @@ -152,42 +134,6 @@ dtrace_dof_init(void) modname = lmp->l_name; else modname++; -#ifndef illumos - elf_version(EV_CURRENT); - if ((efd = open(lmp->l_name, O_RDONLY, 0)) < 0) { - dprintf(1, "couldn't open file for reading\n"); - return; - } - if ((e = elf_begin(efd, ELF_C_READ, NULL)) == NULL) { - dprintf(1, "elf_begin failed\n"); - close(efd); - return; - } - elf_getshdrstrndx(e, &shstridx); - dof = NULL; - while ((scn = elf_nextscn(e, scn)) != NULL) { - gelf_getshdr(scn, &shdr); - if (shdr.sh_type == SHT_SUNW_dof) { - s = elf_strptr(e, shstridx, shdr.sh_name); - if (s != NULL && strcmp(s, ".SUNW_dof") == 0) { - dofdata = elf_getdata(scn, NULL); - dof = dofdata->d_buf; - break; - } - } - } - if (dof == NULL) { - dprintf(1, "SUNW_dof section not found\n"); - elf_end(e); - close(efd); - return; - } - - while ((char *) dof < (char *) dofdata->d_buf + dofdata->d_size) { - aligned_filesz = (shdr.sh_addralign == 0 ? dof->dofh_filesz : - roundup2(dof->dofh_filesz, shdr.sh_addralign)); - dof_next = (void *) ((char *) dof + aligned_filesz); -#endif if (dof->dofh_ident[DOF_ID_MAG0] != DOF_MAG_MAG0 || dof->dofh_ident[DOF_ID_MAG1] != DOF_MAG_MAG1 || @@ -237,21 +183,12 @@ dtrace_dof_init(void) dprintf(1, "DTrace ioctl failed for DOF at %p", dof); else { dprintf(1, "DTrace ioctl succeeded for DOF at %p\n", dof); -#ifndef illumos +#ifdef __FreeBSD__ gen = dh.gen; #endif } (void) close(fd); - -#ifndef illumos - /* End of while loop */ - dof = dof_next; - } - - elf_end(e); - (void) close(efd); -#endif } #ifdef illumos Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h Thu Feb 19 01:29:24 2015 (r278980) @@ -275,6 +275,9 @@ struct dtrace_hdl { int dt_cpp_argc; /* count of initialized cpp(1) arguments */ int dt_cpp_args; /* size of dt_cpp_argv[] array */ char *dt_ld_path; /* pathname of ld(1) to invoke if needed */ +#ifdef __FreeBSD__ + char *dt_objcopy_path; /* pathname of objcopy(1) to invoke if needed */ +#endif dt_list_t dt_lib_path; /* linked-list forming library search path */ uint_t dt_lazyload; /* boolean: set via -xlazyload */ uint_t dt_droptags; /* boolean: set via -xdroptags */ Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Thu Feb 19 01:29:24 2015 (r278980) @@ -281,7 +281,11 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION_ sym->st_value = 0; sym->st_size = dof->dofh_filesz; sym->st_info = ELF32_ST_INFO(STB_GLOBAL, STT_OBJECT); +#ifdef illumos sym->st_other = 0; +#else + sym->st_other = ELF32_ST_VISIBILITY(STV_HIDDEN); +#endif sym->st_shndx = ESHDR_DOF; sym++; @@ -471,7 +475,11 @@ prepare_elf64(dtrace_hdl_t *dtp, const d sym->st_value = 0; sym->st_size = dof->dofh_filesz; sym->st_info = GELF_ST_INFO(STB_GLOBAL, STT_OBJECT); +#ifdef illumos sym->st_other = 0; +#else + sym->st_other = ELF64_ST_VISIBILITY(STV_HIDDEN); +#endif sym->st_shndx = ESHDR_DOF; sym++; @@ -711,11 +719,7 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_ shp = &elf_file.shdr[ESHDR_DOF]; shp->sh_name = 11; /* DTRACE_SHSTRTAB64[11] = ".SUNW_dof" */ -#ifdef illumos shp->sh_flags = SHF_ALLOC; -#else - shp->sh_flags = SHF_WRITE | SHF_ALLOC; -#endif shp->sh_type = SHT_SUNW_dof; shp->sh_offset = off; shp->sh_size = dof->dofh_filesz; @@ -1874,7 +1878,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, d #endif (void) snprintf(drti, sizeof (drti), "/usr/lib%s/dtrace/drti.o", - use_32 ? "32":""); + use_32 ? "32" : ""); len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile, drti) + 1; @@ -1885,26 +1889,61 @@ dtrace_program_link(dtrace_hdl_t *dtp, d drti); #endif if ((status = system(cmd)) == -1) { - ret = dt_link_error(dtp, NULL, -1, NULL, + ret = dt_link_error(dtp, NULL, fd, NULL, "failed to run %s: %s", dtp->dt_ld_path, strerror(errno)); goto done; } if (WIFSIGNALED(status)) { - ret = dt_link_error(dtp, NULL, -1, NULL, + ret = dt_link_error(dtp, NULL, fd, NULL, "failed to link %s: %s failed due to signal %d", file, dtp->dt_ld_path, WTERMSIG(status)); goto done; } if (WEXITSTATUS(status) != 0) { - ret = dt_link_error(dtp, NULL, -1, NULL, + ret = dt_link_error(dtp, NULL, fd, NULL, "failed to link %s: %s exited with status %d\n", file, dtp->dt_ld_path, WEXITSTATUS(status)); goto done; } (void) close(fd); /* release temporary file */ + +#ifdef __FreeBSD__ + /* + * Now that we've linked drti.o, reduce the global __SUNW_dof + * symbol to a local symbol. This is needed to so that multiple + * generated object files (for different providers, for + * instance) can be linked together. This is accomplished using + * the -Blocal flag with Sun's linker, but GNU ld doesn't appear + * to have an equivalent option. + */ + asprintf(&cmd, "%s --localize-hidden %s", dtp->dt_objcopy_path, + file); + if ((status = system(cmd)) == -1) { + ret = dt_link_error(dtp, NULL, -1, NULL, + "failed to run %s: %s", dtp->dt_objcopy_path, + strerror(errno)); + free(cmd); + goto done; + } + free(cmd); + + if (WIFSIGNALED(status)) { + ret = dt_link_error(dtp, NULL, -1, NULL, + "failed to link %s: %s failed due to signal %d", + file, dtp->dt_objcopy_path, WTERMSIG(status)); + goto done; + } + + if (WEXITSTATUS(status) != 0) { + ret = dt_link_error(dtp, NULL, -1, NULL, + "failed to link %s: %s exited with status %d\n", + file, dtp->dt_objcopy_path, WEXITSTATUS(status)); + goto done; + } +#endif } else { (void) close(fd); } Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Thu Feb 19 01:29:24 2015 (r278980) @@ -785,6 +785,7 @@ const char *_dtrace_defld = "/usr/ccs/bi #else const char *_dtrace_defcpp = "cpp"; /* default cpp(1) to invoke */ const char *_dtrace_defld = "ld"; /* default ld(1) to invoke */ +const char *_dtrace_defobjcopy = "objcopy"; /* default objcopy(1) to invoke */ #endif const char *_dtrace_libdir = "/usr/lib/dtrace"; /* default library directory */ @@ -1185,6 +1186,9 @@ alloc: dtp->dt_cpp_argc = 1; dtp->dt_cpp_args = 1; dtp->dt_ld_path = strdup(_dtrace_defld); +#ifdef __FreeBSD__ + dtp->dt_objcopy_path = strdup(_dtrace_defobjcopy); +#endif dtp->dt_provmod = provmod; dtp->dt_vector = vector; dtp->dt_varg = arg; @@ -1193,6 +1197,9 @@ alloc: if (dtp->dt_mods == NULL || dtp->dt_provs == NULL || dtp->dt_procs == NULL || dtp->dt_ld_path == NULL || +#ifdef __FreeBSD__ + dtp->dt_objcopy_path == NULL || +#endif dtp->dt_cpp_path == NULL || dtp->dt_cpp_argv == NULL) return (set_open_errno(dtp, errp, EDT_NOMEM)); @@ -1673,6 +1680,9 @@ dtrace_close(dtrace_hdl_t *dtp) free(dtp->dt_cpp_argv); free(dtp->dt_cpp_path); free(dtp->dt_ld_path); +#ifdef __FreeBSD__ + free(dtp->dt_objcopy_path); +#endif free(dtp->dt_mods); free(dtp->dt_provs); Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c Thu Feb 19 01:29:24 2015 (r278980) @@ -280,6 +280,28 @@ dt_opt_ld_path(dtrace_hdl_t *dtp, const return (0); } +#ifdef __FreeBSD__ +static int +dt_opt_objcopy_path(dtrace_hdl_t *dtp, const char *arg, uintptr_t option) +{ + char *objcopy; + + if (arg == NULL) + return (dt_set_errno(dtp, EDT_BADOPTVAL)); + + if (dtp->dt_pcb != NULL) + return (dt_set_errno(dtp, EDT_BADOPTCTX)); + + if ((objcopy = strdup(arg)) == NULL) + return (dt_set_errno(dtp, EDT_NOMEM)); + + free(dtp->dt_objcopy_path); + dtp->dt_objcopy_path = objcopy; + + return (0); +} +#endif + /*ARGSUSED*/ static int dt_opt_libdir(dtrace_hdl_t *dtp, const char *arg, uintptr_t option) @@ -960,6 +982,9 @@ static const dt_option_t _dtrace_ctoptio { "linkmode", dt_opt_linkmode }, { "linktype", dt_opt_linktype }, { "nolibs", dt_opt_cflags, DTRACE_C_NOLIBS }, +#ifdef __FreeBSD__ + { "objcopypath", dt_opt_objcopy_path }, +#endif { "pgmax", dt_opt_pgmax }, { "pspec", dt_opt_cflags, DTRACE_C_PSPEC }, { "setenv", dt_opt_setenv, 1 }, Modified: projects/ifnet/etc/network.subr ============================================================================== --- projects/ifnet/etc/network.subr Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/etc/network.subr Thu Feb 19 01:29:24 2015 (r278980) @@ -754,7 +754,7 @@ ipv6_down() IFS="$_ifs" for _inet6 in $inetList ; do # get rid of extraneous line - case $_inet in + case $_inet6 in inet6\ *) ;; *) continue ;; esac Modified: projects/ifnet/lib/libc/rpc/clnt_dg.c ============================================================================== --- projects/ifnet/lib/libc/rpc/clnt_dg.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/lib/libc/rpc/clnt_dg.c Thu Feb 19 01:29:24 2015 (r278980) @@ -327,7 +327,7 @@ clnt_dg_call(cl, proc, xargs, argsp, xre struct sockaddr *sa; sigset_t mask; sigset_t newmask; - socklen_t inlen, salen; + socklen_t salen; ssize_t recvlen = 0; int kin_len, n, rpc_lock_value; u_int32_t xid; @@ -520,7 +520,6 @@ get_reply: goto call_again_same_xid; } } - inlen = (socklen_t)recvlen; /* * now decode and validate the response Modified: projects/ifnet/lib/libc/rpc/rpc_soc.c ============================================================================== --- projects/ifnet/lib/libc/rpc/rpc_soc.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/lib/libc/rpc/rpc_soc.c Thu Feb 19 01:29:24 2015 (r278980) @@ -462,12 +462,10 @@ clntunix_create(raddr, prog, vers, sockp u_int recvsz; { struct netbuf *svcaddr; - struct netconfig *nconf; CLIENT *cl; int len; cl = NULL; - nconf = NULL; svcaddr = NULL; if ((raddr->sun_len == 0) || ((svcaddr = malloc(sizeof(struct netbuf))) == NULL ) || Modified: projects/ifnet/lib/libc/stdio/xprintf_float.c ============================================================================== --- projects/ifnet/lib/libc/stdio/xprintf_float.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/lib/libc/stdio/xprintf_float.c Thu Feb 19 01:29:24 2015 (r278980) @@ -168,7 +168,6 @@ __printf_render_float(struct __printf_io int realsz; /* field size expanded by dprec, sign, etc */ int dprec; /* a copy of prec if [diouxX], 0 otherwise */ char ox[2]; /* space for 0x; ox[1] is either x, X, or \0 */ - int prsize; /* max size of printed field */ int ret; /* return value accumulator */ char *decimal_point; /* locale specific decimal point */ int n2; /* XXX: for PRINTANDPAD */ @@ -344,8 +343,6 @@ here: if (ox[1]) realsz += 2; - prsize = pi->width > realsz ? pi->width : realsz; - /* right-adjusting blank padding */ if (pi->pad != '0' && pi->left == 0) ret += __printf_pad(io, pi->width - realsz, 0); Modified: projects/ifnet/sbin/camcontrol/camcontrol.c ============================================================================== --- projects/ifnet/sbin/camcontrol/camcontrol.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sbin/camcontrol/camcontrol.c Thu Feb 19 01:29:24 2015 (r278980) @@ -7404,7 +7404,7 @@ getdevid(struct cam_devitem *item) retry: ccb->ccb_h.func_code = XPT_DEV_ADVINFO; ccb->ccb_h.flags = CAM_DIR_IN; - ccb->cdai.flags = 0; + ccb->cdai.flags = CDAI_FLAG_NONE; ccb->cdai.buftype = CDAI_TYPE_SCSI_DEVID; ccb->cdai.bufsiz = item->device_id_len; if (item->device_id_len != 0) Modified: projects/ifnet/share/mk/bsd.dep.mk ============================================================================== --- projects/ifnet/share/mk/bsd.dep.mk Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/share/mk/bsd.dep.mk Thu Feb 19 01:29:24 2015 (r278980) @@ -121,10 +121,7 @@ ${_YC:R}.o: ${_YC} .endfor # DTrace probe definitions -# libelf is currently needed for drti.o .if ${SRCS:M*.d} -LDADD+= -lelf -DPADD+= ${LIBELF} CFLAGS+= -I${.OBJDIR} .endif .for _DSRC in ${SRCS:M*.d:N*/*} Modified: projects/ifnet/share/mk/bsd.libnames.mk ============================================================================== --- projects/ifnet/share/mk/bsd.libnames.mk Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/share/mk/bsd.libnames.mk Thu Feb 19 01:29:24 2015 (r278980) @@ -131,6 +131,7 @@ LIBVMMAPI?= ${DESTDIR}${LIBDIR}/libvmmap LIBWIND?= ${DESTDIR}${LIBDIR}/libwind.a LIBWRAP?= ${DESTDIR}${LIBDIR}/libwrap.a LIBXPG4?= ${DESTDIR}${LIBDIR}/libxpg4.a +LIBXO?= ${DESTDIR}${LIBDIR}/libxo.a LIBY?= ${DESTDIR}${LIBDIR}/liby.a LIBYPCLNT?= ${DESTDIR}${LIBDIR}/libypclnt.a LIBZ?= ${DESTDIR}${LIBDIR}/libz.a Modified: projects/ifnet/sys/amd64/amd64/ptrace_machdep.c ============================================================================== --- projects/ifnet/sys/amd64/amd64/ptrace_machdep.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/amd64/amd64/ptrace_machdep.c Thu Feb 19 01:29:24 2015 (r278980) @@ -88,7 +88,8 @@ cpu_ptrace_xstate(struct thread *td, int break; case PT_SETXSTATE: - if (data > cpu_max_ext_state_size) { + if (data < sizeof(struct savefpu) || + data > cpu_max_ext_state_size) { error = EINVAL; break; } Modified: projects/ifnet/sys/cam/cam_ccb.h ============================================================================== --- projects/ifnet/sys/cam/cam_ccb.h Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/cam/cam_ccb.h Thu Feb 19 01:29:24 2015 (r278980) @@ -1140,6 +1140,7 @@ struct ccb_eng_exec { /* This structure struct ccb_dev_advinfo { struct ccb_hdr ccb_h; uint32_t flags; +#define CDAI_FLAG_NONE 0x0 /* No flags set */ #define CDAI_FLAG_STORE 0x1 /* If set, action becomes store */ uint32_t buftype; /* IN: Type of data being requested */ /* NB: buftype is interpreted on a per-transport basis */ Modified: projects/ifnet/sys/cam/scsi/scsi_da.c ============================================================================== --- projects/ifnet/sys/cam/scsi/scsi_da.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/cam/scsi/scsi_da.c Thu Feb 19 01:29:24 2015 (r278980) @@ -3787,7 +3787,7 @@ dasetgeom(struct cam_periph *periph, uin xpt_setup_ccb(&cdai.ccb_h, periph->path, CAM_PRIORITY_NORMAL); cdai.ccb_h.func_code = XPT_DEV_ADVINFO; cdai.buftype = CDAI_TYPE_RCAPLONG; - cdai.flags |= CDAI_FLAG_STORE; + cdai.flags = CDAI_FLAG_STORE; cdai.bufsiz = rcap_len; cdai.buf = (uint8_t *)rcaplong; xpt_action((union ccb *)&cdai); Modified: projects/ifnet/sys/cam/scsi/scsi_enc_ses.c ============================================================================== --- projects/ifnet/sys/cam/scsi/scsi_enc_ses.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/cam/scsi/scsi_enc_ses.c Thu Feb 19 01:29:24 2015 (r278980) @@ -1007,7 +1007,7 @@ ses_setphyspath_callback(enc_softc_t *en xpt_setup_ccb(&cdai.ccb_h, path, CAM_PRIORITY_NORMAL); cdai.ccb_h.func_code = XPT_DEV_ADVINFO; cdai.buftype = CDAI_TYPE_PHYS_PATH; - cdai.flags = 0; + cdai.flags = CDAI_FLAG_NONE; cdai.bufsiz = MAXPATHLEN; cdai.buf = old_physpath; xpt_action((union ccb *)&cdai); @@ -1019,7 +1019,7 @@ ses_setphyspath_callback(enc_softc_t *en xpt_setup_ccb(&cdai.ccb_h, path, CAM_PRIORITY_NORMAL); cdai.ccb_h.func_code = XPT_DEV_ADVINFO; cdai.buftype = CDAI_TYPE_PHYS_PATH; - cdai.flags |= CDAI_FLAG_STORE; + cdai.flags = CDAI_FLAG_STORE; cdai.bufsiz = sbuf_len(args->physpath); cdai.buf = sbuf_data(args->physpath); xpt_action((union ccb *)&cdai); Copied: projects/ifnet/sys/conf/config.mk (from r278979, head/sys/conf/config.mk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/sys/conf/config.mk Thu Feb 19 01:29:24 2015 (r278980, copy of r278979, head/sys/conf/config.mk) @@ -0,0 +1,54 @@ +# $FreeBSD$ +# +# Common code to marry kernel config(8) goo and module building goo. +# + +# Generate options files that otherwise would be built +# in substantially similar ways through the tree. Move +# the code here when they all produce identical results +# (or should) +.if !defined(KERNBUILDDIR) +opt_bpf.h: + echo "#define DEV_BPF 1" > ${.TARGET} +.if ${MK_INET_SUPPORT} != "no" +opt_inet.h: + @echo "#define INET 1" > ${.TARGET} + @echo "#define TCP_OFFLOAD 1" >> ${.TARGET} +.endif +.if ${MK_INET6_SUPPORT} != "no" +opt_inet6.h: + @echo "#define INET6 1" > ${.TARGET} +.endif +.if ${MK_EISA} != "no" +opt_eisa.h: + @echo "#define DEV_EISA 1" > ${.TARGET} +.endif +opt_mrouting.h: + echo "#define MROUTING 1" > ${.TARGET} +opt_natm.h: + echo "#define NATM 1" > ${.TARGET} +opt_scsi.h: + echo "#define SCSI_DELAY 15000" > ${.TARGET} +opt_wlan.h: + echo "#define IEEE80211_DEBUG 1" > ${.TARGET} + echo "#define IEEE80211_AMPDU_AGE 1" >> ${.TARGET} + echo "#define IEEE80211_SUPPORT_MESH 1" >> ${.TARGET} +KERN_OPTS.i386=NEW_PCIB DEV_PCI +KERN_OPTS.pc98=NEW_PCIB DEV_PCI +KERN_OPTS.amd64=NEW_PCIB DEV_PCI +KERN_OPTS.powerpc=NEW_PCIB DEV_PCI +KERN_OPTS=MROUTING NATM IEEE80211_DEBUG \ + IEEE80211_AMPDU_AGE IEEE80211_SUPPORT_MESH DEV_BPF \ + ${KERN_OPTS.${MACHINE}} ${KERN_OPTS_EXTRA} +.if ${MK_INET_SUPPORT} != "no" +KERN_OPTS+= INET TCP_OFFLOAD +.endif +.if ${MK_INET6_SUPPORT} != "no" +KERN_OPTS+= INET6 +.endif +.if ${MK_EISA} != "no" +KERN_OPTS+= DEV_EISA +.endif +.else +KERN_OPTS!=cat ${KERNBUILDDIR}/opt*.h | awk '{print $$2;}' | sort -u +.endif Modified: projects/ifnet/sys/conf/files ============================================================================== --- projects/ifnet/sys/conf/files Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/conf/files Thu Feb 19 01:29:24 2015 (r278980) @@ -271,6 +271,7 @@ contrib/dev/acpica/components/debugger/d contrib/dev/acpica/components/debugger/dbutils.c optional acpi acpi_debug contrib/dev/acpica/components/debugger/dbxface.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmbuffer.c optional acpi acpi_debug +contrib/dev/acpica/components/disassembler/dmcstyle.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmdeferred.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmnames.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmopcode.c optional acpi acpi_debug Modified: projects/ifnet/sys/conf/kmod.mk ============================================================================== --- projects/ifnet/sys/conf/kmod.mk Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/conf/kmod.mk Thu Feb 19 01:29:24 2015 (r278980) @@ -70,6 +70,7 @@ OBJCOPY?= objcopy # do this after bsd.own.mk. .include "kern.opts.mk" .include +.include "config.mk" .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S @@ -163,6 +164,11 @@ OBJS+= ${_firmw:C/\:.*$/.fwo/} .endfor .endif +# Conditionally include SRCS based on kernel config options. +.for _o in ${KERN_OPTS} +SRCS+=${SRCS.${_o}} +.endfor + OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .if !defined(PROG) @@ -316,34 +322,6 @@ unload: ${KMODUNLOAD} -v ${PROG} .endif -# Generate options files that otherwise would be built -# in substantially similar ways through the tree. Move -# the code here when they all produce identical results -# (or should) -.if !defined(KERNBUILDDIR) -opt_bpf.h: - echo "#define DEV_BPF 1" > ${.TARGET} -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} - @echo "#define TCP_OFFLOAD 1" >> ${.TARGET} -.endif -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif -opt_mrouting.h: - echo "#define MROUTING 1" > ${.TARGET} -opt_natm.h: - echo "#define NATM 1" > ${.TARGET} -opt_scsi.h: - echo "#define SCSI_DELAY 15000" > ${.TARGET} -opt_wlan.h: - echo "#define IEEE80211_DEBUG 1" > ${.TARGET} - echo "#define IEEE80211_AMPDU_AGE 1" >> ${.TARGET} - echo "#define IEEE80211_SUPPORT_MESH 1" >> ${.TARGET} -.endif - .if defined(KERNBUILDDIR) .PATH: ${KERNBUILDDIR} CFLAGS+= -I${KERNBUILDDIR} Modified: projects/ifnet/sys/contrib/dev/acpica/changes.txt ============================================================================== --- projects/ifnet/sys/contrib/dev/acpica/changes.txt Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/contrib/dev/acpica/changes.txt Thu Feb 19 01:29:24 2015 (r278980) @@ -1,4 +1,223 @@ ---------------------------------------- +04 February 2015. Summary of changes for version 20150204: + +This release is available at https://acpica.org/downloads + +ACPICA kernel-resident subsystem: + +Updated all ACPICA copyrights and signons to 2014. Added the 2014 +copyright to all module headers and signons, including the standard Linux +header. This affects virtually every file in the ACPICA core subsystem, +iASL compiler, all ACPICA utilities, and the test suites. + +Events: Introduce ACPI_GPE_DISPATCH_RAW_HANDLER to fix GPE storm issues. +A raw gpe handling mechanism was created to allow better handling of GPE +storms that aren't easily managed by the normal handler. The raw handler +allows disabling/renabling of the the GPE so that interrupt storms can be +avoided in cases where events cannot be timely serviced. In this scenario, +handlers should use the AcpiSetGpe() API to disable/enable the GPE. This API +will leave the reference counts undisturbed, thereby preventing unintentional +clearing of the GPE when the intent in only to temporarily disable it. Raw +handlers allow enabling and disabling of a GPE by removing GPE register +locking. As such, raw handlers much provide their own locks while using +GPE API's to protect access to GPE data structures. +Lv Zheng + +Events: Always modify GPE registers under the GPE lock. +Applies GPE lock around AcpiFinishGpe() to protect access to GPE register +values. Reported as bug by joe.liu@apple.com. + +Unix makefiles: Separate option to disable optimizations and _FORTIFY_SOURCE. +This change removes the _FORTIFY_SOURCE flag from the NOOPT disable option and +creates a separate flag (NOFORTIFY) for this purpose. Some toolchains may +define _FORTIFY_SOURCE which leads redefined errors when building ACPICA. This +allows disabling the option without also having to disable optimazations. +David Box + + Current Release: + Non-Debug Version: 101.7K Code, 27.9K Data, 129.6K Total + Debug Version: 199.2K Code, 82.4K Data, 281.6K Total + +---------------------------------------- +07 November 2014. Summary of changes for version 20141107: + +This release is available at https://acpica.org/downloads + +This release introduces and implements language extensions to ASL that +provide support for symbolic ("C-style") operators and expressions. These +language extensions are known collectively as ASL+. + + +1) iASL Compiler/Disassembler and Tools: + +Disassembler: Fixed a problem with disassembly of the UartSerialBus +macro. Changed "StopBitsNone" to the correct "StopBitsZero". David E. +Box. + +Disassembler: Fixed the Unicode macro support to add escape sequences. +All non-printable ASCII values are emitted as escape sequences, as well +as the standard escapes for quote and backslash. Ensures that the +disassembled macro can be correctly recompiled. + +iASL: Added Printf/Fprintf macros for formatted output. These macros are +translated to existing AML Concatenate and Store operations. Printf +writes to the ASL Debug object. Fprintf allows the specification of an +ASL name as the target. Only a single format specifier is required, %o, +since the AML interpreter dynamically converts objects to the required +type. David E. Box. + + (old) Store (Concatenate (Concatenate (Concatenate (Concatenate + (Concatenate (Concatenate (Concatenate ("", Arg0), + ": Unexpected value for "), Arg1), ", "), Arg2), + " at line "), Arg3), Debug) + + (new) Printf ("%o: Unexpected value for %o, %o at line %o", + Arg0, Arg1, Arg2, Arg3) + + (old) Store (Concatenate (Concatenate (Concatenate (Concatenate + ("", Arg1), ": "), Arg0), " Successful"), STR1) + + (new) Fprintf (STR1, "%o: %o Successful", Arg1, Arg0) + +iASL: Added debug options (-bp, -bt) to dynamically prune levels of the +ASL parse tree before the AML code is generated. This allows blocks of +ASL code to be removed in order to help locate and identify problem +devices and/or code. David E. Box. + +AcpiExec: Added support (-fi) for an optional namespace object +initialization file. This file specifies initial values for namespace +objects as necessary for debugging and testing different ASL code paths +that may be taken as a result of BIOS options. + + +2) Overview of symbolic operator support for ASL (ASL+) +------------------------------------------------------- + +As an extension to the ASL language, iASL implements support for symbolic +(C-style) operators for math and logical expressions. This can greatly +simplify ASL code as well as improve both readability and +maintainability. These language extensions can exist concurrently with +all legacy ASL code and expressions. + +The symbolic extensions are 100% compatible with existing AML +interpreters, since no new AML opcodes are created. To implement the +extensions, the iASL compiler transforms the symbolic expressions into +the legacy ASL/AML equivalents at compile time. + +Full symbolic expressions are supported, along with the standard C +precedence and associativity rules. + +Full disassembler support for the symbolic expressions is provided, and +creates an automatic migration path for existing ASL code to ASL+ code +via the disassembly process. By default, the disassembler now emits ASL+ +code with symbolic expressions. An option (-dl) is provided to force the +disassembler to emit legacy ASL code if desired. + +Below is the complete list of the currently supported symbolic operators +with examples. See the iASL User Guide for additional information. + + +ASL+ Syntax Legacy ASL Equivalent +----------- --------------------- + + // Math operators + +Z = X + Y Add (X, Y, Z) +Z = X - Y Subtract (X, Y, Z) +Z = X * Y Multiply (X, Y, Z) +Z = X / Y Divide (X, Y, , Z) +Z = X % Y Mod (X, Y, Z) +Z = X << Y ShiftLeft (X, Y, Z) +Z = X >> Y ShiftRight (X, Y, Z) +Z = X & Y And (X, Y, Z) +Z = X | Y Or (X, Y, Z) +Z = X ^ Y Xor (X, Y, Z) +Z = ~X Not (X, Z) +X++ Increment (X) +X-- Decrement (X) + + // Logical operators + +(X == Y) LEqual (X, Y) +(X != Y) LNotEqual (X, Y) +(X < Y) LLess (X, Y) +(X > Y) LGreater (X, Y) +(X <= Y) LLessEqual (X, Y) +(X >= Y) LGreaterEqual (X, Y) +(X && Y) LAnd (X, Y) +(X || Y) LOr (X, Y) +(!X) LNot (X) + + // Assignment and compound assignment operations + +X = Y Store (Y, X) +X += Y Add (X, Y, X) +X -= Y Subtract (X, Y, X) +X *= Y Multiply (X, Y, X) +X /= Y Divide (X, Y, , X) +X %= Y Mod (X, Y, X) +X <<= Y ShiftLeft (X, Y, X) +X >>= Y ShiftRight (X, Y, X) +X &= Y And (X, Y, X) +X |= Y Or (X, Y, X) +X ^= Y Xor (X, Y, X) + + +3) ASL+ Examples: +----------------- + +Legacy ASL: + If (LOr (LOr (LEqual (And (R510, 0x03FB), 0x02E0), LEqual ( + And (R520, 0x03FB), 0x02E0)), LOr (LEqual (And (R530, +0x03FB), + 0x02E0), LEqual (And (R540, 0x03FB), 0x02E0)))) + { + And (MEMB, 0xFFFFFFF0, SRMB) + Store (MEMB, Local2) + Store (PDBM, Local1) + And (PDBM, 0xFFFFFFFFFFFFFFF9, PDBM) + Store (SRMB, MEMB) + Or (PDBM, 0x02, PDBM) + } + +ASL+ version: + If (((R510 & 0x03FB) == 0x02E0) || + ((R520 & 0x03FB) == 0x02E0) || + ((R530 & 0x03FB) == 0x02E0) || + ((R540 & 0x03FB) == 0x02E0)) + { + SRMB = (MEMB & 0xFFFFFFF0) + Local2 = MEMB + Local1 = PDBM + PDBM &= 0xFFFFFFFFFFFFFFF9 + MEMB = SRMB + PDBM |= 0x02 + } + +Legacy ASL: + Store (0x1234, Local1) + Multiply (Add (Add (Local1, TEST), 0x20), Local2, Local3) + Multiply (Local2, Add (Add (Local1, TEST), 0x20), Local3) + Add (Local1, Add (TEST, Multiply (0x20, Local2)), Local3) + Store (Index (PKG1, 0x03), Local6) + Store (Add (Local3, Local2), Debug) + Add (Local1, 0x0F, Local2) + Add (Local1, Multiply (Local2, Local3), Local2) + Multiply (Add (Add (Local1, TEST), 0x20), ToBCD (Local1), Local3) + +ASL+ version: + Local1 = 0x1234 + Local3 = (((Local1 + TEST) + 0x20) * Local2) + Local3 = (Local2 * ((Local1 + TEST) + 0x20)) + Local3 = (Local1 + (TEST + (0x20 * Local2))) + Local6 = Index (PKG1, 0x03) + Debug = (Local3 + Local2) + Local2 = (Local1 + 0x0F) + Local2 = (Local1 + (Local2 * Local3)) + Local3 = (((Local1 + TEST) + 0x20) * ToBCD (Local1)) + + +---------------------------------------- 26 September 2014. Summary of changes for version 20140926: 1) ACPICA kernel-resident subsystem: Modified: projects/ifnet/sys/contrib/dev/acpica/common/acgetline.c ============================================================================== --- projects/ifnet/sys/contrib/dev/acpica/common/acgetline.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/contrib/dev/acpica/common/acgetline.c Thu Feb 19 01:29:24 2015 (r278980) @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2014, Intel Corp. + * Copyright (C) 2000 - 2015, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: projects/ifnet/sys/contrib/dev/acpica/common/adfile.c ============================================================================== --- projects/ifnet/sys/contrib/dev/acpica/common/adfile.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/contrib/dev/acpica/common/adfile.c Thu Feb 19 01:29:24 2015 (r278980) @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2014, Intel Corp. + * Copyright (C) 2000 - 2015, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: projects/ifnet/sys/contrib/dev/acpica/common/adisasm.c ============================================================================== --- projects/ifnet/sys/contrib/dev/acpica/common/adisasm.c Thu Feb 19 01:21:23 2015 (r278979) +++ projects/ifnet/sys/contrib/dev/acpica/common/adisasm.c Thu Feb 19 01:29:24 2015 (r278980) @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2014, Intel Corp. + * Copyright (C) 2000 - 2015, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -357,8 +357,12 @@ AdAmlDisassemble ( AcpiDmDumpDataTable (Table); fprintf (stderr, "Acpi Data Table [%4.4s] decoded\n", Table->Signature); - fprintf (stderr, "Formatted output: %s - %u bytes\n", - DisasmFilename, CmGetFileSize (File)); + + if (File) + { + fprintf (stderr, "Formatted output: %s - %u bytes\n", + DisasmFilename, CmGetFileSize (File)); + } } else { @@ -376,8 +380,11 @@ AdAmlDisassemble ( { AcpiOsPrintf ("/**** Before second load\n"); - NsSetupNamespaceListing (File); - NsDisplayNamespace (); + if (File) + { + NsSetupNamespaceListing (File); + NsDisplayNamespace (); + } AcpiOsPrintf ("*****/\n"); } @@ -457,8 +464,11 @@ AdAmlDisassemble ( if (AslCompilerdebug) { AcpiOsPrintf ("/**** After second load and resource conversion\n"); - NsSetupNamespaceListing (File); - NsDisplayNamespace (); + if (File) + { + NsSetupNamespaceListing (File); + NsDisplayNamespace (); + } AcpiOsPrintf ("*****/\n"); AcpiDmDumpTree (AcpiGbl_ParseOpRoot); @@ -487,8 +497,11 @@ AdAmlDisassemble ( AcpiDmDumpDataTable (Table); fprintf (stderr, "Disassembly completed\n"); - fprintf (stderr, "ASL Output: %s - %u bytes\n", - DisasmFilename, CmGetFileSize (File)); + if (File) + { + fprintf (stderr, "ASL Output: %s - %u bytes\n", + DisasmFilename, CmGetFileSize (File)); + } if (Gbl_MapfileFlag) { @@ -507,7 +520,7 @@ Cleanup: ACPI_FREE (Table); } - if (OutToFile && File) + if (File) { if (AslCompilerdebug) /* Display final namespace, with transforms */ { @@ -544,12 +557,26 @@ AdDisassemblerHeader ( { time_t Timer; + time (&Timer); /* Header and input table info */ AcpiOsPrintf ("/*\n"); - AcpiOsPrintf (ACPI_COMMON_HEADER ("AML Disassembler", " * ")); + AcpiOsPrintf (ACPI_COMMON_HEADER (AML_DISASSEMBLER_NAME, " * ")); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Thu Feb 19 11:41: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 E97D2972; Thu, 19 Feb 2015 11:41: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 CFAB985B; Thu, 19 Feb 2015 11:41: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 t1JBfLVA019791; Thu, 19 Feb 2015 11:41:21 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1JBfEkW019712; Thu, 19 Feb 2015 11:41:14 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502191141.t1JBfEkW019712@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 19 Feb 2015 11:41:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278993 - in projects/building-blocks: . bin/ln bin/sh cddl/contrib/opensolaris/lib/libdtrace/common contrib/elftoolchain/addr2line contrib/elftoolchain/common contrib/elftoolchain/elfc... 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.18-1 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: Thu, 19 Feb 2015 11:41:22 -0000 Author: ngie Date: Thu Feb 19 11:41:12 2015 New Revision: 278993 URL: https://svnweb.freebsd.org/changeset/base/278993 Log: MFhead @ r278992 Added: projects/building-blocks/lib/libc/sparc64/sys/sigaction1.S - copied unchanged from r278992, head/lib/libc/sparc64/sys/sigaction1.S projects/building-blocks/sys/arm/arm/unwind.c - copied unchanged from r278992, head/sys/arm/arm/unwind.c projects/building-blocks/sys/conf/config.mk - copied unchanged from r278992, head/sys/conf/config.mk projects/building-blocks/sys/contrib/dev/acpica/compiler/aslprintf.c - copied unchanged from r278992, head/sys/contrib/dev/acpica/compiler/aslprintf.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslprune.c - copied unchanged from r278992, head/sys/contrib/dev/acpica/compiler/aslprune.c projects/building-blocks/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c - copied unchanged from r278992, head/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c projects/building-blocks/sys/ofed/drivers/infiniband/core/peer_mem.c - copied unchanged from r278992, head/sys/ofed/drivers/infiniband/core/peer_mem.c projects/building-blocks/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.c - copied unchanged from r278992, head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.c projects/building-blocks/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.h - copied unchanged from r278992, head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.h projects/building-blocks/sys/ofed/include/linux/printk.h - copied unchanged from r278992, head/sys/ofed/include/linux/printk.h projects/building-blocks/sys/ofed/include/rdma/ib_peer_mem.h - copied unchanged from r278992, head/sys/ofed/include/rdma/ib_peer_mem.h projects/building-blocks/sys/ofed/include/rdma/ib_user_verbs_exp.h - copied unchanged from r278992, head/sys/ofed/include/rdma/ib_user_verbs_exp.h projects/building-blocks/sys/ofed/include/rdma/ib_verbs_exp.h - copied unchanged from r278992, head/sys/ofed/include/rdma/ib_verbs_exp.h projects/building-blocks/sys/ofed/include/rdma/peer_mem.h - copied unchanged from r278992, head/sys/ofed/include/rdma/peer_mem.h Deleted: projects/building-blocks/lib/libc/sparc64/sys/sigaction.S projects/building-blocks/sys/dev/cxgb/sys/mbufq.h projects/building-blocks/sys/dev/ic/hd64570.h projects/building-blocks/sys/dev/xen/netfront/mbufq.h projects/building-blocks/sys/ofed/drivers/infiniband/core/Makefile projects/building-blocks/sys/ofed/drivers/infiniband/core/local_sa.c projects/building-blocks/sys/ofed/drivers/infiniband/core/notice.c projects/building-blocks/sys/ofed/drivers/infiniband/hw/mlx4/Makefile projects/building-blocks/sys/ofed/drivers/infiniband/ulp/ipoib/Makefile Modified: projects/building-blocks/Makefile.inc1 projects/building-blocks/ObsoleteFiles.inc projects/building-blocks/UPDATING projects/building-blocks/bin/ln/symlink.7 projects/building-blocks/bin/sh/cd.c projects/building-blocks/bin/sh/eval.c projects/building-blocks/bin/sh/expand.c projects/building-blocks/bin/sh/mail.c projects/building-blocks/bin/sh/miscbltin.c projects/building-blocks/bin/sh/nodetypes projects/building-blocks/bin/sh/parser.c projects/building-blocks/bin/sh/var.c projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c projects/building-blocks/contrib/elftoolchain/addr2line/addr2line.c projects/building-blocks/contrib/elftoolchain/common/_elftc.h projects/building-blocks/contrib/elftoolchain/common/elfdefinitions.h projects/building-blocks/contrib/elftoolchain/elfcopy/main.c projects/building-blocks/contrib/elftoolchain/elfcopy/sections.c projects/building-blocks/contrib/elftoolchain/libdwarf/_libdwarf.h projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_attrval.c projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3 projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_hasattr.3 projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_reloc.c projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_whatattr.3 projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf.c projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf.h projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf_reloc.c projects/building-blocks/contrib/elftoolchain/libelf/_libelf_config.h projects/building-blocks/contrib/elftoolchain/libelf/elf.3 projects/building-blocks/contrib/elftoolchain/libelf/elf_scn.c projects/building-blocks/contrib/elftoolchain/libelf/libelf_ar_util.c projects/building-blocks/contrib/elftoolchain/libelf/libelf_convert.m4 projects/building-blocks/contrib/elftoolchain/nm/nm.1 projects/building-blocks/contrib/elftoolchain/nm/nm.c projects/building-blocks/contrib/elftoolchain/readelf/readelf.c projects/building-blocks/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp projects/building-blocks/etc/network.subr projects/building-blocks/lib/libc/gen/ulimit.c projects/building-blocks/lib/libc/include/libc_private.h projects/building-blocks/lib/libc/rpc/clnt_dg.c projects/building-blocks/lib/libc/rpc/rpc_soc.c projects/building-blocks/lib/libc/sparc64/sys/Makefile.inc projects/building-blocks/lib/libc/stdio/xprintf_float.c projects/building-blocks/lib/libc/sys/Makefile.inc projects/building-blocks/lib/libc/sys/mmap.2 projects/building-blocks/lib/libcompat/4.3/rexec.c projects/building-blocks/lib/libelftc/elftc_version.c projects/building-blocks/lib/liblzma/config.h projects/building-blocks/release/Makefile projects/building-blocks/release/Makefile.vm projects/building-blocks/sbin/camcontrol/camcontrol.c projects/building-blocks/share/man/man4/wlan.4 projects/building-blocks/share/man/man9/memguard.9 projects/building-blocks/share/mk/bsd.dep.mk projects/building-blocks/share/mk/bsd.libnames.mk projects/building-blocks/share/mk/bsd.own.mk projects/building-blocks/sys/amd64/amd64/mp_machdep.c projects/building-blocks/sys/amd64/amd64/ptrace_machdep.c projects/building-blocks/sys/arm/arm/db_trace.c projects/building-blocks/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/building-blocks/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h projects/building-blocks/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/building-blocks/sys/arm/include/stack.h projects/building-blocks/sys/boot/fdt/dts/arm/bcm2835.dtsi projects/building-blocks/sys/cam/cam_ccb.h projects/building-blocks/sys/cam/scsi/scsi_da.c projects/building-blocks/sys/cam/scsi/scsi_enc_ses.c projects/building-blocks/sys/conf/files projects/building-blocks/sys/conf/files.arm projects/building-blocks/sys/conf/kern.mk projects/building-blocks/sys/conf/kern.pre.mk projects/building-blocks/sys/conf/kmod.mk projects/building-blocks/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/building-blocks/sys/contrib/dev/acpica/common/acgetline.c projects/building-blocks/sys/contrib/dev/acpica/common/adfile.c projects/building-blocks/sys/contrib/dev/acpica/common/adisasm.c projects/building-blocks/sys/contrib/dev/acpica/common/adwalk.c projects/building-blocks/sys/contrib/dev/acpica/common/ahids.c projects/building-blocks/sys/contrib/dev/acpica/common/ahpredef.c projects/building-blocks/sys/contrib/dev/acpica/common/ahuuids.c projects/building-blocks/sys/contrib/dev/acpica/common/cmfsize.c projects/building-blocks/sys/contrib/dev/acpica/common/dmextern.c projects/building-blocks/sys/contrib/dev/acpica/common/dmrestag.c projects/building-blocks/sys/contrib/dev/acpica/common/dmtable.c projects/building-blocks/sys/contrib/dev/acpica/common/dmtbdump.c projects/building-blocks/sys/contrib/dev/acpica/common/dmtbinfo.c projects/building-blocks/sys/contrib/dev/acpica/common/getopt.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslanalyze.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslascii.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslbtypes.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslcompile.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/building-blocks/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/building-blocks/sys/contrib/dev/acpica/compiler/asldefine.h projects/building-blocks/sys/contrib/dev/acpica/compiler/aslerror.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslfileio.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslfiles.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslfold.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslglobal.h projects/building-blocks/sys/contrib/dev/acpica/compiler/aslhex.c projects/building-blocks/sys/contrib/dev/acpica/compiler/asllength.c projects/building-blocks/sys/contrib/dev/acpica/compiler/asllisting.c projects/building-blocks/sys/contrib/dev/acpica/compiler/asllistsup.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslload.c projects/building-blocks/sys/contrib/dev/acpica/compiler/asllookup.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslmain.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslmap.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslmapenter.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslmapoutput.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslmaputils.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslmessages.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslmessages.h projects/building-blocks/sys/contrib/dev/acpica/compiler/aslmethod.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslnamesp.c projects/building-blocks/sys/contrib/dev/acpica/compiler/asloffset.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslopcodes.c projects/building-blocks/sys/contrib/dev/acpica/compiler/asloperands.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslopt.c projects/building-blocks/sys/contrib/dev/acpica/compiler/asloptions.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslparser.y projects/building-blocks/sys/contrib/dev/acpica/compiler/aslpredef.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslprepkg.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslresource.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslrestype1.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslrestype1i.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslrestype2.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslrestype2d.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslrestype2e.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslrestype2q.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslrestype2s.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslrestype2w.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslrules.y projects/building-blocks/sys/contrib/dev/acpica/compiler/aslstartup.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslstubs.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslsupport.l projects/building-blocks/sys/contrib/dev/acpica/compiler/aslsupport.y projects/building-blocks/sys/contrib/dev/acpica/compiler/asltokens.y projects/building-blocks/sys/contrib/dev/acpica/compiler/asltransform.c projects/building-blocks/sys/contrib/dev/acpica/compiler/asltree.c projects/building-blocks/sys/contrib/dev/acpica/compiler/asltypes.h projects/building-blocks/sys/contrib/dev/acpica/compiler/asltypes.y projects/building-blocks/sys/contrib/dev/acpica/compiler/aslutils.c projects/building-blocks/sys/contrib/dev/acpica/compiler/asluuid.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslwalks.c projects/building-blocks/sys/contrib/dev/acpica/compiler/aslxref.c projects/building-blocks/sys/contrib/dev/acpica/compiler/dtcompile.c projects/building-blocks/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/building-blocks/sys/contrib/dev/acpica/compiler/dtexpress.c projects/building-blocks/sys/contrib/dev/acpica/compiler/dtfield.c projects/building-blocks/sys/contrib/dev/acpica/compiler/dtio.c projects/building-blocks/sys/contrib/dev/acpica/compiler/dtparser.l projects/building-blocks/sys/contrib/dev/acpica/compiler/dtparser.y projects/building-blocks/sys/contrib/dev/acpica/compiler/dtsubtable.c projects/building-blocks/sys/contrib/dev/acpica/compiler/dttable.c projects/building-blocks/sys/contrib/dev/acpica/compiler/dttemplate.c projects/building-blocks/sys/contrib/dev/acpica/compiler/dttemplate.h projects/building-blocks/sys/contrib/dev/acpica/compiler/dtutils.c projects/building-blocks/sys/contrib/dev/acpica/compiler/preprocess.h projects/building-blocks/sys/contrib/dev/acpica/compiler/prexpress.c projects/building-blocks/sys/contrib/dev/acpica/compiler/prmacros.c projects/building-blocks/sys/contrib/dev/acpica/compiler/prparser.l projects/building-blocks/sys/contrib/dev/acpica/compiler/prparser.y projects/building-blocks/sys/contrib/dev/acpica/compiler/prscan.c projects/building-blocks/sys/contrib/dev/acpica/compiler/prutils.c projects/building-blocks/sys/contrib/dev/acpica/components/debugger/dbcmds.c projects/building-blocks/sys/contrib/dev/acpica/components/debugger/dbconvert.c projects/building-blocks/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/building-blocks/sys/contrib/dev/acpica/components/debugger/dbexec.c projects/building-blocks/sys/contrib/dev/acpica/components/debugger/dbfileio.c projects/building-blocks/sys/contrib/dev/acpica/components/debugger/dbhistry.c projects/building-blocks/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/building-blocks/sys/contrib/dev/acpica/components/debugger/dbmethod.c projects/building-blocks/sys/contrib/dev/acpica/components/debugger/dbnames.c projects/building-blocks/sys/contrib/dev/acpica/components/debugger/dbstats.c projects/building-blocks/sys/contrib/dev/acpica/components/debugger/dbtest.c projects/building-blocks/sys/contrib/dev/acpica/components/debugger/dbutils.c projects/building-blocks/sys/contrib/dev/acpica/components/debugger/dbxface.c projects/building-blocks/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c projects/building-blocks/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c projects/building-blocks/sys/contrib/dev/acpica/components/disassembler/dmnames.c projects/building-blocks/sys/contrib/dev/acpica/components/disassembler/dmobject.c projects/building-blocks/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/building-blocks/sys/contrib/dev/acpica/components/disassembler/dmresrc.c projects/building-blocks/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c projects/building-blocks/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c projects/building-blocks/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c projects/building-blocks/sys/contrib/dev/acpica/components/disassembler/dmutils.c projects/building-blocks/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/building-blocks/sys/contrib/dev/acpica/components/dispatcher/dsargs.c projects/building-blocks/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c projects/building-blocks/sys/contrib/dev/acpica/components/dispatcher/dsfield.c projects/building-blocks/sys/contrib/dev/acpica/components/dispatcher/dsinit.c projects/building-blocks/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c projects/building-blocks/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c projects/building-blocks/sys/contrib/dev/acpica/components/dispatcher/dsobject.c projects/building-blocks/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/building-blocks/sys/contrib/dev/acpica/components/dispatcher/dsutils.c projects/building-blocks/sys/contrib/dev/acpica/components/dispatcher/dswexec.c projects/building-blocks/sys/contrib/dev/acpica/components/dispatcher/dswload.c projects/building-blocks/sys/contrib/dev/acpica/components/dispatcher/dswload2.c projects/building-blocks/sys/contrib/dev/acpica/components/dispatcher/dswscope.c projects/building-blocks/sys/contrib/dev/acpica/components/dispatcher/dswstate.c projects/building-blocks/sys/contrib/dev/acpica/components/events/evevent.c projects/building-blocks/sys/contrib/dev/acpica/components/events/evglock.c projects/building-blocks/sys/contrib/dev/acpica/components/events/evgpe.c projects/building-blocks/sys/contrib/dev/acpica/components/events/evgpeblk.c projects/building-blocks/sys/contrib/dev/acpica/components/events/evgpeinit.c projects/building-blocks/sys/contrib/dev/acpica/components/events/evgpeutil.c projects/building-blocks/sys/contrib/dev/acpica/components/events/evhandler.c projects/building-blocks/sys/contrib/dev/acpica/components/events/evmisc.c projects/building-blocks/sys/contrib/dev/acpica/components/events/evregion.c projects/building-blocks/sys/contrib/dev/acpica/components/events/evrgnini.c projects/building-blocks/sys/contrib/dev/acpica/components/events/evsci.c projects/building-blocks/sys/contrib/dev/acpica/components/events/evxface.c projects/building-blocks/sys/contrib/dev/acpica/components/events/evxfevnt.c projects/building-blocks/sys/contrib/dev/acpica/components/events/evxfgpe.c projects/building-blocks/sys/contrib/dev/acpica/components/events/evxfregn.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exconfig.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exconvrt.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/excreate.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exdebug.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exdump.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exfield.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exfldio.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exmisc.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exmutex.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exnames.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exoparg1.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exoparg2.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exoparg3.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exoparg6.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exprep.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exregion.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exresnte.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exresolv.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exresop.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exstore.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exstoren.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exstorob.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exsystem.c projects/building-blocks/sys/contrib/dev/acpica/components/executer/exutils.c projects/building-blocks/sys/contrib/dev/acpica/components/hardware/hwacpi.c projects/building-blocks/sys/contrib/dev/acpica/components/hardware/hwesleep.c projects/building-blocks/sys/contrib/dev/acpica/components/hardware/hwgpe.c projects/building-blocks/sys/contrib/dev/acpica/components/hardware/hwpci.c projects/building-blocks/sys/contrib/dev/acpica/components/hardware/hwregs.c projects/building-blocks/sys/contrib/dev/acpica/components/hardware/hwsleep.c projects/building-blocks/sys/contrib/dev/acpica/components/hardware/hwtimer.c projects/building-blocks/sys/contrib/dev/acpica/components/hardware/hwvalid.c projects/building-blocks/sys/contrib/dev/acpica/components/hardware/hwxface.c projects/building-blocks/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsaccess.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsalloc.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsarguments.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsconvert.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nseval.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsinit.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsload.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsnames.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsobject.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsparse.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nspredef.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsprepkg.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsrepair.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsrepair2.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nssearch.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsutils.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nswalk.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsxfeval.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsxfname.c projects/building-blocks/sys/contrib/dev/acpica/components/namespace/nsxfobj.c projects/building-blocks/sys/contrib/dev/acpica/components/parser/psargs.c projects/building-blocks/sys/contrib/dev/acpica/components/parser/psloop.c projects/building-blocks/sys/contrib/dev/acpica/components/parser/psobject.c projects/building-blocks/sys/contrib/dev/acpica/components/parser/psopcode.c projects/building-blocks/sys/contrib/dev/acpica/components/parser/psopinfo.c projects/building-blocks/sys/contrib/dev/acpica/components/parser/psparse.c projects/building-blocks/sys/contrib/dev/acpica/components/parser/psscope.c projects/building-blocks/sys/contrib/dev/acpica/components/parser/pstree.c projects/building-blocks/sys/contrib/dev/acpica/components/parser/psutils.c projects/building-blocks/sys/contrib/dev/acpica/components/parser/pswalk.c projects/building-blocks/sys/contrib/dev/acpica/components/parser/psxface.c projects/building-blocks/sys/contrib/dev/acpica/components/resources/rsaddr.c projects/building-blocks/sys/contrib/dev/acpica/components/resources/rscalc.c projects/building-blocks/sys/contrib/dev/acpica/components/resources/rscreate.c projects/building-blocks/sys/contrib/dev/acpica/components/resources/rsdump.c projects/building-blocks/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c projects/building-blocks/sys/contrib/dev/acpica/components/resources/rsinfo.c projects/building-blocks/sys/contrib/dev/acpica/components/resources/rsio.c projects/building-blocks/sys/contrib/dev/acpica/components/resources/rsirq.c projects/building-blocks/sys/contrib/dev/acpica/components/resources/rslist.c projects/building-blocks/sys/contrib/dev/acpica/components/resources/rsmemory.c projects/building-blocks/sys/contrib/dev/acpica/components/resources/rsmisc.c projects/building-blocks/sys/contrib/dev/acpica/components/resources/rsserial.c projects/building-blocks/sys/contrib/dev/acpica/components/resources/rsutils.c projects/building-blocks/sys/contrib/dev/acpica/components/resources/rsxface.c projects/building-blocks/sys/contrib/dev/acpica/components/tables/tbdata.c projects/building-blocks/sys/contrib/dev/acpica/components/tables/tbfadt.c projects/building-blocks/sys/contrib/dev/acpica/components/tables/tbfind.c projects/building-blocks/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/building-blocks/sys/contrib/dev/acpica/components/tables/tbprint.c projects/building-blocks/sys/contrib/dev/acpica/components/tables/tbutils.c projects/building-blocks/sys/contrib/dev/acpica/components/tables/tbxface.c projects/building-blocks/sys/contrib/dev/acpica/components/tables/tbxfload.c projects/building-blocks/sys/contrib/dev/acpica/components/tables/tbxfroot.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utaddress.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utalloc.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utbuffer.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utcache.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utcopy.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utdebug.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utdecode.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utdelete.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/uterror.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/uteval.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utexcep.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utfileio.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utglobal.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/uthex.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utids.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utinit.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utlock.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utmath.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utmutex.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utobject.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utosi.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utownerid.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utpredef.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utprint.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utresrc.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utstate.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utstring.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/uttrack.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utuuid.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utxface.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utxferror.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utxfinit.c projects/building-blocks/sys/contrib/dev/acpica/components/utilities/utxfmutex.c projects/building-blocks/sys/contrib/dev/acpica/include/acapps.h projects/building-blocks/sys/contrib/dev/acpica/include/acbuffer.h projects/building-blocks/sys/contrib/dev/acpica/include/accommon.h projects/building-blocks/sys/contrib/dev/acpica/include/acconfig.h projects/building-blocks/sys/contrib/dev/acpica/include/acdebug.h projects/building-blocks/sys/contrib/dev/acpica/include/acdisasm.h projects/building-blocks/sys/contrib/dev/acpica/include/acdispat.h projects/building-blocks/sys/contrib/dev/acpica/include/acevents.h projects/building-blocks/sys/contrib/dev/acpica/include/acexcep.h projects/building-blocks/sys/contrib/dev/acpica/include/acglobal.h projects/building-blocks/sys/contrib/dev/acpica/include/achware.h projects/building-blocks/sys/contrib/dev/acpica/include/acinterp.h projects/building-blocks/sys/contrib/dev/acpica/include/aclocal.h projects/building-blocks/sys/contrib/dev/acpica/include/acmacros.h projects/building-blocks/sys/contrib/dev/acpica/include/acnames.h projects/building-blocks/sys/contrib/dev/acpica/include/acnamesp.h projects/building-blocks/sys/contrib/dev/acpica/include/acobject.h projects/building-blocks/sys/contrib/dev/acpica/include/acopcode.h projects/building-blocks/sys/contrib/dev/acpica/include/acoutput.h projects/building-blocks/sys/contrib/dev/acpica/include/acparser.h projects/building-blocks/sys/contrib/dev/acpica/include/acpi.h projects/building-blocks/sys/contrib/dev/acpica/include/acpiosxf.h projects/building-blocks/sys/contrib/dev/acpica/include/acpixf.h projects/building-blocks/sys/contrib/dev/acpica/include/acpredef.h projects/building-blocks/sys/contrib/dev/acpica/include/acresrc.h projects/building-blocks/sys/contrib/dev/acpica/include/acrestyp.h projects/building-blocks/sys/contrib/dev/acpica/include/acstruct.h projects/building-blocks/sys/contrib/dev/acpica/include/actables.h projects/building-blocks/sys/contrib/dev/acpica/include/actbl.h projects/building-blocks/sys/contrib/dev/acpica/include/actbl1.h projects/building-blocks/sys/contrib/dev/acpica/include/actbl2.h projects/building-blocks/sys/contrib/dev/acpica/include/actbl3.h projects/building-blocks/sys/contrib/dev/acpica/include/actypes.h projects/building-blocks/sys/contrib/dev/acpica/include/acutils.h projects/building-blocks/sys/contrib/dev/acpica/include/amlcode.h projects/building-blocks/sys/contrib/dev/acpica/include/amlresrc.h projects/building-blocks/sys/contrib/dev/acpica/include/platform/acenv.h projects/building-blocks/sys/contrib/dev/acpica/include/platform/acenvex.h projects/building-blocks/sys/contrib/dev/acpica/include/platform/acfreebsd.h projects/building-blocks/sys/contrib/dev/acpica/include/platform/acgcc.h projects/building-blocks/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c projects/building-blocks/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c projects/building-blocks/sys/contrib/rdma/krping/krping.c projects/building-blocks/sys/dev/acpica/acpi_pcib.c projects/building-blocks/sys/dev/cardbus/cardbus.c projects/building-blocks/sys/dev/cxgb/cxgb_adapter.h projects/building-blocks/sys/dev/cxgb/cxgb_sge.c projects/building-blocks/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/building-blocks/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c projects/building-blocks/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/building-blocks/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h projects/building-blocks/sys/dev/cxgbe/iw_cxgbe/cq.c projects/building-blocks/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h projects/building-blocks/sys/dev/cxgbe/iw_cxgbe/mem.c projects/building-blocks/sys/dev/fb/fbd.c projects/building-blocks/sys/dev/iicbus/lm75.c projects/building-blocks/sys/dev/lmc/if_lmc.h projects/building-blocks/sys/dev/mpr/mpr_sas.c projects/building-blocks/sys/dev/mps/mps_sas.c projects/building-blocks/sys/dev/pccbb/pccbb.c projects/building-blocks/sys/dev/pci/pci.c projects/building-blocks/sys/dev/random/dummy_rng.c projects/building-blocks/sys/dev/random/fortuna.c projects/building-blocks/sys/dev/random/random_adaptors.c projects/building-blocks/sys/dev/random/randomdev.c projects/building-blocks/sys/dev/random/randomdev.h projects/building-blocks/sys/dev/random/yarrow.c projects/building-blocks/sys/dev/sfxge/common/efx_ev.c projects/building-blocks/sys/dev/sfxge/common/efx_mac.c projects/building-blocks/sys/dev/sfxge/common/efx_mcdi.c projects/building-blocks/sys/dev/sfxge/common/efx_mcdi.h projects/building-blocks/sys/dev/sfxge/common/efx_nic.c projects/building-blocks/sys/dev/sfxge/common/efx_regs_mcdi.h projects/building-blocks/sys/dev/sfxge/common/efx_rx.c projects/building-blocks/sys/dev/sfxge/common/efx_tx.c projects/building-blocks/sys/dev/sfxge/common/siena_mon.c projects/building-blocks/sys/dev/sfxge/common/siena_nic.c projects/building-blocks/sys/dev/sfxge/common/siena_nvram.c projects/building-blocks/sys/dev/sfxge/common/siena_phy.c projects/building-blocks/sys/dev/sfxge/common/siena_vpd.c projects/building-blocks/sys/dev/sfxge/sfxge.h projects/building-blocks/sys/dev/sfxge/sfxge_ev.c projects/building-blocks/sys/dev/sfxge/sfxge_port.c projects/building-blocks/sys/dev/sfxge/sfxge_rx.c projects/building-blocks/sys/dev/sfxge/sfxge_tx.c projects/building-blocks/sys/dev/sfxge/sfxge_tx.h projects/building-blocks/sys/dev/spibus/spi.h projects/building-blocks/sys/dev/spibus/spibus.c projects/building-blocks/sys/dev/spibus/spibusvar.h projects/building-blocks/sys/dev/usb/controller/musb_otg.c projects/building-blocks/sys/dev/usb/controller/uhci.c projects/building-blocks/sys/dev/usb/usbdevs projects/building-blocks/sys/dev/usb/video/udl.c projects/building-blocks/sys/dev/usb/video/udl.h projects/building-blocks/sys/dev/vt/vt_core.c projects/building-blocks/sys/dev/xen/netfront/netfront.c projects/building-blocks/sys/dev/xen/xenstore/xenstore_dev.c projects/building-blocks/sys/i386/i386/mp_machdep.c projects/building-blocks/sys/i386/i386/ptrace_machdep.c projects/building-blocks/sys/kern/kern_ctf.c projects/building-blocks/sys/kern/kern_descrip.c projects/building-blocks/sys/kern/subr_taskqueue.c projects/building-blocks/sys/kern/sys_generic.c projects/building-blocks/sys/kern/sysv_shm.c projects/building-blocks/sys/kern/tty.c projects/building-blocks/sys/kern/uipc_mbuf.c projects/building-blocks/sys/kern/uipc_syscalls.c projects/building-blocks/sys/kern/vfs_subr.c projects/building-blocks/sys/kern/vfs_syscalls.c projects/building-blocks/sys/mips/conf/AR71XX_BASE projects/building-blocks/sys/modules/Makefile projects/building-blocks/sys/modules/cxgbe/if_cxgbe/Makefile projects/building-blocks/sys/modules/dpt/Makefile projects/building-blocks/sys/modules/drm2/radeonkms/Makefile projects/building-blocks/sys/modules/ed/Makefile projects/building-blocks/sys/modules/ep/Makefile projects/building-blocks/sys/modules/ibcore/Makefile projects/building-blocks/sys/modules/if_gif/Makefile projects/building-blocks/sys/modules/if_gre/Makefile projects/building-blocks/sys/modules/ipoib/Makefile projects/building-blocks/sys/modules/mlx4/Makefile projects/building-blocks/sys/modules/mlx4ib/Makefile projects/building-blocks/sys/modules/mlxen/Makefile projects/building-blocks/sys/modules/mthca/Makefile projects/building-blocks/sys/modules/si/Makefile projects/building-blocks/sys/modules/vx/Makefile projects/building-blocks/sys/net/pfvar.h projects/building-blocks/sys/netinet/igmp.c projects/building-blocks/sys/netinet/in_mcast.c projects/building-blocks/sys/netinet/in_var.h projects/building-blocks/sys/netinet6/frag6.c projects/building-blocks/sys/netinet6/in6_mcast.c projects/building-blocks/sys/netinet6/in6_var.h projects/building-blocks/sys/netinet6/ip6_output.c projects/building-blocks/sys/netinet6/ip6_var.h projects/building-blocks/sys/netinet6/mld6.c projects/building-blocks/sys/netinet6/mld6_var.h projects/building-blocks/sys/netpfil/pf/pf.c projects/building-blocks/sys/netpfil/pf/pf.h projects/building-blocks/sys/netpfil/pf/pf_mtag.h projects/building-blocks/sys/netpfil/pf/pf_norm.c projects/building-blocks/sys/ofed/drivers/infiniband/core/addr.c projects/building-blocks/sys/ofed/drivers/infiniband/core/cache.c projects/building-blocks/sys/ofed/drivers/infiniband/core/cm.c projects/building-blocks/sys/ofed/drivers/infiniband/core/cm_msgs.h projects/building-blocks/sys/ofed/drivers/infiniband/core/cma.c projects/building-blocks/sys/ofed/drivers/infiniband/core/core_priv.h projects/building-blocks/sys/ofed/drivers/infiniband/core/device.c projects/building-blocks/sys/ofed/drivers/infiniband/core/fmr_pool.c projects/building-blocks/sys/ofed/drivers/infiniband/core/iwcm.c projects/building-blocks/sys/ofed/drivers/infiniband/core/mad.c projects/building-blocks/sys/ofed/drivers/infiniband/core/mad_priv.h projects/building-blocks/sys/ofed/drivers/infiniband/core/mad_rmpp.c projects/building-blocks/sys/ofed/drivers/infiniband/core/multicast.c projects/building-blocks/sys/ofed/drivers/infiniband/core/packer.c projects/building-blocks/sys/ofed/drivers/infiniband/core/sa.h projects/building-blocks/sys/ofed/drivers/infiniband/core/sa_query.c projects/building-blocks/sys/ofed/drivers/infiniband/core/smi.c projects/building-blocks/sys/ofed/drivers/infiniband/core/sysfs.c projects/building-blocks/sys/ofed/drivers/infiniband/core/ucm.c projects/building-blocks/sys/ofed/drivers/infiniband/core/ucma.c projects/building-blocks/sys/ofed/drivers/infiniband/core/ud_header.c projects/building-blocks/sys/ofed/drivers/infiniband/core/umem.c projects/building-blocks/sys/ofed/drivers/infiniband/core/user_mad.c projects/building-blocks/sys/ofed/drivers/infiniband/core/uverbs.h projects/building-blocks/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/building-blocks/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/building-blocks/sys/ofed/drivers/infiniband/core/uverbs_marshall.c projects/building-blocks/sys/ofed/drivers/infiniband/core/verbs.c projects/building-blocks/sys/ofed/drivers/infiniband/debug/memtrack.c projects/building-blocks/sys/ofed/drivers/infiniband/debug/memtrack.h projects/building-blocks/sys/ofed/drivers/infiniband/debug/mtrack.h projects/building-blocks/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/building-blocks/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/building-blocks/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/building-blocks/sys/ofed/drivers/infiniband/hw/mlx4/cq.c projects/building-blocks/sys/ofed/drivers/infiniband/hw/mlx4/doorbell.c projects/building-blocks/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/building-blocks/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/building-blocks/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c projects/building-blocks/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/building-blocks/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/building-blocks/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/building-blocks/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/building-blocks/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/building-blocks/sys/ofed/drivers/infiniband/hw/mthca/mthca_qp.c projects/building-blocks/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/building-blocks/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c projects/building-blocks/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/building-blocks/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c projects/building-blocks/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c projects/building-blocks/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c projects/building-blocks/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c projects/building-blocks/sys/ofed/drivers/net/mlx4/Makefile projects/building-blocks/sys/ofed/drivers/net/mlx4/en_rx.c projects/building-blocks/sys/ofed/include/linux/device.h projects/building-blocks/sys/ofed/include/linux/file.h projects/building-blocks/sys/ofed/include/linux/linux_compat.c projects/building-blocks/sys/ofed/include/net/ip.h projects/building-blocks/sys/ofed/include/rdma/ib_addr.h projects/building-blocks/sys/ofed/include/rdma/ib_cache.h projects/building-blocks/sys/ofed/include/rdma/ib_cm.h projects/building-blocks/sys/ofed/include/rdma/ib_mad.h projects/building-blocks/sys/ofed/include/rdma/ib_pack.h projects/building-blocks/sys/ofed/include/rdma/ib_sa.h projects/building-blocks/sys/ofed/include/rdma/ib_umem.h projects/building-blocks/sys/ofed/include/rdma/ib_user_verbs.h projects/building-blocks/sys/ofed/include/rdma/ib_verbs.h projects/building-blocks/sys/ofed/include/rdma/iw_cm.h projects/building-blocks/sys/ofed/include/rdma/rdma_cm.h projects/building-blocks/sys/ofed/include/rdma/rdma_user_cm.h projects/building-blocks/sys/powerpc/powermac/atibl.c projects/building-blocks/sys/powerpc/powermac/nvbl.c projects/building-blocks/sys/powerpc/powerpc/db_trace.c projects/building-blocks/sys/sparc64/include/asm.h projects/building-blocks/sys/sys/fbio.h projects/building-blocks/sys/sys/file.h projects/building-blocks/sys/sys/filedesc.h projects/building-blocks/sys/sys/mbuf.h projects/building-blocks/sys/sys/param.h projects/building-blocks/sys/sys/taskqueue.h projects/building-blocks/sys/vm/memguard.c projects/building-blocks/sys/x86/acpica/acpi_wakeup.c projects/building-blocks/sys/x86/x86/local_apic.c projects/building-blocks/sys/x86/xen/pvcpu_enum.c projects/building-blocks/sys/x86/xen/xen_intr.c projects/building-blocks/usr.bin/compress/compress.c projects/building-blocks/usr.bin/du/du.c projects/building-blocks/usr.bin/gzip/gzip.c projects/building-blocks/usr.bin/kdump/kdump.c projects/building-blocks/usr.bin/ministat/ministat.c projects/building-blocks/usr.sbin/Makefile projects/building-blocks/usr.sbin/acpi/acpidb/Makefile projects/building-blocks/usr.sbin/acpi/acpidb/acpidb.c projects/building-blocks/usr.sbin/acpi/iasl/Makefile projects/building-blocks/usr.sbin/binmiscctl/binmiscctl.8 projects/building-blocks/usr.sbin/binmiscctl/binmiscctl.c projects/building-blocks/usr.sbin/devctl/Makefile projects/building-blocks/usr.sbin/pw/tests/pw_useradd.sh Directory Properties: projects/building-blocks/ (props changed) projects/building-blocks/cddl/ (props changed) projects/building-blocks/cddl/contrib/opensolaris/ (props changed) projects/building-blocks/contrib/elftoolchain/ (props changed) projects/building-blocks/contrib/llvm/ (props changed) projects/building-blocks/contrib/llvm/tools/lldb/ (props changed) projects/building-blocks/etc/ (props changed) projects/building-blocks/lib/libc/ (props changed) projects/building-blocks/sbin/ (props changed) projects/building-blocks/share/ (props changed) projects/building-blocks/share/man/man4/ (props changed) projects/building-blocks/sys/ (props changed) projects/building-blocks/sys/boot/ (props changed) projects/building-blocks/sys/conf/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/common/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/compiler/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/components/dispatcher/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/components/events/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/components/executer/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/components/hardware/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/components/namespace/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/components/parser/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/components/resources/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/components/tables/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/include/ (props changed) projects/building-blocks/sys/contrib/dev/acpica/os_specific/ (props changed) Modified: projects/building-blocks/Makefile.inc1 ============================================================================== --- projects/building-blocks/Makefile.inc1 Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/Makefile.inc1 Thu Feb 19 11:41:12 2015 (r278993) @@ -348,16 +348,15 @@ WMAKEENV+= CC="${XCC} ${XCFLAGS}" CXX="$ SIZE="${XSIZE}" .if ${XCC:M/*} -XFLAGS= --sysroot=${WORLDTMP} .if defined(CROSS_BINUTILS_PREFIX) # In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a # directory, but the compiler will look in the right place for it's # tools so we don't need to tell it where to look. .if exists(${CROSS_BINUTILS_PREFIX}) -XFLAGS+= -B${CROSS_BINUTILS_PREFIX} +BFLAGS+= -B${CROSS_BINUTILS_PREFIX} .endif .else -XFLAGS+= -B${WORLDTMP}/usr/bin +BFLAGS+= -B${WORLDTMP}/usr/bin .endif .if ${TARGET} == "arm" .if ${TARGET_ARCH:M*hf*} != "" @@ -374,6 +373,8 @@ DEPFLAGS+= -I${WORLDTMP}/usr/include/c++ TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XCFLAGS+= -target ${TARGET_TRIPLE} +XCFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} +XCXXFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} .endif .endif @@ -917,25 +918,25 @@ packageworld: .for dist in base ${EXTRA_DISTRIBUTIONS} .if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ - --exclude usr/lib/debug \ - @${DESTDIR}/${DISTDIR}/${dist}.meta + tar cvf - --exclude usr/lib/debug \ + @${DESTDIR}/${DISTDIR}/${dist}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz .else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ - --exclude usr/lib/debug . + tar cvf - --exclude usr/lib/debug . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz .endif .endfor .for dist in ${DEBUG_DISTRIBUTIONS} . if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \ - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta + tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz . else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \ - usr/lib/debug + tar cvLf - usr/lib/debug | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz . endif .endfor @@ -1143,19 +1144,21 @@ distributekernel distributekernel.debug: packagekernel: .if defined(NO_ROOT) cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \ - @${DESTDIR}/${DISTDIR}/kernel.meta + tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \ - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta + tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .endfor .else cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz . + tar cvf - . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz . + tar cvf - . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .endfor .endif @@ -1253,13 +1256,6 @@ _m4= lib/libohash \ ${_bt}-usr.bin/m4: ${_bt}-lib/libohash .endif -.if ${BOOTSTRAPPING} < 1000013 -_yacc= lib/liby \ - usr.bin/yacc - -${_bt}-usr.bin/yacc: ${_bt}-lib/liby -.endif - .if ${BOOTSTRAPPING} < 1000014 _crunch= usr.sbin/crunch .endif @@ -1283,6 +1279,13 @@ _lex= usr.bin/lex _awk= usr.bin/awk .endif +.if ${BOOTSTRAPPING} < 1001506 +_yacc= lib/liby \ + usr.bin/yacc + +${_bt}-usr.bin/yacc: ${_bt}-lib/liby +.endif + .if ${MK_BSNMP} != "no" _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif Modified: projects/building-blocks/ObsoleteFiles.inc ============================================================================== --- projects/building-blocks/ObsoleteFiles.inc Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/ObsoleteFiles.inc Thu Feb 19 11:41:12 2015 (r278993) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20150217: Removed remnants of ar(4) driver +OLD_FILES+=usr/include/sys/dev/ic/hd64570.h # 20150212: /usr/games moving into /usr/bin OLD_FILES+=usr/games/bcd OLD_FILES+=usr/games/caesar Modified: projects/building-blocks/UPDATING ============================================================================== --- projects/building-blocks/UPDATING Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/UPDATING Thu Feb 19 11:41:12 2015 (r278993) @@ -31,6 +31,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150217: + If you are running a -CURRENT kernel since r273872 (Oct 30th, 2014), + but before r278950, the RNG was not seeded properly. Immediately + upgrade the kernel to r278950 or later and regenerate any keys (e.g. + ssh keys or openssl keys) that were generated w/ a kernel from that + range. This does not effect programs that directly used /dev/random + or /dev/urandom. All userland uses of arc4random(3) are affected. + 20150210: The autofs(4) ABI was changed in order to restore binary compatibility with 10.1-RELEASE. The automountd(8) daemon needs to be rebuilt to work Modified: projects/building-blocks/bin/ln/symlink.7 ============================================================================== --- projects/building-blocks/bin/ln/symlink.7 Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/bin/ln/symlink.7 Thu Feb 19 11:41:12 2015 (r278993) @@ -29,7 +29,7 @@ .\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 .\" $FreeBSD$ .\" -.Dd January 23, 2015 +.Dd February 16, 2015 .Dt SYMLINK 7 .Os .Sh NAME @@ -146,6 +146,7 @@ The following system calls follow symbol unless given the .Dv AT_SYMLINK_NOFOLLOW flag: +.Xr chflagsat 2 , .Xr fchmodat 2 , .Xr fchownat 2 , .Xr fstatat 2 Modified: projects/building-blocks/bin/sh/cd.c ============================================================================== --- projects/building-blocks/bin/sh/cd.c Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/bin/sh/cd.c Thu Feb 19 11:41:12 2015 (r278993) @@ -122,7 +122,7 @@ cdcmd(int argc __unused, char **argv __u (dest[0] == '.' && (dest[1] == '/' || dest[1] == '\0')) || (dest[0] == '.' && dest[1] == '.' && (dest[2] == '/' || dest[2] == '\0')) || (path = bltinlookup("CDPATH", 1)) == NULL) - path = nullstr; + path = ""; while ((p = padvance(&path, dest)) != NULL) { if (stat(p, &statb) < 0) { if (errno != ENOENT) Modified: projects/building-blocks/bin/sh/eval.c ============================================================================== --- projects/building-blocks/bin/sh/eval.c Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/bin/sh/eval.c Thu Feb 19 11:41:12 2015 (r278993) @@ -498,7 +498,7 @@ exphere(union node *redir, struct arglis struct localvar *savelocalvars; int need_longjmp = 0; - redir->nhere.expdoc = nullstr; + redir->nhere.expdoc = ""; savelocalvars = localvars; localvars = NULL; forcelocal++; Modified: projects/building-blocks/bin/sh/expand.c ============================================================================== --- projects/building-blocks/bin/sh/expand.c Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/bin/sh/expand.c Thu Feb 19 11:41:12 2015 (r278993) @@ -105,11 +105,12 @@ static void expbackq(union node *, int, static int subevalvar(char *, char *, int, int, int, int, int); static char *evalvar(char *, int); static int varisset(const char *, int); +static void strtodest(const char *, int, int, int); static void varvalue(const char *, int, int, int); static void recordregion(int, int, int); static void removerecordregions(int); static void ifsbreakup(char *, struct arglist *); -static void expandmeta(struct strlist *, int); +static void expandmeta(struct strlist *); static void expmeta(char *, char *); static void addfname(char *); static struct strlist *expsort(struct strlist *); @@ -175,7 +176,7 @@ expandarg(union node *arg, struct arglis ifsbreakup(p, &exparg); *exparg.lastp = NULL; exparg.lastp = &exparg.list; - expandmeta(exparg.list, flag); + expandmeta(exparg.list); } else { sp = (struct strlist *)stalloc(sizeof (struct strlist)); sp->text = p; @@ -298,9 +299,9 @@ exptilde(char *p, int flag) char c, *startp = p; struct passwd *pw; char *home; - int quotes = flag & (EXP_FULL | EXP_CASE); - while ((c = *p) != '\0') { + for (;;) { + c = *p; switch(c) { case CTLESC: /* This means CTL* are always considered quoted. */ case CTLVAR: @@ -311,31 +312,27 @@ exptilde(char *p, int flag) case CTLQUOTEMARK: return (startp); case ':': - if (flag & EXP_VARTILDE) - goto done; - break; + if ((flag & EXP_VARTILDE) == 0) + break; + /* FALLTHROUGH */ + case '\0': case '/': case CTLENDVAR: - goto done; + *p = '\0'; + if (*(startp+1) == '\0') { + home = lookupvar("HOME"); + } else { + pw = getpwnam(startp+1); + home = pw != NULL ? pw->pw_dir : NULL; + } + *p = c; + if (home == NULL || *home == '\0') + return (startp); + strtodest(home, flag, VSNORMAL, 1); + return (p); } p++; } -done: - *p = '\0'; - if (*(startp+1) == '\0') { - home = lookupvar("HOME"); - } else { - pw = getpwnam(startp+1); - home = pw != NULL ? pw->pw_dir : NULL; - } - *p = c; - if (home == NULL || *home == '\0') - return (startp); - if (quotes) - STPUTS_QUOTES(home, DQSYNTAX, expdest); - else - STPUTS(home, expdest); - return (p); } @@ -496,6 +493,17 @@ expbackq(union node *cmd, int quoted, in +static void +recordleft(const char *str, const char *loc, char *startp) +{ + int amount; + + amount = ((str - 1) - (loc - startp)) - expdest; + STADJUST(amount, expdest); + while (loc != str - 1) + *startp++ = *loc++; +} + static int subevalvar(char *p, char *str, int strloc, int subtype, int startloc, int varflags, int quotes) @@ -530,8 +538,7 @@ subevalvar(char *p, char *str, int strlo error((char *)NULL); } error("%.*s: parameter %snot set", (int)(p - str - 1), - str, (varflags & VSNUL) ? "null or " - : nullstr); + str, (varflags & VSNUL) ? "null or " : ""); return 0; case VSTRIMLEFT: @@ -540,7 +547,8 @@ subevalvar(char *p, char *str, int strlo *loc = '\0'; if (patmatch(str, startp, quotes)) { *loc = c; - goto recordleft; + recordleft(str, loc, startp); + return 1; } *loc = c; if (quotes && *loc == CTLESC) @@ -554,7 +562,8 @@ subevalvar(char *p, char *str, int strlo *loc = '\0'; if (patmatch(str, startp, quotes)) { *loc = c; - goto recordleft; + recordleft(str, loc, startp); + return 1; } *loc = c; loc--; @@ -602,13 +611,6 @@ subevalvar(char *p, char *str, int strlo default: abort(); } - -recordleft: - amount = ((str - 1) - (loc - startp)) - expdest; - STADJUST(amount, expdest); - while (loc != str - 1) - *startp++ = *loc++; - return 1; } @@ -633,6 +635,7 @@ evalvar(char *p, int flag) int varlenb; int easy; int quotes = flag & (EXP_FULL | EXP_CASE); + int record; varflags = (unsigned char)*p++; subtype = varflags & VSTYPE; @@ -690,22 +693,15 @@ again: /* jump here after setting a vari STADJUST(-varlenb, expdest); } } else { - char const *syntax = (varflags & VSQUOTE) ? DQSYNTAX - : BASESYNTAX; - if (subtype == VSLENGTH) { for (;*val; val++) if (!localeisutf8 || (*val & 0xC0) != 0x80) varlen++; } - else { - if (quotes) - STPUTS_QUOTES(val, syntax, expdest); - else - STPUTS(val, expdest); - - } + else + strtodest(val, flag, subtype, + varflags & VSQUOTE); } } @@ -719,15 +715,11 @@ again: /* jump here after setting a vari switch (subtype) { case VSLENGTH: expdest = cvtnum(varlen, expdest); - goto record; + record = 1; + break; case VSNORMAL: - if (!easy) - break; -record: - recordregion(startloc, expdest - stackblock(), - varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' && - (*var == '@' || *var == '*'))); + record = easy; break; case VSPLUS: @@ -737,8 +729,7 @@ record: (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0)); break; } - if (easy) - goto record; + record = easy; break; case VSTRIMLEFT: @@ -760,7 +751,8 @@ record: } /* Remove any recorded regions beyond start of variable */ removerecordregions(startloc); - goto record; + record = 1; + break; case VSASSIGN: case VSQUESTION: @@ -777,8 +769,7 @@ record: } break; } - if (easy) - goto record; + record = easy; break; case VSERROR: @@ -790,6 +781,11 @@ record: abort(); } + if (record) + recordregion(startloc, expdest - stackblock(), + varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' && + (*var == '@' || *var == '*'))); + if (subtype != VSNORMAL) { /* skip to end of alternative */ int nesting = 1; for (;;) { @@ -1093,7 +1089,7 @@ static char expdir[PATH_MAX]; * The results are stored in the list exparg. */ static void -expandmeta(struct strlist *str, int flag __unused) +expandmeta(struct strlist *str) { char *p; struct strlist **savelastp; @@ -1475,16 +1471,14 @@ patmatch(const char *pattern, const char endp = p; if (*endp == '!' || *endp == '^') endp++; - for (;;) { + do { while (*endp == CTLQUOTEMARK) endp++; if (*endp == 0) goto dft; /* no matching ] */ if (*endp == CTLESC) endp++; - if (*++endp == ']') - break; - } + } while (*++endp != ']'); invert = 0; if (*p == '!' || *p == '^') { invert++; Modified: projects/building-blocks/bin/sh/mail.c ============================================================================== --- projects/building-blocks/bin/sh/mail.c Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/bin/sh/mail.c Thu Feb 19 11:41:12 2015 (r278993) @@ -85,7 +85,7 @@ chkmail(int silent) setstackmark(&smark); mpath = mpathset()? mpathval() : mailval(); for (i = 0 ; i < nmboxes ; i++) { - p = padvance(&mpath, nullstr); + p = padvance(&mpath, ""); if (p == NULL) break; if (*p == '\0') Modified: projects/building-blocks/bin/sh/miscbltin.c ============================================================================== --- projects/building-blocks/bin/sh/miscbltin.c Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/bin/sh/miscbltin.c Thu Feb 19 11:41:12 2015 (r278993) @@ -265,7 +265,7 @@ readcmd(int argc __unused, char **argv _ /* Set any remaining args to "" */ while (*++ap != NULL) - setvar(*ap, nullstr, 0); + setvar(*ap, "", 0); return status; } Modified: projects/building-blocks/bin/sh/nodetypes ============================================================================== --- projects/building-blocks/bin/sh/nodetypes Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/bin/sh/nodetypes Thu Feb 19 11:41:12 2015 (r278993) @@ -138,7 +138,7 @@ NXHERE nhere # fd<flags & VREADONLY) return (1); if (vp->text[vp->name_len + 1] != '\0') - setvar(s, nullstr, 0); + setvar(s, "", 0); if ((vp->flags & VEXPORT) && localevar(vp->text)) { change_env(s, 0); setlocale(LC_ALL, ""); Modified: projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Thu Feb 19 11:41:12 2015 (r278993) @@ -36,7 +36,6 @@ #include #include #include -#include /* * In Solaris 10 GA, the only mechanism for communicating helper information @@ -62,9 +61,7 @@ static const char *olddevname = "/device static const char *modname; /* Name of this load object */ static int gen; /* DOF helper generation */ -#ifdef illumos extern dof_hdr_t __SUNW_dof; /* DOF defined in the .SUNW_dof section */ -#endif static boolean_t dof_init_debug = B_FALSE; /* From DTRACE_DOF_INIT_DEBUG */ static void @@ -99,11 +96,7 @@ static void dtrace_dof_init(void) __attr static void dtrace_dof_init(void) { -#ifdef illumos dof_hdr_t *dof = &__SUNW_dof; -#else - dof_hdr_t *dof = NULL; -#endif #ifdef _LP64 Elf64_Ehdr *elf; #else @@ -118,17 +111,6 @@ dtrace_dof_init(void) #endif int fd; const char *p; -#ifndef illumos - Elf *e; - Elf_Scn *scn = NULL; - Elf_Data *dofdata = NULL; - dof_hdr_t *dof_next = NULL; - GElf_Shdr shdr; - int efd; - char *s; - size_t shstridx; - uint64_t aligned_filesz; -#endif if (getenv("DTRACE_DOF_INIT_DISABLE") != NULL) return; @@ -152,42 +134,6 @@ dtrace_dof_init(void) modname = lmp->l_name; else modname++; -#ifndef illumos - elf_version(EV_CURRENT); - if ((efd = open(lmp->l_name, O_RDONLY, 0)) < 0) { - dprintf(1, "couldn't open file for reading\n"); - return; - } - if ((e = elf_begin(efd, ELF_C_READ, NULL)) == NULL) { - dprintf(1, "elf_begin failed\n"); - close(efd); - return; - } - elf_getshdrstrndx(e, &shstridx); - dof = NULL; - while ((scn = elf_nextscn(e, scn)) != NULL) { - gelf_getshdr(scn, &shdr); - if (shdr.sh_type == SHT_SUNW_dof) { - s = elf_strptr(e, shstridx, shdr.sh_name); - if (s != NULL && strcmp(s, ".SUNW_dof") == 0) { - dofdata = elf_getdata(scn, NULL); - dof = dofdata->d_buf; - break; - } - } - } - if (dof == NULL) { - dprintf(1, "SUNW_dof section not found\n"); - elf_end(e); - close(efd); - return; - } - - while ((char *) dof < (char *) dofdata->d_buf + dofdata->d_size) { - aligned_filesz = (shdr.sh_addralign == 0 ? dof->dofh_filesz : - roundup2(dof->dofh_filesz, shdr.sh_addralign)); - dof_next = (void *) ((char *) dof + aligned_filesz); -#endif if (dof->dofh_ident[DOF_ID_MAG0] != DOF_MAG_MAG0 || dof->dofh_ident[DOF_ID_MAG1] != DOF_MAG_MAG1 || @@ -237,21 +183,12 @@ dtrace_dof_init(void) dprintf(1, "DTrace ioctl failed for DOF at %p", dof); else { dprintf(1, "DTrace ioctl succeeded for DOF at %p\n", dof); -#ifndef illumos +#ifdef __FreeBSD__ gen = dh.gen; #endif } (void) close(fd); - -#ifndef illumos - /* End of while loop */ - dof = dof_next; - } - - elf_end(e); - (void) close(efd); -#endif } #ifdef illumos Modified: projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h ============================================================================== --- projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h Thu Feb 19 11:41:12 2015 (r278993) @@ -275,6 +275,9 @@ struct dtrace_hdl { int dt_cpp_argc; /* count of initialized cpp(1) arguments */ int dt_cpp_args; /* size of dt_cpp_argv[] array */ char *dt_ld_path; /* pathname of ld(1) to invoke if needed */ +#ifdef __FreeBSD__ + char *dt_objcopy_path; /* pathname of objcopy(1) to invoke if needed */ +#endif dt_list_t dt_lib_path; /* linked-list forming library search path */ uint_t dt_lazyload; /* boolean: set via -xlazyload */ uint_t dt_droptags; /* boolean: set via -xdroptags */ Modified: projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Thu Feb 19 11:41:12 2015 (r278993) @@ -281,7 +281,11 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION_ sym->st_value = 0; sym->st_size = dof->dofh_filesz; sym->st_info = ELF32_ST_INFO(STB_GLOBAL, STT_OBJECT); +#ifdef illumos sym->st_other = 0; +#else + sym->st_other = ELF32_ST_VISIBILITY(STV_HIDDEN); +#endif sym->st_shndx = ESHDR_DOF; sym++; @@ -471,7 +475,11 @@ prepare_elf64(dtrace_hdl_t *dtp, const d sym->st_value = 0; sym->st_size = dof->dofh_filesz; sym->st_info = GELF_ST_INFO(STB_GLOBAL, STT_OBJECT); +#ifdef illumos sym->st_other = 0; +#else + sym->st_other = ELF64_ST_VISIBILITY(STV_HIDDEN); +#endif sym->st_shndx = ESHDR_DOF; sym++; @@ -711,11 +719,7 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_ shp = &elf_file.shdr[ESHDR_DOF]; shp->sh_name = 11; /* DTRACE_SHSTRTAB64[11] = ".SUNW_dof" */ -#ifdef illumos shp->sh_flags = SHF_ALLOC; -#else - shp->sh_flags = SHF_WRITE | SHF_ALLOC; -#endif shp->sh_type = SHT_SUNW_dof; shp->sh_offset = off; shp->sh_size = dof->dofh_filesz; @@ -1874,7 +1878,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, d #endif (void) snprintf(drti, sizeof (drti), "/usr/lib%s/dtrace/drti.o", - use_32 ? "32":""); + use_32 ? "32" : ""); len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile, drti) + 1; @@ -1885,26 +1889,61 @@ dtrace_program_link(dtrace_hdl_t *dtp, d drti); #endif if ((status = system(cmd)) == -1) { - ret = dt_link_error(dtp, NULL, -1, NULL, + ret = dt_link_error(dtp, NULL, fd, NULL, "failed to run %s: %s", dtp->dt_ld_path, strerror(errno)); goto done; } if (WIFSIGNALED(status)) { - ret = dt_link_error(dtp, NULL, -1, NULL, + ret = dt_link_error(dtp, NULL, fd, NULL, "failed to link %s: %s failed due to signal %d", file, dtp->dt_ld_path, WTERMSIG(status)); goto done; } if (WEXITSTATUS(status) != 0) { - ret = dt_link_error(dtp, NULL, -1, NULL, + ret = dt_link_error(dtp, NULL, fd, NULL, "failed to link %s: %s exited with status %d\n", file, dtp->dt_ld_path, WEXITSTATUS(status)); goto done; } (void) close(fd); /* release temporary file */ + +#ifdef __FreeBSD__ + /* + * Now that we've linked drti.o, reduce the global __SUNW_dof + * symbol to a local symbol. This is needed to so that multiple + * generated object files (for different providers, for + * instance) can be linked together. This is accomplished using + * the -Blocal flag with Sun's linker, but GNU ld doesn't appear + * to have an equivalent option. + */ + asprintf(&cmd, "%s --localize-hidden %s", dtp->dt_objcopy_path, + file); + if ((status = system(cmd)) == -1) { + ret = dt_link_error(dtp, NULL, -1, NULL, + "failed to run %s: %s", dtp->dt_objcopy_path, + strerror(errno)); + free(cmd); + goto done; + } + free(cmd); + + if (WIFSIGNALED(status)) { + ret = dt_link_error(dtp, NULL, -1, NULL, + "failed to link %s: %s failed due to signal %d", + file, dtp->dt_objcopy_path, WTERMSIG(status)); + goto done; + } + + if (WEXITSTATUS(status) != 0) { + ret = dt_link_error(dtp, NULL, -1, NULL, + "failed to link %s: %s exited with status %d\n", + file, dtp->dt_objcopy_path, WEXITSTATUS(status)); + goto done; + } +#endif } else { (void) close(fd); } Modified: projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Thu Feb 19 11:41:12 2015 (r278993) @@ -785,6 +785,7 @@ const char *_dtrace_defld = "/usr/ccs/bi #else const char *_dtrace_defcpp = "cpp"; /* default cpp(1) to invoke */ const char *_dtrace_defld = "ld"; /* default ld(1) to invoke */ +const char *_dtrace_defobjcopy = "objcopy"; /* default objcopy(1) to invoke */ #endif const char *_dtrace_libdir = "/usr/lib/dtrace"; /* default library directory */ @@ -1185,6 +1186,9 @@ alloc: dtp->dt_cpp_argc = 1; dtp->dt_cpp_args = 1; dtp->dt_ld_path = strdup(_dtrace_defld); +#ifdef __FreeBSD__ + dtp->dt_objcopy_path = strdup(_dtrace_defobjcopy); +#endif dtp->dt_provmod = provmod; dtp->dt_vector = vector; dtp->dt_varg = arg; @@ -1193,6 +1197,9 @@ alloc: if (dtp->dt_mods == NULL || dtp->dt_provs == NULL || dtp->dt_procs == NULL || dtp->dt_ld_path == NULL || +#ifdef __FreeBSD__ + dtp->dt_objcopy_path == NULL || +#endif dtp->dt_cpp_path == NULL || dtp->dt_cpp_argv == NULL) return (set_open_errno(dtp, errp, EDT_NOMEM)); @@ -1673,6 +1680,9 @@ dtrace_close(dtrace_hdl_t *dtp) free(dtp->dt_cpp_argv); free(dtp->dt_cpp_path); free(dtp->dt_ld_path); +#ifdef __FreeBSD__ + free(dtp->dt_objcopy_path); +#endif free(dtp->dt_mods); free(dtp->dt_provs); Modified: projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c ============================================================================== --- projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c Thu Feb 19 11:41:12 2015 (r278993) @@ -280,6 +280,28 @@ dt_opt_ld_path(dtrace_hdl_t *dtp, const return (0); } +#ifdef __FreeBSD__ +static int +dt_opt_objcopy_path(dtrace_hdl_t *dtp, const char *arg, uintptr_t option) +{ + char *objcopy; + + if (arg == NULL) + return (dt_set_errno(dtp, EDT_BADOPTVAL)); + + if (dtp->dt_pcb != NULL) + return (dt_set_errno(dtp, EDT_BADOPTCTX)); + + if ((objcopy = strdup(arg)) == NULL) + return (dt_set_errno(dtp, EDT_NOMEM)); + + free(dtp->dt_objcopy_path); + dtp->dt_objcopy_path = objcopy; + + return (0); +} +#endif + /*ARGSUSED*/ static int dt_opt_libdir(dtrace_hdl_t *dtp, const char *arg, uintptr_t option) @@ -960,6 +982,9 @@ static const dt_option_t _dtrace_ctoptio { "linkmode", dt_opt_linkmode }, { "linktype", dt_opt_linktype }, { "nolibs", dt_opt_cflags, DTRACE_C_NOLIBS }, +#ifdef __FreeBSD__ + { "objcopypath", dt_opt_objcopy_path }, +#endif { "pgmax", dt_opt_pgmax }, { "pspec", dt_opt_cflags, DTRACE_C_PSPEC }, { "setenv", dt_opt_setenv, 1 }, Modified: projects/building-blocks/contrib/elftoolchain/addr2line/addr2line.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/addr2line/addr2line.c Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/contrib/elftoolchain/addr2line/addr2line.c Thu Feb 19 11:41:12 2015 (r278993) @@ -40,7 +40,7 @@ #include "_elftc.h" -ELFTC_VCSID("$Id: addr2line.c 2185 2011-11-19 16:07:16Z jkoshy $"); +ELFTC_VCSID("$Id: addr2line.c 3148 2015-02-15 18:47:39Z emaste $"); static struct option longopts[] = { {"target" , required_argument, NULL, 'b'}, Modified: projects/building-blocks/contrib/elftoolchain/common/_elftc.h ============================================================================== --- projects/building-blocks/contrib/elftoolchain/common/_elftc.h Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/contrib/elftoolchain/common/_elftc.h Thu Feb 19 11:41:12 2015 (r278993) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: _elftc.h 2922 2013-03-17 22:53:15Z kaiwang27 $ + * $Id: _elftc.h 3139 2015-01-05 03:17:06Z kaiwang27 $ */ /** @@ -76,10 +76,17 @@ * SUCH DAMAGE. */ +#ifndef LIST_FOREACH_SAFE +#define LIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = LIST_FIRST((head)); \ + (var) && ((tvar) = LIST_NEXT((var), field), 1); \ + (var) = (tvar)) +#endif + #ifndef SLIST_FOREACH_SAFE -#define SLIST_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = SLIST_FIRST((head)); \ - (var) && ((tvar) = SLIST_NEXT((var), field), 1); \ +#define SLIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = SLIST_FIRST((head)); \ + (var) && ((tvar) = SLIST_NEXT((var), field), 1); \ (var) = (tvar)) #endif Modified: projects/building-blocks/contrib/elftoolchain/common/elfdefinitions.h ============================================================================== --- projects/building-blocks/contrib/elftoolchain/common/elfdefinitions.h Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/contrib/elftoolchain/common/elfdefinitions.h Thu Feb 19 11:41:12 2015 (r278993) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: elfdefinitions.h 3110 2014-12-20 08:32:46Z kaiwang27 $ + * $Id: elfdefinitions.h 3149 2015-02-15 19:00:06Z emaste $ */ /* @@ -1396,6 +1396,12 @@ _ELF_DEFINE_RELOC(R_386_8, 22) \ _ELF_DEFINE_RELOC(R_386_PC8, 23) /* + */ +#define _ELF_DEFINE_AARCH64_RELOCATIONS() \ +_ELF_DEFINE_RELOC(R_AARCH64_ABS64, 257) \ +_ELF_DEFINE_RELOC(R_AARCH64_ABS32, 258) \ + +/* * These are the symbols used in the Sun ``Linkers and Loaders * Guide'', Document No: 817-1984-17. See the X86_64 relocations list * below for the spellings used in the ELF specification. @@ -1962,6 +1968,7 @@ _ELF_DEFINE_RELOC(R_X86_64_IRELATIVE, 37 #define _ELF_DEFINE_RELOCATIONS() \ _ELF_DEFINE_386_RELOCATIONS() \ +_ELF_DEFINE_AARCH64_RELOCATIONS() \ _ELF_DEFINE_AMD64_RELOCATIONS() \ _ELF_DEFINE_ARM_RELOCATIONS() \ _ELF_DEFINE_IA64_RELOCATIONS() \ Modified: projects/building-blocks/contrib/elftoolchain/elfcopy/main.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/elfcopy/main.c Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/contrib/elftoolchain/elfcopy/main.c Thu Feb 19 11:41:12 2015 (r278993) @@ -40,7 +40,7 @@ #include "elfcopy.h" -ELFTC_VCSID("$Id: main.c 3111 2014-12-20 08:33:01Z kaiwang27 $"); +ELFTC_VCSID("$Id: main.c 3156 2015-02-15 21:40:01Z emaste $"); enum options { Modified: projects/building-blocks/contrib/elftoolchain/elfcopy/sections.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/elfcopy/sections.c Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/contrib/elftoolchain/elfcopy/sections.c Thu Feb 19 11:41:12 2015 (r278993) @@ -35,7 +35,7 @@ #include "elfcopy.h" -ELFTC_VCSID("$Id: sections.c 3134 2014-12-23 10:43:59Z kaiwang27 $"); +ELFTC_VCSID("$Id: sections.c 3150 2015-02-15 19:07:46Z emaste $"); static void add_gnu_debuglink(struct elfcopy *ecp); static uint32_t calc_crc32(const char *p, size_t len, uint32_t crc); Modified: projects/building-blocks/contrib/elftoolchain/libdwarf/_libdwarf.h ============================================================================== --- projects/building-blocks/contrib/elftoolchain/libdwarf/_libdwarf.h Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/contrib/elftoolchain/libdwarf/_libdwarf.h Thu Feb 19 11:41:12 2015 (r278993) @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: _libdwarf.h 3106 2014-12-19 16:00:58Z kaiwang27 $ + * $Id: _libdwarf.h 3161 2015-02-15 21:43:36Z emaste $ */ #ifndef __LIBDWARF_H_ Modified: projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_attrval.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_attrval.c Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_attrval.c Thu Feb 19 11:41:12 2015 (r278993) @@ -26,7 +26,7 @@ #include "_libdwarf.h" -ELFTC_VCSID("$Id: dwarf_attrval.c 2977 2014-01-21 20:13:31Z kaiwang27 $"); +ELFTC_VCSID("$Id: dwarf_attrval.c 3159 2015-02-15 21:43:27Z emaste $"); int dwarf_attrval_flag(Dwarf_Die die, Dwarf_Half attr, Dwarf_Bool *valp, Dwarf_Error *err) Modified: projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 ============================================================================== --- projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 Thu Feb 19 11:41:12 2015 (r278993) @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: dwarf_get_AT_name.3 2071 2011-10-27 03:20:00Z jkoshy $ +.\" $Id: dwarf_get_AT_name.3 3142 2015-01-29 23:11:14Z jkoshy $ .\" .Dd April 22, 2011 .Os Modified: projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 ============================================================================== --- projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 Thu Feb 19 11:41:12 2015 (r278993) @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: dwarf_get_arange_info.3 2134 2011-11-10 08:40:14Z jkoshy $ +.\" $Id: dwarf_get_arange_info.3 3142 2015-01-29 23:11:14Z jkoshy $ .\" .Dd April 16, 2011 .Os Modified: projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3 ============================================================================== --- projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3 Thu Feb 19 11:17:36 2015 (r278992) +++ projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3 Thu Feb 19 11:41:12 2015 (r278993) @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: dwarf_get_section_max_offsets.3 3098 2014-09-02 22:18:29Z kaiwang27 $ +.\" $Id: dwarf_get_section_max_offsets.3 3141 2015-01-29 23:11:10Z jkoshy $ .\" -.Dd July 27, 2014 +.Dd December 21, 2014 .Os .Dt DWARF_GET_SECTION_MAX_OFFSETS .Sh NAME @@ -101,7 +101,7 @@ is identical to function .Fn dwarf_get_section_max_offsets_b except that it does not provide argument .Ar debug_types , -thus it can not retrieve the size of the +and thus cannot return the size of the .Dq \&.debug_types section. .Sh RETURN VALUES *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Thu Feb 19 11:44:52 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 1DEF6A9E; Thu, 19 Feb 2015 11:44:52 +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 0994A912; Thu, 19 Feb 2015 11:44:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1JBiplH020877; Thu, 19 Feb 2015 11:44:51 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1JBiptM020875; Thu, 19 Feb 2015 11:44:51 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502191144.t1JBiptM020875@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 19 Feb 2015 11:44:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278994 - in projects/building-blocks: share/man/man9 sys/vm 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.18-1 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: Thu, 19 Feb 2015 11:44:52 -0000 Author: ngie Date: Thu Feb 19 11:44:50 2015 New Revision: 278994 URL: https://svnweb.freebsd.org/changeset/base/278994 Log: Revert an accidental commit I had staged up Modified: projects/building-blocks/share/man/man9/memguard.9 projects/building-blocks/sys/vm/memguard.c Modified: projects/building-blocks/share/man/man9/memguard.9 ============================================================================== --- projects/building-blocks/share/man/man9/memguard.9 Thu Feb 19 11:41:12 2015 (r278993) +++ projects/building-blocks/share/man/man9/memguard.9 Thu Feb 19 11:44:50 2015 (r278994) @@ -176,8 +176,6 @@ doesn't guard those .Xr uma 9 zones that have been initialized with the .Dv UMA_ZONE_NOFREE -or -.Dv UMA_ZONE_REFCNT flag set, since it can produce false positives on them. However, this safety measure can be turned off by setting bit 3 of the Modified: projects/building-blocks/sys/vm/memguard.c ============================================================================== --- projects/building-blocks/sys/vm/memguard.c Thu Feb 19 11:41:12 2015 (r278993) +++ projects/building-blocks/sys/vm/memguard.c Thu Feb 19 11:44:50 2015 (r278994) @@ -504,9 +504,6 @@ memguard_cmp_zone(uma_zone_t zone) zone->uz_flags & UMA_ZONE_NOFREE) return (0); - if (zone->uz_flags & UMA_ZONE_REFCNT) - return (0); - if (memguard_cmp(zone->uz_size)) return (1); From owner-svn-src-projects@FreeBSD.ORG Thu Feb 19 21:10:09 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 BD3C17EE; Thu, 19 Feb 2015 21:10:09 +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 A3A971FC; Thu, 19 Feb 2015 21:10:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1JLA9DL097923; Thu, 19 Feb 2015 21:10:09 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1JLA2xu097875; Thu, 19 Feb 2015 21:10:02 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502192110.t1JLA2xu097875@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 19 Feb 2015 21:10:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r279023 - in projects/clang360-import: . cddl/contrib/opensolaris/lib/libdtrace/common etc lib/libc/rpc lib/libc/stdio lib/libc/sys release sbin/camcontrol share/mk sys/amd64/amd64 sys/... 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.18-1 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: Thu, 19 Feb 2015 21:10:09 -0000 Author: dim Date: Thu Feb 19 21:10:01 2015 New Revision: 279023 URL: https://svnweb.freebsd.org/changeset/base/279023 Log: Merging ^/head r278916 through r279022. Added: projects/clang360-import/sys/conf/config.mk - copied unchanged from r279022, head/sys/conf/config.mk projects/clang360-import/sys/contrib/dev/acpica/compiler/aslprintf.c - copied unchanged from r279022, head/sys/contrib/dev/acpica/compiler/aslprintf.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslprune.c - copied unchanged from r279022, head/sys/contrib/dev/acpica/compiler/aslprune.c projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c - copied unchanged from r279022, head/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c projects/clang360-import/sys/dev/ofw/ofw_cpu.h - copied unchanged from r279022, head/sys/dev/ofw/ofw_cpu.h Deleted: projects/clang360-import/sys/dev/cxgb/sys/mbufq.h projects/clang360-import/sys/dev/xen/netfront/mbufq.h Modified: projects/clang360-import/Makefile.inc1 projects/clang360-import/UPDATING projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c projects/clang360-import/etc/network.subr projects/clang360-import/lib/libc/rpc/clnt_dg.c projects/clang360-import/lib/libc/rpc/rpc_soc.c projects/clang360-import/lib/libc/stdio/xprintf_float.c projects/clang360-import/lib/libc/sys/mmap.2 projects/clang360-import/release/Makefile projects/clang360-import/release/Makefile.vm projects/clang360-import/sbin/camcontrol/camcontrol.c projects/clang360-import/share/mk/bsd.dep.mk projects/clang360-import/share/mk/bsd.libnames.mk projects/clang360-import/share/mk/bsd.own.mk projects/clang360-import/share/mk/bsd.sys.mk projects/clang360-import/sys/amd64/amd64/ptrace_machdep.c projects/clang360-import/sys/arm/arm/db_trace.c projects/clang360-import/sys/arm/arm/unwind.c projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/clang360-import/sys/arm/include/stack.h projects/clang360-import/sys/cam/cam_ccb.h projects/clang360-import/sys/cam/scsi/scsi_da.c projects/clang360-import/sys/cam/scsi/scsi_enc_ses.c projects/clang360-import/sys/cddl/dev/dtrace/arm/dtrace_isa.c projects/clang360-import/sys/conf/NOTES projects/clang360-import/sys/conf/files projects/clang360-import/sys/conf/files.arm projects/clang360-import/sys/conf/kmod.mk projects/clang360-import/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/clang360-import/sys/contrib/dev/acpica/common/acgetline.c projects/clang360-import/sys/contrib/dev/acpica/common/adfile.c projects/clang360-import/sys/contrib/dev/acpica/common/adisasm.c projects/clang360-import/sys/contrib/dev/acpica/common/adwalk.c projects/clang360-import/sys/contrib/dev/acpica/common/ahids.c projects/clang360-import/sys/contrib/dev/acpica/common/ahpredef.c projects/clang360-import/sys/contrib/dev/acpica/common/ahuuids.c projects/clang360-import/sys/contrib/dev/acpica/common/cmfsize.c projects/clang360-import/sys/contrib/dev/acpica/common/dmextern.c projects/clang360-import/sys/contrib/dev/acpica/common/dmrestag.c projects/clang360-import/sys/contrib/dev/acpica/common/dmtable.c projects/clang360-import/sys/contrib/dev/acpica/common/dmtbdump.c projects/clang360-import/sys/contrib/dev/acpica/common/dmtbinfo.c projects/clang360-import/sys/contrib/dev/acpica/common/getopt.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslanalyze.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslascii.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslbtypes.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslcompile.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/clang360-import/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/clang360-import/sys/contrib/dev/acpica/compiler/asldefine.h projects/clang360-import/sys/contrib/dev/acpica/compiler/aslerror.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslfileio.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslfiles.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslfold.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslglobal.h projects/clang360-import/sys/contrib/dev/acpica/compiler/aslhex.c projects/clang360-import/sys/contrib/dev/acpica/compiler/asllength.c projects/clang360-import/sys/contrib/dev/acpica/compiler/asllisting.c projects/clang360-import/sys/contrib/dev/acpica/compiler/asllistsup.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslload.c projects/clang360-import/sys/contrib/dev/acpica/compiler/asllookup.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmain.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmap.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmapenter.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmapoutput.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmaputils.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmessages.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmessages.h projects/clang360-import/sys/contrib/dev/acpica/compiler/aslmethod.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslnamesp.c projects/clang360-import/sys/contrib/dev/acpica/compiler/asloffset.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslopcodes.c projects/clang360-import/sys/contrib/dev/acpica/compiler/asloperands.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslopt.c projects/clang360-import/sys/contrib/dev/acpica/compiler/asloptions.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslparser.y projects/clang360-import/sys/contrib/dev/acpica/compiler/aslpredef.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslprepkg.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslresource.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype1.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype1i.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype2.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype2d.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype2e.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype2q.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype2s.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrestype2w.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslrules.y projects/clang360-import/sys/contrib/dev/acpica/compiler/aslstartup.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslstubs.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslsupport.l projects/clang360-import/sys/contrib/dev/acpica/compiler/aslsupport.y projects/clang360-import/sys/contrib/dev/acpica/compiler/asltokens.y projects/clang360-import/sys/contrib/dev/acpica/compiler/asltransform.c projects/clang360-import/sys/contrib/dev/acpica/compiler/asltree.c projects/clang360-import/sys/contrib/dev/acpica/compiler/asltypes.h projects/clang360-import/sys/contrib/dev/acpica/compiler/asltypes.y projects/clang360-import/sys/contrib/dev/acpica/compiler/aslutils.c projects/clang360-import/sys/contrib/dev/acpica/compiler/asluuid.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslwalks.c projects/clang360-import/sys/contrib/dev/acpica/compiler/aslxref.c projects/clang360-import/sys/contrib/dev/acpica/compiler/dtcompile.c projects/clang360-import/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/clang360-import/sys/contrib/dev/acpica/compiler/dtexpress.c projects/clang360-import/sys/contrib/dev/acpica/compiler/dtfield.c projects/clang360-import/sys/contrib/dev/acpica/compiler/dtio.c projects/clang360-import/sys/contrib/dev/acpica/compiler/dtparser.l projects/clang360-import/sys/contrib/dev/acpica/compiler/dtparser.y projects/clang360-import/sys/contrib/dev/acpica/compiler/dtsubtable.c projects/clang360-import/sys/contrib/dev/acpica/compiler/dttable.c projects/clang360-import/sys/contrib/dev/acpica/compiler/dttemplate.c projects/clang360-import/sys/contrib/dev/acpica/compiler/dttemplate.h projects/clang360-import/sys/contrib/dev/acpica/compiler/dtutils.c projects/clang360-import/sys/contrib/dev/acpica/compiler/preprocess.h projects/clang360-import/sys/contrib/dev/acpica/compiler/prexpress.c projects/clang360-import/sys/contrib/dev/acpica/compiler/prmacros.c projects/clang360-import/sys/contrib/dev/acpica/compiler/prparser.l projects/clang360-import/sys/contrib/dev/acpica/compiler/prparser.y projects/clang360-import/sys/contrib/dev/acpica/compiler/prscan.c projects/clang360-import/sys/contrib/dev/acpica/compiler/prutils.c projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbcmds.c projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbconvert.c projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbexec.c projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbfileio.c projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbhistry.c projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbmethod.c projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbnames.c projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbstats.c projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbtest.c projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbutils.c projects/clang360-import/sys/contrib/dev/acpica/components/debugger/dbxface.c projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmnames.c projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmobject.c projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmresrc.c projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmutils.c projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsargs.c projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsfield.c projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsinit.c projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsobject.c projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dsutils.c projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dswexec.c projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dswload.c projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dswload2.c projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dswscope.c projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/dswstate.c projects/clang360-import/sys/contrib/dev/acpica/components/events/evevent.c projects/clang360-import/sys/contrib/dev/acpica/components/events/evglock.c projects/clang360-import/sys/contrib/dev/acpica/components/events/evgpe.c projects/clang360-import/sys/contrib/dev/acpica/components/events/evgpeblk.c projects/clang360-import/sys/contrib/dev/acpica/components/events/evgpeinit.c projects/clang360-import/sys/contrib/dev/acpica/components/events/evgpeutil.c projects/clang360-import/sys/contrib/dev/acpica/components/events/evhandler.c projects/clang360-import/sys/contrib/dev/acpica/components/events/evmisc.c projects/clang360-import/sys/contrib/dev/acpica/components/events/evregion.c projects/clang360-import/sys/contrib/dev/acpica/components/events/evrgnini.c projects/clang360-import/sys/contrib/dev/acpica/components/events/evsci.c projects/clang360-import/sys/contrib/dev/acpica/components/events/evxface.c projects/clang360-import/sys/contrib/dev/acpica/components/events/evxfevnt.c projects/clang360-import/sys/contrib/dev/acpica/components/events/evxfgpe.c projects/clang360-import/sys/contrib/dev/acpica/components/events/evxfregn.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exconfig.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exconvrt.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/excreate.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exdebug.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exdump.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exfield.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exfldio.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exmisc.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exmutex.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exnames.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exoparg1.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exoparg2.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exoparg3.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exoparg6.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exprep.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exregion.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exresnte.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exresolv.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exresop.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exstore.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exstoren.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exstorob.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exsystem.c projects/clang360-import/sys/contrib/dev/acpica/components/executer/exutils.c projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwacpi.c projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwesleep.c projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwgpe.c projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwpci.c projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwregs.c projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwsleep.c projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwtimer.c projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwvalid.c projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwxface.c projects/clang360-import/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsaccess.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsalloc.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsarguments.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsconvert.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nseval.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsinit.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsload.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsnames.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsobject.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsparse.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nspredef.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsprepkg.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsrepair.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsrepair2.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nssearch.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsutils.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nswalk.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsxfeval.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsxfname.c projects/clang360-import/sys/contrib/dev/acpica/components/namespace/nsxfobj.c projects/clang360-import/sys/contrib/dev/acpica/components/parser/psargs.c projects/clang360-import/sys/contrib/dev/acpica/components/parser/psloop.c projects/clang360-import/sys/contrib/dev/acpica/components/parser/psobject.c projects/clang360-import/sys/contrib/dev/acpica/components/parser/psopcode.c projects/clang360-import/sys/contrib/dev/acpica/components/parser/psopinfo.c projects/clang360-import/sys/contrib/dev/acpica/components/parser/psparse.c projects/clang360-import/sys/contrib/dev/acpica/components/parser/psscope.c projects/clang360-import/sys/contrib/dev/acpica/components/parser/pstree.c projects/clang360-import/sys/contrib/dev/acpica/components/parser/psutils.c projects/clang360-import/sys/contrib/dev/acpica/components/parser/pswalk.c projects/clang360-import/sys/contrib/dev/acpica/components/parser/psxface.c projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsaddr.c projects/clang360-import/sys/contrib/dev/acpica/components/resources/rscalc.c projects/clang360-import/sys/contrib/dev/acpica/components/resources/rscreate.c projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsdump.c projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsinfo.c projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsio.c projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsirq.c projects/clang360-import/sys/contrib/dev/acpica/components/resources/rslist.c projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsmemory.c projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsmisc.c projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsserial.c projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsutils.c projects/clang360-import/sys/contrib/dev/acpica/components/resources/rsxface.c projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbdata.c projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbfadt.c projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbfind.c projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbprint.c projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbutils.c projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbxface.c projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbxfload.c projects/clang360-import/sys/contrib/dev/acpica/components/tables/tbxfroot.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utaddress.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utalloc.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utbuffer.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utcache.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utcopy.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utdebug.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utdecode.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utdelete.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/uterror.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/uteval.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utexcep.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utfileio.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utglobal.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/uthex.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utids.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utinit.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utlock.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utmath.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utmutex.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utobject.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utosi.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utownerid.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utpredef.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utprint.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utresrc.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utstate.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utstring.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/uttrack.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utuuid.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utxface.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utxferror.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utxfinit.c projects/clang360-import/sys/contrib/dev/acpica/components/utilities/utxfmutex.c projects/clang360-import/sys/contrib/dev/acpica/include/acapps.h projects/clang360-import/sys/contrib/dev/acpica/include/acbuffer.h projects/clang360-import/sys/contrib/dev/acpica/include/accommon.h projects/clang360-import/sys/contrib/dev/acpica/include/acconfig.h projects/clang360-import/sys/contrib/dev/acpica/include/acdebug.h projects/clang360-import/sys/contrib/dev/acpica/include/acdisasm.h projects/clang360-import/sys/contrib/dev/acpica/include/acdispat.h projects/clang360-import/sys/contrib/dev/acpica/include/acevents.h projects/clang360-import/sys/contrib/dev/acpica/include/acexcep.h projects/clang360-import/sys/contrib/dev/acpica/include/acglobal.h projects/clang360-import/sys/contrib/dev/acpica/include/achware.h projects/clang360-import/sys/contrib/dev/acpica/include/acinterp.h projects/clang360-import/sys/contrib/dev/acpica/include/aclocal.h projects/clang360-import/sys/contrib/dev/acpica/include/acmacros.h projects/clang360-import/sys/contrib/dev/acpica/include/acnames.h projects/clang360-import/sys/contrib/dev/acpica/include/acnamesp.h projects/clang360-import/sys/contrib/dev/acpica/include/acobject.h projects/clang360-import/sys/contrib/dev/acpica/include/acopcode.h projects/clang360-import/sys/contrib/dev/acpica/include/acoutput.h projects/clang360-import/sys/contrib/dev/acpica/include/acparser.h projects/clang360-import/sys/contrib/dev/acpica/include/acpi.h projects/clang360-import/sys/contrib/dev/acpica/include/acpiosxf.h projects/clang360-import/sys/contrib/dev/acpica/include/acpixf.h projects/clang360-import/sys/contrib/dev/acpica/include/acpredef.h projects/clang360-import/sys/contrib/dev/acpica/include/acresrc.h projects/clang360-import/sys/contrib/dev/acpica/include/acrestyp.h projects/clang360-import/sys/contrib/dev/acpica/include/acstruct.h projects/clang360-import/sys/contrib/dev/acpica/include/actables.h projects/clang360-import/sys/contrib/dev/acpica/include/actbl.h projects/clang360-import/sys/contrib/dev/acpica/include/actbl1.h projects/clang360-import/sys/contrib/dev/acpica/include/actbl2.h projects/clang360-import/sys/contrib/dev/acpica/include/actbl3.h projects/clang360-import/sys/contrib/dev/acpica/include/actypes.h projects/clang360-import/sys/contrib/dev/acpica/include/acutils.h projects/clang360-import/sys/contrib/dev/acpica/include/amlcode.h projects/clang360-import/sys/contrib/dev/acpica/include/amlresrc.h projects/clang360-import/sys/contrib/dev/acpica/include/platform/acenv.h projects/clang360-import/sys/contrib/dev/acpica/include/platform/acenvex.h projects/clang360-import/sys/contrib/dev/acpica/include/platform/acfreebsd.h projects/clang360-import/sys/contrib/dev/acpica/include/platform/acgcc.h projects/clang360-import/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c projects/clang360-import/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c projects/clang360-import/sys/dev/cardbus/cardbus.c projects/clang360-import/sys/dev/cxgb/cxgb_adapter.h projects/clang360-import/sys/dev/cxgb/cxgb_sge.c projects/clang360-import/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/clang360-import/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h projects/clang360-import/sys/dev/iicbus/lm75.c projects/clang360-import/sys/dev/mpr/mpr_sas.c projects/clang360-import/sys/dev/mps/mps_sas.c projects/clang360-import/sys/dev/ofw/ofw_cpu.c projects/clang360-import/sys/dev/pccbb/pccbb.c projects/clang360-import/sys/dev/random/fortuna.c projects/clang360-import/sys/dev/random/yarrow.c projects/clang360-import/sys/dev/sfxge/common/efx_ev.c projects/clang360-import/sys/dev/sfxge/common/efx_mcdi.h projects/clang360-import/sys/dev/sfxge/common/efx_regs_mcdi.h projects/clang360-import/sys/dev/sfxge/common/siena_nic.c projects/clang360-import/sys/dev/sfxge/common/siena_nvram.c projects/clang360-import/sys/dev/sfxge/common/siena_phy.c projects/clang360-import/sys/dev/sfxge/sfxge.h projects/clang360-import/sys/dev/sfxge/sfxge_ev.c projects/clang360-import/sys/dev/sfxge/sfxge_rx.c projects/clang360-import/sys/dev/sfxge/sfxge_tx.c projects/clang360-import/sys/dev/sfxge/sfxge_tx.h projects/clang360-import/sys/dev/spibus/spi.h projects/clang360-import/sys/dev/spibus/spibus.c projects/clang360-import/sys/dev/spibus/spibusvar.h projects/clang360-import/sys/dev/xen/netfront/netfront.c projects/clang360-import/sys/i386/i386/ptrace_machdep.c projects/clang360-import/sys/kern/kern_ctf.c projects/clang360-import/sys/kern/kern_descrip.c projects/clang360-import/sys/kern/sys_generic.c projects/clang360-import/sys/kern/sysv_shm.c projects/clang360-import/sys/kern/tty.c projects/clang360-import/sys/kern/uipc_mbuf.c projects/clang360-import/sys/kern/uipc_syscalls.c projects/clang360-import/sys/kern/vfs_syscalls.c projects/clang360-import/sys/modules/Makefile projects/clang360-import/sys/modules/dpt/Makefile projects/clang360-import/sys/modules/ed/Makefile projects/clang360-import/sys/modules/ep/Makefile projects/clang360-import/sys/modules/if_gif/Makefile projects/clang360-import/sys/modules/if_gre/Makefile projects/clang360-import/sys/modules/si/Makefile projects/clang360-import/sys/modules/vx/Makefile projects/clang360-import/sys/netinet/igmp.c projects/clang360-import/sys/netinet/in_mcast.c projects/clang360-import/sys/netinet/in_var.h projects/clang360-import/sys/netinet6/in6_mcast.c projects/clang360-import/sys/netinet6/in6_var.h projects/clang360-import/sys/netinet6/mld6.c projects/clang360-import/sys/netinet6/mld6_var.h projects/clang360-import/sys/netpfil/pf/pf_norm.c projects/clang360-import/sys/ofed/drivers/infiniband/core/cma.c projects/clang360-import/sys/ofed/include/linux/file.h projects/clang360-import/sys/ofed/include/net/ip.h projects/clang360-import/sys/powerpc/powermac/atibl.c projects/clang360-import/sys/powerpc/powermac/nvbl.c projects/clang360-import/sys/sys/cpu.h projects/clang360-import/sys/sys/file.h projects/clang360-import/sys/sys/filedesc.h projects/clang360-import/sys/sys/mbuf.h projects/clang360-import/sys/sys/param.h projects/clang360-import/sys/x86/acpica/acpi_wakeup.c projects/clang360-import/usr.bin/du/du.c projects/clang360-import/usr.bin/ministat/ministat.c projects/clang360-import/usr.bin/netstat/inet.c projects/clang360-import/usr.sbin/Makefile projects/clang360-import/usr.sbin/acpi/acpidb/Makefile projects/clang360-import/usr.sbin/acpi/acpidb/acpidb.c projects/clang360-import/usr.sbin/acpi/iasl/Makefile projects/clang360-import/usr.sbin/syslogd/syslogd.c Directory Properties: projects/clang360-import/ (props changed) projects/clang360-import/cddl/ (props changed) projects/clang360-import/cddl/contrib/opensolaris/ (props changed) projects/clang360-import/etc/ (props changed) projects/clang360-import/lib/libc/ (props changed) projects/clang360-import/sbin/ (props changed) projects/clang360-import/share/ (props changed) projects/clang360-import/sys/ (props changed) projects/clang360-import/sys/conf/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/common/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/compiler/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/components/dispatcher/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/components/events/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/components/executer/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/components/hardware/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/components/namespace/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/components/parser/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/components/resources/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/components/tables/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/include/ (props changed) projects/clang360-import/sys/contrib/dev/acpica/os_specific/ (props changed) Modified: projects/clang360-import/Makefile.inc1 ============================================================================== --- projects/clang360-import/Makefile.inc1 Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/Makefile.inc1 Thu Feb 19 21:10:01 2015 (r279023) @@ -343,16 +343,15 @@ WMAKEENV+= CC="${XCC} ${XCFLAGS}" CXX="$ SIZE="${XSIZE}" .if ${XCC:M/*} -XFLAGS= --sysroot=${WORLDTMP} .if defined(CROSS_BINUTILS_PREFIX) # In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a # directory, but the compiler will look in the right place for it's # tools so we don't need to tell it where to look. .if exists(${CROSS_BINUTILS_PREFIX}) -XFLAGS+= -B${CROSS_BINUTILS_PREFIX} +BFLAGS+= -B${CROSS_BINUTILS_PREFIX} .endif .else -XFLAGS+= -B${WORLDTMP}/usr/bin +BFLAGS+= -B${WORLDTMP}/usr/bin .endif .if ${TARGET} == "arm" .if ${TARGET_ARCH:M*hf*} != "" @@ -369,6 +368,8 @@ DEPFLAGS+= -I${WORLDTMP}/usr/include/c++ TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XCFLAGS+= -target ${TARGET_TRIPLE} +XCFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} +XCXXFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} .endif .endif @@ -912,25 +913,25 @@ packageworld: .for dist in base ${EXTRA_DISTRIBUTIONS} .if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ - --exclude usr/lib/debug \ - @${DESTDIR}/${DISTDIR}/${dist}.meta + tar cvf - --exclude usr/lib/debug \ + @${DESTDIR}/${DISTDIR}/${dist}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz .else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ - --exclude usr/lib/debug . + tar cvf - --exclude usr/lib/debug . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz .endif .endfor .for dist in ${DEBUG_DISTRIBUTIONS} . if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \ - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta + tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz . else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJLf ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \ - usr/lib/debug + tar cvLf - usr/lib/debug | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz . endif .endfor @@ -1138,19 +1139,21 @@ distributekernel distributekernel.debug: packagekernel: .if defined(NO_ROOT) cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \ - @${DESTDIR}/${DISTDIR}/kernel.meta + tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \ - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta + tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .endfor .else cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz . + tar cvf - . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz . + tar cvf - . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .endfor .endif @@ -1244,11 +1247,6 @@ _m4= lib/libohash \ usr.bin/m4 .endif -.if ${BOOTSTRAPPING} < 1000013 -_yacc= lib/liby \ - usr.bin/yacc -.endif - .if ${BOOTSTRAPPING} < 1000014 _crunch= usr.sbin/crunch .endif @@ -1270,6 +1268,11 @@ _lex= usr.bin/lex _awk= usr.bin/awk .endif +.if ${BOOTSTRAPPING} < 1001506 +_yacc= lib/liby \ + usr.bin/yacc +.endif + .if ${MK_BSNMP} != "no" _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif Modified: projects/clang360-import/UPDATING ============================================================================== --- projects/clang360-import/UPDATING Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/UPDATING Thu Feb 19 21:10:01 2015 (r279023) @@ -34,6 +34,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 2015mmdd: Clang and llvm have been upgraded to 3.6.0 release. +20150217: + If you are running a -CURRENT kernel since r273872 (Oct 30th, 2014), + but before r278950, the RNG was not seeded properly. Immediately + upgrade the kernel to r278950 or later and regenerate any keys (e.g. + ssh keys or openssl keys) that were generated w/ a kernel from that + range. This does not effect programs that directly used /dev/random + or /dev/urandom. All userland uses of arc4random(3) are affected. + 20150210: The autofs(4) ABI was changed in order to restore binary compatibility with 10.1-RELEASE. The automountd(8) daemon needs to be rebuilt to work Modified: projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Thu Feb 19 21:10:01 2015 (r279023) @@ -36,7 +36,6 @@ #include #include #include -#include /* * In Solaris 10 GA, the only mechanism for communicating helper information @@ -62,9 +61,7 @@ static const char *olddevname = "/device static const char *modname; /* Name of this load object */ static int gen; /* DOF helper generation */ -#ifdef illumos extern dof_hdr_t __SUNW_dof; /* DOF defined in the .SUNW_dof section */ -#endif static boolean_t dof_init_debug = B_FALSE; /* From DTRACE_DOF_INIT_DEBUG */ static void @@ -99,11 +96,7 @@ static void dtrace_dof_init(void) __attr static void dtrace_dof_init(void) { -#ifdef illumos dof_hdr_t *dof = &__SUNW_dof; -#else - dof_hdr_t *dof = NULL; -#endif #ifdef _LP64 Elf64_Ehdr *elf; #else @@ -118,17 +111,6 @@ dtrace_dof_init(void) #endif int fd; const char *p; -#ifndef illumos - Elf *e; - Elf_Scn *scn = NULL; - Elf_Data *dofdata = NULL; - dof_hdr_t *dof_next = NULL; - GElf_Shdr shdr; - int efd; - char *s; - size_t shstridx; - uint64_t aligned_filesz; -#endif if (getenv("DTRACE_DOF_INIT_DISABLE") != NULL) return; @@ -152,42 +134,6 @@ dtrace_dof_init(void) modname = lmp->l_name; else modname++; -#ifndef illumos - elf_version(EV_CURRENT); - if ((efd = open(lmp->l_name, O_RDONLY, 0)) < 0) { - dprintf(1, "couldn't open file for reading\n"); - return; - } - if ((e = elf_begin(efd, ELF_C_READ, NULL)) == NULL) { - dprintf(1, "elf_begin failed\n"); - close(efd); - return; - } - elf_getshdrstrndx(e, &shstridx); - dof = NULL; - while ((scn = elf_nextscn(e, scn)) != NULL) { - gelf_getshdr(scn, &shdr); - if (shdr.sh_type == SHT_SUNW_dof) { - s = elf_strptr(e, shstridx, shdr.sh_name); - if (s != NULL && strcmp(s, ".SUNW_dof") == 0) { - dofdata = elf_getdata(scn, NULL); - dof = dofdata->d_buf; - break; - } - } - } - if (dof == NULL) { - dprintf(1, "SUNW_dof section not found\n"); - elf_end(e); - close(efd); - return; - } - - while ((char *) dof < (char *) dofdata->d_buf + dofdata->d_size) { - aligned_filesz = (shdr.sh_addralign == 0 ? dof->dofh_filesz : - roundup2(dof->dofh_filesz, shdr.sh_addralign)); - dof_next = (void *) ((char *) dof + aligned_filesz); -#endif if (dof->dofh_ident[DOF_ID_MAG0] != DOF_MAG_MAG0 || dof->dofh_ident[DOF_ID_MAG1] != DOF_MAG_MAG1 || @@ -237,21 +183,12 @@ dtrace_dof_init(void) dprintf(1, "DTrace ioctl failed for DOF at %p", dof); else { dprintf(1, "DTrace ioctl succeeded for DOF at %p\n", dof); -#ifndef illumos +#ifdef __FreeBSD__ gen = dh.gen; #endif } (void) close(fd); - -#ifndef illumos - /* End of while loop */ - dof = dof_next; - } - - elf_end(e); - (void) close(efd); -#endif } #ifdef illumos Modified: projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h ============================================================================== --- projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h Thu Feb 19 21:10:01 2015 (r279023) @@ -275,6 +275,9 @@ struct dtrace_hdl { int dt_cpp_argc; /* count of initialized cpp(1) arguments */ int dt_cpp_args; /* size of dt_cpp_argv[] array */ char *dt_ld_path; /* pathname of ld(1) to invoke if needed */ +#ifdef __FreeBSD__ + char *dt_objcopy_path; /* pathname of objcopy(1) to invoke if needed */ +#endif dt_list_t dt_lib_path; /* linked-list forming library search path */ uint_t dt_lazyload; /* boolean: set via -xlazyload */ uint_t dt_droptags; /* boolean: set via -xdroptags */ Modified: projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Thu Feb 19 21:10:01 2015 (r279023) @@ -281,7 +281,11 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION_ sym->st_value = 0; sym->st_size = dof->dofh_filesz; sym->st_info = ELF32_ST_INFO(STB_GLOBAL, STT_OBJECT); +#ifdef illumos sym->st_other = 0; +#else + sym->st_other = ELF32_ST_VISIBILITY(STV_HIDDEN); +#endif sym->st_shndx = ESHDR_DOF; sym++; @@ -471,7 +475,11 @@ prepare_elf64(dtrace_hdl_t *dtp, const d sym->st_value = 0; sym->st_size = dof->dofh_filesz; sym->st_info = GELF_ST_INFO(STB_GLOBAL, STT_OBJECT); +#ifdef illumos sym->st_other = 0; +#else + sym->st_other = ELF64_ST_VISIBILITY(STV_HIDDEN); +#endif sym->st_shndx = ESHDR_DOF; sym++; @@ -711,11 +719,7 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_ shp = &elf_file.shdr[ESHDR_DOF]; shp->sh_name = 11; /* DTRACE_SHSTRTAB64[11] = ".SUNW_dof" */ -#ifdef illumos shp->sh_flags = SHF_ALLOC; -#else - shp->sh_flags = SHF_WRITE | SHF_ALLOC; -#endif shp->sh_type = SHT_SUNW_dof; shp->sh_offset = off; shp->sh_size = dof->dofh_filesz; @@ -1874,7 +1878,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, d #endif (void) snprintf(drti, sizeof (drti), "/usr/lib%s/dtrace/drti.o", - use_32 ? "32":""); + use_32 ? "32" : ""); len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile, drti) + 1; @@ -1885,26 +1889,61 @@ dtrace_program_link(dtrace_hdl_t *dtp, d drti); #endif if ((status = system(cmd)) == -1) { - ret = dt_link_error(dtp, NULL, -1, NULL, + ret = dt_link_error(dtp, NULL, fd, NULL, "failed to run %s: %s", dtp->dt_ld_path, strerror(errno)); goto done; } if (WIFSIGNALED(status)) { - ret = dt_link_error(dtp, NULL, -1, NULL, + ret = dt_link_error(dtp, NULL, fd, NULL, "failed to link %s: %s failed due to signal %d", file, dtp->dt_ld_path, WTERMSIG(status)); goto done; } if (WEXITSTATUS(status) != 0) { - ret = dt_link_error(dtp, NULL, -1, NULL, + ret = dt_link_error(dtp, NULL, fd, NULL, "failed to link %s: %s exited with status %d\n", file, dtp->dt_ld_path, WEXITSTATUS(status)); goto done; } (void) close(fd); /* release temporary file */ + +#ifdef __FreeBSD__ + /* + * Now that we've linked drti.o, reduce the global __SUNW_dof + * symbol to a local symbol. This is needed to so that multiple + * generated object files (for different providers, for + * instance) can be linked together. This is accomplished using + * the -Blocal flag with Sun's linker, but GNU ld doesn't appear + * to have an equivalent option. + */ + asprintf(&cmd, "%s --localize-hidden %s", dtp->dt_objcopy_path, + file); + if ((status = system(cmd)) == -1) { + ret = dt_link_error(dtp, NULL, -1, NULL, + "failed to run %s: %s", dtp->dt_objcopy_path, + strerror(errno)); + free(cmd); + goto done; + } + free(cmd); + + if (WIFSIGNALED(status)) { + ret = dt_link_error(dtp, NULL, -1, NULL, + "failed to link %s: %s failed due to signal %d", + file, dtp->dt_objcopy_path, WTERMSIG(status)); + goto done; + } + + if (WEXITSTATUS(status) != 0) { + ret = dt_link_error(dtp, NULL, -1, NULL, + "failed to link %s: %s exited with status %d\n", + file, dtp->dt_objcopy_path, WEXITSTATUS(status)); + goto done; + } +#endif } else { (void) close(fd); } Modified: projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Thu Feb 19 21:10:01 2015 (r279023) @@ -785,6 +785,7 @@ const char *_dtrace_defld = "/usr/ccs/bi #else const char *_dtrace_defcpp = "cpp"; /* default cpp(1) to invoke */ const char *_dtrace_defld = "ld"; /* default ld(1) to invoke */ +const char *_dtrace_defobjcopy = "objcopy"; /* default objcopy(1) to invoke */ #endif const char *_dtrace_libdir = "/usr/lib/dtrace"; /* default library directory */ @@ -1185,6 +1186,9 @@ alloc: dtp->dt_cpp_argc = 1; dtp->dt_cpp_args = 1; dtp->dt_ld_path = strdup(_dtrace_defld); +#ifdef __FreeBSD__ + dtp->dt_objcopy_path = strdup(_dtrace_defobjcopy); +#endif dtp->dt_provmod = provmod; dtp->dt_vector = vector; dtp->dt_varg = arg; @@ -1193,6 +1197,9 @@ alloc: if (dtp->dt_mods == NULL || dtp->dt_provs == NULL || dtp->dt_procs == NULL || dtp->dt_ld_path == NULL || +#ifdef __FreeBSD__ + dtp->dt_objcopy_path == NULL || +#endif dtp->dt_cpp_path == NULL || dtp->dt_cpp_argv == NULL) return (set_open_errno(dtp, errp, EDT_NOMEM)); @@ -1673,6 +1680,9 @@ dtrace_close(dtrace_hdl_t *dtp) free(dtp->dt_cpp_argv); free(dtp->dt_cpp_path); free(dtp->dt_ld_path); +#ifdef __FreeBSD__ + free(dtp->dt_objcopy_path); +#endif free(dtp->dt_mods); free(dtp->dt_provs); Modified: projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c ============================================================================== --- projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c Thu Feb 19 21:10:01 2015 (r279023) @@ -280,6 +280,28 @@ dt_opt_ld_path(dtrace_hdl_t *dtp, const return (0); } +#ifdef __FreeBSD__ +static int +dt_opt_objcopy_path(dtrace_hdl_t *dtp, const char *arg, uintptr_t option) +{ + char *objcopy; + + if (arg == NULL) + return (dt_set_errno(dtp, EDT_BADOPTVAL)); + + if (dtp->dt_pcb != NULL) + return (dt_set_errno(dtp, EDT_BADOPTCTX)); + + if ((objcopy = strdup(arg)) == NULL) + return (dt_set_errno(dtp, EDT_NOMEM)); + + free(dtp->dt_objcopy_path); + dtp->dt_objcopy_path = objcopy; + + return (0); +} +#endif + /*ARGSUSED*/ static int dt_opt_libdir(dtrace_hdl_t *dtp, const char *arg, uintptr_t option) @@ -960,6 +982,9 @@ static const dt_option_t _dtrace_ctoptio { "linkmode", dt_opt_linkmode }, { "linktype", dt_opt_linktype }, { "nolibs", dt_opt_cflags, DTRACE_C_NOLIBS }, +#ifdef __FreeBSD__ + { "objcopypath", dt_opt_objcopy_path }, +#endif { "pgmax", dt_opt_pgmax }, { "pspec", dt_opt_cflags, DTRACE_C_PSPEC }, { "setenv", dt_opt_setenv, 1 }, Modified: projects/clang360-import/etc/network.subr ============================================================================== --- projects/clang360-import/etc/network.subr Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/etc/network.subr Thu Feb 19 21:10:01 2015 (r279023) @@ -754,7 +754,7 @@ ipv6_down() IFS="$_ifs" for _inet6 in $inetList ; do # get rid of extraneous line - case $_inet in + case $_inet6 in inet6\ *) ;; *) continue ;; esac Modified: projects/clang360-import/lib/libc/rpc/clnt_dg.c ============================================================================== --- projects/clang360-import/lib/libc/rpc/clnt_dg.c Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/lib/libc/rpc/clnt_dg.c Thu Feb 19 21:10:01 2015 (r279023) @@ -327,7 +327,7 @@ clnt_dg_call(cl, proc, xargs, argsp, xre struct sockaddr *sa; sigset_t mask; sigset_t newmask; - socklen_t inlen, salen; + socklen_t salen; ssize_t recvlen = 0; int kin_len, n, rpc_lock_value; u_int32_t xid; @@ -520,7 +520,6 @@ get_reply: goto call_again_same_xid; } } - inlen = (socklen_t)recvlen; /* * now decode and validate the response Modified: projects/clang360-import/lib/libc/rpc/rpc_soc.c ============================================================================== --- projects/clang360-import/lib/libc/rpc/rpc_soc.c Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/lib/libc/rpc/rpc_soc.c Thu Feb 19 21:10:01 2015 (r279023) @@ -462,12 +462,10 @@ clntunix_create(raddr, prog, vers, sockp u_int recvsz; { struct netbuf *svcaddr; - struct netconfig *nconf; CLIENT *cl; int len; cl = NULL; - nconf = NULL; svcaddr = NULL; if ((raddr->sun_len == 0) || ((svcaddr = malloc(sizeof(struct netbuf))) == NULL ) || Modified: projects/clang360-import/lib/libc/stdio/xprintf_float.c ============================================================================== --- projects/clang360-import/lib/libc/stdio/xprintf_float.c Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/lib/libc/stdio/xprintf_float.c Thu Feb 19 21:10:01 2015 (r279023) @@ -168,7 +168,6 @@ __printf_render_float(struct __printf_io int realsz; /* field size expanded by dprec, sign, etc */ int dprec; /* a copy of prec if [diouxX], 0 otherwise */ char ox[2]; /* space for 0x; ox[1] is either x, X, or \0 */ - int prsize; /* max size of printed field */ int ret; /* return value accumulator */ char *decimal_point; /* locale specific decimal point */ int n2; /* XXX: for PRINTANDPAD */ @@ -344,8 +343,6 @@ here: if (ox[1]) realsz += 2; - prsize = pi->width > realsz ? pi->width : realsz; - /* right-adjusting blank padding */ if (pi->pad != '0' && pi->left == 0) ret += __printf_pad(io, pi->width - realsz, 0); Modified: projects/clang360-import/lib/libc/sys/mmap.2 ============================================================================== --- projects/clang360-import/lib/libc/sys/mmap.2 Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/lib/libc/sys/mmap.2 Thu Feb 19 21:10:01 2015 (r279023) @@ -28,7 +28,7 @@ .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 .\" $FreeBSD$ .\" -.Dd September 17, 2014 +.Dd February 18, 2015 .Dt MMAP 2 .Os .Sh NAME @@ -160,7 +160,7 @@ is specified, must be a multiple of the pagesize. If .Dv MAP_EXCL -is not specified, a successfull +is not specified, a successful .Dv MAP_FIXED request replaces any previous mappings for the process' pages in the range from @@ -225,7 +225,7 @@ it. You can test file fragmentation by observing the KB/t (kilobytes per transfer) results from an .Dq Li iostat 1 -while reading a large file sequentially, e.g.\& using +while reading a large file sequentially, e.g.,\& using .Dq Li dd if=filename of=/dev/null bs=32k . .Pp The @@ -448,17 +448,3 @@ was specified and insufficient memory wa .Xr munmap 2 , .Xr getpagesize 3 , .Xr getpagesizes 3 -.Sh BUGS -The -.Fa len -argument -is limited to the maximum file size or available userland address -space. -Files may not be able to be made more than 1TB large on 32 bit systems -due to file systems restrictions and bugs, but address space is far more -restrictive. -Larger files may be possible on 64 bit systems. -.Pp -The previous documented limit of 2GB was a documentation bug. -That limit has not existed since -.Fx 2.2 . Modified: projects/clang360-import/release/Makefile ============================================================================== --- projects/clang360-import/release/Makefile Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/release/Makefile Thu Feb 19 21:10:01 2015 (r279023) @@ -33,18 +33,12 @@ # with xz(1) (extremely time consuming) # WITH_CLOUDWARE: if set, build cloud hosting disk images with the release # TARGET/TARGET_ARCH: architecture of built release -# XZ_FLAGS: Additional arguments to pass to xz(1) -# XZ_THREADS: Number of xz(1) threads to use -# NO_XZTHREADS: Disable multi-threaded xz(1) compression # WORLDDIR?= ${.CURDIR}/.. PORTSDIR?= /usr/ports DOCDIR?= /usr/doc RELNOTES_LANG?= en_US.ISO8859-1 -XZCMD?= /usr/bin/xz -XZ_FLAGS?= -XZ_THREADS?= .if !defined(TARGET) || empty(TARGET) TARGET= ${MACHINE} @@ -59,15 +53,6 @@ TARGET_ARCH= ${TARGET} IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} DISTDIR= dist -.if !defined(NO_XZTHREADS) && empty(XZ_THREADS) -XZ_THREADS= 0 -.else -XZ_THREADS= ${XZ_THREADS} -.endif -.if !empty(XZ_THREADS) -XZ_FLAGS+= -T ${XZ_THREADS} -.endif - # Define OSRELEASE by using newvars.sh .if !defined(OSRELEASE) || empty(OSRELEASE) .for _V in TYPE BRANCH REVISION @@ -158,16 +143,18 @@ kernel.txz: src.txz: mkdir -p ${DISTDIR}/usr ln -fs ${WORLDDIR} ${DISTDIR}/usr/src - cd ${DISTDIR} && tar cLvJf ${.OBJDIR}/src.txz --exclude .svn --exclude .zfs \ - --exclude .git --exclude @ --exclude usr/src/release/dist usr/src + cd ${DISTDIR} && tar cLvf - --exclude .svn --exclude .zfs \ + --exclude .git --exclude @ --exclude usr/src/release/dist usr/src | \ + ${XZ_CMD} > ${.OBJDIR}/src.txz ports.txz: mkdir -p ${DISTDIR}/usr ln -fs ${PORTSDIR} ${DISTDIR}/usr/ports - cd ${DISTDIR} && tar cLvJf ${.OBJDIR}/ports.txz \ + cd ${DISTDIR} && tar cLvf - \ --exclude .git --exclude .svn \ --exclude usr/ports/distfiles --exclude usr/ports/packages \ - --exclude 'usr/ports/INDEX*' --exclude work usr/ports + --exclude 'usr/ports/INDEX*' --exclude work usr/ports | \ + ${XZ_CMD} > ${.OBJDIR}/ports.txz reldoc: cd ${.CURDIR}/doc && ${MAKE} all install clean 'FORMATS=html txt' \ @@ -309,7 +296,7 @@ release-install: .for I in ${IMAGES} cp -p ${I} ${DESTDIR}/${OSRELEASE}-${I} . if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES) - ${XZCMD} ${XZ_FLAGS} -k ${DESTDIR}/${OSRELEASE}-${I} + ${XZ_CMD} -k ${DESTDIR}/${OSRELEASE}-${I} . endif .endfor cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256 Modified: projects/clang360-import/release/Makefile.vm ============================================================================== --- projects/clang360-import/release/Makefile.vm Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/release/Makefile.vm Thu Feb 19 21:10:01 2015 (r279023) @@ -101,7 +101,7 @@ vm-install: # the DESTDIR. . for FORMAT in ${VMFORMATS} # Don't keep the originals. There is a copy in ${.OBJDIR} if needed. - ${XZCMD} ${XZ_FLAGS} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT} + ${XZ_CMD} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT} . endfor . endif cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \ Modified: projects/clang360-import/sbin/camcontrol/camcontrol.c ============================================================================== --- projects/clang360-import/sbin/camcontrol/camcontrol.c Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/sbin/camcontrol/camcontrol.c Thu Feb 19 21:10:01 2015 (r279023) @@ -7404,7 +7404,7 @@ getdevid(struct cam_devitem *item) retry: ccb->ccb_h.func_code = XPT_DEV_ADVINFO; ccb->ccb_h.flags = CAM_DIR_IN; - ccb->cdai.flags = 0; + ccb->cdai.flags = CDAI_FLAG_NONE; ccb->cdai.buftype = CDAI_TYPE_SCSI_DEVID; ccb->cdai.bufsiz = item->device_id_len; if (item->device_id_len != 0) Modified: projects/clang360-import/share/mk/bsd.dep.mk ============================================================================== --- projects/clang360-import/share/mk/bsd.dep.mk Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/share/mk/bsd.dep.mk Thu Feb 19 21:10:01 2015 (r279023) @@ -121,10 +121,7 @@ ${_YC:R}.o: ${_YC} .endfor # DTrace probe definitions -# libelf is currently needed for drti.o .if ${SRCS:M*.d} -LDADD+= -lelf -DPADD+= ${LIBELF} CFLAGS+= -I${.OBJDIR} .endif .for _DSRC in ${SRCS:M*.d:N*/*} Modified: projects/clang360-import/share/mk/bsd.libnames.mk ============================================================================== --- projects/clang360-import/share/mk/bsd.libnames.mk Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/share/mk/bsd.libnames.mk Thu Feb 19 21:10:01 2015 (r279023) @@ -131,6 +131,7 @@ LIBVMMAPI?= ${DESTDIR}${LIBDIR}/libvmmap LIBWIND?= ${DESTDIR}${LIBDIR}/libwind.a LIBWRAP?= ${DESTDIR}${LIBDIR}/libwrap.a LIBXPG4?= ${DESTDIR}${LIBDIR}/libxpg4.a +LIBXO?= ${DESTDIR}${LIBDIR}/libxo.a LIBY?= ${DESTDIR}${LIBDIR}/liby.a LIBYPCLNT?= ${DESTDIR}${LIBDIR}/libypclnt.a LIBZ?= ${DESTDIR}${LIBDIR}/libz.a Modified: projects/clang360-import/share/mk/bsd.own.mk ============================================================================== --- projects/clang360-import/share/mk/bsd.own.mk Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/share/mk/bsd.own.mk Thu Feb 19 21:10:01 2015 (r279023) @@ -234,6 +234,15 @@ STRIP?= -s COMPRESS_CMD?= gzip -cn COMPRESS_EXT?= .gz +# Set XZ_THREADS to 1 to disable multi-threading. +XZ_THREADS?= 0 + +.if !empty(XZ_THREADS) +XZ_CMD?= xz -T ${XZ_THREADS} +.else +XZ_CMD?= xz +.endif + # Pointer to the top directory into which tests are installed. Should not be # overriden by Makefiles, but the user may choose to set this in src.conf(5). TESTSBASE?= /usr/tests Modified: projects/clang360-import/share/mk/bsd.sys.mk ============================================================================== --- projects/clang360-import/share/mk/bsd.sys.mk Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/share/mk/bsd.sys.mk Thu Feb 19 21:10:01 2015 (r279023) @@ -128,7 +128,10 @@ CWARNFLAGS+= -Wno-unknown-pragmas CLANG_NO_IAS= -no-integrated-as .endif CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\ - -mllvm -simplifycfg-dup-ret -mllvm -enable-gvn=false + -mllvm -simplifycfg-dup-ret -mllvm +.if ${COMPILER_VERSION} > 30400 +CLANG_OPT_SMALL+= -enable-gvn=false +.endif CFLAGS.clang+= -Qunused-arguments .if ${MACHINE_CPUARCH} == "sparc64" # Don't emit .cfi directives, since we must use GNU as on sparc64, for now. Modified: projects/clang360-import/sys/amd64/amd64/ptrace_machdep.c ============================================================================== --- projects/clang360-import/sys/amd64/amd64/ptrace_machdep.c Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/sys/amd64/amd64/ptrace_machdep.c Thu Feb 19 21:10:01 2015 (r279023) @@ -88,7 +88,8 @@ cpu_ptrace_xstate(struct thread *td, int break; case PT_SETXSTATE: - if (data > cpu_max_ext_state_size) { + if (data < sizeof(struct savefpu) || + data > cpu_max_ext_state_size) { error = EINVAL; break; } Modified: projects/clang360-import/sys/arm/arm/db_trace.c ============================================================================== --- projects/clang360-import/sys/arm/arm/db_trace.c Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/sys/arm/arm/db_trace.c Thu Feb 19 21:10:01 2015 (r279023) @@ -66,7 +66,7 @@ db_stack_trace_cmd(struct unwind_state * finished = false; while (!finished) { - finished = unwind_stack_one(state); + finished = unwind_stack_one(state, 0); /* Print the frame details */ sym = db_search_symbol(state->start_pc, DB_STGY_ANY, &offset); Modified: projects/clang360-import/sys/arm/arm/unwind.c ============================================================================== --- projects/clang360-import/sys/arm/arm/unwind.c Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/sys/arm/arm/unwind.c Thu Feb 19 21:10:01 2015 (r279023) @@ -33,9 +33,12 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include +#include "linker_if.h" + /* * Definitions for the instruction interpreter. * @@ -61,7 +64,7 @@ __FBSDID("$FreeBSD$"); * These are set in the linker script. Their addresses will be * either the start or end of the exception table or index. */ -extern int extab_start, extab_end, exidx_start, exidx_end; +extern int exidx_start, exidx_end; /* * Entry types. @@ -104,13 +107,47 @@ expand_prel31(uint32_t prel31) return ((int32_t)(prel31 & 0x7fffffffu) << 1) / 2; } +struct search_context { + uint32_t addr; + caddr_t exidx_start; + caddr_t exidx_end; +}; + +static int +module_search(linker_file_t lf, void *context) +{ + struct search_context *sc = context; + linker_symval_t symval; + c_linker_sym_t sym; + + if (lf->address <= (caddr_t)sc->addr && + (lf->address + lf->size) >= (caddr_t)sc->addr) { + if ((LINKER_LOOKUP_SYMBOL(lf, "__exidx_start", &sym) == 0 || + LINKER_LOOKUP_SYMBOL(lf, "exidx_start", &sym) == 0) && + LINKER_SYMBOL_VALUES(lf, sym, &symval) == 0) + sc->exidx_start = symval.value; + + if ((LINKER_LOOKUP_SYMBOL(lf, "__exidx_end", &sym) == 0 || + LINKER_LOOKUP_SYMBOL(lf, "exidx_end", &sym) == 0) && + LINKER_SYMBOL_VALUES(lf, sym, &symval) == 0) + sc->exidx_end = symval.value; + + if (sc->exidx_start != NULL && sc->exidx_end != NULL) + return (1); + panic("Invalid module %s, no unwind tables\n", lf->filename); + } + return (0); +} + /* * Perform a binary search of the index table to find the function * with the largest address that doesn't exceed addr. */ static struct unwind_idx * -find_index(uint32_t addr) +find_index(uint32_t addr, int search_modules) { + struct search_context sc; + caddr_t idx_start, idx_end; unsigned int min, mid, max; struct unwind_idx *start; struct unwind_idx *item; @@ -118,9 +155,23 @@ find_index(uint32_t addr) uint32_t func_addr; start = (struct unwind_idx *)&exidx_start; + idx_start = (caddr_t)&exidx_start; + idx_end = (caddr_t)&exidx_end; + + /* This may acquire a lock */ + if (search_modules) { + bzero(&sc, sizeof(sc)); + sc.addr = addr; + if (linker_file_foreach(module_search, &sc) != 0 && + sc.exidx_start != NULL && sc.exidx_end != NULL) { + start = (struct unwind_idx *)sc.exidx_start; + idx_start = sc.exidx_start; + idx_end = sc.exidx_end; + } + } min = 0; - max = (&exidx_end - &exidx_start) / 2; + max = (idx_end - idx_start) / sizeof(struct unwind_idx); while (min != max) { mid = min + (max - min + 1) / 2; @@ -332,7 +383,7 @@ unwind_tab(struct unwind_state *state) } int -unwind_stack_one(struct unwind_state *state) +unwind_stack_one(struct unwind_state *state, int can_lock) { struct unwind_idx *index; int finished; @@ -344,7 +395,7 @@ unwind_stack_one(struct unwind_state *st state->start_pc = state->registers[PC]; /* Find the item to run */ - index = find_index(state->start_pc); + index = find_index(state->start_pc, can_lock); finished = 0; if (index->insn != EXIDX_CANTUNWIND) { Modified: projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_gpio.c ============================================================================== --- projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Thu Feb 19 21:10:01 2015 (r279023) @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2012 Oleksandr Tymoshenko - * Copyright (c) 2012 Luiz Otavio O Souza. + * Copyright (c) 2012 Oleksandr Tymoshenko + * Copyright (c) 2012-2015 Luiz Otavio O Souza * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -251,16 +251,14 @@ bcm_gpio_set_function(struct bcm_gpio_so static void bcm_gpio_set_pud(struct bcm_gpio_softc *sc, uint32_t pin, uint32_t state) { - uint32_t bank, offset; + uint32_t bank; /* Must be called with lock held. */ BCM_GPIO_LOCK_ASSERT(sc); - bank = pin / 32; - offset = pin - 32 * bank; - + bank = BCM_GPIO_BANK(pin); BCM_GPIO_WRITE(sc, BCM_GPIO_GPPUD(0), state); - BCM_GPIO_WRITE(sc, BCM_GPIO_GPPUDCLK(bank), (1 << offset)); + BCM_GPIO_WRITE(sc, BCM_GPIO_GPPUDCLK(bank), BCM_GPIO_MASK(pin)); BCM_GPIO_WRITE(sc, BCM_GPIO_GPPUD(0), 0); BCM_GPIO_WRITE(sc, BCM_GPIO_GPPUDCLK(bank), 0); } @@ -438,29 +436,25 @@ static int bcm_gpio_pin_set(device_t dev, uint32_t pin, unsigned int value) { struct bcm_gpio_softc *sc = device_get_softc(dev); - uint32_t bank, offset; + uint32_t bank, reg; int i; for (i = 0; i < sc->sc_gpio_npins; i++) { if (sc->sc_gpio_pins[i].gp_pin == pin) break; } - if (i >= sc->sc_gpio_npins) return (EINVAL); - /* We never write to read-only/reserved pins. */ if (bcm_gpio_pin_is_ro(sc, pin)) return (EINVAL); - - bank = pin / 32; - offset = pin - 32 * bank; - BCM_GPIO_LOCK(sc); + bank = BCM_GPIO_BANK(pin); if (value) - BCM_GPIO_WRITE(sc, BCM_GPIO_GPSET(bank), (1 << offset)); + reg = BCM_GPIO_GPSET(bank); else - BCM_GPIO_WRITE(sc, BCM_GPIO_GPCLR(bank), (1 << offset)); + reg = BCM_GPIO_GPCLR(bank); + BCM_GPIO_WRITE(sc, reg, BCM_GPIO_MASK(pin)); BCM_GPIO_UNLOCK(sc); return (0); @@ -470,24 +464,20 @@ static int bcm_gpio_pin_get(device_t dev, uint32_t pin, unsigned int *val) { struct bcm_gpio_softc *sc = device_get_softc(dev); - uint32_t bank, offset, reg_data; + uint32_t bank, reg_data; int i; for (i = 0; i < sc->sc_gpio_npins; i++) { if (sc->sc_gpio_pins[i].gp_pin == pin) break; } - if (i >= sc->sc_gpio_npins) return (EINVAL); - - bank = pin / 32; - offset = pin - 32 * bank; - + bank = BCM_GPIO_BANK(pin); BCM_GPIO_LOCK(sc); reg_data = BCM_GPIO_READ(sc, BCM_GPIO_GPLEV(bank)); BCM_GPIO_UNLOCK(sc); - *val = (reg_data & (1 << offset)) ? 1 : 0; + *val = (reg_data & BCM_GPIO_MASK(pin)) ? 1 : 0; return (0); } @@ -496,30 +486,26 @@ static int bcm_gpio_pin_toggle(device_t dev, uint32_t pin) { struct bcm_gpio_softc *sc = device_get_softc(dev); - uint32_t bank, data, offset; + uint32_t bank, data, reg; int i; for (i = 0; i < sc->sc_gpio_npins; i++) { if (sc->sc_gpio_pins[i].gp_pin == pin) break; } - if (i >= sc->sc_gpio_npins) return (EINVAL); - /* We never write to read-only/reserved pins. */ if (bcm_gpio_pin_is_ro(sc, pin)) return (EINVAL); - - bank = pin / 32; - offset = pin - 32 * bank; - BCM_GPIO_LOCK(sc); + bank = BCM_GPIO_BANK(pin); data = BCM_GPIO_READ(sc, BCM_GPIO_GPLEV(bank)); - if (data & (1 << offset)) - BCM_GPIO_WRITE(sc, BCM_GPIO_GPCLR(bank), (1 << offset)); + if (data & BCM_GPIO_MASK(pin)) + reg = BCM_GPIO_GPCLR(bank); else - BCM_GPIO_WRITE(sc, BCM_GPIO_GPSET(bank), (1 << offset)); + reg = BCM_GPIO_GPSET(bank); + BCM_GPIO_WRITE(sc, reg, BCM_GPIO_MASK(pin)); BCM_GPIO_UNLOCK(sc); return (0); Modified: projects/clang360-import/sys/arm/include/stack.h ============================================================================== --- projects/clang360-import/sys/arm/include/stack.h Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/sys/arm/include/stack.h Thu Feb 19 21:10:01 2015 (r279023) @@ -55,6 +55,6 @@ struct unwind_state { #define LR 14 #define PC 15 -int unwind_stack_one(struct unwind_state *); +int unwind_stack_one(struct unwind_state *, int); #endif /* !_MACHINE_STACK_H_ */ Modified: projects/clang360-import/sys/cam/cam_ccb.h ============================================================================== --- projects/clang360-import/sys/cam/cam_ccb.h Thu Feb 19 20:58:45 2015 (r279022) +++ projects/clang360-import/sys/cam/cam_ccb.h Thu Feb 19 21:10:01 2015 (r279023) @@ -1140,6 +1140,7 @@ struct ccb_eng_exec { /* This structure struct ccb_dev_advinfo { struct ccb_hdr ccb_h; uint32_t flags; +#define CDAI_FLAG_NONE 0x0 /* No flags set */ #define CDAI_FLAG_STORE 0x1 /* If set, action becomes store */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Thu Feb 19 22:20:24 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 D15B3641; Thu, 19 Feb 2015 22:20:24 +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 B8F86C38; Thu, 19 Feb 2015 22:20:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1JMKOIl033098; Thu, 19 Feb 2015 22:20:24 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1JMKKFA033079; Thu, 19 Feb 2015 22:20:20 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502192220.t1JMKKFA033079@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 19 Feb 2015 22:20:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r279025 - in projects/clang360-import: contrib/llvm/include/llvm/CodeGen contrib/llvm/include/llvm/IR contrib/llvm/lib/Bitcode/Reader contrib/llvm/lib/CodeGen/SelectionDAG contrib/llvm/... 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.18-1 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: Thu, 19 Feb 2015 22:20:24 -0000 Author: dim Date: Thu Feb 19 22:20:19 2015 New Revision: 279025 URL: https://svnweb.freebsd.org/changeset/base/279025 Log: Merge llvm 3.6.0rc4 from ^/vendor/llvm/dist, merge clang 3.6.0rc4 from ^/vendor/clang/dist, resolve conflicts, and update patches. Added: projects/clang360-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp - copied unchanged from r279023, vendor/llvm/dist/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp Deleted: projects/clang360-import/contrib/llvm/lib/ExecutionEngine/RTDyldMemoryManager.cpp Modified: projects/clang360-import/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h projects/clang360-import/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h projects/clang360-import/contrib/llvm/include/llvm/IR/Constants.h projects/clang360-import/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp projects/clang360-import/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp projects/clang360-import/contrib/llvm/lib/IR/Constants.cpp projects/clang360-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/clang360-import/contrib/llvm/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp projects/clang360-import/contrib/llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp projects/clang360-import/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp projects/clang360-import/contrib/llvm/patches/README.TXT projects/clang360-import/contrib/llvm/patches/patch-01-freebsd-kprintf.diff projects/clang360-import/contrib/llvm/patches/patch-05-enable-armv6-clrex.diff projects/clang360-import/contrib/llvm/patches/patch-06-clang-add-mips-triples.diff projects/clang360-import/contrib/llvm/tools/clang/lib/Basic/Version.cpp projects/clang360-import/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp projects/clang360-import/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp projects/clang360-import/lib/clang/include/clang/Basic/Version.inc projects/clang360-import/lib/clang/libllvmexecutionengine/Makefile projects/clang360-import/lib/clang/libllvmruntimedyld/Makefile Directory Properties: projects/clang360-import/contrib/llvm/ (props changed) projects/clang360-import/contrib/llvm/tools/clang/ (props changed) Modified: projects/clang360-import/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h ============================================================================== --- projects/clang360-import/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h Thu Feb 19 21:47:31 2015 (r279024) +++ projects/clang360-import/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h Thu Feb 19 22:20:19 2015 (r279025) @@ -867,9 +867,11 @@ public: SDValue Offset, ISD::MemIndexedMode AM); SDValue getMaskedLoad(EVT VT, SDLoc dl, SDValue Chain, SDValue Ptr, - SDValue Mask, SDValue Src0, MachineMemOperand *MMO); + SDValue Mask, SDValue Src0, EVT MemVT, + MachineMemOperand *MMO, ISD::LoadExtType); SDValue getMaskedStore(SDValue Chain, SDLoc dl, SDValue Val, - SDValue Ptr, SDValue Mask, MachineMemOperand *MMO); + SDValue Ptr, SDValue Mask, EVT MemVT, + MachineMemOperand *MMO, bool IsTrunc); /// getSrcValue - Construct a node to track a Value* through the backend. SDValue getSrcValue(const Value *v); Modified: projects/clang360-import/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h ============================================================================== --- projects/clang360-import/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h Thu Feb 19 21:47:31 2015 (r279024) +++ projects/clang360-import/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h Thu Feb 19 22:20:19 2015 (r279025) @@ -1970,13 +1970,17 @@ public: class MaskedLoadSDNode : public MaskedLoadStoreSDNode { public: friend class SelectionDAG; - MaskedLoadSDNode(unsigned Order, DebugLoc dl, - SDValue *Operands, unsigned numOperands, - SDVTList VTs, EVT MemVT, MachineMemOperand *MMO) + MaskedLoadSDNode(unsigned Order, DebugLoc dl, SDValue *Operands, + unsigned numOperands, SDVTList VTs, ISD::LoadExtType ETy, + EVT MemVT, MachineMemOperand *MMO) : MaskedLoadStoreSDNode(ISD::MLOAD, Order, dl, Operands, numOperands, - VTs, MemVT, MMO) - {} + VTs, MemVT, MMO) { + SubclassData |= (unsigned short)ETy; + } + ISD::LoadExtType getExtensionType() const { + return ISD::LoadExtType(SubclassData & 3); + } const SDValue &getSrc0() const { return getOperand(3); } static bool classof(const SDNode *N) { return N->getOpcode() == ISD::MLOAD; @@ -1989,14 +1993,19 @@ class MaskedStoreSDNode : public MaskedL public: friend class SelectionDAG; - MaskedStoreSDNode(unsigned Order, DebugLoc dl, - SDValue *Operands, unsigned numOperands, - SDVTList VTs, EVT MemVT, MachineMemOperand *MMO) + MaskedStoreSDNode(unsigned Order, DebugLoc dl, SDValue *Operands, + unsigned numOperands, SDVTList VTs, bool isTrunc, EVT MemVT, + MachineMemOperand *MMO) : MaskedLoadStoreSDNode(ISD::MSTORE, Order, dl, Operands, numOperands, - VTs, MemVT, MMO) - {} + VTs, MemVT, MMO) { + SubclassData |= (unsigned short)isTrunc; + } + /// isTruncatingStore - Return true if the op does a truncation before store. + /// For integers this is the same as doing a TRUNCATE and storing the result. + /// For floats, it is the same as doing an FP_ROUND and storing the result. + bool isTruncatingStore() const { return SubclassData & 1; } - const SDValue &getData() const { return getOperand(3); } + const SDValue &getValue() const { return getOperand(3); } static bool classof(const SDNode *N) { return N->getOpcode() == ISD::MSTORE; Modified: projects/clang360-import/contrib/llvm/include/llvm/IR/Constants.h ============================================================================== --- projects/clang360-import/contrib/llvm/include/llvm/IR/Constants.h Thu Feb 19 21:47:31 2015 (r279024) +++ projects/clang360-import/contrib/llvm/include/llvm/IR/Constants.h Thu Feb 19 22:20:19 2015 (r279025) @@ -325,6 +325,9 @@ public: /// index. Constant *getElementValue(unsigned Idx) const; + /// \brief Return the number of elements in the array, vector, or struct. + unsigned getNumElements() const; + /// Methods for support type inquiry through isa, cast, and dyn_cast: /// static bool classof(const Value *V) { @@ -1196,6 +1199,9 @@ public: /// index. UndefValue *getElementValue(unsigned Idx) const; + /// \brief Return the number of elements in the array, vector, or struct. + unsigned getNumElements() const; + void destroyConstant() override; /// Methods for support type inquiry through isa, cast, and dyn_cast: Modified: projects/clang360-import/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp ============================================================================== --- projects/clang360-import/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp Thu Feb 19 21:47:31 2015 (r279024) +++ projects/clang360-import/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp Thu Feb 19 22:20:19 2015 (r279025) @@ -538,9 +538,17 @@ Metadata *BitcodeReaderMDValueList::getV if (Metadata *MD = MDValuePtrs[Idx]) return MD; - // Create and return a placeholder, which will later be RAUW'd. - AnyFwdRefs = true; + // Track forward refs to be resolved later. + if (AnyFwdRefs) { + MinFwdRef = std::min(MinFwdRef, Idx); + MaxFwdRef = std::max(MaxFwdRef, Idx); + } else { + AnyFwdRefs = true; + MinFwdRef = MaxFwdRef = Idx; + } ++NumFwdRefs; + + // Create and return a placeholder, which will later be RAUW'd. Metadata *MD = MDNode::getTemporary(Context, None); MDValuePtrs[Idx].reset(MD); return MD; @@ -556,11 +564,15 @@ void BitcodeReaderMDValueList::tryToReso return; // Resolve any cycles. - for (auto &MD : MDValuePtrs) { + for (unsigned I = MinFwdRef, E = MaxFwdRef + 1; I != E; ++I) { + auto &MD = MDValuePtrs[I]; assert(!(MD && isa(MD)) && "Unexpected forward reference"); if (auto *N = dyn_cast_or_null(MD)) N->resolveCycles(); } + + // Make sure we return early again until there's another forward ref. + AnyFwdRefs = false; } Type *BitcodeReader::getTypeByID(unsigned ID) { Modified: projects/clang360-import/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h ============================================================================== --- projects/clang360-import/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h Thu Feb 19 21:47:31 2015 (r279024) +++ projects/clang360-import/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h Thu Feb 19 22:20:19 2015 (r279025) @@ -99,6 +99,8 @@ public: class BitcodeReaderMDValueList { unsigned NumFwdRefs; bool AnyFwdRefs; + unsigned MinFwdRef; + unsigned MaxFwdRef; std::vector MDValuePtrs; LLVMContext &Context; Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp ============================================================================== --- projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Thu Feb 19 21:47:31 2015 (r279024) +++ projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Thu Feb 19 22:20:19 2015 (r279025) @@ -4842,7 +4842,7 @@ SDValue DAGCombiner::visitMSTORE(SDNode MaskedStoreSDNode *MST = dyn_cast(N); SDValue Mask = MST->getMask(); - SDValue Data = MST->getData(); + SDValue Data = MST->getValue(); SDLoc DL(N); // If the MSTORE data type requires splitting and the mask is provided by a @@ -4885,7 +4885,8 @@ SDValue DAGCombiner::visitMSTORE(SDNode MachineMemOperand::MOStore, LoMemVT.getStoreSize(), Alignment, MST->getAAInfo(), MST->getRanges()); - Lo = DAG.getMaskedStore(Chain, DL, DataLo, Ptr, MaskLo, MMO); + Lo = DAG.getMaskedStore(Chain, DL, DataLo, Ptr, MaskLo, LoMemVT, MMO, + MST->isTruncatingStore()); unsigned IncrementSize = LoMemVT.getSizeInBits()/8; Ptr = DAG.getNode(ISD::ADD, DL, Ptr.getValueType(), Ptr, @@ -4897,7 +4898,8 @@ SDValue DAGCombiner::visitMSTORE(SDNode SecondHalfAlignment, MST->getAAInfo(), MST->getRanges()); - Hi = DAG.getMaskedStore(Chain, DL, DataHi, Ptr, MaskHi, MMO); + Hi = DAG.getMaskedStore(Chain, DL, DataHi, Ptr, MaskHi, HiMemVT, MMO, + MST->isTruncatingStore()); AddToWorklist(Lo.getNode()); AddToWorklist(Hi.getNode()); @@ -4958,7 +4960,8 @@ SDValue DAGCombiner::visitMLOAD(SDNode * MachineMemOperand::MOLoad, LoMemVT.getStoreSize(), Alignment, MLD->getAAInfo(), MLD->getRanges()); - Lo = DAG.getMaskedLoad(LoVT, DL, Chain, Ptr, MaskLo, Src0Lo, MMO); + Lo = DAG.getMaskedLoad(LoVT, DL, Chain, Ptr, MaskLo, Src0Lo, LoMemVT, MMO, + ISD::NON_EXTLOAD); unsigned IncrementSize = LoMemVT.getSizeInBits()/8; Ptr = DAG.getNode(ISD::ADD, DL, Ptr.getValueType(), Ptr, @@ -4969,7 +4972,8 @@ SDValue DAGCombiner::visitMLOAD(SDNode * MachineMemOperand::MOLoad, HiMemVT.getStoreSize(), SecondHalfAlignment, MLD->getAAInfo(), MLD->getRanges()); - Hi = DAG.getMaskedLoad(HiVT, DL, Chain, Ptr, MaskHi, Src0Hi, MMO); + Hi = DAG.getMaskedLoad(HiVT, DL, Chain, Ptr, MaskHi, Src0Hi, HiMemVT, MMO, + ISD::NON_EXTLOAD); AddToWorklist(Lo.getNode()); AddToWorklist(Hi.getNode()); @@ -9482,6 +9486,8 @@ SDValue DAGCombiner::ReduceLoadOpStoreWi unsigned MSB = BitWidth - Imm.countLeadingZeros() - 1; unsigned NewBW = NextPowerOf2(MSB - ShAmt); EVT NewVT = EVT::getIntegerVT(*DAG.getContext(), NewBW); + // The narrowing should be profitable, the load/store operation should be + // legal (or custom) and the store size should be equal to the NewVT width. while (NewBW < BitWidth && !(TLI.isOperationLegalOrCustom(Opc, NewVT) && TLI.isNarrowingProfitable(VT, NewVT))) { Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp ============================================================================== --- projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Thu Feb 19 21:47:31 2015 (r279024) +++ projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Thu Feb 19 22:20:19 2015 (r279025) @@ -458,16 +458,16 @@ SDValue DAGTypeLegalizer::PromoteIntRes_ SDValue DAGTypeLegalizer::PromoteIntRes_MLOAD(MaskedLoadSDNode *N) { EVT NVT = TLI.getTypeToTransformTo(*DAG.getContext(), N->getValueType(0)); SDValue ExtSrc0 = GetPromotedInteger(N->getSrc0()); - SDValue ExtMask = PromoteTargetBoolean(N->getMask(), NVT); - SDLoc dl(N); - MachineMemOperand *MMO = DAG.getMachineFunction(). - getMachineMemOperand(N->getPointerInfo(), - MachineMemOperand::MOLoad, NVT.getStoreSize(), - N->getAlignment(), N->getAAInfo(), N->getRanges()); + SDValue Mask = N->getMask(); + EVT NewMaskVT = getSetCCResultType(NVT); + if (NewMaskVT != N->getMask().getValueType()) + Mask = PromoteTargetBoolean(Mask, NewMaskVT); + SDLoc dl(N); SDValue Res = DAG.getMaskedLoad(NVT, dl, N->getChain(), N->getBasePtr(), - ExtMask, ExtSrc0, MMO); + Mask, ExtSrc0, N->getMemoryVT(), + N->getMemOperand(), ISD::SEXTLOAD); // Legalized the chain result - switch anything that used the old chain to // use the new one. ReplaceValueWith(SDValue(N, 1), Res.getValue(1)); @@ -1117,16 +1117,18 @@ SDValue DAGTypeLegalizer::PromoteIntOp_S SDValue DAGTypeLegalizer::PromoteIntOp_MSTORE(MaskedStoreSDNode *N, unsigned OpNo){ assert(OpNo == 2 && "Only know how to promote the mask!"); - SDValue DataOp = N->getData(); + SDValue DataOp = N->getValue(); EVT DataVT = DataOp.getValueType(); SDValue Mask = N->getMask(); EVT MaskVT = Mask.getValueType(); SDLoc dl(N); + bool TruncateStore = false; if (!TLI.isTypeLegal(DataVT)) { if (getTypeAction(DataVT) == TargetLowering::TypePromoteInteger) { DataOp = GetPromotedInteger(DataOp); Mask = PromoteTargetBoolean(Mask, DataOp.getValueType()); + TruncateStore = true; } else { assert(getTypeAction(DataVT) == TargetLowering::TypeWidenVector && @@ -1156,10 +1158,9 @@ SDValue DAGTypeLegalizer::PromoteIntOp_M } else Mask = PromoteTargetBoolean(N->getMask(), DataOp.getValueType()); - SmallVector NewOps(N->op_begin(), N->op_end()); - NewOps[2] = Mask; - NewOps[3] = DataOp; - return SDValue(DAG.UpdateNodeOperands(N, NewOps), 0); + return DAG.getMaskedStore(N->getChain(), dl, DataOp, N->getBasePtr(), Mask, + N->getMemoryVT(), N->getMemOperand(), + TruncateStore); } SDValue DAGTypeLegalizer::PromoteIntOp_MLOAD(MaskedLoadSDNode *N, unsigned OpNo){ Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h ============================================================================== --- projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h Thu Feb 19 21:47:31 2015 (r279024) +++ projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h Thu Feb 19 22:20:19 2015 (r279025) @@ -659,6 +659,7 @@ private: SDValue WidenVecOp_EXTRACT_VECTOR_ELT(SDNode *N); SDValue WidenVecOp_EXTRACT_SUBVECTOR(SDNode *N); SDValue WidenVecOp_STORE(SDNode* N); + SDValue WidenVecOp_MSTORE(SDNode* N, unsigned OpNo); SDValue WidenVecOp_SETCC(SDNode* N); SDValue WidenVecOp_Convert(SDNode *N); Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp ============================================================================== --- projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp Thu Feb 19 21:47:31 2015 (r279024) +++ projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp Thu Feb 19 22:20:19 2015 (r279025) @@ -992,6 +992,7 @@ void DAGTypeLegalizer::SplitVecRes_MLOAD SDValue Ptr = MLD->getBasePtr(); SDValue Mask = MLD->getMask(); unsigned Alignment = MLD->getOriginalAlignment(); + ISD::LoadExtType ExtType = MLD->getExtensionType(); // if Alignment is equal to the vector size, // take the half of it for the second part @@ -1015,7 +1016,8 @@ void DAGTypeLegalizer::SplitVecRes_MLOAD MachineMemOperand::MOLoad, LoMemVT.getStoreSize(), Alignment, MLD->getAAInfo(), MLD->getRanges()); - Lo = DAG.getMaskedLoad(LoVT, dl, Ch, Ptr, MaskLo, Src0Lo, MMO); + Lo = DAG.getMaskedLoad(LoVT, dl, Ch, Ptr, MaskLo, Src0Lo, LoMemVT, MMO, + ExtType); unsigned IncrementSize = LoMemVT.getSizeInBits()/8; Ptr = DAG.getNode(ISD::ADD, dl, Ptr.getValueType(), Ptr, @@ -1026,7 +1028,8 @@ void DAGTypeLegalizer::SplitVecRes_MLOAD MachineMemOperand::MOLoad, HiMemVT.getStoreSize(), SecondHalfAlignment, MLD->getAAInfo(), MLD->getRanges()); - Hi = DAG.getMaskedLoad(HiVT, dl, Ch, Ptr, MaskHi, Src0Hi, MMO); + Hi = DAG.getMaskedLoad(HiVT, dl, Ch, Ptr, MaskHi, Src0Hi, HiMemVT, MMO, + ExtType); // Build a factor node to remember that this load is independent of the @@ -1464,7 +1467,7 @@ SDValue DAGTypeLegalizer::SplitVecOp_MST SDValue Ch = N->getChain(); SDValue Ptr = N->getBasePtr(); SDValue Mask = N->getMask(); - SDValue Data = N->getData(); + SDValue Data = N->getValue(); EVT MemoryVT = N->getMemoryVT(); unsigned Alignment = N->getOriginalAlignment(); SDLoc DL(N); @@ -1489,7 +1492,8 @@ SDValue DAGTypeLegalizer::SplitVecOp_MST MachineMemOperand::MOStore, LoMemVT.getStoreSize(), Alignment, N->getAAInfo(), N->getRanges()); - Lo = DAG.getMaskedStore(Ch, DL, DataLo, Ptr, MaskLo, MMO); + Lo = DAG.getMaskedStore(Ch, DL, DataLo, Ptr, MaskLo, LoMemVT, MMO, + N->isTruncatingStore()); unsigned IncrementSize = LoMemVT.getSizeInBits()/8; Ptr = DAG.getNode(ISD::ADD, DL, Ptr.getValueType(), Ptr, @@ -1500,7 +1504,8 @@ SDValue DAGTypeLegalizer::SplitVecOp_MST MachineMemOperand::MOStore, HiMemVT.getStoreSize(), SecondHalfAlignment, N->getAAInfo(), N->getRanges()); - Hi = DAG.getMaskedStore(Ch, DL, DataHi, Ptr, MaskHi, MMO); + Hi = DAG.getMaskedStore(Ch, DL, DataHi, Ptr, MaskHi, HiMemVT, MMO, + N->isTruncatingStore()); // Build a factor node to remember that this store is independent of the @@ -2412,6 +2417,7 @@ SDValue DAGTypeLegalizer::WidenVecRes_ML SDValue Mask = N->getMask(); EVT MaskVT = Mask.getValueType(); SDValue Src0 = GetWidenedVector(N->getSrc0()); + ISD::LoadExtType ExtType = N->getExtensionType(); SDLoc dl(N); if (getTypeAction(MaskVT) == TargetLowering::TypeWidenVector) @@ -2434,14 +2440,9 @@ SDValue DAGTypeLegalizer::WidenVecRes_ML Mask = DAG.getNode(ISD::CONCAT_VECTORS, dl, BoolVT, Ops); } - // Rebuild memory operand because MemoryVT was changed - MachineMemOperand *MMO = DAG.getMachineFunction(). - getMachineMemOperand(N->getPointerInfo(), - MachineMemOperand::MOLoad, WidenVT.getStoreSize(), - N->getAlignment(), N->getAAInfo(), N->getRanges()); - SDValue Res = DAG.getMaskedLoad(WidenVT, dl, N->getChain(), N->getBasePtr(), - Mask, Src0, MMO); + Mask, Src0, N->getMemoryVT(), + N->getMemOperand(), ExtType); // Legalized the chain result - switch anything that used the old chain to // use the new one. ReplaceValueWith(SDValue(N, 1), Res.getValue(1)); @@ -2593,6 +2594,7 @@ bool DAGTypeLegalizer::WidenVectorOperan case ISD::EXTRACT_SUBVECTOR: Res = WidenVecOp_EXTRACT_SUBVECTOR(N); break; case ISD::EXTRACT_VECTOR_ELT: Res = WidenVecOp_EXTRACT_VECTOR_ELT(N); break; case ISD::STORE: Res = WidenVecOp_STORE(N); break; + case ISD::MSTORE: Res = WidenVecOp_MSTORE(N, OpNo); break; case ISD::SETCC: Res = WidenVecOp_SETCC(N); break; case ISD::ANY_EXTEND: @@ -2791,6 +2793,42 @@ SDValue DAGTypeLegalizer::WidenVecOp_STO return DAG.getNode(ISD::TokenFactor, SDLoc(ST), MVT::Other, StChain); } +SDValue DAGTypeLegalizer::WidenVecOp_MSTORE(SDNode *N, unsigned OpNo) { + MaskedStoreSDNode *MST = cast(N); + SDValue Mask = MST->getMask(); + EVT MaskVT = Mask.getValueType(); + SDValue StVal = MST->getValue(); + // Widen the value + SDValue WideVal = GetWidenedVector(StVal); + SDLoc dl(N); + + if (OpNo == 2 || getTypeAction(MaskVT) == TargetLowering::TypeWidenVector) + Mask = GetWidenedVector(Mask); + else { + // The mask should be widened as well + EVT BoolVT = getSetCCResultType(WideVal.getValueType()); + // We can't use ModifyToType() because we should fill the mask with + // zeroes + unsigned WidenNumElts = BoolVT.getVectorNumElements(); + unsigned MaskNumElts = MaskVT.getVectorNumElements(); + + unsigned NumConcat = WidenNumElts / MaskNumElts; + SmallVector Ops(NumConcat); + SDValue ZeroVal = DAG.getConstant(0, MaskVT); + Ops[0] = Mask; + for (unsigned i = 1; i != NumConcat; ++i) + Ops[i] = ZeroVal; + + Mask = DAG.getNode(ISD::CONCAT_VECTORS, dl, BoolVT, Ops); + } + assert(Mask.getValueType().getVectorNumElements() == + WideVal.getValueType().getVectorNumElements() && + "Mask and data vectors should have the same number of elements"); + return DAG.getMaskedStore(MST->getChain(), dl, WideVal, MST->getBasePtr(), + Mask, MST->getMemoryVT(), MST->getMemOperand(), + false); +} + SDValue DAGTypeLegalizer::WidenVecOp_SETCC(SDNode *N) { SDValue InOp0 = GetWidenedVector(N->getOperand(0)); SDValue InOp1 = GetWidenedVector(N->getOperand(1)); Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp ============================================================================== --- projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Thu Feb 19 21:47:31 2015 (r279024) +++ projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Thu Feb 19 22:20:19 2015 (r279025) @@ -4924,15 +4924,15 @@ SelectionDAG::getIndexedStore(SDValue Or SDValue SelectionDAG::getMaskedLoad(EVT VT, SDLoc dl, SDValue Chain, - SDValue Ptr, SDValue Mask, SDValue Src0, - MachineMemOperand *MMO) { + SDValue Ptr, SDValue Mask, SDValue Src0, EVT MemVT, + MachineMemOperand *MMO, ISD::LoadExtType ExtTy) { SDVTList VTs = getVTList(VT, MVT::Other); SDValue Ops[] = { Chain, Ptr, Mask, Src0 }; FoldingSetNodeID ID; AddNodeIDNode(ID, ISD::MLOAD, VTs, Ops); ID.AddInteger(VT.getRawBits()); - ID.AddInteger(encodeMemSDNodeFlags(ISD::NON_EXTLOAD, ISD::UNINDEXED, + ID.AddInteger(encodeMemSDNodeFlags(ExtTy, ISD::UNINDEXED, MMO->isVolatile(), MMO->isNonTemporal(), MMO->isInvariant())); @@ -4944,14 +4944,15 @@ SelectionDAG::getMaskedLoad(EVT VT, SDLo } SDNode *N = new (NodeAllocator) MaskedLoadSDNode(dl.getIROrder(), dl.getDebugLoc(), Ops, 4, VTs, - VT, MMO); + ExtTy, MemVT, MMO); CSEMap.InsertNode(N, IP); InsertNode(N); return SDValue(N, 0); } SDValue SelectionDAG::getMaskedStore(SDValue Chain, SDLoc dl, SDValue Val, - SDValue Ptr, SDValue Mask, MachineMemOperand *MMO) { + SDValue Ptr, SDValue Mask, EVT MemVT, + MachineMemOperand *MMO, bool isTrunc) { assert(Chain.getValueType() == MVT::Other && "Invalid chain type"); EVT VT = Val.getValueType(); @@ -4970,7 +4971,7 @@ SDValue SelectionDAG::getMaskedStore(SDV } SDNode *N = new (NodeAllocator) MaskedStoreSDNode(dl.getIROrder(), dl.getDebugLoc(), Ops, 4, - VTs, VT, MMO); + VTs, isTrunc, MemVT, MMO); CSEMap.InsertNode(N, IP); InsertNode(N); return SDValue(N, 0); Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp ============================================================================== --- projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Thu Feb 19 21:47:31 2015 (r279024) +++ projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Thu Feb 19 22:20:19 2015 (r279025) @@ -3667,7 +3667,8 @@ void SelectionDAGBuilder::visitMaskedSto getMachineMemOperand(MachinePointerInfo(PtrOperand), MachineMemOperand::MOStore, VT.getStoreSize(), Alignment, AAInfo); - SDValue StoreNode = DAG.getMaskedStore(getRoot(), sdl, Src0, Ptr, Mask, MMO); + SDValue StoreNode = DAG.getMaskedStore(getRoot(), sdl, Src0, Ptr, Mask, VT, + MMO, false); DAG.setRoot(StoreNode); setValue(&I, StoreNode); } @@ -3706,7 +3707,8 @@ void SelectionDAGBuilder::visitMaskedLoa MachineMemOperand::MOLoad, VT.getStoreSize(), Alignment, AAInfo, Ranges); - SDValue Load = DAG.getMaskedLoad(VT, sdl, InChain, Ptr, Mask, Src0, MMO); + SDValue Load = DAG.getMaskedLoad(VT, sdl, InChain, Ptr, Mask, Src0, VT, MMO, + ISD::NON_EXTLOAD); SDValue OutChain = Load.getValue(1); DAG.setRoot(OutChain); setValue(&I, Load); Copied: projects/clang360-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp (from r279023, vendor/llvm/dist/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang360-import/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp Thu Feb 19 22:20:19 2015 (r279025, copy of r279023, vendor/llvm/dist/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp) @@ -0,0 +1,294 @@ +//===-- RTDyldMemoryManager.cpp - Memory manager for MC-JIT -----*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// Implementation of the runtime dynamic memory manager base class. +// +//===----------------------------------------------------------------------===// + +#include "llvm/Config/config.h" +#include "llvm/ExecutionEngine/RTDyldMemoryManager.h" +#include "llvm/Support/Compiler.h" +#include "llvm/Support/DynamicLibrary.h" +#include "llvm/Support/ErrorHandling.h" +#include + +#ifdef __linux__ + // These includes used by RTDyldMemoryManager::getPointerToNamedFunction() + // for Glibc trickery. See comments in this function for more information. + #ifdef HAVE_SYS_STAT_H + #include + #endif + #include + #include +#endif + +namespace llvm { + +RTDyldMemoryManager::~RTDyldMemoryManager() {} + +// Determine whether we can register EH tables. +#if (defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__ia64__) && \ + !defined(__SEH__) && !defined(__USING_SJLJ_EXCEPTIONS__)) +#define HAVE_EHTABLE_SUPPORT 1 +#else +#define HAVE_EHTABLE_SUPPORT 0 +#endif + +#if HAVE_EHTABLE_SUPPORT +extern "C" void __register_frame(void*); +extern "C" void __deregister_frame(void*); +#else +// The building compiler does not have __(de)register_frame but +// it may be found at runtime in a dynamically-loaded library. +// For example, this happens when building LLVM with Visual C++ +// but using the MingW runtime. +void __register_frame(void *p) { + static bool Searched = false; + static void *rf = 0; + + if (!Searched) { + Searched = true; + rf = llvm::sys::DynamicLibrary::SearchForAddressOfSymbol( + "__register_frame"); + } + if (rf) + ((void (*)(void *))rf)(p); +} + +void __deregister_frame(void *p) { + static bool Searched = false; + static void *df = 0; + + if (!Searched) { + Searched = true; + df = llvm::sys::DynamicLibrary::SearchForAddressOfSymbol( + "__deregister_frame"); + } + if (df) + ((void (*)(void *))df)(p); +} +#endif + +#ifdef __APPLE__ + +static const char *processFDE(const char *Entry, bool isDeregister) { + const char *P = Entry; + uint32_t Length = *((const uint32_t *)P); + P += 4; + uint32_t Offset = *((const uint32_t *)P); + if (Offset != 0) { + if (isDeregister) + __deregister_frame(const_cast(Entry)); + else + __register_frame(const_cast(Entry)); + } + return P + Length; +} + +// This implementation handles frame registration for local targets. +// Memory managers for remote targets should re-implement this function +// and use the LoadAddr parameter. +void RTDyldMemoryManager::registerEHFrames(uint8_t *Addr, + uint64_t LoadAddr, + size_t Size) { + // On OS X OS X __register_frame takes a single FDE as an argument. + // See http://lists.cs.uiuc.edu/pipermail/llvmdev/2013-April/061768.html + const char *P = (const char *)Addr; + const char *End = P + Size; + do { + P = processFDE(P, false); + } while(P != End); +} + +void RTDyldMemoryManager::deregisterEHFrames(uint8_t *Addr, + uint64_t LoadAddr, + size_t Size) { + const char *P = (const char *)Addr; + const char *End = P + Size; + do { + P = processFDE(P, true); + } while(P != End); +} + +#else + +void RTDyldMemoryManager::registerEHFrames(uint8_t *Addr, + uint64_t LoadAddr, + size_t Size) { + // On Linux __register_frame takes a single argument: + // a pointer to the start of the .eh_frame section. + + // How can it find the end? Because crtendS.o is linked + // in and it has an .eh_frame section with four zero chars. + __register_frame(Addr); +} + +void RTDyldMemoryManager::deregisterEHFrames(uint8_t *Addr, + uint64_t LoadAddr, + size_t Size) { + __deregister_frame(Addr); +} + +#endif + +static int jit_noop() { + return 0; +} + +// ARM math functions are statically linked on Android from libgcc.a, but not +// available at runtime for dynamic linking. On Linux these are usually placed +// in libgcc_s.so so can be found by normal dynamic lookup. +#if defined(__BIONIC__) && defined(__arm__) +// List of functions which are statically linked on Android and can be generated +// by LLVM. This is done as a nested macro which is used once to declare the +// imported functions with ARM_MATH_DECL and once to compare them to the +// user-requested symbol in getSymbolAddress with ARM_MATH_CHECK. The test +// assumes that all functions start with __aeabi_ and getSymbolAddress must be +// modified if that changes. +#define ARM_MATH_IMPORTS(PP) \ + PP(__aeabi_d2f) \ + PP(__aeabi_d2iz) \ + PP(__aeabi_d2lz) \ + PP(__aeabi_d2uiz) \ + PP(__aeabi_d2ulz) \ + PP(__aeabi_dadd) \ + PP(__aeabi_dcmpeq) \ + PP(__aeabi_dcmpge) \ + PP(__aeabi_dcmpgt) \ + PP(__aeabi_dcmple) \ + PP(__aeabi_dcmplt) \ + PP(__aeabi_dcmpun) \ + PP(__aeabi_ddiv) \ + PP(__aeabi_dmul) \ + PP(__aeabi_dsub) \ + PP(__aeabi_f2d) \ + PP(__aeabi_f2iz) \ + PP(__aeabi_f2lz) \ + PP(__aeabi_f2uiz) \ + PP(__aeabi_f2ulz) \ + PP(__aeabi_fadd) \ + PP(__aeabi_fcmpeq) \ + PP(__aeabi_fcmpge) \ + PP(__aeabi_fcmpgt) \ + PP(__aeabi_fcmple) \ + PP(__aeabi_fcmplt) \ + PP(__aeabi_fcmpun) \ + PP(__aeabi_fdiv) \ + PP(__aeabi_fmul) \ + PP(__aeabi_fsub) \ + PP(__aeabi_i2d) \ + PP(__aeabi_i2f) \ + PP(__aeabi_idiv) \ + PP(__aeabi_idivmod) \ + PP(__aeabi_l2d) \ + PP(__aeabi_l2f) \ + PP(__aeabi_lasr) \ + PP(__aeabi_ldivmod) \ + PP(__aeabi_llsl) \ + PP(__aeabi_llsr) \ + PP(__aeabi_lmul) \ + PP(__aeabi_ui2d) \ + PP(__aeabi_ui2f) \ + PP(__aeabi_uidiv) \ + PP(__aeabi_uidivmod) \ + PP(__aeabi_ul2d) \ + PP(__aeabi_ul2f) \ + PP(__aeabi_uldivmod) + +// Declare statically linked math functions on ARM. The function declarations +// here do not have the correct prototypes for each function in +// ARM_MATH_IMPORTS, but it doesn't matter because only the symbol addresses are +// needed. In particular the __aeabi_*divmod functions do not have calling +// conventions which match any C prototype. +#define ARM_MATH_DECL(name) extern "C" void name(); +ARM_MATH_IMPORTS(ARM_MATH_DECL) +#undef ARM_MATH_DECL +#endif + +#if defined(__linux__) && defined(__GLIBC__) && \ + (defined(__i386__) || defined(__x86_64__)) +extern "C" LLVM_ATTRIBUTE_WEAK void __morestack(); +#endif + +uint64_t +RTDyldMemoryManager::getSymbolAddressInProcess(const std::string &Name) { + // This implementation assumes that the host program is the target. + // Clients generating code for a remote target should implement their own + // memory manager. +#if defined(__linux__) && defined(__GLIBC__) + //===--------------------------------------------------------------------===// + // Function stubs that are invoked instead of certain library calls + // + // Force the following functions to be linked in to anything that uses the + // JIT. This is a hack designed to work around the all-too-clever Glibc + // strategy of making these functions work differently when inlined vs. when + // not inlined, and hiding their real definitions in a separate archive file + // that the dynamic linker can't see. For more info, search for + // 'libc_nonshared.a' on Google, or read http://llvm.org/PR274. + if (Name == "stat") return (uint64_t)&stat; + if (Name == "fstat") return (uint64_t)&fstat; + if (Name == "lstat") return (uint64_t)&lstat; + if (Name == "stat64") return (uint64_t)&stat64; + if (Name == "fstat64") return (uint64_t)&fstat64; + if (Name == "lstat64") return (uint64_t)&lstat64; + if (Name == "atexit") return (uint64_t)&atexit; + if (Name == "mknod") return (uint64_t)&mknod; + +#if defined(__i386__) || defined(__x86_64__) + // __morestack lives in libgcc, a static library. + if (&__morestack && Name == "__morestack") + return (uint64_t)&__morestack; +#endif +#endif // __linux__ && __GLIBC__ + + // See ARM_MATH_IMPORTS definition for explanation +#if defined(__BIONIC__) && defined(__arm__) + if (Name.compare(0, 8, "__aeabi_") == 0) { + // Check if the user has requested any of the functions listed in + // ARM_MATH_IMPORTS, and if so redirect to the statically linked symbol. +#define ARM_MATH_CHECK(fn) if (Name == #fn) return (uint64_t)&fn; + ARM_MATH_IMPORTS(ARM_MATH_CHECK) +#undef ARM_MATH_CHECK + } +#endif + + // We should not invoke parent's ctors/dtors from generated main()! + // On Mingw and Cygwin, the symbol __main is resolved to + // callee's(eg. tools/lli) one, to invoke wrong duplicated ctors + // (and register wrong callee's dtors with atexit(3)). + // We expect ExecutionEngine::runStaticConstructorsDestructors() + // is called before ExecutionEngine::runFunctionAsMain() is called. + if (Name == "__main") return (uint64_t)&jit_noop; + + // Try to demangle Name before looking it up in the process, otherwise symbol + // '_' (if present) will shadow '', and there will be no way to + // refer to the latter. + + const char *NameStr = Name.c_str(); + + if (NameStr[0] == '_') + if (void *Ptr = sys::DynamicLibrary::SearchForAddressOfSymbol(NameStr + 1)) + return (uint64_t)Ptr; + + // If we Name did not require demangling, or we failed to find the demangled + // name, try again without demangling. + return (uint64_t)sys::DynamicLibrary::SearchForAddressOfSymbol(NameStr); +} + +void *RTDyldMemoryManager::getPointerToNamedFunction(const std::string &Name, + bool AbortOnFailure) { + uint64_t Addr = getSymbolAddress(Name); + + if (!Addr && AbortOnFailure) + report_fatal_error("Program used external function '" + Name + + "' which could not be resolved!"); + return (void*)Addr; +} + +} // namespace llvm Modified: projects/clang360-import/contrib/llvm/lib/IR/Constants.cpp ============================================================================== --- projects/clang360-import/contrib/llvm/lib/IR/Constants.cpp Thu Feb 19 21:47:31 2015 (r279024) +++ projects/clang360-import/contrib/llvm/lib/IR/Constants.cpp Thu Feb 19 22:20:19 2015 (r279025) @@ -257,11 +257,11 @@ Constant *Constant::getAggregateElement( if (const ConstantVector *CV = dyn_cast(this)) return Elt < CV->getNumOperands() ? CV->getOperand(Elt) : nullptr; - if (const ConstantAggregateZero *CAZ =dyn_cast(this)) - return CAZ->getElementValue(Elt); + if (const ConstantAggregateZero *CAZ = dyn_cast(this)) + return Elt < CAZ->getNumElements() ? CAZ->getElementValue(Elt) : nullptr; if (const UndefValue *UV = dyn_cast(this)) - return UV->getElementValue(Elt); + return Elt < UV->getNumElements() ? UV->getElementValue(Elt) : nullptr; if (const ConstantDataSequential *CDS =dyn_cast(this)) return Elt < CDS->getNumElements() ? CDS->getElementAsConstant(Elt) @@ -764,6 +764,14 @@ Constant *ConstantAggregateZero::getElem return getStructElement(Idx); } +unsigned ConstantAggregateZero::getNumElements() const { + const Type *Ty = getType(); + if (const auto *AT = dyn_cast(Ty)) + return AT->getNumElements(); + if (const auto *VT = dyn_cast(Ty)) + return VT->getNumElements(); + return Ty->getStructNumElements(); +} //===----------------------------------------------------------------------===// // UndefValue Implementation @@ -797,7 +805,14 @@ UndefValue *UndefValue::getElementValue( return getStructElement(Idx); } - +unsigned UndefValue::getNumElements() const { + const Type *Ty = getType(); + if (const auto *AT = dyn_cast(Ty)) + return AT->getNumElements(); + if (const auto *VT = dyn_cast(Ty)) + return VT->getNumElements(); + return Ty->getStructNumElements(); +} //===----------------------------------------------------------------------===// // ConstantXXX Classes Modified: projects/clang360-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp ============================================================================== --- projects/clang360-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp Thu Feb 19 21:47:31 2015 (r279024) +++ projects/clang360-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp Thu Feb 19 22:20:19 2015 (r279025) @@ -1679,7 +1679,9 @@ void X86TargetLowering::resetOperationAc setTargetDAGCombine(ISD::FMA); setTargetDAGCombine(ISD::SUB); setTargetDAGCombine(ISD::LOAD); + setTargetDAGCombine(ISD::MLOAD); setTargetDAGCombine(ISD::STORE); + setTargetDAGCombine(ISD::MSTORE); setTargetDAGCombine(ISD::ZERO_EXTEND); setTargetDAGCombine(ISD::ANY_EXTEND); setTargetDAGCombine(ISD::SIGN_EXTEND); @@ -24738,6 +24740,166 @@ static SDValue PerformLOADCombine(SDNode return SDValue(); } +/// PerformMLOADCombine - Resolve extending loads +static SDValue PerformMLOADCombine(SDNode *N, SelectionDAG &DAG, + TargetLowering::DAGCombinerInfo &DCI, + const X86Subtarget *Subtarget) { + MaskedLoadSDNode *Mld = cast(N); + if (Mld->getExtensionType() != ISD::SEXTLOAD) + return SDValue(); + + EVT VT = Mld->getValueType(0); + const TargetLowering &TLI = DAG.getTargetLoweringInfo(); + unsigned NumElems = VT.getVectorNumElements(); + EVT LdVT = Mld->getMemoryVT(); + SDLoc dl(Mld); + + assert(LdVT != VT && "Cannot extend to the same type"); + unsigned ToSz = VT.getVectorElementType().getSizeInBits(); + unsigned FromSz = LdVT.getVectorElementType().getSizeInBits(); + // From, To sizes and ElemCount must be pow of two + assert (isPowerOf2_32(NumElems * FromSz * ToSz) && + "Unexpected size for extending masked load"); + + unsigned SizeRatio = ToSz / FromSz; + assert(SizeRatio * NumElems * FromSz == VT.getSizeInBits()); + + // Create a type on which we perform the shuffle + EVT WideVecVT = EVT::getVectorVT(*DAG.getContext(), + LdVT.getScalarType(), NumElems*SizeRatio); + assert(WideVecVT.getSizeInBits() == VT.getSizeInBits()); + + // Convert Src0 value + SDValue WideSrc0 = DAG.getNode(ISD::BITCAST, dl, WideVecVT, Mld->getSrc0()); + if (Mld->getSrc0().getOpcode() != ISD::UNDEF) { + SmallVector ShuffleVec(NumElems * SizeRatio, -1); + for (unsigned i = 0; i != NumElems; ++i) + ShuffleVec[i] = i * SizeRatio; + + // Can't shuffle using an illegal type. + assert (TLI.isTypeLegal(WideVecVT) && "WideVecVT should be legal"); + WideSrc0 = DAG.getVectorShuffle(WideVecVT, dl, WideSrc0, + DAG.getUNDEF(WideVecVT), &ShuffleVec[0]); + } + // Prepare the new mask + SDValue NewMask; + SDValue Mask = Mld->getMask(); + if (Mask.getValueType() == VT) { + // Mask and original value have the same type + NewMask = DAG.getNode(ISD::BITCAST, dl, WideVecVT, Mask); + SmallVector ShuffleVec(NumElems * SizeRatio, -1); + for (unsigned i = 0; i != NumElems; ++i) + ShuffleVec[i] = i * SizeRatio; + for (unsigned i = NumElems; i != NumElems*SizeRatio; ++i) + ShuffleVec[i] = NumElems*SizeRatio; + NewMask = DAG.getVectorShuffle(WideVecVT, dl, NewMask, + DAG.getConstant(0, WideVecVT), + &ShuffleVec[0]); + } + else { + assert(Mask.getValueType().getVectorElementType() == MVT::i1); + unsigned WidenNumElts = NumElems*SizeRatio; + unsigned MaskNumElts = VT.getVectorNumElements(); + EVT NewMaskVT = EVT::getVectorVT(*DAG.getContext(), MVT::i1, + WidenNumElts); + + unsigned NumConcat = WidenNumElts / MaskNumElts; + SmallVector Ops(NumConcat); + SDValue ZeroVal = DAG.getConstant(0, Mask.getValueType()); + Ops[0] = Mask; + for (unsigned i = 1; i != NumConcat; ++i) + Ops[i] = ZeroVal; + + NewMask = DAG.getNode(ISD::CONCAT_VECTORS, dl, NewMaskVT, Ops); + } + + SDValue WideLd = DAG.getMaskedLoad(WideVecVT, dl, Mld->getChain(), + Mld->getBasePtr(), NewMask, WideSrc0, + Mld->getMemoryVT(), Mld->getMemOperand(), + ISD::NON_EXTLOAD); + SDValue NewVec = DAG.getNode(X86ISD::VSEXT, dl, VT, WideLd); + return DCI.CombineTo(N, NewVec, WideLd.getValue(1), true); + +} +/// PerformMSTORECombine - Resolve truncating stores +static SDValue PerformMSTORECombine(SDNode *N, SelectionDAG &DAG, + const X86Subtarget *Subtarget) { + MaskedStoreSDNode *Mst = cast(N); + if (!Mst->isTruncatingStore()) + return SDValue(); + + EVT VT = Mst->getValue().getValueType(); + const TargetLowering &TLI = DAG.getTargetLoweringInfo(); + unsigned NumElems = VT.getVectorNumElements(); + EVT StVT = Mst->getMemoryVT(); + SDLoc dl(Mst); + + assert(StVT != VT && "Cannot truncate to the same type"); + unsigned FromSz = VT.getVectorElementType().getSizeInBits(); + unsigned ToSz = StVT.getVectorElementType().getSizeInBits(); + + // From, To sizes and ElemCount must be pow of two + assert (isPowerOf2_32(NumElems * FromSz * ToSz) && + "Unexpected size for truncating masked store"); + // We are going to use the original vector elt for storing. + // Accumulated smaller vector elements must be a multiple of the store size. + assert (((NumElems * FromSz) % ToSz) == 0 && + "Unexpected ratio for truncating masked store"); + + unsigned SizeRatio = FromSz / ToSz; + assert(SizeRatio * NumElems * ToSz == VT.getSizeInBits()); + + // Create a type on which we perform the shuffle + EVT WideVecVT = EVT::getVectorVT(*DAG.getContext(), + StVT.getScalarType(), NumElems*SizeRatio); + + assert(WideVecVT.getSizeInBits() == VT.getSizeInBits()); + + SDValue WideVec = DAG.getNode(ISD::BITCAST, dl, WideVecVT, Mst->getValue()); + SmallVector ShuffleVec(NumElems * SizeRatio, -1); + for (unsigned i = 0; i != NumElems; ++i) + ShuffleVec[i] = i * SizeRatio; + + // Can't shuffle using an illegal type. + assert (TLI.isTypeLegal(WideVecVT) && "WideVecVT should be legal"); + + SDValue TruncatedVal = DAG.getVectorShuffle(WideVecVT, dl, WideVec, + DAG.getUNDEF(WideVecVT), + &ShuffleVec[0]); + + SDValue NewMask; + SDValue Mask = Mst->getMask(); + if (Mask.getValueType() == VT) { + // Mask and original value have the same type + NewMask = DAG.getNode(ISD::BITCAST, dl, WideVecVT, Mask); + for (unsigned i = 0; i != NumElems; ++i) + ShuffleVec[i] = i * SizeRatio; + for (unsigned i = NumElems; i != NumElems*SizeRatio; ++i) + ShuffleVec[i] = NumElems*SizeRatio; + NewMask = DAG.getVectorShuffle(WideVecVT, dl, NewMask, + DAG.getConstant(0, WideVecVT), + &ShuffleVec[0]); + } + else { + assert(Mask.getValueType().getVectorElementType() == MVT::i1); + unsigned WidenNumElts = NumElems*SizeRatio; + unsigned MaskNumElts = VT.getVectorNumElements(); + EVT NewMaskVT = EVT::getVectorVT(*DAG.getContext(), MVT::i1, + WidenNumElts); + + unsigned NumConcat = WidenNumElts / MaskNumElts; + SmallVector Ops(NumConcat); + SDValue ZeroVal = DAG.getConstant(0, Mask.getValueType()); + Ops[0] = Mask; + for (unsigned i = 1; i != NumConcat; ++i) + Ops[i] = ZeroVal; + + NewMask = DAG.getNode(ISD::CONCAT_VECTORS, dl, NewMaskVT, Ops); + } + + return DAG.getMaskedStore(Mst->getChain(), dl, TruncatedVal, Mst->getBasePtr(), + NewMask, StVT, Mst->getMemOperand(), false); +} /// PerformSTORECombine - Do target-specific dag combines on STORE nodes. static SDValue PerformSTORECombine(SDNode *N, SelectionDAG &DAG, const X86Subtarget *Subtarget) { @@ -25836,7 +25998,9 @@ SDValue X86TargetLowering::PerformDAGCom case ISD::OR: return PerformOrCombine(N, DAG, DCI, Subtarget); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Feb 20 00:13:05 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 141AD923; Fri, 20 Feb 2015 00:13:05 +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 EF12EBA9; Fri, 20 Feb 2015 00:13:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1K0D4TF089848; Fri, 20 Feb 2015 00:13:04 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1K0D0bE089808; Fri, 20 Feb 2015 00:13:00 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201502200013.t1K0D0bE089808@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 20 Feb 2015 00:13:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r279032 - in projects/ifnet: . contrib/ipfilter lib/libc/sys share/misc share/mk sys/arm/arm sys/arm/include sys/cddl/dev/dtrace/arm sys/conf sys/dev/ofw sys/kern sys/net sys/netinet sy... 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.18-1 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, 20 Feb 2015 00:13:05 -0000 Author: glebius Date: Fri Feb 20 00:12:59 2015 New Revision: 279032 URL: https://svnweb.freebsd.org/changeset/base/279032 Log: Merge head r257698 through r279031. Added: projects/ifnet/sys/dev/ofw/ofw_cpu.h - copied unchanged from r279031, head/sys/dev/ofw/ofw_cpu.h Modified: projects/ifnet/UPDATING projects/ifnet/contrib/ipfilter/ip_fil.c projects/ifnet/contrib/ipfilter/ipf.h projects/ifnet/lib/libc/sys/mmap.2 projects/ifnet/share/misc/committers-doc.dot projects/ifnet/share/mk/bsd.sys.mk projects/ifnet/sys/arm/arm/db_trace.c projects/ifnet/sys/arm/arm/unwind.c projects/ifnet/sys/arm/include/stack.h projects/ifnet/sys/cddl/dev/dtrace/arm/dtrace_isa.c projects/ifnet/sys/conf/NOTES projects/ifnet/sys/conf/files.arm projects/ifnet/sys/conf/kmod.mk projects/ifnet/sys/dev/ofw/ofw_cpu.c projects/ifnet/sys/kern/kern_ctf.c projects/ifnet/sys/net/if_var.h projects/ifnet/sys/netinet/igmp.c projects/ifnet/sys/netinet/igmp_var.h projects/ifnet/sys/netinet/in_mcast.c projects/ifnet/sys/netinet/in_var.h projects/ifnet/sys/netinet6/in6_var.h projects/ifnet/sys/netinet6/mld6.c projects/ifnet/sys/netinet6/mld6_var.h projects/ifnet/sys/ofed/drivers/infiniband/core/cma.c projects/ifnet/sys/sys/cpu.h projects/ifnet/sys/sys/mbuf.h projects/ifnet/usr.bin/netstat/inet.c projects/ifnet/usr.sbin/ifmcstat/Makefile projects/ifnet/usr.sbin/ifmcstat/ifmcstat.c projects/ifnet/usr.sbin/syslogd/syslogd.c Directory Properties: projects/ifnet/ (props changed) projects/ifnet/contrib/ipfilter/ (props changed) projects/ifnet/lib/libc/ (props changed) projects/ifnet/share/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/conf/ (props changed) Modified: projects/ifnet/UPDATING ============================================================================== --- projects/ifnet/UPDATING Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/UPDATING Fri Feb 20 00:12:59 2015 (r279032) @@ -37,7 +37,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 upgrade the kernel to r278950 or later and regenerate any keys (e.g. ssh keys or openssl keys) that were generated w/ a kernel from that range. This does not effect programs that directly used /dev/random - or /dev/urandom. All userland uses of arc4random(3) are effected. + or /dev/urandom. All userland uses of arc4random(3) are affected. 20150210: The autofs(4) ABI was changed in order to restore binary compatibility Modified: projects/ifnet/contrib/ipfilter/ip_fil.c ============================================================================== --- projects/ifnet/contrib/ipfilter/ip_fil.c Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/contrib/ipfilter/ip_fil.c Fri Feb 20 00:12:59 2015 (r279032) @@ -44,6 +44,9 @@ static int write_output __P((struct ifne # endif #endif +struct ifaddr { + struct sockaddr_storage ifa_addr; +}; int ipfattach(softc) Modified: projects/ifnet/contrib/ipfilter/ipf.h ============================================================================== --- projects/ifnet/contrib/ipfilter/ipf.h Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/contrib/ipfilter/ipf.h Fri Feb 20 00:12:59 2015 (r279032) @@ -43,9 +43,6 @@ struct file; #include #include -#define _WANT_IFADDR -#include - #include #include #include Modified: projects/ifnet/lib/libc/sys/mmap.2 ============================================================================== --- projects/ifnet/lib/libc/sys/mmap.2 Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/lib/libc/sys/mmap.2 Fri Feb 20 00:12:59 2015 (r279032) @@ -28,7 +28,7 @@ .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 .\" $FreeBSD$ .\" -.Dd September 17, 2014 +.Dd February 18, 2015 .Dt MMAP 2 .Os .Sh NAME @@ -160,7 +160,7 @@ is specified, must be a multiple of the pagesize. If .Dv MAP_EXCL -is not specified, a successfull +is not specified, a successful .Dv MAP_FIXED request replaces any previous mappings for the process' pages in the range from @@ -225,7 +225,7 @@ it. You can test file fragmentation by observing the KB/t (kilobytes per transfer) results from an .Dq Li iostat 1 -while reading a large file sequentially, e.g.\& using +while reading a large file sequentially, e.g.,\& using .Dq Li dd if=filename of=/dev/null bs=32k . .Pp The @@ -448,17 +448,3 @@ was specified and insufficient memory wa .Xr munmap 2 , .Xr getpagesize 3 , .Xr getpagesizes 3 -.Sh BUGS -The -.Fa len -argument -is limited to the maximum file size or available userland address -space. -Files may not be able to be made more than 1TB large on 32 bit systems -due to file systems restrictions and bugs, but address space is far more -restrictive. -Larger files may be possible on 64 bit systems. -.Pp -The previous documented limit of 2GB was a documentation bug. -That limit has not existed since -.Fx 2.2 . Modified: projects/ifnet/share/misc/committers-doc.dot ============================================================================== --- projects/ifnet/share/misc/committers-doc.dot Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/share/misc/committers-doc.dot Fri Feb 20 00:12:59 2015 (r279032) @@ -53,6 +53,7 @@ node [color=lightblue2, style=filled, bg ale [label="Alex Dupre\nale@FreeBSD.org\n2003/12/22"] allanjude [label="Allan Jude\nallanjude@FreeBSD.org\n2014/05/17"] bcr [label="Benedict Reuschling\nbcr@FreeBSD.org\n2009/12/24"] +bhd [label="Björn Heidotting\nbhd@FreeBSD.org\n2014/10/14"] blackend [label="Marc Fonvieille\nblackend@FreeBSD.org\n2002/06/16"] brd [label="Brad Davis\nbrd@FreeBSD.org\n2005/06/01"] brueffer [label="Christian Brueffer\nbrueffer@FreeBSD.org\n2003/01/13"] @@ -102,6 +103,7 @@ bcr -> dru bcr -> crees bcr -> jgh bcr -> allanjude +bcr -> bhd blackend -> ale Modified: projects/ifnet/share/mk/bsd.sys.mk ============================================================================== --- projects/ifnet/share/mk/bsd.sys.mk Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/share/mk/bsd.sys.mk Fri Feb 20 00:12:59 2015 (r279032) @@ -118,7 +118,10 @@ CWARNFLAGS+= -Wno-unknown-pragmas CLANG_NO_IAS= -no-integrated-as .endif CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\ - -mllvm -simplifycfg-dup-ret -mllvm -enable-gvn=false + -mllvm -simplifycfg-dup-ret -mllvm +.if ${COMPILER_VERSION} > 30400 +CLANG_OPT_SMALL+= -enable-gvn=false +.endif CFLAGS.clang+= -Qunused-arguments .if ${MACHINE_CPUARCH} == "sparc64" # Don't emit .cfi directives, since we must use GNU as on sparc64, for now. Modified: projects/ifnet/sys/arm/arm/db_trace.c ============================================================================== --- projects/ifnet/sys/arm/arm/db_trace.c Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/sys/arm/arm/db_trace.c Fri Feb 20 00:12:59 2015 (r279032) @@ -66,7 +66,7 @@ db_stack_trace_cmd(struct unwind_state * finished = false; while (!finished) { - finished = unwind_stack_one(state); + finished = unwind_stack_one(state, 0); /* Print the frame details */ sym = db_search_symbol(state->start_pc, DB_STGY_ANY, &offset); Modified: projects/ifnet/sys/arm/arm/unwind.c ============================================================================== --- projects/ifnet/sys/arm/arm/unwind.c Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/sys/arm/arm/unwind.c Fri Feb 20 00:12:59 2015 (r279032) @@ -33,9 +33,12 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include +#include "linker_if.h" + /* * Definitions for the instruction interpreter. * @@ -61,7 +64,7 @@ __FBSDID("$FreeBSD$"); * These are set in the linker script. Their addresses will be * either the start or end of the exception table or index. */ -extern int extab_start, extab_end, exidx_start, exidx_end; +extern int exidx_start, exidx_end; /* * Entry types. @@ -104,13 +107,47 @@ expand_prel31(uint32_t prel31) return ((int32_t)(prel31 & 0x7fffffffu) << 1) / 2; } +struct search_context { + uint32_t addr; + caddr_t exidx_start; + caddr_t exidx_end; +}; + +static int +module_search(linker_file_t lf, void *context) +{ + struct search_context *sc = context; + linker_symval_t symval; + c_linker_sym_t sym; + + if (lf->address <= (caddr_t)sc->addr && + (lf->address + lf->size) >= (caddr_t)sc->addr) { + if ((LINKER_LOOKUP_SYMBOL(lf, "__exidx_start", &sym) == 0 || + LINKER_LOOKUP_SYMBOL(lf, "exidx_start", &sym) == 0) && + LINKER_SYMBOL_VALUES(lf, sym, &symval) == 0) + sc->exidx_start = symval.value; + + if ((LINKER_LOOKUP_SYMBOL(lf, "__exidx_end", &sym) == 0 || + LINKER_LOOKUP_SYMBOL(lf, "exidx_end", &sym) == 0) && + LINKER_SYMBOL_VALUES(lf, sym, &symval) == 0) + sc->exidx_end = symval.value; + + if (sc->exidx_start != NULL && sc->exidx_end != NULL) + return (1); + panic("Invalid module %s, no unwind tables\n", lf->filename); + } + return (0); +} + /* * Perform a binary search of the index table to find the function * with the largest address that doesn't exceed addr. */ static struct unwind_idx * -find_index(uint32_t addr) +find_index(uint32_t addr, int search_modules) { + struct search_context sc; + caddr_t idx_start, idx_end; unsigned int min, mid, max; struct unwind_idx *start; struct unwind_idx *item; @@ -118,9 +155,23 @@ find_index(uint32_t addr) uint32_t func_addr; start = (struct unwind_idx *)&exidx_start; + idx_start = (caddr_t)&exidx_start; + idx_end = (caddr_t)&exidx_end; + + /* This may acquire a lock */ + if (search_modules) { + bzero(&sc, sizeof(sc)); + sc.addr = addr; + if (linker_file_foreach(module_search, &sc) != 0 && + sc.exidx_start != NULL && sc.exidx_end != NULL) { + start = (struct unwind_idx *)sc.exidx_start; + idx_start = sc.exidx_start; + idx_end = sc.exidx_end; + } + } min = 0; - max = (&exidx_end - &exidx_start) / 2; + max = (idx_end - idx_start) / sizeof(struct unwind_idx); while (min != max) { mid = min + (max - min + 1) / 2; @@ -332,7 +383,7 @@ unwind_tab(struct unwind_state *state) } int -unwind_stack_one(struct unwind_state *state) +unwind_stack_one(struct unwind_state *state, int can_lock) { struct unwind_idx *index; int finished; @@ -344,7 +395,7 @@ unwind_stack_one(struct unwind_state *st state->start_pc = state->registers[PC]; /* Find the item to run */ - index = find_index(state->start_pc); + index = find_index(state->start_pc, can_lock); finished = 0; if (index->insn != EXIDX_CANTUNWIND) { Modified: projects/ifnet/sys/arm/include/stack.h ============================================================================== --- projects/ifnet/sys/arm/include/stack.h Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/sys/arm/include/stack.h Fri Feb 20 00:12:59 2015 (r279032) @@ -55,6 +55,6 @@ struct unwind_state { #define LR 14 #define PC 15 -int unwind_stack_one(struct unwind_state *); +int unwind_stack_one(struct unwind_state *, int); #endif /* !_MACHINE_STACK_H_ */ Modified: projects/ifnet/sys/cddl/dev/dtrace/arm/dtrace_isa.c ============================================================================== --- projects/ifnet/sys/cddl/dev/dtrace/arm/dtrace_isa.c Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/sys/cddl/dev/dtrace/arm/dtrace_isa.c Fri Feb 20 00:12:59 2015 (r279032) @@ -69,9 +69,10 @@ void dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes, uint32_t *intrpc) { - u_int32_t *frame, *lastframe; - int scp_offset; - int depth = 0; + struct unwind_state state; + register_t sp; + int scp_offset; + int depth = 0; pc_t caller = (pc_t) solaris_cpu[curcpu].cpu_dtrace_caller; if (intrpc != 0) @@ -79,23 +80,17 @@ dtrace_getpcstack(pc_t *pcstack, int pcs aframes++; - frame = (u_int32_t *)__builtin_frame_address(0);; - lastframe = NULL; - scp_offset = -(get_pc_str_offset() >> 2); - - while ((frame != NULL) && (depth < pcstack_limit)) { - db_addr_t scp; -#if 0 - u_int32_t savecode; - int r; - u_int32_t *rp; -#endif - - /* - * In theory, the SCP isn't guaranteed to be in the function - * that generated the stack frame. We hope for the best. - */ - scp = frame[FR_SCP]; + __asm __volatile("mov %0, sp" : "=&r" (sp)); + + state.registers[FP] = (uint32_t)__builtin_frame_address(0); + state.registers[SP] = sp; + state.registers[LR] = (uint32_t)__builtin_return_address(0); + state.registers[PC] = (uint32_t)dtrace_getpcstack; + + while (depth < pcstack_limit) { + int done; + + done = unwind_stack_one(&state, 1); if (aframes > 0) { aframes--; @@ -104,39 +99,10 @@ dtrace_getpcstack(pc_t *pcstack, int pcs } } else { - pcstack[depth++] = scp; + pcstack[depth++] = state.registers[PC]; } -#if 0 - savecode = ((u_int32_t *)scp)[scp_offset]; - if ((savecode & 0x0e100000) == 0x08000000) { - /* Looks like an STM */ - rp = frame - 4; - for (r = 10; r >= 0; r--) { - if (savecode & (1 << r)) { - /* register r == *rp-- */ - } - } - } -#endif - - /* - * Switch to next frame up - */ - if (frame[FR_RFP] == 0) - break; /* Top of stack */ - - lastframe = frame; - frame = (u_int32_t *)(frame[FR_RFP]); - - if (INKERNEL((int)frame)) { - /* staying in kernel */ - if (frame <= lastframe) { - /* bad frame pointer */ - break; - } - } - else + if (done) break; } @@ -176,55 +142,28 @@ dtrace_getarg(int arg, int aframes) int dtrace_getstackdepth(int aframes) { - u_int32_t *frame, *lastframe; - int scp_offset; - int depth = 1; - - frame = (u_int32_t *)__builtin_frame_address(0);; - lastframe = NULL; - scp_offset = -(get_pc_str_offset() >> 2); - - while (frame != NULL) { - db_addr_t scp; -#if 0 - u_int32_t savecode; - int r; - u_int32_t *rp; -#endif - - /* - * In theory, the SCP isn't guaranteed to be in the function - * that generated the stack frame. We hope for the best. - */ - scp = frame[FR_SCP]; + struct unwind_state state; + register_t sp; + int scp_offset; + int done = 0; + int depth = 1; + + __asm __volatile("mov %0, sp" : "=&r" (sp)); + + state.registers[FP] = (uint32_t)__builtin_frame_address(0); + state.registers[SP] = sp; + state.registers[LR] = (uint32_t)__builtin_return_address(0); + state.registers[PC] = (uint32_t)dtrace_getstackdepth; + do { + done = unwind_stack_one(&state, 1); depth++; - - /* - * Switch to next frame up - */ - if (frame[FR_RFP] == 0) - break; /* Top of stack */ - - lastframe = frame; - frame = (u_int32_t *)(frame[FR_RFP]); - - if (INKERNEL((int)frame)) { - /* staying in kernel */ - if (frame <= lastframe) { - /* bad frame pointer */ - break; - } - } - else - break; - } + } while (!done); if (depth < aframes) return 0; else return depth - aframes; - } ulong_t Modified: projects/ifnet/sys/conf/NOTES ============================================================================== --- projects/ifnet/sys/conf/NOTES Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/sys/conf/NOTES Fri Feb 20 00:12:59 2015 (r279032) @@ -495,7 +495,7 @@ options KTRACE_REQUEST_POOL=101 options KTR options KTR_BOOT_ENTRIES=1024 options KTR_ENTRIES=(128*1024) -options KTR_COMPILE=(KTR_INTR|KTR_PROC) +options KTR_COMPILE=(KTR_ALL) options KTR_MASK=KTR_INTR options KTR_CPUMASK=0x3 options KTR_VERBOSE Modified: projects/ifnet/sys/conf/files.arm ============================================================================== --- projects/ifnet/sys/conf/files.arm Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/sys/conf/files.arm Fri Feb 20 00:12:59 2015 (r279032) @@ -57,7 +57,7 @@ arm/arm/trap.c optional !armv6 arm/arm/trap-v6.c optional armv6 arm/arm/uio_machdep.c standard arm/arm/undefined.c standard -arm/arm/unwind.c optional ddb +arm/arm/unwind.c optional ddb | kdtrace_hooks arm/arm/vm_machdep.c standard arm/arm/vfp.c standard board_id.h standard \ Modified: projects/ifnet/sys/conf/kmod.mk ============================================================================== --- projects/ifnet/sys/conf/kmod.mk Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/sys/conf/kmod.mk Fri Feb 20 00:12:59 2015 (r279032) @@ -125,6 +125,7 @@ CFLAGS+= -fno-omit-frame-pointer -mno-om .if ${MACHINE_CPUARCH} == arm CFLAGS.clang+= -mllvm -arm-use-movt=0 CFLAGS.clang+= -mfpu=none +CFLAGS+= -funwind-tables .endif .if ${MACHINE_CPUARCH} == powerpc Modified: projects/ifnet/sys/dev/ofw/ofw_cpu.c ============================================================================== --- projects/ifnet/sys/dev/ofw/ofw_cpu.c Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/sys/dev/ofw/ofw_cpu.c Fri Feb 20 00:12:59 2015 (r279032) @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include static int ofw_cpulist_probe(device_t); static int ofw_cpulist_attach(device_t); @@ -244,6 +245,7 @@ ofw_cpu_attach(device_t dev) static int ofw_cpu_read_ivar(device_t dev, device_t child, int index, uintptr_t *result) { + struct ofw_cpulist_softc *psc; struct ofw_cpu_softc *sc; sc = device_get_softc(dev); @@ -258,8 +260,65 @@ ofw_cpu_read_ivar(device_t dev, device_t return (0); } break; + case CPU_IVAR_CPUID_SIZE: + psc = device_get_softc(device_get_parent(dev)); + *result = psc->sc_addr_cells; + return (0); + case CPU_IVAR_CPUID: + if (sc->sc_reg_valid) { + *result = (uintptr_t)sc->sc_reg; + return (0); + } + break; } return (ENOENT); } +int +ofw_cpu_early_foreach(ofw_cpu_foreach_cb callback, boolean_t only_runnable) +{ + phandle_t node, child; + pcell_t addr_cells, reg[2]; + char status[16]; + u_int id; + int count, rv; + + count = 0; + id = 0; + + node = OF_finddevice("/cpus"); + if (node == -1) + return (-1); + + /* Find the number of cells in the cpu register */ + if (OF_getencprop(node, "#address-cells", &addr_cells, + sizeof(addr_cells)) < 0) + return (-1); + + for (child = OF_child(node); child != 0; child = OF_peer(child), id++) { + /* + * If we are filtering by runnable then limit to only + * those that have been enabled. + */ + if (only_runnable) { + status[0] = '\0'; + OF_getprop(child, "status", status, sizeof(status)); + if (status[0] != '\0' && strcmp(status, "okay") != 0) + continue; + } + + /* + * Check we have a register to identify the cpu + */ + rv = OF_getencprop(child, "reg", reg, + addr_cells * sizeof(cell_t)); + if (rv != addr_cells * sizeof(cell_t)) + continue; + + if (callback == NULL || callback(id, child, addr_cells, reg)) + count++; + } + + return (only_runnable ? count : id); +} Copied: projects/ifnet/sys/dev/ofw/ofw_cpu.h (from r279031, head/sys/dev/ofw/ofw_cpu.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/sys/dev/ofw/ofw_cpu.h Fri Feb 20 00:12:59 2015 (r279032, copy of r279031, head/sys/dev/ofw/ofw_cpu.h) @@ -0,0 +1,38 @@ +/*- + * Copyright (c) 2015 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Andrew Turner under + * sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _DEV_OFW_OFW_CPU_H_ +#define _DEV_OFW_OFW_CPU_H_ + +typedef boolean_t (*ofw_cpu_foreach_cb)(u_int, phandle_t, u_int, pcell_t *); +int ofw_cpu_early_foreach(ofw_cpu_foreach_cb, boolean_t); + +#endif /* _DEV_OFW_OFW_CPU_H_ */ Modified: projects/ifnet/sys/kern/kern_ctf.c ============================================================================== --- projects/ifnet/sys/kern/kern_ctf.c Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/sys/kern/kern_ctf.c Fri Feb 20 00:12:59 2015 (r279032) @@ -121,10 +121,7 @@ link_elf_ctf_get(linker_file_t lf, linke NDFREE(&nd, NDF_ONLY_PNBUF); /* Allocate memory for the FLF header. */ - if ((hdr = malloc(sizeof(*hdr), M_LINKER, M_WAITOK)) == NULL) { - error = ENOMEM; - goto out; - } + hdr = malloc(sizeof(*hdr), M_LINKER, M_WAITOK); /* Read the ELF header. */ if ((error = vn_rdwr(UIO_READ, nd.ni_vp, hdr, sizeof(*hdr), @@ -146,10 +143,7 @@ link_elf_ctf_get(linker_file_t lf, linke } /* Allocate memory for all the section headers */ - if ((shdr = malloc(nbytes, M_LINKER, M_WAITOK)) == NULL) { - error = ENOMEM; - goto out; - } + shdr = malloc(nbytes, M_LINKER, M_WAITOK); /* Read all the section headers */ if ((error = vn_rdwr(UIO_READ, nd.ni_vp, (caddr_t)shdr, nbytes, @@ -171,11 +165,7 @@ link_elf_ctf_get(linker_file_t lf, linke } /* Allocate memory to buffer the section header strings. */ - if ((shstrtab = malloc(shdr[hdr->e_shstrndx].sh_size, M_LINKER, - M_WAITOK)) == NULL) { - error = ENOMEM; - goto out; - } + shstrtab = malloc(shdr[hdr->e_shstrndx].sh_size, M_LINKER, M_WAITOK); /* Read the section header strings. */ if ((error = vn_rdwr(UIO_READ, nd.ni_vp, shstrtab, @@ -238,10 +228,7 @@ link_elf_ctf_get(linker_file_t lf, linke * Allocate memory for the compressed CTF data, including * the header (which isn't compressed). */ - if ((raw = malloc(shdr[i].sh_size, M_LINKER, M_WAITOK)) == NULL) { - error = ENOMEM; - goto out; - } + raw = malloc(shdr[i].sh_size, M_LINKER, M_WAITOK); } else { /* * The CTF data is not compressed, so the ELF section @@ -254,10 +241,7 @@ link_elf_ctf_get(linker_file_t lf, linke * Allocate memory to buffer the CTF data in it's decompressed * form. */ - if ((ctftab = malloc(sz, M_LINKER, M_WAITOK)) == NULL) { - error = ENOMEM; - goto out; - } + ctftab = malloc(sz, M_LINKER, M_WAITOK); /* * Read the CTF data into the raw buffer if compressed, or @@ -293,7 +277,9 @@ link_elf_ctf_get(linker_file_t lf, linke zs.next_in = ((uint8_t *) raw) + sizeof(ctf_hdr); zs.avail_out = sz - sizeof(ctf_hdr); zs.next_out = ((uint8_t *) ctftab) + sizeof(ctf_hdr); - if ((ret = inflate(&zs, Z_FINISH)) != Z_STREAM_END) { + ret = inflate(&zs, Z_FINISH); + inflateEnd(&zs); + if (ret != Z_STREAM_END) { printf("%s(%d): zlib inflate returned %d\n", __func__, __LINE__, ret); error = EIO; goto out; Modified: projects/ifnet/sys/net/if_var.h ============================================================================== --- projects/ifnet/sys/net/if_var.h Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/sys/net/if_var.h Fri Feb 20 00:12:59 2015 (r279032) @@ -257,8 +257,6 @@ EVENTHANDLER_DECLARE(group_change_event, #define TOEDEV(ifp) ((ifp)->if_llsoftc) -#endif /* _KERNEL */ - /* * The ifaddr structure contains information about one address * of an interface. They are maintained by the different address families, @@ -269,7 +267,6 @@ EVENTHANDLER_DECLARE(group_change_event, * chunk of malloc'ed memory, where we store the three addresses * (ifa_addr, ifa_dstaddr and ifa_netmask) referenced here. */ -#if defined(_KERNEL) || defined(_WANT_IFADDR) struct ifaddr { struct sockaddr *ifa_addr; /* address of interface */ struct sockaddr *ifa_dstaddr; /* other end of p-to-p link */ @@ -281,6 +278,8 @@ struct ifaddr { void (*ifa_rtrequest) /* check or clean routes (+ or -)'d */ (int, struct rtentry *, struct rt_addrinfo *); u_short ifa_flags; /* mostly rt_flags for cloning */ +#define IFA_ROUTE RTF_UP /* route installed */ +#define IFA_RTSELF RTF_HOST /* loopback route to self installed */ u_int ifa_refcnt; /* references to this structure */ counter_u64_t ifa_ipackets; @@ -288,11 +287,6 @@ struct ifaddr { counter_u64_t ifa_ibytes; counter_u64_t ifa_obytes; }; -#endif - -#ifdef _KERNEL -#define IFA_ROUTE RTF_UP /* route installed */ -#define IFA_RTSELF RTF_HOST /* loopback route to self installed */ /* For compatibility with other BSDs. SCTP uses it. */ #define ifa_list ifa_link Modified: projects/ifnet/sys/netinet/igmp.c ============================================================================== --- projects/ifnet/sys/netinet/igmp.c Thu Feb 19 23:59:27 2015 (r279031) +++ projects/ifnet/sys/netinet/igmp.c Fri Feb 20 00:12:59 2015 (r279032) @@ -84,15 +84,15 @@ __FBSDID("$FreeBSD$"); #define KTR_IGMPV3 KTR_INET #endif -static struct igmp_ifinfo * +static struct igmp_ifsoftc * igi_alloc_locked(struct ifnet *); static void igi_delete_locked(const struct ifnet *); static void igmp_dispatch_queue(struct mbufq *, int, const int); static void igmp_fasttimo_vnet(void); -static void igmp_final_leave(struct in_multi *, struct igmp_ifinfo *); +static void igmp_final_leave(struct in_multi *, struct igmp_ifsoftc *); static int igmp_handle_state_change(struct in_multi *, - struct igmp_ifinfo *); -static int igmp_initial_join(struct in_multi *, struct igmp_ifinfo *); + struct igmp_ifsoftc *); +static int igmp_initial_join(struct in_multi *, struct igmp_ifsoftc *); static int igmp_input_v1_query(struct ifnet *, const struct ip *, const struct igmp *); static int igmp_input_v2_query(struct ifnet *, const struct ip *, @@ -100,7 +100,7 @@ static int igmp_input_v2_query(struct if static int igmp_input_v3_query(struct ifnet *, const struct ip *, /*const*/ struct igmpv3 *); static int igmp_input_v3_group_query(struct in_multi *, - struct igmp_ifinfo *, int, /*const*/ struct igmpv3 *); + struct igmp_ifsoftc *, int, /*const*/ struct igmpv3 *); static int igmp_input_v1_report(struct ifnet *, /*const*/ struct ip *, /*const*/ struct igmp *); static int igmp_input_v2_report(struct ifnet *, /*const*/ struct ip *, @@ -112,21 +112,21 @@ static struct mbuf * #ifdef KTR static char * igmp_rec_type_to_str(const int); #endif -static void igmp_set_version(struct igmp_ifinfo *, const int); +static void igmp_set_version(struct igmp_ifsoftc *, const int); static void igmp_slowtimo_vnet(void); static int igmp_v1v2_queue_report(struct in_multi *, const int); static void igmp_v1v2_process_group_timer(struct in_multi *, const int); -static void igmp_v1v2_process_querier_timers(struct igmp_ifinfo *); +static void igmp_v1v2_process_querier_timers(struct igmp_ifsoftc *); static void igmp_v2_update_group(struct in_multi *, const int); -static void igmp_v3_cancel_link_timers(struct igmp_ifinfo *); -static void igmp_v3_dispatch_general_query(struct igmp_ifinfo *); +static void igmp_v3_cancel_link_timers(struct igmp_ifsoftc *); +static void igmp_v3_dispatch_general_query(struct igmp_ifsoftc *); static struct mbuf * igmp_v3_encap_report(struct ifnet *, struct mbuf *); static int igmp_v3_enqueue_group_record(struct mbufq *, struct in_multi *, const int, const int, const int); static int igmp_v3_enqueue_filter_change(struct mbufq *, struct in_multi *); -static void igmp_v3_process_group_timers(struct igmp_ifinfo *, +static void igmp_v3_process_group_timers(struct igmp_ifsoftc *, struct mbufq *, struct mbufq *, struct in_multi *, const int); static int igmp_v3_merge_state_changes(struct in_multi *, @@ -158,13 +158,13 @@ static const struct netisr_handler igmp_ * * All output is delegated to the netisr. * Now that Giant has been eliminated, the netisr may be inlined. * * IN_MULTI_LOCK covers in_multi. - * * IGMP_LOCK covers igmp_ifinfo and any global variables in this file, + * * IGMP_LOCK covers igmp_ifsoftc and any global variables in this file, * including the output queue. * * IF_ADDR_LOCK covers if_multiaddrs, which is used for a variety of * per-link state iterators. - * * igmp_ifinfo is valid as long as PF_INET is attached to the interface, + * * igmp_ifsoftc is valid as long as PF_INET is attached to the interface, * therefore it is not refcounted. - * We allow unlocked reads of igmp_ifinfo when accessed via in_multi. + * We allow unlocked reads of igmp_ifsoftc when accessed via in_multi. * * Reference counting * * IGMP acquires its own reference every time an in_multi is passed to @@ -219,7 +219,7 @@ static VNET_DEFINE(int, current_state_ti #define V_state_change_timers_running VNET(state_change_timers_running) #define V_current_state_timers_running VNET(current_state_timers_running) -static VNET_DEFINE(LIST_HEAD(, igmp_ifinfo), igi_head); +static VNET_DEFINE(LIST_HEAD(, igmp_ifsoftc), igi_head); static VNET_DEFINE(struct igmpstat, igmpstat) = { .igps_version = IGPS_VERSION_3, .igps_len = sizeof(struct igmpstat), @@ -412,7 +412,7 @@ out_locked: } /* - * Expose struct igmp_ifinfo to userland, keyed by ifindex. + * Expose struct igmp_ifsoftc to userland, keyed by ifindex. * For use by ifmcstat(8). * * SMPng: NOTE: Does an unlocked ifindex space read. @@ -426,7 +426,7 @@ sysctl_igmp_ifinfo(SYSCTL_HANDLER_ARGS) int error; u_int namelen; struct ifnet *ifp; - struct igmp_ifinfo *igi; + struct igmp_ifsoftc *igi; name = (int *)arg1; namelen = arg2; @@ -457,8 +457,18 @@ sysctl_igmp_ifinfo(SYSCTL_HANDLER_ARGS) LIST_FOREACH(igi, &V_igi_head, igi_link) { if (ifp == igi->igi_ifp) { - error = SYSCTL_OUT(req, igi, - sizeof(struct igmp_ifinfo)); + struct igmp_ifinfo info; + + info.igi_version = igi->igi_version; + info.igi_v1_timer = igi->igi_v1_timer; + info.igi_v2_timer = igi->igi_v2_timer; + info.igi_v3_timer = igi->igi_v3_timer; + info.igi_flags = igi->igi_flags; + info.igi_rv = igi->igi_rv; + info.igi_qi = igi->igi_qi; + info.igi_qri = igi->igi_qri; + info.igi_uri = igi->igi_uri; + error = SYSCTL_OUT(req, &info, sizeof(info)); break; } } @@ -536,10 +546,10 @@ igmp_ra_alloc(void) /* * Attach IGMP when PF_INET is attached to an interface. */ -struct igmp_ifinfo * +struct igmp_ifsoftc * igmp_domifattach(struct ifnet *ifp) { - struct igmp_ifinfo *igi; + struct igmp_ifsoftc *igi; CTR3(KTR_IGMPV3, "%s: called for ifp %p(%s)", __func__, ifp, ifp->if_xname); @@ -558,14 +568,14 @@ igmp_domifattach(struct ifnet *ifp) /* * VIMAGE: assume curvnet set by caller. */ -static struct igmp_ifinfo * +static struct igmp_ifsoftc * igi_alloc_locked(/*const*/ struct ifnet *ifp) { - struct igmp_ifinfo *igi; + struct igmp_ifsoftc *igi; IGMP_LOCK_ASSERT(); - igi = malloc(sizeof(struct igmp_ifinfo), M_IGMP, M_NOWAIT|M_ZERO); + igi = malloc(sizeof(struct igmp_ifsoftc), M_IGMP, M_NOWAIT|M_ZERO); if (igi == NULL) goto out; @@ -581,7 +591,7 @@ igi_alloc_locked(/*const*/ struct ifnet LIST_INSERT_HEAD(&V_igi_head, igi, igi_link); - CTR2(KTR_IGMPV3, "allocate igmp_ifinfo for ifp %p(%s)", + CTR2(KTR_IGMPV3, "allocate igmp_ifsoftc for ifp %p(%s)", ifp, ifp->if_xname); out: @@ -600,7 +610,7 @@ out: void igmp_ifdetach(struct ifnet *ifp) { - struct igmp_ifinfo *igi; + struct igmp_ifsoftc *igi; struct ifmultiaddr *ifma; struct in_multi *inm, *tinm; @@ -647,7 +657,7 @@ igmp_ifdetach(struct ifnet *ifp) void igmp_domifdetach(struct ifnet *ifp) { - struct igmp_ifinfo *igi; + struct igmp_ifsoftc *igi; CTR3(KTR_IGMPV3, "%s: called for ifp %p(%s)", __func__, ifp, ifp->if_xname); @@ -663,9 +673,9 @@ igmp_domifdetach(struct ifnet *ifp) static void igi_delete_locked(const struct ifnet *ifp) { - struct igmp_ifinfo *igi, *tigi; + struct igmp_ifsoftc *igi, *tigi; - CTR3(KTR_IGMPV3, "%s: freeing igmp_ifinfo for ifp %p(%s)", + CTR3(KTR_IGMPV3, "%s: freeing igmp_ifsoftc for ifp %p(%s)", __func__, ifp, ifp->if_xname); IGMP_LOCK_ASSERT(); @@ -689,7 +699,7 @@ igi_delete_locked(const struct ifnet *if } #ifdef INVARIANTS - panic("%s: igmp_ifinfo not found for ifp %p\n", __func__, ifp); + panic("%s: igmp_ifsoftc not found for ifp %p\n", __func__, ifp); #endif } @@ -704,7 +714,7 @@ igmp_input_v1_query(struct ifnet *ifp, c const struct igmp *igmp) { struct ifmultiaddr *ifma; - struct igmp_ifinfo *igi; + struct igmp_ifsoftc *igi; struct in_multi *inm; /* @@ -724,7 +734,7 @@ igmp_input_v1_query(struct ifnet *ifp, c IGMP_LOCK(); igi = ((struct in_ifinfo *)ifp->if_afdata[AF_INET])->ii_igmp; - KASSERT(igi != NULL, ("%s: no igmp_ifinfo for ifp %p", __func__, ifp)); + KASSERT(igi != NULL, ("%s: no igmp_ifsoftc for ifp %p", __func__, ifp)); if (igi->igi_flags & IGIF_LOOPBACK) { CTR2(KTR_IGMPV3, "ignore v1 query on IGIF_LOOPBACK ifp %p(%s)", @@ -789,7 +799,7 @@ igmp_input_v2_query(struct ifnet *ifp, c const struct igmp *igmp) { struct ifmultiaddr *ifma; - struct igmp_ifinfo *igi; + struct igmp_ifsoftc *igi; struct in_multi *inm; int is_general_query; uint16_t timer; @@ -818,7 +828,7 @@ igmp_input_v2_query(struct ifnet *ifp, c IGMP_LOCK(); igi = ((struct in_ifinfo *)ifp->if_afdata[AF_INET])->ii_igmp; - KASSERT(igi != NULL, ("%s: no igmp_ifinfo for ifp %p", __func__, ifp)); + KASSERT(igi != NULL, ("%s: no igmp_ifsoftc for ifp %p", __func__, ifp)); if (igi->igi_flags & IGIF_LOOPBACK) { CTR2(KTR_IGMPV3, "ignore v2 query on IGIF_LOOPBACK ifp %p(%s)", @@ -939,7 +949,7 @@ static int igmp_input_v3_query(struct ifnet *ifp, const struct ip *ip, /*const*/ struct igmpv3 *igmpv3) { - struct igmp_ifinfo *igi; + struct igmp_ifsoftc *igi; struct in_multi *inm; int is_general_query; uint32_t maxresp, nsrc, qqi; @@ -1012,7 +1022,7 @@ igmp_input_v3_query(struct ifnet *ifp, c IGMP_LOCK(); igi = ((struct in_ifinfo *)ifp->if_afdata[AF_INET])->ii_igmp; - KASSERT(igi != NULL, ("%s: no igmp_ifinfo for ifp %p", __func__, ifp)); + KASSERT(igi != NULL, ("%s: no igmp_ifsoftc for ifp %p", __func__, ifp)); if (igi->igi_flags & IGIF_LOOPBACK) { CTR2(KTR_IGMPV3, "ignore v3 query on IGIF_LOOPBACK ifp %p(%s)", @@ -1100,7 +1110,7 @@ out_locked: * Return <0 if any error occured. Currently this is ignored. */ static int -igmp_input_v3_group_query(struct in_multi *inm, struct igmp_ifinfo *igi, +igmp_input_v3_group_query(struct in_multi *inm, struct igmp_ifsoftc *igi, int timer, /*const*/ struct igmpv3 *igmpv3) { int retval; @@ -1245,7 +1255,7 @@ igmp_input_v1_report(struct ifnet *ifp, IN_MULTI_LOCK(); inm = inm_lookup(ifp, igmp->igmp_group); if (inm != NULL) { - struct igmp_ifinfo *igi; + struct igmp_ifsoftc *igi; igi = inm->inm_igi; if (igi == NULL) { @@ -1369,7 +1379,7 @@ igmp_input_v2_report(struct ifnet *ifp, IN_MULTI_LOCK(); inm = inm_lookup(ifp, igmp->igmp_group); if (inm != NULL) { - struct igmp_ifinfo *igi; + struct igmp_ifsoftc *igi; igi = inm->inm_igi; KASSERT(igi != NULL, ("%s: no igi for ifp %p", __func__, ifp)); @@ -1638,7 +1648,7 @@ igmp_fasttimo_vnet(void) struct mbufq scq; /* State-change packets */ struct mbufq qrq; /* Query response packets */ struct ifnet *ifp; - struct igmp_ifinfo *igi; + struct igmp_ifsoftc *igi; struct ifmultiaddr *ifma; struct in_multi *inm; int loop, uri_fasthz; @@ -1796,7 +1806,7 @@ igmp_v1v2_process_group_timer(struct in_ * Note: Unlocked read from igi. */ static void -igmp_v3_process_group_timers(struct igmp_ifinfo *igi, +igmp_v3_process_group_timers(struct igmp_ifsoftc *igi, struct mbufq *qrq, struct mbufq *scq, struct in_multi *inm, const int uri_fasthz) { @@ -1943,7 +1953,7 @@ igmp_v3_suppress_group_record(struct in_ * as per Section 7.2.1. */ static void -igmp_set_version(struct igmp_ifinfo *igi, const int version) +igmp_set_version(struct igmp_ifsoftc *igi, const int version) { int old_version_timer; @@ -1992,7 +2002,7 @@ igmp_set_version(struct igmp_ifinfo *igi * query processing. */ static void *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Feb 20 18:59:54 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 90DD9626; Fri, 20 Feb 2015 18:59:54 +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 7825B8D0; Fri, 20 Feb 2015 18:59:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1KIxs4e024963; Fri, 20 Feb 2015 18:59:54 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1KIxjUW024910; Fri, 20 Feb 2015 18:59:45 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201502201859.t1KIxjUW024910@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 20 Feb 2015 18:59:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r279075 - in projects/release-install-debug: . contrib/ipfilter lib/libc/db/man lib/libc/gen lib/libc/sys release release/doc/en_US.ISO8859-1/relnotes share/man/man4/man4.arm share/man/... 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.18-1 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, 20 Feb 2015 18:59:54 -0000 Author: gjb Date: Fri Feb 20 18:59:43 2015 New Revision: 279075 URL: https://svnweb.freebsd.org/changeset/base/279075 Log: MFH: r278968-r279074 Sponsored by: The FreeBSD Foundation Added: projects/release-install-debug/share/man/man4/man4.powerpc/llan.4 - copied unchanged from r279074, head/share/man/man4/man4.powerpc/llan.4 projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslprintf.c - copied unchanged from r279074, head/sys/contrib/dev/acpica/compiler/aslprintf.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslprune.c - copied unchanged from r279074, head/sys/contrib/dev/acpica/compiler/aslprune.c projects/release-install-debug/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c - copied unchanged from r279074, head/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c projects/release-install-debug/sys/dev/ofw/ofw_cpu.h - copied unchanged from r279074, head/sys/dev/ofw/ofw_cpu.h Deleted: projects/release-install-debug/sys/dev/cxgb/sys/mbufq.h projects/release-install-debug/sys/dev/xen/netfront/mbufq.h Modified: projects/release-install-debug/Makefile.inc1 projects/release-install-debug/UPDATING projects/release-install-debug/contrib/ipfilter/ip_fil.c projects/release-install-debug/contrib/ipfilter/ipf.h projects/release-install-debug/lib/libc/db/man/dbm.3 projects/release-install-debug/lib/libc/gen/getgrent.c projects/release-install-debug/lib/libc/gen/getpwent.c projects/release-install-debug/lib/libc/sys/mmap.2 projects/release-install-debug/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/release-install-debug/release/release.conf.sample projects/release-install-debug/release/release.sh projects/release-install-debug/share/man/man4/man4.arm/devcfg.4 projects/release-install-debug/share/man/man4/man4.i386/apm.4 projects/release-install-debug/share/man/man4/man4.powerpc/Makefile projects/release-install-debug/share/man/man4/man4.powerpc/tsec.4 projects/release-install-debug/share/man/man7/release.7 projects/release-install-debug/share/misc/committers-doc.dot projects/release-install-debug/share/mk/bsd.sys.mk projects/release-install-debug/share/mk/src.opts.mk projects/release-install-debug/sys/amd64/amd64/ptrace_machdep.c projects/release-install-debug/sys/arm/arm/db_trace.c projects/release-install-debug/sys/arm/arm/unwind.c projects/release-install-debug/sys/arm/include/stack.h projects/release-install-debug/sys/boot/efi/include/amd64/efibind.h projects/release-install-debug/sys/boot/efi/include/efidef.h projects/release-install-debug/sys/boot/efi/include/i386/efibind.h projects/release-install-debug/sys/cddl/dev/dtrace/arm/dtrace_isa.c projects/release-install-debug/sys/conf/NOTES projects/release-install-debug/sys/conf/files projects/release-install-debug/sys/conf/files.arm projects/release-install-debug/sys/conf/kmod.mk projects/release-install-debug/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/release-install-debug/sys/contrib/dev/acpica/common/acgetline.c projects/release-install-debug/sys/contrib/dev/acpica/common/adfile.c projects/release-install-debug/sys/contrib/dev/acpica/common/adisasm.c projects/release-install-debug/sys/contrib/dev/acpica/common/adwalk.c projects/release-install-debug/sys/contrib/dev/acpica/common/ahids.c projects/release-install-debug/sys/contrib/dev/acpica/common/ahpredef.c projects/release-install-debug/sys/contrib/dev/acpica/common/ahuuids.c projects/release-install-debug/sys/contrib/dev/acpica/common/cmfsize.c projects/release-install-debug/sys/contrib/dev/acpica/common/dmextern.c projects/release-install-debug/sys/contrib/dev/acpica/common/dmrestag.c projects/release-install-debug/sys/contrib/dev/acpica/common/dmtable.c projects/release-install-debug/sys/contrib/dev/acpica/common/dmtbdump.c projects/release-install-debug/sys/contrib/dev/acpica/common/dmtbinfo.c projects/release-install-debug/sys/contrib/dev/acpica/common/getopt.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslanalyze.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslascii.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslbtypes.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslcompile.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/release-install-debug/sys/contrib/dev/acpica/compiler/asldefine.h projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslerror.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslfileio.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslfiles.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslfold.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslglobal.h projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslhex.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/asllength.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/asllisting.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/asllistsup.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslload.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/asllookup.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslmain.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslmap.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslmapenter.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslmapoutput.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslmaputils.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslmessages.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslmessages.h projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslmethod.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslnamesp.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/asloffset.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslopcodes.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/asloperands.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslopt.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/asloptions.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslparser.y projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslpredef.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslprepkg.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslresource.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslrestype1.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslrestype1i.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslrestype2.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslrestype2d.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslrestype2e.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslrestype2q.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslrestype2s.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslrestype2w.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslrules.y projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslstartup.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslstubs.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslsupport.l projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslsupport.y projects/release-install-debug/sys/contrib/dev/acpica/compiler/asltokens.y projects/release-install-debug/sys/contrib/dev/acpica/compiler/asltransform.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/asltree.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/asltypes.h projects/release-install-debug/sys/contrib/dev/acpica/compiler/asltypes.y projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslutils.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/asluuid.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslwalks.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/aslxref.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/dtcompile.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/release-install-debug/sys/contrib/dev/acpica/compiler/dtexpress.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/dtfield.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/dtio.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/dtparser.l projects/release-install-debug/sys/contrib/dev/acpica/compiler/dtparser.y projects/release-install-debug/sys/contrib/dev/acpica/compiler/dtsubtable.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/dttable.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/dttemplate.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/dttemplate.h projects/release-install-debug/sys/contrib/dev/acpica/compiler/dtutils.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/preprocess.h projects/release-install-debug/sys/contrib/dev/acpica/compiler/prexpress.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/prmacros.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/prparser.l projects/release-install-debug/sys/contrib/dev/acpica/compiler/prparser.y projects/release-install-debug/sys/contrib/dev/acpica/compiler/prscan.c projects/release-install-debug/sys/contrib/dev/acpica/compiler/prutils.c projects/release-install-debug/sys/contrib/dev/acpica/components/debugger/dbcmds.c projects/release-install-debug/sys/contrib/dev/acpica/components/debugger/dbconvert.c projects/release-install-debug/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/release-install-debug/sys/contrib/dev/acpica/components/debugger/dbexec.c projects/release-install-debug/sys/contrib/dev/acpica/components/debugger/dbfileio.c projects/release-install-debug/sys/contrib/dev/acpica/components/debugger/dbhistry.c projects/release-install-debug/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/release-install-debug/sys/contrib/dev/acpica/components/debugger/dbmethod.c projects/release-install-debug/sys/contrib/dev/acpica/components/debugger/dbnames.c projects/release-install-debug/sys/contrib/dev/acpica/components/debugger/dbstats.c projects/release-install-debug/sys/contrib/dev/acpica/components/debugger/dbtest.c projects/release-install-debug/sys/contrib/dev/acpica/components/debugger/dbutils.c projects/release-install-debug/sys/contrib/dev/acpica/components/debugger/dbxface.c projects/release-install-debug/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c projects/release-install-debug/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c projects/release-install-debug/sys/contrib/dev/acpica/components/disassembler/dmnames.c projects/release-install-debug/sys/contrib/dev/acpica/components/disassembler/dmobject.c projects/release-install-debug/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/release-install-debug/sys/contrib/dev/acpica/components/disassembler/dmresrc.c projects/release-install-debug/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c projects/release-install-debug/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c projects/release-install-debug/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c projects/release-install-debug/sys/contrib/dev/acpica/components/disassembler/dmutils.c projects/release-install-debug/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/release-install-debug/sys/contrib/dev/acpica/components/dispatcher/dsargs.c projects/release-install-debug/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c projects/release-install-debug/sys/contrib/dev/acpica/components/dispatcher/dsfield.c projects/release-install-debug/sys/contrib/dev/acpica/components/dispatcher/dsinit.c projects/release-install-debug/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c projects/release-install-debug/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c projects/release-install-debug/sys/contrib/dev/acpica/components/dispatcher/dsobject.c projects/release-install-debug/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/release-install-debug/sys/contrib/dev/acpica/components/dispatcher/dsutils.c projects/release-install-debug/sys/contrib/dev/acpica/components/dispatcher/dswexec.c projects/release-install-debug/sys/contrib/dev/acpica/components/dispatcher/dswload.c projects/release-install-debug/sys/contrib/dev/acpica/components/dispatcher/dswload2.c projects/release-install-debug/sys/contrib/dev/acpica/components/dispatcher/dswscope.c projects/release-install-debug/sys/contrib/dev/acpica/components/dispatcher/dswstate.c projects/release-install-debug/sys/contrib/dev/acpica/components/events/evevent.c projects/release-install-debug/sys/contrib/dev/acpica/components/events/evglock.c projects/release-install-debug/sys/contrib/dev/acpica/components/events/evgpe.c projects/release-install-debug/sys/contrib/dev/acpica/components/events/evgpeblk.c projects/release-install-debug/sys/contrib/dev/acpica/components/events/evgpeinit.c projects/release-install-debug/sys/contrib/dev/acpica/components/events/evgpeutil.c projects/release-install-debug/sys/contrib/dev/acpica/components/events/evhandler.c projects/release-install-debug/sys/contrib/dev/acpica/components/events/evmisc.c projects/release-install-debug/sys/contrib/dev/acpica/components/events/evregion.c projects/release-install-debug/sys/contrib/dev/acpica/components/events/evrgnini.c projects/release-install-debug/sys/contrib/dev/acpica/components/events/evsci.c projects/release-install-debug/sys/contrib/dev/acpica/components/events/evxface.c projects/release-install-debug/sys/contrib/dev/acpica/components/events/evxfevnt.c projects/release-install-debug/sys/contrib/dev/acpica/components/events/evxfgpe.c projects/release-install-debug/sys/contrib/dev/acpica/components/events/evxfregn.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exconfig.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exconvrt.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/excreate.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exdebug.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exdump.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exfield.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exfldio.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exmisc.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exmutex.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exnames.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exoparg1.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exoparg2.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exoparg3.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exoparg6.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exprep.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exregion.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exresnte.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exresolv.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exresop.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exstore.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exstoren.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exstorob.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exsystem.c projects/release-install-debug/sys/contrib/dev/acpica/components/executer/exutils.c projects/release-install-debug/sys/contrib/dev/acpica/components/hardware/hwacpi.c projects/release-install-debug/sys/contrib/dev/acpica/components/hardware/hwesleep.c projects/release-install-debug/sys/contrib/dev/acpica/components/hardware/hwgpe.c projects/release-install-debug/sys/contrib/dev/acpica/components/hardware/hwpci.c projects/release-install-debug/sys/contrib/dev/acpica/components/hardware/hwregs.c projects/release-install-debug/sys/contrib/dev/acpica/components/hardware/hwsleep.c projects/release-install-debug/sys/contrib/dev/acpica/components/hardware/hwtimer.c projects/release-install-debug/sys/contrib/dev/acpica/components/hardware/hwvalid.c projects/release-install-debug/sys/contrib/dev/acpica/components/hardware/hwxface.c projects/release-install-debug/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsaccess.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsalloc.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsarguments.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsconvert.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nseval.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsinit.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsload.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsnames.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsobject.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsparse.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nspredef.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsprepkg.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsrepair.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsrepair2.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nssearch.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsutils.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nswalk.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsxfeval.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsxfname.c projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/nsxfobj.c projects/release-install-debug/sys/contrib/dev/acpica/components/parser/psargs.c projects/release-install-debug/sys/contrib/dev/acpica/components/parser/psloop.c projects/release-install-debug/sys/contrib/dev/acpica/components/parser/psobject.c projects/release-install-debug/sys/contrib/dev/acpica/components/parser/psopcode.c projects/release-install-debug/sys/contrib/dev/acpica/components/parser/psopinfo.c projects/release-install-debug/sys/contrib/dev/acpica/components/parser/psparse.c projects/release-install-debug/sys/contrib/dev/acpica/components/parser/psscope.c projects/release-install-debug/sys/contrib/dev/acpica/components/parser/pstree.c projects/release-install-debug/sys/contrib/dev/acpica/components/parser/psutils.c projects/release-install-debug/sys/contrib/dev/acpica/components/parser/pswalk.c projects/release-install-debug/sys/contrib/dev/acpica/components/parser/psxface.c projects/release-install-debug/sys/contrib/dev/acpica/components/resources/rsaddr.c projects/release-install-debug/sys/contrib/dev/acpica/components/resources/rscalc.c projects/release-install-debug/sys/contrib/dev/acpica/components/resources/rscreate.c projects/release-install-debug/sys/contrib/dev/acpica/components/resources/rsdump.c projects/release-install-debug/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c projects/release-install-debug/sys/contrib/dev/acpica/components/resources/rsinfo.c projects/release-install-debug/sys/contrib/dev/acpica/components/resources/rsio.c projects/release-install-debug/sys/contrib/dev/acpica/components/resources/rsirq.c projects/release-install-debug/sys/contrib/dev/acpica/components/resources/rslist.c projects/release-install-debug/sys/contrib/dev/acpica/components/resources/rsmemory.c projects/release-install-debug/sys/contrib/dev/acpica/components/resources/rsmisc.c projects/release-install-debug/sys/contrib/dev/acpica/components/resources/rsserial.c projects/release-install-debug/sys/contrib/dev/acpica/components/resources/rsutils.c projects/release-install-debug/sys/contrib/dev/acpica/components/resources/rsxface.c projects/release-install-debug/sys/contrib/dev/acpica/components/tables/tbdata.c projects/release-install-debug/sys/contrib/dev/acpica/components/tables/tbfadt.c projects/release-install-debug/sys/contrib/dev/acpica/components/tables/tbfind.c projects/release-install-debug/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/release-install-debug/sys/contrib/dev/acpica/components/tables/tbprint.c projects/release-install-debug/sys/contrib/dev/acpica/components/tables/tbutils.c projects/release-install-debug/sys/contrib/dev/acpica/components/tables/tbxface.c projects/release-install-debug/sys/contrib/dev/acpica/components/tables/tbxfload.c projects/release-install-debug/sys/contrib/dev/acpica/components/tables/tbxfroot.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utaddress.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utalloc.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utbuffer.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utcache.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utcopy.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utdebug.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utdecode.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utdelete.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/uterror.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/uteval.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utexcep.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utfileio.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utglobal.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/uthex.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utids.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utinit.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utlock.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utmath.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utmutex.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utobject.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utosi.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utownerid.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utpredef.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utprint.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utresrc.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utstate.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utstring.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/uttrack.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utuuid.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utxface.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utxferror.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utxfinit.c projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/utxfmutex.c projects/release-install-debug/sys/contrib/dev/acpica/include/acapps.h projects/release-install-debug/sys/contrib/dev/acpica/include/acbuffer.h projects/release-install-debug/sys/contrib/dev/acpica/include/accommon.h projects/release-install-debug/sys/contrib/dev/acpica/include/acconfig.h projects/release-install-debug/sys/contrib/dev/acpica/include/acdebug.h projects/release-install-debug/sys/contrib/dev/acpica/include/acdisasm.h projects/release-install-debug/sys/contrib/dev/acpica/include/acdispat.h projects/release-install-debug/sys/contrib/dev/acpica/include/acevents.h projects/release-install-debug/sys/contrib/dev/acpica/include/acexcep.h projects/release-install-debug/sys/contrib/dev/acpica/include/acglobal.h projects/release-install-debug/sys/contrib/dev/acpica/include/achware.h projects/release-install-debug/sys/contrib/dev/acpica/include/acinterp.h projects/release-install-debug/sys/contrib/dev/acpica/include/aclocal.h projects/release-install-debug/sys/contrib/dev/acpica/include/acmacros.h projects/release-install-debug/sys/contrib/dev/acpica/include/acnames.h projects/release-install-debug/sys/contrib/dev/acpica/include/acnamesp.h projects/release-install-debug/sys/contrib/dev/acpica/include/acobject.h projects/release-install-debug/sys/contrib/dev/acpica/include/acopcode.h projects/release-install-debug/sys/contrib/dev/acpica/include/acoutput.h projects/release-install-debug/sys/contrib/dev/acpica/include/acparser.h projects/release-install-debug/sys/contrib/dev/acpica/include/acpi.h projects/release-install-debug/sys/contrib/dev/acpica/include/acpiosxf.h projects/release-install-debug/sys/contrib/dev/acpica/include/acpixf.h projects/release-install-debug/sys/contrib/dev/acpica/include/acpredef.h projects/release-install-debug/sys/contrib/dev/acpica/include/acresrc.h projects/release-install-debug/sys/contrib/dev/acpica/include/acrestyp.h projects/release-install-debug/sys/contrib/dev/acpica/include/acstruct.h projects/release-install-debug/sys/contrib/dev/acpica/include/actables.h projects/release-install-debug/sys/contrib/dev/acpica/include/actbl.h projects/release-install-debug/sys/contrib/dev/acpica/include/actbl1.h projects/release-install-debug/sys/contrib/dev/acpica/include/actbl2.h projects/release-install-debug/sys/contrib/dev/acpica/include/actbl3.h projects/release-install-debug/sys/contrib/dev/acpica/include/actypes.h projects/release-install-debug/sys/contrib/dev/acpica/include/acutils.h projects/release-install-debug/sys/contrib/dev/acpica/include/amlcode.h projects/release-install-debug/sys/contrib/dev/acpica/include/amlresrc.h projects/release-install-debug/sys/contrib/dev/acpica/include/platform/acenv.h projects/release-install-debug/sys/contrib/dev/acpica/include/platform/acenvex.h projects/release-install-debug/sys/contrib/dev/acpica/include/platform/acfreebsd.h projects/release-install-debug/sys/contrib/dev/acpica/include/platform/acgcc.h projects/release-install-debug/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c projects/release-install-debug/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c projects/release-install-debug/sys/dev/cxgb/cxgb_adapter.h projects/release-install-debug/sys/dev/cxgb/cxgb_sge.c projects/release-install-debug/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/release-install-debug/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h projects/release-install-debug/sys/dev/ixl/i40e_adminq.c projects/release-install-debug/sys/dev/ixl/i40e_adminq_cmd.h projects/release-install-debug/sys/dev/ixl/i40e_common.c projects/release-install-debug/sys/dev/ixl/i40e_lan_hmc.c projects/release-install-debug/sys/dev/ixl/i40e_prototype.h projects/release-install-debug/sys/dev/ixl/i40e_type.h projects/release-install-debug/sys/dev/ixl/if_ixl.c projects/release-install-debug/sys/dev/ixl/if_ixlv.c projects/release-install-debug/sys/dev/ixl/ixl.h projects/release-install-debug/sys/dev/ixl/ixl_pf.h projects/release-install-debug/sys/dev/ixl/ixl_txrx.c projects/release-install-debug/sys/dev/ixl/ixlvc.c projects/release-install-debug/sys/dev/ofw/ofw_cpu.c projects/release-install-debug/sys/dev/sfxge/common/efx.h projects/release-install-debug/sys/dev/sfxge/common/efx_ev.c projects/release-install-debug/sys/dev/sfxge/common/efx_mcdi.h projects/release-install-debug/sys/dev/sfxge/common/efx_regs_mcdi.h projects/release-install-debug/sys/dev/sfxge/common/siena_nic.c projects/release-install-debug/sys/dev/sfxge/sfxge_tx.c projects/release-install-debug/sys/dev/xen/netfront/netfront.c projects/release-install-debug/sys/i386/i386/ptrace_machdep.c projects/release-install-debug/sys/kern/kern_ctf.c projects/release-install-debug/sys/net/if_var.h projects/release-install-debug/sys/net/if_vlan.c projects/release-install-debug/sys/netinet/igmp.c projects/release-install-debug/sys/netinet/igmp_var.h projects/release-install-debug/sys/netinet/in_mcast.c projects/release-install-debug/sys/netinet/in_var.h projects/release-install-debug/sys/netinet6/in6_mcast.c projects/release-install-debug/sys/netinet6/in6_var.h projects/release-install-debug/sys/netinet6/mld6.c projects/release-install-debug/sys/netinet6/mld6_var.h projects/release-install-debug/sys/ofed/drivers/infiniband/core/cma.c projects/release-install-debug/sys/powerpc/powermac/powermac_thermal.c projects/release-install-debug/sys/sys/cpu.h projects/release-install-debug/sys/sys/mbuf.h projects/release-install-debug/usr.bin/netstat/inet.c projects/release-install-debug/usr.sbin/acpi/acpidb/Makefile projects/release-install-debug/usr.sbin/acpi/acpidb/acpidb.c projects/release-install-debug/usr.sbin/acpi/iasl/Makefile projects/release-install-debug/usr.sbin/ifmcstat/Makefile projects/release-install-debug/usr.sbin/ifmcstat/ifmcstat.c projects/release-install-debug/usr.sbin/syslogd/syslogd.c Directory Properties: projects/release-install-debug/ (props changed) projects/release-install-debug/contrib/ipfilter/ (props changed) projects/release-install-debug/lib/libc/ (props changed) projects/release-install-debug/share/ (props changed) projects/release-install-debug/share/man/man4/ (props changed) projects/release-install-debug/sys/ (props changed) projects/release-install-debug/sys/boot/ (props changed) projects/release-install-debug/sys/conf/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/common/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/compiler/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/components/dispatcher/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/components/events/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/components/executer/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/components/hardware/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/components/namespace/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/components/parser/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/components/resources/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/components/tables/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/include/ (props changed) projects/release-install-debug/sys/contrib/dev/acpica/os_specific/ (props changed) Modified: projects/release-install-debug/Makefile.inc1 ============================================================================== --- projects/release-install-debug/Makefile.inc1 Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/Makefile.inc1 Fri Feb 20 18:59:43 2015 (r279075) @@ -1263,11 +1263,6 @@ _m4= lib/libohash \ usr.bin/m4 .endif -.if ${BOOTSTRAPPING} < 1000013 -_yacc= lib/liby \ - usr.bin/yacc -.endif - .if ${BOOTSTRAPPING} < 1000014 _crunch= usr.sbin/crunch .endif @@ -1289,6 +1284,11 @@ _lex= usr.bin/lex _awk= usr.bin/awk .endif +.if ${BOOTSTRAPPING} < 1001506 +_yacc= lib/liby \ + usr.bin/yacc +.endif + .if ${MK_BSNMP} != "no" _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif Modified: projects/release-install-debug/UPDATING ============================================================================== --- projects/release-install-debug/UPDATING Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/UPDATING Fri Feb 20 18:59:43 2015 (r279075) @@ -37,7 +37,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 upgrade the kernel to r278950 or later and regenerate any keys (e.g. ssh keys or openssl keys) that were generated w/ a kernel from that range. This does not effect programs that directly used /dev/random - or /dev/urandom. All userland uses of arc4random(3) are effected. + or /dev/urandom. All userland uses of arc4random(3) are affected. 20150210: The autofs(4) ABI was changed in order to restore binary compatibility Modified: projects/release-install-debug/contrib/ipfilter/ip_fil.c ============================================================================== --- projects/release-install-debug/contrib/ipfilter/ip_fil.c Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/contrib/ipfilter/ip_fil.c Fri Feb 20 18:59:43 2015 (r279075) @@ -44,6 +44,9 @@ static int write_output __P((struct ifne # endif #endif +struct ifaddr { + struct sockaddr_storage ifa_addr; +}; int ipfattach(softc) Modified: projects/release-install-debug/contrib/ipfilter/ipf.h ============================================================================== --- projects/release-install-debug/contrib/ipfilter/ipf.h Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/contrib/ipfilter/ipf.h Fri Feb 20 18:59:43 2015 (r279075) @@ -43,9 +43,6 @@ struct file; #include #include -#define _WANT_IFADDR -#include - #include #include #include Modified: projects/release-install-debug/lib/libc/db/man/dbm.3 ============================================================================== --- projects/release-install-debug/lib/libc/db/man/dbm.3 Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/lib/libc/db/man/dbm.3 Fri Feb 20 18:59:43 2015 (r279075) @@ -15,7 +15,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 16, 2006 +.Dd February 19, 2015 .Dt DBM 3 .Os .Sh NAME @@ -174,9 +174,7 @@ deletes the entry for The .Fn dbm_delete function -normally returns zero but returns 1 if there was no entry with -.Fa key -in the database or returns -1 and sets +normally returns zero or returns -1 and sets .Va errno if there were any errors. .Pp Modified: projects/release-install-debug/lib/libc/gen/getgrent.c ============================================================================== --- projects/release-install-debug/lib/libc/gen/getgrent.c Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/lib/libc/gen/getgrent.c Fri Feb 20 18:59:43 2015 (r279075) @@ -1173,8 +1173,10 @@ nis_group(void *retval, void *mdata, va_ * terminator, alignment padding, and one (char *) * pointer for the member list terminator. */ - if (resultlen >= bufsize - _ALIGNBYTES - sizeof(char *)) + if (resultlen >= bufsize - _ALIGNBYTES - sizeof(char *)) { + free(result); goto erange; + } memcpy(buffer, result, resultlen); buffer[resultlen] = '\0'; free(result); Modified: projects/release-install-debug/lib/libc/gen/getpwent.c ============================================================================== --- projects/release-install-debug/lib/libc/gen/getpwent.c Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/lib/libc/gen/getpwent.c Fri Feb 20 18:59:43 2015 (r279075) @@ -1392,8 +1392,10 @@ nis_passwd(void *retval, void *mdata, va continue; } } - if (resultlen >= bufsize) + if (resultlen >= bufsize) { + free(result); goto erange; + } memcpy(buffer, result, resultlen); buffer[resultlen] = '\0'; free(result); Modified: projects/release-install-debug/lib/libc/sys/mmap.2 ============================================================================== --- projects/release-install-debug/lib/libc/sys/mmap.2 Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/lib/libc/sys/mmap.2 Fri Feb 20 18:59:43 2015 (r279075) @@ -28,7 +28,7 @@ .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 .\" $FreeBSD$ .\" -.Dd September 17, 2014 +.Dd February 18, 2015 .Dt MMAP 2 .Os .Sh NAME @@ -160,7 +160,7 @@ is specified, must be a multiple of the pagesize. If .Dv MAP_EXCL -is not specified, a successfull +is not specified, a successful .Dv MAP_FIXED request replaces any previous mappings for the process' pages in the range from @@ -225,7 +225,7 @@ it. You can test file fragmentation by observing the KB/t (kilobytes per transfer) results from an .Dq Li iostat 1 -while reading a large file sequentially, e.g.\& using +while reading a large file sequentially, e.g.,\& using .Dq Li dd if=filename of=/dev/null bs=32k . .Pp The @@ -448,17 +448,3 @@ was specified and insufficient memory wa .Xr munmap 2 , .Xr getpagesize 3 , .Xr getpagesizes 3 -.Sh BUGS -The -.Fa len -argument -is limited to the maximum file size or available userland address -space. -Files may not be able to be made more than 1TB large on 32 bit systems -due to file systems restrictions and bugs, but address space is far more -restrictive. -Larger files may be possible on 64 bit systems. -.Pp -The previous documented limit of 2GB was a documentation bug. -That limit has not existed since -.Fx 2.2 . Modified: projects/release-install-debug/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- projects/release-install-debug/release/doc/en_US.ISO8859-1/relnotes/article.xml Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/release/doc/en_US.ISO8859-1/relnotes/article.xml Fri Feb 20 18:59:43 2015 (r279075) @@ -22,7 +22,7 @@ $FreeBSD$ - + 2015 @@ -302,6 +302,13 @@ The &man.ptrace.2; system call has been updated include support for Altivec registers on &os;/&arch.powerpc;. + + A new device control utility, + &man.devctl.8; has been added, which allows making + administrative changes to individual devices, such as + attaching and detaching drivers, and enabling and disabling + devices. The &man.devctl.8; utility uses the new + &man.devctl.3; library. @@ -375,6 +382,12 @@ OpenSSL has been updated to version 1.0.1l. + + The &man.xz.1; utility has been udpated + to version 5.2.0. + + The &man.xz.1; utility has been updated + to support multi-threaded compression. @@ -460,6 +473,16 @@ The &man.gpio.3; library has been added, providing a wrapper around the &man.gpio.4; kernel interface. + + The futimens() and + utimensat() system calls have been + added. See &man.utimensat.2; for more information. + + The &man.elf.3; compile-time dependency + has been removed from dtri.o, which + allows adding DTrace probes to + userland applications and libraries without also linking + against &man.elf.3;. @@ -515,12 +538,32 @@ at the &man.loader.8; prompt during boot, or add kern.vty=vt to &man.loader.conf.5; and reboot the system. + + The &man.config.8; utility has been + updated to allow using a non-standard src/ tree, specified as an + argument to the -s flag. + + The + &os;/&arch.powerpc64; kernel now builds as + a position-independent executable, allowing the kernel to be + loaded into and run from any physical or virtual + address. + + + This change requires an update to &man.loader.8;. + The userland and kernel must be updated before rebooting the + system. + System Tuning and Controls -   + The + &man.hwpmc.4; default and maximum callchain depths have been + increased. The default has been increased from 16 to 32, and + the maximum increased from 32 to 128. @@ -761,6 +804,18 @@ This section covers changes and additions to file systems and other storage subsystems, both local and networked. + + General Storage + The + &man.ctl.4; LUN mapping has been rewritten, + replacing iSCSI-specific mapping mechanisms + with a new mechanism that works for any port. + + The + &man.ctld.8; utility has been updated to allow controlling + non-iSCSI &man.ctl.4; ports. + + Networked Storage @@ -962,6 +1017,11 @@ Release Engineering build tools have been updated to include support for producing virtual machine disk images for various cloud hosting providers. + + The Release Engineering build tools have + been updated to use multi-threaded &man.xz.1;. By default, + the number of &man.xz.1; threads is set to the number of cores + available. Modified: projects/release-install-debug/release/release.conf.sample ============================================================================== --- projects/release-install-debug/release/release.conf.sample Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/release/release.conf.sample Fri Feb 20 18:59:43 2015 (r279075) @@ -53,6 +53,9 @@ PORTBRANCH="ports/head@rHEAD" #WITH_DVD= #WITH_COMPRESSED_IMAGES= +## Set to '1' to disable multi-threaded xz(1) compression. +#XZ_THREADS=0 + ## Set when building embedded images. #EMBEDDEDBUILD= Modified: projects/release-install-debug/release/release.sh ============================================================================== --- projects/release-install-debug/release/release.sh Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/release/release.sh Fri Feb 20 18:59:43 2015 (r279075) @@ -93,6 +93,7 @@ WITH_COMPRESSED_IMAGES= # the release. WITH_VMIMAGES= WITH_COMPRESSED_VMIMAGES= +XZ_THREADS=0 # Set to non-empty value to build virtual machine images for various # cloud providers as part of the release. @@ -179,7 +180,7 @@ RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORL RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}" RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=\"${KERNEL}\" ${CONF_FILES} \ ${DOCPORTS} WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \ - WITH_CLOUDWARE=${WITH_CLOUDWARE}" + WITH_CLOUDWARE=${WITH_CLOUDWARE} XZ_THREADS=${XZ_THREADS}" # Force src checkout if configured FORCE_SRC_KEY= Modified: projects/release-install-debug/share/man/man4/man4.arm/devcfg.4 ============================================================================== --- projects/release-install-debug/share/man/man4/man4.arm/devcfg.4 Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/share/man/man4/man4.arm/devcfg.4 Fri Feb 20 18:59:43 2015 (r279075) @@ -92,4 +92,4 @@ driver. .Sh SEE ALSO Zynq-7000 SoC Technical Reference Manual (Xilinx doc UG585) .Sh AUTHORS -Thomas Skibo +.An Thomas Skibo Modified: projects/release-install-debug/share/man/man4/man4.i386/apm.4 ============================================================================== --- projects/release-install-debug/share/man/man4/man4.i386/apm.4 Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/share/man/man4/man4.i386/apm.4 Fri Feb 20 18:59:43 2015 (r279075) @@ -121,7 +121,7 @@ polls APM events and handles the followi .Xr apm 8 , .Xr zzz 8 .Sh AUTHORS -Tatsumi Hosokawa +.An Tatsumi Hosokawa Aq Mt hosokawa@jp.FreeBSD.org .Sh BUGS WARNING! Many, if not most, of the implementations of APM-bios in laptops Modified: projects/release-install-debug/share/man/man4/man4.powerpc/Makefile ============================================================================== --- projects/release-install-debug/share/man/man4/man4.powerpc/Makefile Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/share/man/man4/man4.powerpc/Makefile Fri Feb 20 18:59:43 2015 (r279075) @@ -6,6 +6,7 @@ MAN= adb.4 \ ams.4 \ bm.4 \ cuda.4 \ + llan.4 \ pmu.4 \ powermac_nvram.4 \ smu.4 \ Copied: projects/release-install-debug/share/man/man4/man4.powerpc/llan.4 (from r279074, head/share/man/man4/man4.powerpc/llan.4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-install-debug/share/man/man4/man4.powerpc/llan.4 Fri Feb 20 18:59:43 2015 (r279075, copy of r279074, head/share/man/man4/man4.powerpc/llan.4) @@ -0,0 +1,61 @@ +.\"- +.\" Copyright (c) 2015 Nathan Whitehorn +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +.\" DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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. +.\" +.\" $FreeBSD$ +.\" +.Dd February 19, 2015 +.Dt LLAN 4 +.Os +.Sh NAME +.Nm llan +.Nd POWER Logical Lan +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device llan" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides support for the inter-partition logical LAN controller +provided by PAPR-compliant POWER hypervisors (such as PowerVM and PowerKVM). +On some firmwares, advanced offload features are supported by the hypervisor, +but these are not currently supported by the driver. +.Sh SEE ALSO +.Xr vtnet 4 , +.Xr ifconfig 8 +.Sh HISTORY +The +.Nm +device driver appeared in +.Fx 10.0. +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org . Modified: projects/release-install-debug/share/man/man4/man4.powerpc/tsec.4 ============================================================================== --- projects/release-install-debug/share/man/man4/man4.powerpc/tsec.4 Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/share/man/man4/man4.powerpc/tsec.4 Fri Feb 20 18:59:43 2015 (r279075) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 22, 2009 +.Dd February 20, 2015 .Dt TSEC 4 .Os .Sh NAME @@ -91,18 +91,23 @@ The driver supports interrupts coalescing (IC) so that raising a transmit/receive frame interrupt is delayed, if possible, until a threshold-defined period of time has elapsed, or a threshold-defined frame counter has been reached -(whichever occurs first). The following sysctls regulate this behaviour: +(whichever occurs first). +The following sysctls regulate this behaviour: .Bl -tag -width indent .It Va dev.tsec.X.int_coal.rx_time .It Va dev.tsec.X.int_coal.rx_count .It Va dev.tsec.X.int_coal.tx_time .It Va dev.tsec.X.int_coal.tx_count .Pp -Value of 0 for either time or count disables IC on the given path. Time value +Value of 0 for either time or count disables IC on the given path. +Time value 1-65535 corresponds to a real time period and is expressed in units equivalent -to 64 ticks of the TSEC clock. Count 1-255 represents the number of frames -(note that value of 1 is equivalent to IC disabled). User provided values -larger than supported will be trimmed to the maximum supported. More details +to 64 ticks of the TSEC clock. +Count 1-255 represents the number of frames +(note that value of 1 is equivalent to IC disabled). +User provided values +larger than supported will be trimmed to the maximum supported. +More details are available in the reference manual of the device. .El .Sh HARDWARE @@ -144,9 +149,9 @@ device driver first appeared in The base version of .Nm device driver was written by -.An Piotr Kruszynski. +.An Piotr Kruszynski . It has been extended with polling and interrupt coalescing support by -.An Rafal Jaworowski. +.An Rafal Jaworowski . It has been further enhanced with multicast, h/w checksum calculation and vlan support by .An Piotr Ziecik . Modified: projects/release-install-debug/share/man/man7/release.7 ============================================================================== --- projects/release-install-debug/share/man/man7/release.7 Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/share/man/man7/release.7 Fri Feb 20 18:59:43 2015 (r279075) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 28, 2015 +.Dd February 20, 2015 .Dt RELEASE 7 .Os .Sh NAME @@ -256,6 +256,15 @@ Set to a non-empty value to compress the The original .Pq uncompressed images are not removed. +.It Va XZ_THREADS Pq Vt int +Set to the number of threads +.Xr xz 1 +should use when compressing images. +By default, +.Va XZ_THREADS +is set to +.Va 0 , +which uses all available cores on the system. .It Va VCSCMD The command run to obtain the source trees. Defaults to Modified: projects/release-install-debug/share/misc/committers-doc.dot ============================================================================== --- projects/release-install-debug/share/misc/committers-doc.dot Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/share/misc/committers-doc.dot Fri Feb 20 18:59:43 2015 (r279075) @@ -53,6 +53,7 @@ node [color=lightblue2, style=filled, bg ale [label="Alex Dupre\nale@FreeBSD.org\n2003/12/22"] allanjude [label="Allan Jude\nallanjude@FreeBSD.org\n2014/05/17"] bcr [label="Benedict Reuschling\nbcr@FreeBSD.org\n2009/12/24"] +bhd [label="Björn Heidotting\nbhd@FreeBSD.org\n2014/10/14"] blackend [label="Marc Fonvieille\nblackend@FreeBSD.org\n2002/06/16"] brd [label="Brad Davis\nbrd@FreeBSD.org\n2005/06/01"] brueffer [label="Christian Brueffer\nbrueffer@FreeBSD.org\n2003/01/13"] @@ -102,6 +103,7 @@ bcr -> dru bcr -> crees bcr -> jgh bcr -> allanjude +bcr -> bhd blackend -> ale Modified: projects/release-install-debug/share/mk/bsd.sys.mk ============================================================================== --- projects/release-install-debug/share/mk/bsd.sys.mk Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/share/mk/bsd.sys.mk Fri Feb 20 18:59:43 2015 (r279075) @@ -118,7 +118,10 @@ CWARNFLAGS+= -Wno-unknown-pragmas CLANG_NO_IAS= -no-integrated-as .endif CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\ - -mllvm -simplifycfg-dup-ret -mllvm -enable-gvn=false + -mllvm -simplifycfg-dup-ret -mllvm +.if ${COMPILER_VERSION} > 30400 +CLANG_OPT_SMALL+= -enable-gvn=false +.endif CFLAGS.clang+= -Qunused-arguments .if ${MACHINE_CPUARCH} == "sparc64" # Don't emit .cfi directives, since we must use GNU as on sparc64, for now. Modified: projects/release-install-debug/share/mk/src.opts.mk ============================================================================== --- projects/release-install-debug/share/mk/src.opts.mk Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/share/mk/src.opts.mk Fri Feb 20 18:59:43 2015 (r279075) @@ -178,6 +178,8 @@ __DEFAULT_YES_OPTIONS = \ __DEFAULT_NO_OPTIONS = \ BSD_GREP \ CLANG_EXTRAS \ + DEBUG_BINS \ + DEBUG_LIBS \ EISA \ FMAKE \ HESIOD \ Modified: projects/release-install-debug/sys/amd64/amd64/ptrace_machdep.c ============================================================================== --- projects/release-install-debug/sys/amd64/amd64/ptrace_machdep.c Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/sys/amd64/amd64/ptrace_machdep.c Fri Feb 20 18:59:43 2015 (r279075) @@ -88,7 +88,8 @@ cpu_ptrace_xstate(struct thread *td, int break; case PT_SETXSTATE: - if (data > cpu_max_ext_state_size) { + if (data < sizeof(struct savefpu) || + data > cpu_max_ext_state_size) { error = EINVAL; break; } Modified: projects/release-install-debug/sys/arm/arm/db_trace.c ============================================================================== --- projects/release-install-debug/sys/arm/arm/db_trace.c Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/sys/arm/arm/db_trace.c Fri Feb 20 18:59:43 2015 (r279075) @@ -66,7 +66,7 @@ db_stack_trace_cmd(struct unwind_state * finished = false; while (!finished) { - finished = unwind_stack_one(state); + finished = unwind_stack_one(state, 0); /* Print the frame details */ sym = db_search_symbol(state->start_pc, DB_STGY_ANY, &offset); Modified: projects/release-install-debug/sys/arm/arm/unwind.c ============================================================================== --- projects/release-install-debug/sys/arm/arm/unwind.c Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/sys/arm/arm/unwind.c Fri Feb 20 18:59:43 2015 (r279075) @@ -33,9 +33,12 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include +#include "linker_if.h" + /* * Definitions for the instruction interpreter. * @@ -61,7 +64,7 @@ __FBSDID("$FreeBSD$"); * These are set in the linker script. Their addresses will be * either the start or end of the exception table or index. */ -extern int extab_start, extab_end, exidx_start, exidx_end; +extern int exidx_start, exidx_end; /* * Entry types. @@ -104,13 +107,47 @@ expand_prel31(uint32_t prel31) return ((int32_t)(prel31 & 0x7fffffffu) << 1) / 2; } +struct search_context { + uint32_t addr; + caddr_t exidx_start; + caddr_t exidx_end; +}; + +static int +module_search(linker_file_t lf, void *context) +{ + struct search_context *sc = context; + linker_symval_t symval; + c_linker_sym_t sym; + + if (lf->address <= (caddr_t)sc->addr && + (lf->address + lf->size) >= (caddr_t)sc->addr) { + if ((LINKER_LOOKUP_SYMBOL(lf, "__exidx_start", &sym) == 0 || + LINKER_LOOKUP_SYMBOL(lf, "exidx_start", &sym) == 0) && + LINKER_SYMBOL_VALUES(lf, sym, &symval) == 0) + sc->exidx_start = symval.value; + + if ((LINKER_LOOKUP_SYMBOL(lf, "__exidx_end", &sym) == 0 || + LINKER_LOOKUP_SYMBOL(lf, "exidx_end", &sym) == 0) && + LINKER_SYMBOL_VALUES(lf, sym, &symval) == 0) + sc->exidx_end = symval.value; + + if (sc->exidx_start != NULL && sc->exidx_end != NULL) + return (1); + panic("Invalid module %s, no unwind tables\n", lf->filename); + } + return (0); +} + /* * Perform a binary search of the index table to find the function * with the largest address that doesn't exceed addr. */ static struct unwind_idx * -find_index(uint32_t addr) +find_index(uint32_t addr, int search_modules) { + struct search_context sc; + caddr_t idx_start, idx_end; unsigned int min, mid, max; struct unwind_idx *start; struct unwind_idx *item; @@ -118,9 +155,23 @@ find_index(uint32_t addr) uint32_t func_addr; start = (struct unwind_idx *)&exidx_start; + idx_start = (caddr_t)&exidx_start; + idx_end = (caddr_t)&exidx_end; + + /* This may acquire a lock */ + if (search_modules) { + bzero(&sc, sizeof(sc)); + sc.addr = addr; + if (linker_file_foreach(module_search, &sc) != 0 && + sc.exidx_start != NULL && sc.exidx_end != NULL) { + start = (struct unwind_idx *)sc.exidx_start; + idx_start = sc.exidx_start; + idx_end = sc.exidx_end; + } + } min = 0; - max = (&exidx_end - &exidx_start) / 2; + max = (idx_end - idx_start) / sizeof(struct unwind_idx); while (min != max) { mid = min + (max - min + 1) / 2; @@ -332,7 +383,7 @@ unwind_tab(struct unwind_state *state) } int -unwind_stack_one(struct unwind_state *state) +unwind_stack_one(struct unwind_state *state, int can_lock) { struct unwind_idx *index; int finished; @@ -344,7 +395,7 @@ unwind_stack_one(struct unwind_state *st state->start_pc = state->registers[PC]; /* Find the item to run */ - index = find_index(state->start_pc); + index = find_index(state->start_pc, can_lock); finished = 0; if (index->insn != EXIDX_CANTUNWIND) { Modified: projects/release-install-debug/sys/arm/include/stack.h ============================================================================== --- projects/release-install-debug/sys/arm/include/stack.h Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/sys/arm/include/stack.h Fri Feb 20 18:59:43 2015 (r279075) @@ -55,6 +55,6 @@ struct unwind_state { #define LR 14 #define PC 15 -int unwind_stack_one(struct unwind_state *); +int unwind_stack_one(struct unwind_state *, int); #endif /* !_MACHINE_STACK_H_ */ Modified: projects/release-install-debug/sys/boot/efi/include/amd64/efibind.h ============================================================================== --- projects/release-install-debug/sys/boot/efi/include/amd64/efibind.h Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/sys/boot/efi/include/amd64/efibind.h Fri Feb 20 18:59:43 2015 (r279075) @@ -85,6 +85,9 @@ Revision History // Basic EFI types of various widths // +#ifndef ACPI_THREAD_ID /* ACPI's definitions are fine */ +#define ACPI_USE_SYSTEM_INTTYPES 1 /* Tell ACPI we've defined types */ + typedef uint64_t UINT64; typedef int64_t INT64; @@ -98,6 +101,7 @@ typedef int16_t INT16; typedef uint8_t UINT8; typedef int8_t INT8; +#endif #undef VOID #define VOID void Modified: projects/release-install-debug/sys/boot/efi/include/efidef.h ============================================================================== --- projects/release-install-debug/sys/boot/efi/include/efidef.h Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/sys/boot/efi/include/efidef.h Fri Feb 20 18:59:43 2015 (r279075) @@ -30,7 +30,9 @@ Revision History typedef UINT16 CHAR16; typedef UINT8 CHAR8; +#ifndef ACPI_THREAD_ID /* ACPI's definitions are fine */ typedef UINT8 BOOLEAN; +#endif #ifndef TRUE #define TRUE ((BOOLEAN) 1) Modified: projects/release-install-debug/sys/boot/efi/include/i386/efibind.h ============================================================================== --- projects/release-install-debug/sys/boot/efi/include/i386/efibind.h Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/sys/boot/efi/include/i386/efibind.h Fri Feb 20 18:59:43 2015 (r279075) @@ -85,6 +85,9 @@ Revision History // Basic EFI types of various widths // +#ifndef ACPI_THREAD_ID /* ACPI's definitions are fine, use those */ +#define ACPI_USE_SYSTEM_INTTYPES 1 /* Tell ACPI we've defined types */ + typedef uint64_t UINT64; typedef int64_t INT64; @@ -98,6 +101,7 @@ typedef int16_t INT16; typedef uint8_t UINT8; typedef int8_t INT8; +#endif #undef VOID #define VOID void Modified: projects/release-install-debug/sys/cddl/dev/dtrace/arm/dtrace_isa.c ============================================================================== --- projects/release-install-debug/sys/cddl/dev/dtrace/arm/dtrace_isa.c Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/sys/cddl/dev/dtrace/arm/dtrace_isa.c Fri Feb 20 18:59:43 2015 (r279075) @@ -69,9 +69,10 @@ void dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes, uint32_t *intrpc) { - u_int32_t *frame, *lastframe; - int scp_offset; - int depth = 0; + struct unwind_state state; + register_t sp; + int scp_offset; + int depth = 0; pc_t caller = (pc_t) solaris_cpu[curcpu].cpu_dtrace_caller; if (intrpc != 0) @@ -79,23 +80,17 @@ dtrace_getpcstack(pc_t *pcstack, int pcs aframes++; - frame = (u_int32_t *)__builtin_frame_address(0);; - lastframe = NULL; - scp_offset = -(get_pc_str_offset() >> 2); - - while ((frame != NULL) && (depth < pcstack_limit)) { - db_addr_t scp; -#if 0 - u_int32_t savecode; - int r; - u_int32_t *rp; -#endif - - /* - * In theory, the SCP isn't guaranteed to be in the function - * that generated the stack frame. We hope for the best. - */ - scp = frame[FR_SCP]; + __asm __volatile("mov %0, sp" : "=&r" (sp)); + + state.registers[FP] = (uint32_t)__builtin_frame_address(0); + state.registers[SP] = sp; + state.registers[LR] = (uint32_t)__builtin_return_address(0); + state.registers[PC] = (uint32_t)dtrace_getpcstack; + + while (depth < pcstack_limit) { + int done; + + done = unwind_stack_one(&state, 1); if (aframes > 0) { aframes--; @@ -104,39 +99,10 @@ dtrace_getpcstack(pc_t *pcstack, int pcs } } else { - pcstack[depth++] = scp; + pcstack[depth++] = state.registers[PC]; } -#if 0 - savecode = ((u_int32_t *)scp)[scp_offset]; - if ((savecode & 0x0e100000) == 0x08000000) { - /* Looks like an STM */ - rp = frame - 4; - for (r = 10; r >= 0; r--) { - if (savecode & (1 << r)) { - /* register r == *rp-- */ - } - } - } -#endif - - /* - * Switch to next frame up - */ - if (frame[FR_RFP] == 0) - break; /* Top of stack */ - - lastframe = frame; - frame = (u_int32_t *)(frame[FR_RFP]); - - if (INKERNEL((int)frame)) { - /* staying in kernel */ - if (frame <= lastframe) { - /* bad frame pointer */ - break; - } - } - else + if (done) break; } @@ -176,55 +142,28 @@ dtrace_getarg(int arg, int aframes) int dtrace_getstackdepth(int aframes) { - u_int32_t *frame, *lastframe; - int scp_offset; - int depth = 1; - - frame = (u_int32_t *)__builtin_frame_address(0);; - lastframe = NULL; - scp_offset = -(get_pc_str_offset() >> 2); - - while (frame != NULL) { - db_addr_t scp; -#if 0 - u_int32_t savecode; - int r; - u_int32_t *rp; -#endif - - /* - * In theory, the SCP isn't guaranteed to be in the function - * that generated the stack frame. We hope for the best. - */ - scp = frame[FR_SCP]; + struct unwind_state state; + register_t sp; + int scp_offset; + int done = 0; + int depth = 1; + + __asm __volatile("mov %0, sp" : "=&r" (sp)); + + state.registers[FP] = (uint32_t)__builtin_frame_address(0); + state.registers[SP] = sp; + state.registers[LR] = (uint32_t)__builtin_return_address(0); + state.registers[PC] = (uint32_t)dtrace_getstackdepth; + do { + done = unwind_stack_one(&state, 1); depth++; - - /* - * Switch to next frame up - */ - if (frame[FR_RFP] == 0) - break; /* Top of stack */ - - lastframe = frame; - frame = (u_int32_t *)(frame[FR_RFP]); - - if (INKERNEL((int)frame)) { - /* staying in kernel */ - if (frame <= lastframe) { - /* bad frame pointer */ - break; - } - } - else - break; - } + } while (!done); if (depth < aframes) return 0; else return depth - aframes; - } ulong_t Modified: projects/release-install-debug/sys/conf/NOTES ============================================================================== --- projects/release-install-debug/sys/conf/NOTES Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/sys/conf/NOTES Fri Feb 20 18:59:43 2015 (r279075) @@ -495,7 +495,7 @@ options KTRACE_REQUEST_POOL=101 options KTR options KTR_BOOT_ENTRIES=1024 options KTR_ENTRIES=(128*1024) -options KTR_COMPILE=(KTR_INTR|KTR_PROC) +options KTR_COMPILE=(KTR_ALL) options KTR_MASK=KTR_INTR options KTR_CPUMASK=0x3 options KTR_VERBOSE Modified: projects/release-install-debug/sys/conf/files ============================================================================== --- projects/release-install-debug/sys/conf/files Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/sys/conf/files Fri Feb 20 18:59:43 2015 (r279075) @@ -271,6 +271,7 @@ contrib/dev/acpica/components/debugger/d contrib/dev/acpica/components/debugger/dbutils.c optional acpi acpi_debug contrib/dev/acpica/components/debugger/dbxface.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmbuffer.c optional acpi acpi_debug +contrib/dev/acpica/components/disassembler/dmcstyle.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmdeferred.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmnames.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmopcode.c optional acpi acpi_debug Modified: projects/release-install-debug/sys/conf/files.arm ============================================================================== --- projects/release-install-debug/sys/conf/files.arm Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/sys/conf/files.arm Fri Feb 20 18:59:43 2015 (r279075) @@ -57,7 +57,7 @@ arm/arm/trap.c optional !armv6 arm/arm/trap-v6.c optional armv6 arm/arm/uio_machdep.c standard arm/arm/undefined.c standard -arm/arm/unwind.c optional ddb +arm/arm/unwind.c optional ddb | kdtrace_hooks arm/arm/vm_machdep.c standard arm/arm/vfp.c standard board_id.h standard \ Modified: projects/release-install-debug/sys/conf/kmod.mk ============================================================================== --- projects/release-install-debug/sys/conf/kmod.mk Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/sys/conf/kmod.mk Fri Feb 20 18:59:43 2015 (r279075) @@ -125,6 +125,7 @@ CFLAGS+= -fno-omit-frame-pointer -mno-om .if ${MACHINE_CPUARCH} == arm CFLAGS.clang+= -mllvm -arm-use-movt=0 CFLAGS.clang+= -mfpu=none +CFLAGS+= -funwind-tables .endif .if ${MACHINE_CPUARCH} == powerpc Modified: projects/release-install-debug/sys/contrib/dev/acpica/changes.txt ============================================================================== --- projects/release-install-debug/sys/contrib/dev/acpica/changes.txt Fri Feb 20 18:51:52 2015 (r279074) +++ projects/release-install-debug/sys/contrib/dev/acpica/changes.txt Fri Feb 20 18:59:43 2015 (r279075) @@ -1,4 +1,223 @@ ---------------------------------------- +04 February 2015. Summary of changes for version 20150204: + +This release is available at https://acpica.org/downloads + +ACPICA kernel-resident subsystem: + +Updated all ACPICA copyrights and signons to 2014. Added the 2014 +copyright to all module headers and signons, including the standard Linux +header. This affects virtually every file in the ACPICA core subsystem, +iASL compiler, all ACPICA utilities, and the test suites. + +Events: Introduce ACPI_GPE_DISPATCH_RAW_HANDLER to fix GPE storm issues. +A raw gpe handling mechanism was created to allow better handling of GPE +storms that aren't easily managed by the normal handler. The raw handler +allows disabling/renabling of the the GPE so that interrupt storms can be +avoided in cases where events cannot be timely serviced. In this scenario, +handlers should use the AcpiSetGpe() API to disable/enable the GPE. This API +will leave the reference counts undisturbed, thereby preventing unintentional +clearing of the GPE when the intent in only to temporarily disable it. Raw +handlers allow enabling and disabling of a GPE by removing GPE register +locking. As such, raw handlers much provide their own locks while using +GPE API's to protect access to GPE data structures. +Lv Zheng + +Events: Always modify GPE registers under the GPE lock. +Applies GPE lock around AcpiFinishGpe() to protect access to GPE register +values. Reported as bug by joe.liu@apple.com. + +Unix makefiles: Separate option to disable optimizations and _FORTIFY_SOURCE. +This change removes the _FORTIFY_SOURCE flag from the NOOPT disable option and +creates a separate flag (NOFORTIFY) for this purpose. Some toolchains may +define _FORTIFY_SOURCE which leads redefined errors when building ACPICA. This +allows disabling the option without also having to disable optimazations. +David Box + + Current Release: + Non-Debug Version: 101.7K Code, 27.9K Data, 129.6K Total + Debug Version: 199.2K Code, 82.4K Data, 281.6K Total + +---------------------------------------- +07 November 2014. Summary of changes for version 20141107: + +This release is available at https://acpica.org/downloads + +This release introduces and implements language extensions to ASL that +provide support for symbolic ("C-style") operators and expressions. These +language extensions are known collectively as ASL+. + + +1) iASL Compiler/Disassembler and Tools: + +Disassembler: Fixed a problem with disassembly of the UartSerialBus +macro. Changed "StopBitsNone" to the correct "StopBitsZero". David E. +Box. + +Disassembler: Fixed the Unicode macro support to add escape sequences. +All non-printable ASCII values are emitted as escape sequences, as well +as the standard escapes for quote and backslash. Ensures that the +disassembled macro can be correctly recompiled. + +iASL: Added Printf/Fprintf macros for formatted output. These macros are +translated to existing AML Concatenate and Store operations. Printf +writes to the ASL Debug object. Fprintf allows the specification of an +ASL name as the target. Only a single format specifier is required, %o, +since the AML interpreter dynamically converts objects to the required *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***