From owner-svn-src-projects@freebsd.org Mon Sep 28 17:30:20 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3EFEA0B326
for <svn-src-projects@mailman.ysv.freebsd.org>;
Mon, 28 Sep 2015 17:30:19 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 E07AA12D4;
Mon, 28 Sep 2015 17:30:19 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8SHUJmq092605;
Mon, 28 Sep 2015 17:30:19 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8SHUAJ0092077;
Mon, 28 Sep 2015 17:30:10 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201509281730.t8SHUAJ0092077@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org
using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Mon, 28 Sep 2015 17:30:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r288343 - in projects/cxl_iscsi: . bin/ls bin/ls/tests
bin/ps cddl/contrib/opensolaris/cmd/sgs cddl/contrib/opensolaris/cmd/zdb
cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Sep 2015 17:30:20 -0000
Author: np
Date: Mon Sep 28 17:30:07 2015
New Revision: 288343
URL: https://svnweb.freebsd.org/changeset/base/288343
Log:
Sync up with head (up to r288341).
Added:
projects/cxl_iscsi/bin/ls/tests/
- copied from r288341, head/bin/ls/tests/
projects/cxl_iscsi/contrib/llvm/projects/
- copied from r288341, head/contrib/llvm/projects/
projects/cxl_iscsi/contrib/unbound/compat/reallocarray.c
- copied unchanged from r288341, head/contrib/unbound/compat/reallocarray.c
projects/cxl_iscsi/contrib/unbound/libunbound/python/file_py3.i
- copied unchanged from r288341, head/contrib/unbound/libunbound/python/file_py3.i
projects/cxl_iscsi/contrib/unbound/sldns/
- copied from r288341, head/contrib/unbound/sldns/
projects/cxl_iscsi/share/dtrace/tcpdebug
- copied unchanged from r288341, head/share/dtrace/tcpdebug
projects/cxl_iscsi/share/man/man4/otus.4
- copied unchanged from r288341, head/share/man/man4/otus.4
projects/cxl_iscsi/share/man/man4/otusfw.4
- copied unchanged from r288341, head/share/man/man4/otusfw.4
projects/cxl_iscsi/share/man/man9/bus_get_resource.9
- copied unchanged from r288341, head/share/man/man9/bus_get_resource.9
projects/cxl_iscsi/share/vt/fonts/vgarom-16x32.hex
- copied unchanged from r288341, head/share/vt/fonts/vgarom-16x32.hex
projects/cxl_iscsi/sys/arm/allwinner/a20/a20_if_dwc.c
- copied unchanged from r288341, head/sys/arm/allwinner/a20/a20_if_dwc.c
projects/cxl_iscsi/sys/cam/ctl/ctl_ha.c
- copied unchanged from r288341, head/sys/cam/ctl/ctl_ha.c
projects/cxl_iscsi/sys/contrib/dev/otus/
- copied from r288341, head/sys/contrib/dev/otus/
projects/cxl_iscsi/sys/dev/dwc/if_dwc_if.m
- copied unchanged from r288341, head/sys/dev/dwc/if_dwc_if.m
projects/cxl_iscsi/sys/dev/dwc/if_dwcvar.h
- copied unchanged from r288341, head/sys/dev/dwc/if_dwcvar.h
projects/cxl_iscsi/sys/dev/otus/
- copied from r288341, head/sys/dev/otus/
projects/cxl_iscsi/sys/modules/otus/
- copied from r288341, head/sys/modules/otus/
projects/cxl_iscsi/sys/modules/otusfw/
- copied from r288341, head/sys/modules/otusfw/
projects/cxl_iscsi/sys/sparc64/pci/ofw_pci.c
- copied unchanged from r288341, head/sys/sparc64/pci/ofw_pci.c
projects/cxl_iscsi/sys/x86/include/stack.h
- copied unchanged from r288341, head/sys/x86/include/stack.h
projects/cxl_iscsi/sys/x86/x86/stack_machdep.c
- copied unchanged from r288341, head/sys/x86/x86/stack_machdep.c
projects/cxl_iscsi/usr.bin/numactl/Makefile.depend
- copied unchanged from r288341, head/usr.bin/numactl/Makefile.depend
projects/cxl_iscsi/usr.bin/systat/zarc.c
- copied unchanged from r288341, head/usr.bin/systat/zarc.c
projects/cxl_iscsi/usr.sbin/sesutil/Makefile.depend
- copied unchanged from r288341, head/usr.sbin/sesutil/Makefile.depend
projects/cxl_iscsi/usr.sbin/sesutil/eltsub.c
- copied unchanged from r288341, head/usr.sbin/sesutil/eltsub.c
projects/cxl_iscsi/usr.sbin/sesutil/eltsub.h
- copied unchanged from r288341, head/usr.sbin/sesutil/eltsub.h
Replaced:
- copied from r288341, head/contrib/libc++/
Directory Properties:
projects/cxl_iscsi/contrib/libc++/ (props changed)
Deleted:
projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/sgs/
projects/cxl_iscsi/cddl/contrib/opensolaris/common/avl/avl.c
projects/cxl_iscsi/cddl/usr.bin/sgsmsg/
projects/cxl_iscsi/contrib/unbound/ldns/
projects/cxl_iscsi/sbin/ipf/ipsend/
projects/cxl_iscsi/sbin/ipf/iptest/
projects/cxl_iscsi/sbin/ipf/rules/
projects/cxl_iscsi/sys/amd64/amd64/stack_machdep.c
projects/cxl_iscsi/sys/i386/i386/stack_machdep.c
Modified:
projects/cxl_iscsi/Makefile
projects/cxl_iscsi/Makefile.inc1
projects/cxl_iscsi/ObsoleteFiles.inc
projects/cxl_iscsi/UPDATING
projects/cxl_iscsi/bin/ls/Makefile
projects/cxl_iscsi/bin/ls/ls.1
projects/cxl_iscsi/bin/ps/Makefile.depend
projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zdb/zdb.c
projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zfs/zfs.8
projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
projects/cxl_iscsi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
projects/cxl_iscsi/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
projects/cxl_iscsi/cddl/lib/libdtrace/Makefile
projects/cxl_iscsi/cddl/lib/libdtrace/ip.d
projects/cxl_iscsi/cddl/lib/libdtrace/tcp.d
projects/cxl_iscsi/cddl/usr.bin/Makefile
projects/cxl_iscsi/cddl/usr.bin/ctfconvert/Makefile.depend
projects/cxl_iscsi/cddl/usr.bin/ctfdump/Makefile.depend
projects/cxl_iscsi/cddl/usr.bin/ctfmerge/Makefile.depend
projects/cxl_iscsi/cddl/usr.sbin/dtrace/Makefile.depend
projects/cxl_iscsi/cddl/usr.sbin/dtruss/Makefile.depend
projects/cxl_iscsi/contrib/binutils/opcodes/arm-dis.c
projects/cxl_iscsi/contrib/elftoolchain/addr2line/addr2line.c
projects/cxl_iscsi/contrib/elftoolchain/elfdump/elfdump.c
projects/cxl_iscsi/contrib/elftoolchain/readelf/readelf.c
projects/cxl_iscsi/contrib/file/ChangeLog
projects/cxl_iscsi/contrib/file/configure
projects/cxl_iscsi/contrib/file/configure.ac
projects/cxl_iscsi/contrib/file/doc/file.man
projects/cxl_iscsi/contrib/file/doc/libmagic.man
projects/cxl_iscsi/contrib/file/doc/magic.man
projects/cxl_iscsi/contrib/file/magic/Magdir/adventure
projects/cxl_iscsi/contrib/file/magic/Magdir/apple
projects/cxl_iscsi/contrib/file/magic/Magdir/archive
projects/cxl_iscsi/contrib/file/magic/Magdir/c-lang
projects/cxl_iscsi/contrib/file/magic/Magdir/c64
projects/cxl_iscsi/contrib/file/magic/Magdir/compress
projects/cxl_iscsi/contrib/file/magic/Magdir/database
projects/cxl_iscsi/contrib/file/magic/Magdir/filesystems
projects/cxl_iscsi/contrib/file/magic/Magdir/frame
projects/cxl_iscsi/contrib/file/magic/Magdir/iff
projects/cxl_iscsi/contrib/file/magic/Magdir/images
projects/cxl_iscsi/contrib/file/magic/Magdir/karma
projects/cxl_iscsi/contrib/file/magic/Magdir/linux
projects/cxl_iscsi/contrib/file/magic/Magdir/make
projects/cxl_iscsi/contrib/file/magic/Magdir/map
projects/cxl_iscsi/contrib/file/magic/Magdir/msdos
projects/cxl_iscsi/contrib/file/magic/Magdir/netscape
projects/cxl_iscsi/contrib/file/magic/Magdir/python
projects/cxl_iscsi/contrib/file/magic/Magdir/scientific
projects/cxl_iscsi/contrib/file/magic/Magdir/sgi
projects/cxl_iscsi/contrib/file/magic/Magdir/sgml
projects/cxl_iscsi/contrib/file/magic/Magdir/windows
projects/cxl_iscsi/contrib/file/src/apprentice.c
projects/cxl_iscsi/contrib/file/src/file.c
projects/cxl_iscsi/contrib/file/src/file.h
projects/cxl_iscsi/contrib/file/src/file_opts.h
projects/cxl_iscsi/contrib/file/src/funcs.c
projects/cxl_iscsi/contrib/file/src/gmtime_r.c
projects/cxl_iscsi/contrib/file/src/localtime_r.c
projects/cxl_iscsi/contrib/file/src/magic.c
projects/cxl_iscsi/contrib/file/src/magic.h
projects/cxl_iscsi/contrib/file/src/magic.h.in
projects/cxl_iscsi/contrib/file/src/print.c
projects/cxl_iscsi/contrib/file/src/readelf.c
projects/cxl_iscsi/contrib/file/src/softmagic.c
projects/cxl_iscsi/contrib/jemalloc/ChangeLog
projects/cxl_iscsi/contrib/jemalloc/FREEBSD-diffs
projects/cxl_iscsi/contrib/jemalloc/VERSION
projects/cxl_iscsi/contrib/jemalloc/doc/jemalloc.3
projects/cxl_iscsi/contrib/jemalloc/include/jemalloc/internal/arena.h
projects/cxl_iscsi/contrib/jemalloc/include/jemalloc/internal/huge.h
projects/cxl_iscsi/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h
projects/cxl_iscsi/contrib/jemalloc/include/jemalloc/internal/private_namespace.h
projects/cxl_iscsi/contrib/jemalloc/include/jemalloc/internal/prof.h
projects/cxl_iscsi/contrib/jemalloc/include/jemalloc/internal/size_classes.h
projects/cxl_iscsi/contrib/jemalloc/include/jemalloc/internal/tcache.h
projects/cxl_iscsi/contrib/jemalloc/include/jemalloc/internal/tsd.h
projects/cxl_iscsi/contrib/jemalloc/include/jemalloc/jemalloc.h
projects/cxl_iscsi/contrib/jemalloc/src/arena.c
projects/cxl_iscsi/contrib/jemalloc/src/chunk_dss.c
projects/cxl_iscsi/contrib/jemalloc/src/chunk_mmap.c
projects/cxl_iscsi/contrib/jemalloc/src/huge.c
projects/cxl_iscsi/contrib/jemalloc/src/jemalloc.c
projects/cxl_iscsi/contrib/jemalloc/src/prof.c
projects/cxl_iscsi/contrib/jemalloc/src/tcache.c
projects/cxl_iscsi/contrib/libcxxrt/exception.cc
projects/cxl_iscsi/contrib/netcat/nc.1
projects/cxl_iscsi/contrib/netcat/netcat.c
projects/cxl_iscsi/contrib/netcat/socks.c
projects/cxl_iscsi/contrib/openpam/lib/libpam/openpam_constants.c
projects/cxl_iscsi/contrib/unbound/Makefile.in
projects/cxl_iscsi/contrib/unbound/acx_nlnetlabs.m4
projects/cxl_iscsi/contrib/unbound/compat/getentropy_linux.c
projects/cxl_iscsi/contrib/unbound/config.h
projects/cxl_iscsi/contrib/unbound/config.h.in
projects/cxl_iscsi/contrib/unbound/configure
projects/cxl_iscsi/contrib/unbound/configure.ac
projects/cxl_iscsi/contrib/unbound/daemon/cachedump.c
projects/cxl_iscsi/contrib/unbound/daemon/daemon.c
projects/cxl_iscsi/contrib/unbound/daemon/remote.c
projects/cxl_iscsi/contrib/unbound/daemon/stats.c
projects/cxl_iscsi/contrib/unbound/daemon/stats.h
projects/cxl_iscsi/contrib/unbound/daemon/worker.c
projects/cxl_iscsi/contrib/unbound/daemon/worker.h
projects/cxl_iscsi/contrib/unbound/dns64/dns64.c
projects/cxl_iscsi/contrib/unbound/dnstap/dnstap.c
projects/cxl_iscsi/contrib/unbound/doc/Changelog
projects/cxl_iscsi/contrib/unbound/doc/README
projects/cxl_iscsi/contrib/unbound/doc/example.conf
projects/cxl_iscsi/contrib/unbound/doc/example.conf.in
projects/cxl_iscsi/contrib/unbound/doc/libunbound.3
projects/cxl_iscsi/contrib/unbound/doc/libunbound.3.in
projects/cxl_iscsi/contrib/unbound/doc/unbound-anchor.8
projects/cxl_iscsi/contrib/unbound/doc/unbound-anchor.8.in
projects/cxl_iscsi/contrib/unbound/doc/unbound-checkconf.8
projects/cxl_iscsi/contrib/unbound/doc/unbound-checkconf.8.in
projects/cxl_iscsi/contrib/unbound/doc/unbound-control.8
projects/cxl_iscsi/contrib/unbound/doc/unbound-control.8.in
projects/cxl_iscsi/contrib/unbound/doc/unbound-host.1
projects/cxl_iscsi/contrib/unbound/doc/unbound-host.1.in
projects/cxl_iscsi/contrib/unbound/doc/unbound.8
projects/cxl_iscsi/contrib/unbound/doc/unbound.8.in
projects/cxl_iscsi/contrib/unbound/doc/unbound.conf.5
projects/cxl_iscsi/contrib/unbound/doc/unbound.conf.5.in
projects/cxl_iscsi/contrib/unbound/freebsd-configure.sh
projects/cxl_iscsi/contrib/unbound/iterator/iter_delegpt.c
projects/cxl_iscsi/contrib/unbound/iterator/iter_fwd.c
projects/cxl_iscsi/contrib/unbound/iterator/iter_hints.c
projects/cxl_iscsi/contrib/unbound/iterator/iter_priv.c
projects/cxl_iscsi/contrib/unbound/iterator/iter_resptype.c
projects/cxl_iscsi/contrib/unbound/iterator/iter_scrub.c
projects/cxl_iscsi/contrib/unbound/iterator/iter_utils.c
projects/cxl_iscsi/contrib/unbound/iterator/iter_utils.h
projects/cxl_iscsi/contrib/unbound/iterator/iterator.c
projects/cxl_iscsi/contrib/unbound/iterator/iterator.h
projects/cxl_iscsi/contrib/unbound/libunbound/context.c
projects/cxl_iscsi/contrib/unbound/libunbound/libunbound.c
projects/cxl_iscsi/contrib/unbound/libunbound/libworker.c
projects/cxl_iscsi/contrib/unbound/libunbound/python/Makefile
projects/cxl_iscsi/contrib/unbound/libunbound/python/examples/async-lookup.py
projects/cxl_iscsi/contrib/unbound/libunbound/python/examples/dns-lookup.py
projects/cxl_iscsi/contrib/unbound/libunbound/python/examples/dnssec-valid.py
projects/cxl_iscsi/contrib/unbound/libunbound/python/examples/dnssec_test.py
projects/cxl_iscsi/contrib/unbound/libunbound/python/examples/example8-1.py
projects/cxl_iscsi/contrib/unbound/libunbound/python/examples/idn-lookup.py
projects/cxl_iscsi/contrib/unbound/libunbound/python/examples/mx-lookup.py
projects/cxl_iscsi/contrib/unbound/libunbound/python/examples/ns-lookup.py
projects/cxl_iscsi/contrib/unbound/libunbound/python/examples/reverse-lookup.py
projects/cxl_iscsi/contrib/unbound/libunbound/python/libunbound.i
projects/cxl_iscsi/contrib/unbound/libunbound/worker.h
projects/cxl_iscsi/contrib/unbound/services/cache/dns.c
projects/cxl_iscsi/contrib/unbound/services/cache/infra.c
projects/cxl_iscsi/contrib/unbound/services/cache/infra.h
projects/cxl_iscsi/contrib/unbound/services/cache/rrset.c
projects/cxl_iscsi/contrib/unbound/services/listen_dnsport.c
projects/cxl_iscsi/contrib/unbound/services/listen_dnsport.h
projects/cxl_iscsi/contrib/unbound/services/localzone.c
projects/cxl_iscsi/contrib/unbound/services/localzone.h
projects/cxl_iscsi/contrib/unbound/services/mesh.c
projects/cxl_iscsi/contrib/unbound/services/outside_network.c
projects/cxl_iscsi/contrib/unbound/smallapp/unbound-anchor.c
projects/cxl_iscsi/contrib/unbound/smallapp/unbound-checkconf.c
projects/cxl_iscsi/contrib/unbound/smallapp/unbound-control-setup.sh
projects/cxl_iscsi/contrib/unbound/smallapp/unbound-control-setup.sh.in
projects/cxl_iscsi/contrib/unbound/smallapp/unbound-control.c
projects/cxl_iscsi/contrib/unbound/smallapp/unbound-host.c
projects/cxl_iscsi/contrib/unbound/util/alloc.c
projects/cxl_iscsi/contrib/unbound/util/alloc.h
projects/cxl_iscsi/contrib/unbound/util/config_file.c
projects/cxl_iscsi/contrib/unbound/util/config_file.h
projects/cxl_iscsi/contrib/unbound/util/configlexer.lex
projects/cxl_iscsi/contrib/unbound/util/configparser.y
projects/cxl_iscsi/contrib/unbound/util/data/dname.c
projects/cxl_iscsi/contrib/unbound/util/data/msgencode.c
projects/cxl_iscsi/contrib/unbound/util/data/msgparse.c
projects/cxl_iscsi/contrib/unbound/util/data/msgparse.h
projects/cxl_iscsi/contrib/unbound/util/data/msgreply.c
projects/cxl_iscsi/contrib/unbound/util/data/msgreply.h
projects/cxl_iscsi/contrib/unbound/util/data/packed_rrset.c
projects/cxl_iscsi/contrib/unbound/util/data/packed_rrset.h
projects/cxl_iscsi/contrib/unbound/util/fptr_wlist.c
projects/cxl_iscsi/contrib/unbound/util/iana_ports.inc
projects/cxl_iscsi/contrib/unbound/util/log.c
projects/cxl_iscsi/contrib/unbound/util/log.h
projects/cxl_iscsi/contrib/unbound/util/net_help.c
projects/cxl_iscsi/contrib/unbound/util/netevent.c
projects/cxl_iscsi/contrib/unbound/util/netevent.h
projects/cxl_iscsi/contrib/unbound/validator/autotrust.c
projects/cxl_iscsi/contrib/unbound/validator/val_anchor.c
projects/cxl_iscsi/contrib/unbound/validator/val_kentry.c
projects/cxl_iscsi/contrib/unbound/validator/val_neg.c
projects/cxl_iscsi/contrib/unbound/validator/val_nsec3.c
projects/cxl_iscsi/contrib/unbound/validator/val_secalgo.c
projects/cxl_iscsi/contrib/unbound/validator/val_sigcrypt.c
projects/cxl_iscsi/contrib/unbound/validator/validator.c
projects/cxl_iscsi/etc/mtree/BSD.debug.dist
projects/cxl_iscsi/etc/mtree/BSD.tests.dist
projects/cxl_iscsi/etc/rc.d/automount
projects/cxl_iscsi/etc/rc.d/automountd
projects/cxl_iscsi/etc/rc.d/autounmountd
projects/cxl_iscsi/etc/rc.d/bgfsck
projects/cxl_iscsi/etc/rc.d/jail
projects/cxl_iscsi/etc/rc.d/netif
projects/cxl_iscsi/etc/rc.subr
projects/cxl_iscsi/etc/sendmail/Makefile.depend
projects/cxl_iscsi/gnu/lib/csu/Makefile
projects/cxl_iscsi/gnu/lib/libreadline/readline/Makefile
projects/cxl_iscsi/gnu/lib/libssp/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/binutils/ld/Makefile
projects/cxl_iscsi/gnu/usr.bin/binutils/ld/Makefile.amd64
projects/cxl_iscsi/gnu/usr.bin/binutils/ld/Makefile.mips
projects/cxl_iscsi/gnu/usr.bin/binutils/ld/Makefile.powerpc64
projects/cxl_iscsi/gnu/usr.bin/binutils/ld/Makefile.sparc64
projects/cxl_iscsi/gnu/usr.bin/binutils/libbfd/Makefile.i386
projects/cxl_iscsi/gnu/usr.bin/cc/c++/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/cc/cc/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/cc/cc1/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/cc/cc1plus/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/cc/cc_int/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/cc/cc_tools/Makefile
projects/cxl_iscsi/gnu/usr.bin/cc/cc_tools/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/cc/cpp/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/cc/gcov/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/cc/include/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/cc/libcpp/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/cc/libdecnumber/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/cc/libiberty/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/diff/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/dtc/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/gperf/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/grep/Makefile.depend
projects/cxl_iscsi/gnu/usr.bin/groff/src/utils/indxbib/Makefile
projects/cxl_iscsi/include/Makefile
projects/cxl_iscsi/kerberos5/Makefile
projects/cxl_iscsi/kerberos5/lib/Makefile
projects/cxl_iscsi/kerberos5/libexec/Makefile
projects/cxl_iscsi/kerberos5/libexec/kdigest/Makefile
projects/cxl_iscsi/kerberos5/tools/Makefile
projects/cxl_iscsi/kerberos5/usr.bin/Makefile
projects/cxl_iscsi/kerberos5/usr.bin/hxtool/Makefile
projects/cxl_iscsi/kerberos5/usr.bin/kadmin/Makefile
projects/cxl_iscsi/kerberos5/usr.bin/kcc/Makefile
projects/cxl_iscsi/kerberos5/usr.sbin/Makefile
projects/cxl_iscsi/kerberos5/usr.sbin/iprop-log/Makefile
projects/cxl_iscsi/kerberos5/usr.sbin/ktutil/Makefile
projects/cxl_iscsi/lib/clang/include/Makefile
projects/cxl_iscsi/lib/clang/libllvmdebuginfo/Makefile.depend
projects/cxl_iscsi/lib/clang/libllvminterpreter/Makefile.depend
projects/cxl_iscsi/lib/csu/Makefile.inc
projects/cxl_iscsi/lib/csu/aarch64/Makefile
projects/cxl_iscsi/lib/csu/amd64/Makefile
projects/cxl_iscsi/lib/csu/arm/Makefile
projects/cxl_iscsi/lib/csu/arm/Makefile.depend
projects/cxl_iscsi/lib/csu/i386/Makefile
projects/cxl_iscsi/lib/csu/i386/Makefile.depend
projects/cxl_iscsi/lib/csu/mips/Makefile
projects/cxl_iscsi/lib/csu/mips/Makefile.depend
projects/cxl_iscsi/lib/csu/powerpc/Makefile
projects/cxl_iscsi/lib/csu/powerpc/Makefile.depend
projects/cxl_iscsi/lib/csu/powerpc64/Makefile
projects/cxl_iscsi/lib/csu/powerpc64/Makefile.depend
projects/cxl_iscsi/lib/csu/sparc64/Makefile
projects/cxl_iscsi/lib/csu/sparc64/Makefile.depend
projects/cxl_iscsi/lib/libblocksruntime/Makefile.depend
projects/cxl_iscsi/lib/libc/Makefile.depend
projects/cxl_iscsi/lib/libc/aarch64/gen/_set_tp.c
projects/cxl_iscsi/lib/libc/amd64/gen/_set_tp.c
projects/cxl_iscsi/lib/libc/arm/gen/_set_tp.c
projects/cxl_iscsi/lib/libc/compat-43/creat.c
projects/cxl_iscsi/lib/libc/compat-43/sigcompat.c
projects/cxl_iscsi/lib/libc/db/hash/ndbm.c
projects/cxl_iscsi/lib/libc/db/recno/rec_open.c
projects/cxl_iscsi/lib/libc/gdtoa/_ldtoa.c
projects/cxl_iscsi/lib/libc/gen/alarm.c
projects/cxl_iscsi/lib/libc/gen/assert.c
projects/cxl_iscsi/lib/libc/gen/clock.c
projects/cxl_iscsi/lib/libc/gen/dlfcn.c
projects/cxl_iscsi/lib/libc/gen/dup3.c
projects/cxl_iscsi/lib/libc/gen/elf_utils.c
projects/cxl_iscsi/lib/libc/gen/err.c
projects/cxl_iscsi/lib/libc/gen/exec.c
projects/cxl_iscsi/lib/libc/gen/feature_present.c
projects/cxl_iscsi/lib/libc/gen/fmtcheck.c
projects/cxl_iscsi/lib/libc/gen/fnmatch.c
projects/cxl_iscsi/lib/libc/gen/ftok.c
projects/cxl_iscsi/lib/libc/gen/fts-compat.c
projects/cxl_iscsi/lib/libc/gen/fts.c
projects/cxl_iscsi/lib/libc/gen/getbsize.c
projects/cxl_iscsi/lib/libc/gen/getcwd.c
projects/cxl_iscsi/lib/libc/gen/getdomainname.c
projects/cxl_iscsi/lib/libc/gen/getgrent.c
projects/cxl_iscsi/lib/libc/gen/gethostname.c
projects/cxl_iscsi/lib/libc/gen/getloadavg.c
projects/cxl_iscsi/lib/libc/gen/getmntinfo.c
projects/cxl_iscsi/lib/libc/gen/getpagesize.c
projects/cxl_iscsi/lib/libc/gen/getpwent.c
projects/cxl_iscsi/lib/libc/gen/getusershell.c
projects/cxl_iscsi/lib/libc/gen/getvfsbyname.c
projects/cxl_iscsi/lib/libc/gen/glob.c
projects/cxl_iscsi/lib/libc/gen/initgroups.c
projects/cxl_iscsi/lib/libc/gen/isatty.c
projects/cxl_iscsi/lib/libc/gen/nlist.c
projects/cxl_iscsi/lib/libc/gen/pause.c
projects/cxl_iscsi/lib/libc/gen/popen.c
projects/cxl_iscsi/lib/libc/gen/psignal.c
projects/cxl_iscsi/lib/libc/gen/raise.c
projects/cxl_iscsi/lib/libc/gen/readdir.c
projects/cxl_iscsi/lib/libc/gen/rewinddir.c
projects/cxl_iscsi/lib/libc/gen/seekdir.c
projects/cxl_iscsi/lib/libc/gen/semctl.c
projects/cxl_iscsi/lib/libc/gen/setjmperr.c
projects/cxl_iscsi/lib/libc/gen/sigsetops.c
projects/cxl_iscsi/lib/libc/gen/sleep.c
projects/cxl_iscsi/lib/libc/gen/strtofflags.c
projects/cxl_iscsi/lib/libc/gen/sysconf.c
projects/cxl_iscsi/lib/libc/gen/sysctl.3
projects/cxl_iscsi/lib/libc/gen/telldir.c
projects/cxl_iscsi/lib/libc/gen/tls.c
projects/cxl_iscsi/lib/libc/gen/ttyslot.c
projects/cxl_iscsi/lib/libc/gen/ualarm.c
projects/cxl_iscsi/lib/libc/gen/uname.c
projects/cxl_iscsi/lib/libc/gen/unvis-compat.c
projects/cxl_iscsi/lib/libc/gen/usleep.c
projects/cxl_iscsi/lib/libc/gen/utime.c
projects/cxl_iscsi/lib/libc/gen/wait.c
projects/cxl_iscsi/lib/libc/gen/wait3.c
projects/cxl_iscsi/lib/libc/gen/waitid.c
projects/cxl_iscsi/lib/libc/gen/waitpid.c
projects/cxl_iscsi/lib/libc/gmon/gmon.c
projects/cxl_iscsi/lib/libc/inet/inet_lnaof.c
projects/cxl_iscsi/lib/libc/inet/inet_makeaddr.c
projects/cxl_iscsi/lib/libc/inet/inet_net_ntop.c
projects/cxl_iscsi/lib/libc/inet/inet_neta.c
projects/cxl_iscsi/lib/libc/inet/inet_netof.c
projects/cxl_iscsi/lib/libc/inet/inet_network.c
projects/cxl_iscsi/lib/libc/isc/ev_timers.c
projects/cxl_iscsi/lib/libc/locale/isctype.c
projects/cxl_iscsi/lib/libc/locale/iswctype.c
projects/cxl_iscsi/lib/libc/locale/setlocale.c
projects/cxl_iscsi/lib/libc/locale/tolower.c
projects/cxl_iscsi/lib/libc/locale/toupper.c
projects/cxl_iscsi/lib/libc/mips/gen/_set_tp.c
projects/cxl_iscsi/lib/libc/net/getaddrinfo.3
projects/cxl_iscsi/lib/libc/net/getaddrinfo.c
projects/cxl_iscsi/lib/libc/net/gethostbydns.c
projects/cxl_iscsi/lib/libc/net/gethostnamadr.c
projects/cxl_iscsi/lib/libc/net/getnameinfo.3
projects/cxl_iscsi/lib/libc/net/getnameinfo.c
projects/cxl_iscsi/lib/libc/net/getnetbydns.c
projects/cxl_iscsi/lib/libc/net/getnetnamadr.c
projects/cxl_iscsi/lib/libc/net/getproto.c
projects/cxl_iscsi/lib/libc/net/getservent.c
projects/cxl_iscsi/lib/libc/net/if_nametoindex.c
projects/cxl_iscsi/lib/libc/net/linkaddr.c
projects/cxl_iscsi/lib/libc/net/map_v4v6.c
projects/cxl_iscsi/lib/libc/net/netdb_private.h
projects/cxl_iscsi/lib/libc/net/nscache.c
projects/cxl_iscsi/lib/libc/net/nslexer.l
projects/cxl_iscsi/lib/libc/net/nsparser.y
projects/cxl_iscsi/lib/libc/net/nss_compat.c
projects/cxl_iscsi/lib/libc/net/ntoh.c
projects/cxl_iscsi/lib/libc/net/rcmd.c
projects/cxl_iscsi/lib/libc/net/recv.c
projects/cxl_iscsi/lib/libc/net/rthdr.c
projects/cxl_iscsi/lib/libc/net/send.c
projects/cxl_iscsi/lib/libc/net/sockatmark.c
projects/cxl_iscsi/lib/libc/posix1e/acl_compat.c
projects/cxl_iscsi/lib/libc/posix1e/acl_support.h
projects/cxl_iscsi/lib/libc/powerpc/gen/_set_tp.c
projects/cxl_iscsi/lib/libc/powerpc64/gen/_set_tp.c
projects/cxl_iscsi/lib/libc/resolv/h_errno.c
projects/cxl_iscsi/lib/libc/resolv/res_debug.c
projects/cxl_iscsi/lib/libc/resolv/res_init.c
projects/cxl_iscsi/lib/libc/resolv/res_mkupdate.c
projects/cxl_iscsi/lib/libc/resolv/res_send.c
projects/cxl_iscsi/lib/libc/rpc/auth_unix.c
projects/cxl_iscsi/lib/libc/rpc/authdes_prot.c
projects/cxl_iscsi/lib/libc/rpc/authunix_prot.c
projects/cxl_iscsi/lib/libc/rpc/bindresvport.c
projects/cxl_iscsi/lib/libc/rpc/clnt_bcast.c
projects/cxl_iscsi/lib/libc/rpc/clnt_perror.c
projects/cxl_iscsi/lib/libc/rpc/clnt_raw.c
projects/cxl_iscsi/lib/libc/rpc/clnt_simple.c
projects/cxl_iscsi/lib/libc/rpc/clnt_vc.c
projects/cxl_iscsi/lib/libc/rpc/des_crypt.c
projects/cxl_iscsi/lib/libc/rpc/getnetconfig.c
projects/cxl_iscsi/lib/libc/rpc/getnetpath.c
projects/cxl_iscsi/lib/libc/rpc/getrpcent.c
projects/cxl_iscsi/lib/libc/rpc/getrpcport.c
projects/cxl_iscsi/lib/libc/rpc/mt_misc.c
projects/cxl_iscsi/lib/libc/rpc/netname.c
projects/cxl_iscsi/lib/libc/rpc/netnamer.c
projects/cxl_iscsi/lib/libc/rpc/pmap_getmaps.c
projects/cxl_iscsi/lib/libc/rpc/pmap_getport.c
projects/cxl_iscsi/lib/libc/rpc/pmap_prot.c
projects/cxl_iscsi/lib/libc/rpc/pmap_prot2.c
projects/cxl_iscsi/lib/libc/rpc/pmap_rmt.c
projects/cxl_iscsi/lib/libc/rpc/rpc_callmsg.c
projects/cxl_iscsi/lib/libc/rpc/rpc_generic.c
projects/cxl_iscsi/lib/libc/rpc/rpc_prot.c
projects/cxl_iscsi/lib/libc/rpc/rpc_soc.c
projects/cxl_iscsi/lib/libc/rpc/rpcb_clnt.c
projects/cxl_iscsi/lib/libc/rpc/rpcb_prot.c
projects/cxl_iscsi/lib/libc/rpc/rpcb_st_xdr.c
projects/cxl_iscsi/lib/libc/rpc/svc.c
projects/cxl_iscsi/lib/libc/rpc/svc_auth.c
projects/cxl_iscsi/lib/libc/rpc/svc_auth_unix.c
projects/cxl_iscsi/lib/libc/rpc/svc_generic.c
projects/cxl_iscsi/lib/libc/rpc/svc_raw.c
projects/cxl_iscsi/lib/libc/rpc/svc_run.c
projects/cxl_iscsi/lib/libc/rpc/svc_simple.c
projects/cxl_iscsi/lib/libc/sparc64/gen/_set_tp.c
projects/cxl_iscsi/lib/libc/stdio/_flock_stub.c
projects/cxl_iscsi/lib/libc/stdio/fgetwln.c
projects/cxl_iscsi/lib/libc/stdio/findfp.c
projects/cxl_iscsi/lib/libc/stdio/getchar.c
projects/cxl_iscsi/lib/libc/stdio/vfscanf.c
projects/cxl_iscsi/lib/libc/stdlib/abort.c
projects/cxl_iscsi/lib/libc/stdlib/abs.c
projects/cxl_iscsi/lib/libc/stdlib/atexit.c
projects/cxl_iscsi/lib/libc/stdlib/atof.c
projects/cxl_iscsi/lib/libc/stdlib/atoi.c
projects/cxl_iscsi/lib/libc/stdlib/atol.c
projects/cxl_iscsi/lib/libc/stdlib/atoll.c
projects/cxl_iscsi/lib/libc/stdlib/bsearch.c
projects/cxl_iscsi/lib/libc/stdlib/exit.c
projects/cxl_iscsi/lib/libc/stdlib/heapsort.c
projects/cxl_iscsi/lib/libc/stdlib/labs.c
projects/cxl_iscsi/lib/libc/stdlib/merge.c
projects/cxl_iscsi/lib/libc/stdlib/qsort.c
projects/cxl_iscsi/lib/libc/stdlib/radixsort.c
projects/cxl_iscsi/lib/libc/stdlib/rand.c
projects/cxl_iscsi/lib/libc/stdlib/tfind.c
projects/cxl_iscsi/lib/libc/stdtime/strftime.c
projects/cxl_iscsi/lib/libc/string/strchrnul.c
projects/cxl_iscsi/lib/libc/sys/Makefile.inc
projects/cxl_iscsi/lib/libc/sys/__error.c
projects/cxl_iscsi/lib/libc/sys/close.c
projects/cxl_iscsi/lib/libc/sys/fsync.c
projects/cxl_iscsi/lib/libc/sys/msync.c
projects/cxl_iscsi/lib/libc/sys/readv.c
projects/cxl_iscsi/lib/libc/sys/reboot.2
projects/cxl_iscsi/lib/libc/sys/setuid.2
projects/cxl_iscsi/lib/libc/sys/writev.c
projects/cxl_iscsi/lib/libc/tests/gen/posix_spawn/Makefile
projects/cxl_iscsi/lib/libc/xdr/xdr_float.c
projects/cxl_iscsi/lib/libcrypt/tests/Makefile.depend
projects/cxl_iscsi/lib/libcuse/Makefile.depend
projects/cxl_iscsi/lib/libcxxrt/Makefile.depend.host
projects/cxl_iscsi/lib/libevent/Makefile.depend
projects/cxl_iscsi/lib/libfetch/common.c
projects/cxl_iscsi/lib/libgpib/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/BIG5/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/DECHanyu/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/EUC/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/EUCTW/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/GBK2K/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/HZ/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/ISO2022/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/JOHAB/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/MSKanji/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/UES/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/UTF1632/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/UTF7/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/UTF8/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/VIQR/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/ZW/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/iconv_none/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/iconv_std/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/mapper_646/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/mapper_none/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/mapper_parallel/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/mapper_serial/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/mapper_std/Makefile.depend
projects/cxl_iscsi/lib/libiconv_modules/mapper_zone/Makefile.depend
projects/cxl_iscsi/lib/liblzma/Makefile
projects/cxl_iscsi/lib/libmagic/config.h
projects/cxl_iscsi/lib/libmilter/Makefile.depend
projects/cxl_iscsi/lib/libpam/Makefile.inc
projects/cxl_iscsi/lib/libpam/libpam/Makefile
projects/cxl_iscsi/lib/librpcsec_gss/Makefile.depend
projects/cxl_iscsi/lib/libsm/Makefile.depend
projects/cxl_iscsi/lib/libsmb/Makefile.depend
projects/cxl_iscsi/lib/libstand/Makefile.depend
projects/cxl_iscsi/lib/libstdbuf/Makefile.depend
projects/cxl_iscsi/lib/libstdthreads/Makefile.depend
projects/cxl_iscsi/lib/libunbound/Makefile
projects/cxl_iscsi/lib/libunbound/Makefile.depend
projects/cxl_iscsi/lib/libusb/Makefile
projects/cxl_iscsi/lib/libvgl/Makefile.depend
projects/cxl_iscsi/lib/libxo/Makefile.depend
projects/cxl_iscsi/lib/libz/Makefile
projects/cxl_iscsi/lib/ncurses/form/Makefile.depend
projects/cxl_iscsi/lib/ncurses/formw/Makefile.depend
projects/cxl_iscsi/lib/ncurses/menu/Makefile.depend
projects/cxl_iscsi/lib/ncurses/menuw/Makefile.depend
projects/cxl_iscsi/lib/ncurses/ncurses/Makefile
projects/cxl_iscsi/libexec/bootpd/Makefile.depend
projects/cxl_iscsi/libexec/rtld-elf/Makefile
projects/cxl_iscsi/release/Makefile
projects/cxl_iscsi/release/amd64/mkisoimages.sh
projects/cxl_iscsi/release/i386/mkisoimages.sh
projects/cxl_iscsi/release/pc98/mkisoimages.sh
projects/cxl_iscsi/release/powerpc/mkisoimages.sh
projects/cxl_iscsi/release/release.sh
projects/cxl_iscsi/release/sparc64/mkisoimages.sh
projects/cxl_iscsi/rescue/librescue/Makefile.depend
projects/cxl_iscsi/sbin/fdisk_pc98/Makefile.depend
projects/cxl_iscsi/sbin/geom/class/nop/geom_nop.c
projects/cxl_iscsi/sbin/geom/class/nop/gnop.8
projects/cxl_iscsi/sbin/ifconfig/af_inet6.c
projects/cxl_iscsi/sbin/ifconfig/carp.c
projects/cxl_iscsi/sbin/ifconfig/ifbridge.c
projects/cxl_iscsi/sbin/ifconfig/ifclone.c
projects/cxl_iscsi/sbin/ifconfig/ifconfig.c
projects/cxl_iscsi/sbin/ifconfig/iffib.c
projects/cxl_iscsi/sbin/ifconfig/ifgif.c
projects/cxl_iscsi/sbin/ifconfig/ifgre.c
projects/cxl_iscsi/sbin/ifconfig/ifgroup.c
projects/cxl_iscsi/sbin/ifconfig/ifieee80211.c
projects/cxl_iscsi/sbin/ifconfig/iflagg.c
projects/cxl_iscsi/sbin/ifconfig/ifmac.c
projects/cxl_iscsi/sbin/ifconfig/ifmedia.c
projects/cxl_iscsi/sbin/ifconfig/ifpfsync.c
projects/cxl_iscsi/sbin/ifconfig/ifvlan.c
projects/cxl_iscsi/sbin/ifconfig/ifvxlan.c
projects/cxl_iscsi/sbin/ipf/Makefile
projects/cxl_iscsi/sbin/ipf/ipftest/Makefile.depend
projects/cxl_iscsi/sbin/natd/natd.c
projects/cxl_iscsi/sbin/route/route.c
projects/cxl_iscsi/sbin/routed/Makefile.depend
projects/cxl_iscsi/sbin/rtsol/Makefile
projects/cxl_iscsi/sbin/savecore/Makefile.depend
projects/cxl_iscsi/sbin/sconfig/Makefile.depend
projects/cxl_iscsi/sbin/sunlabel/Makefile.depend
projects/cxl_iscsi/secure/lib/libcrypto/Makefile
projects/cxl_iscsi/share/doc/legal/realtek/Makefile.depend
projects/cxl_iscsi/share/doc/llvm/Makefile.depend
projects/cxl_iscsi/share/examples/libvgl/Makefile.depend
projects/cxl_iscsi/share/man/man4/Makefile
projects/cxl_iscsi/share/man/man4/ctl.4
projects/cxl_iscsi/share/man/man4/dtrace_ip.4
projects/cxl_iscsi/share/man/man4/geom_fox.4
projects/cxl_iscsi/share/man/man4/gif.4
projects/cxl_iscsi/share/man/man4/man4.arm/Makefile.depend
projects/cxl_iscsi/share/man/man4/man4.i386/Makefile.depend
projects/cxl_iscsi/share/man/man4/man4.powerpc/Makefile.depend
projects/cxl_iscsi/share/man/man4/man4.sparc64/Makefile.depend
projects/cxl_iscsi/share/man/man4/ng_pppoe.4
projects/cxl_iscsi/share/man/man4/rsu.4
projects/cxl_iscsi/share/man/man4/usb_quirk.4
projects/cxl_iscsi/share/man/man5/Makefile
projects/cxl_iscsi/share/man/man5/src.conf.5
projects/cxl_iscsi/share/man/man7/hier.7
projects/cxl_iscsi/share/man/man9/Makefile
projects/cxl_iscsi/share/man/man9/VOP_ADVISE.9
projects/cxl_iscsi/share/man/man9/mbuf.9
projects/cxl_iscsi/share/man/man9/stack.9
projects/cxl_iscsi/share/man/man9/timeout.9
projects/cxl_iscsi/share/mk/Makefile
projects/cxl_iscsi/share/mk/bsd.README
projects/cxl_iscsi/share/mk/bsd.files.mk
projects/cxl_iscsi/share/mk/bsd.incs.mk
projects/cxl_iscsi/share/mk/bsd.lib.mk
projects/cxl_iscsi/share/mk/bsd.prog.mk
projects/cxl_iscsi/share/mk/bsd.progs.mk
projects/cxl_iscsi/share/mk/bsd.subdir.mk
projects/cxl_iscsi/share/mk/bsd.sys.mk
projects/cxl_iscsi/share/mk/bsd.test.mk
projects/cxl_iscsi/share/mk/local.meta.sys.mk
projects/cxl_iscsi/share/mk/src.sys.env.mk
projects/cxl_iscsi/share/mk/src.sys.mk
projects/cxl_iscsi/share/mk/suite.test.mk
projects/cxl_iscsi/share/mk/sys.mk
projects/cxl_iscsi/share/msgdef/Makefile
projects/cxl_iscsi/share/security/Makefile.depend
projects/cxl_iscsi/share/vt/fonts/Makefile
projects/cxl_iscsi/sys/amd64/amd64/elf_machdep.c
projects/cxl_iscsi/sys/amd64/amd64/pmap.c
projects/cxl_iscsi/sys/amd64/amd64/trap.c
projects/cxl_iscsi/sys/amd64/include/smp.h
projects/cxl_iscsi/sys/amd64/include/stack.h
projects/cxl_iscsi/sys/arm/allwinner/a20/files.a20
projects/cxl_iscsi/sys/arm/altera/socfpga/files.socfpga
projects/cxl_iscsi/sys/arm/amlogic/aml8726/files.aml8726
projects/cxl_iscsi/sys/arm/arm/elf_machdep.c
projects/cxl_iscsi/sys/arm/arm/pmap-v6-new.c
projects/cxl_iscsi/sys/arm/arm/pmap-v6.c
projects/cxl_iscsi/sys/arm/arm/stack_machdep.c
projects/cxl_iscsi/sys/arm/arm/stdatomic.c
projects/cxl_iscsi/sys/arm/arm/trap-v6.c
projects/cxl_iscsi/sys/arm/arm/trap.c
projects/cxl_iscsi/sys/arm/conf/A20
projects/cxl_iscsi/sys/arm/versatile/versatile_pci.c
projects/cxl_iscsi/sys/arm/xscale/i80321/i80321_pci.c
projects/cxl_iscsi/sys/arm/xscale/i8134x/i81342_pci.c
projects/cxl_iscsi/sys/arm64/arm64/copyinout.S
projects/cxl_iscsi/sys/arm64/arm64/exception.S
projects/cxl_iscsi/sys/arm64/arm64/gic_v3_its.c
projects/cxl_iscsi/sys/arm64/arm64/gic_v3_var.h
projects/cxl_iscsi/sys/arm64/arm64/machdep.c
projects/cxl_iscsi/sys/arm64/arm64/mp_machdep.c
projects/cxl_iscsi/sys/arm64/arm64/pmap.c
projects/cxl_iscsi/sys/arm64/arm64/stack_machdep.c
projects/cxl_iscsi/sys/arm64/arm64/trap.c
projects/cxl_iscsi/sys/arm64/cavium/thunder_pcie_pem.c
projects/cxl_iscsi/sys/arm64/conf/GENERIC
projects/cxl_iscsi/sys/arm64/include/cpu.h
projects/cxl_iscsi/sys/arm64/include/cpufunc.h
projects/cxl_iscsi/sys/boot/efi/boot1/Makefile
projects/cxl_iscsi/sys/boot/efi/libefi/Makefile.depend
projects/cxl_iscsi/sys/boot/efi/loader/Makefile
projects/cxl_iscsi/sys/boot/efi/loader/copy.c
projects/cxl_iscsi/sys/boot/fdt/dts/arm/bcm2836.dtsi
projects/cxl_iscsi/sys/boot/fdt/dts/arm/cubieboard2.dts
projects/cxl_iscsi/sys/boot/ficl/Makefile.depend
projects/cxl_iscsi/sys/boot/i386/boot0/Makefile.depend
projects/cxl_iscsi/sys/boot/i386/boot0sio/Makefile.depend
projects/cxl_iscsi/sys/boot/i386/boot2/Makefile.depend
projects/cxl_iscsi/sys/boot/i386/loader/Makefile.depend
projects/cxl_iscsi/sys/boot/i386/zfsloader/Makefile.depend
projects/cxl_iscsi/sys/boot/usb/usbcore.mk
projects/cxl_iscsi/sys/cam/ctl/README.ctl.txt
projects/cxl_iscsi/sys/cam/ctl/ctl.c
projects/cxl_iscsi/sys/cam/ctl/ctl.h
projects/cxl_iscsi/sys/cam/ctl/ctl_backend.c
projects/cxl_iscsi/sys/cam/ctl/ctl_backend.h
projects/cxl_iscsi/sys/cam/ctl/ctl_backend_block.c
projects/cxl_iscsi/sys/cam/ctl/ctl_backend_ramdisk.c
projects/cxl_iscsi/sys/cam/ctl/ctl_cmd_table.c
projects/cxl_iscsi/sys/cam/ctl/ctl_error.c
projects/cxl_iscsi/sys/cam/ctl/ctl_error.h
projects/cxl_iscsi/sys/cam/ctl/ctl_frontend.c
projects/cxl_iscsi/sys/cam/ctl/ctl_frontend.h
projects/cxl_iscsi/sys/cam/ctl/ctl_frontend_cam_sim.c
projects/cxl_iscsi/sys/cam/ctl/ctl_frontend_ioctl.c
projects/cxl_iscsi/sys/cam/ctl/ctl_frontend_iscsi.c
projects/cxl_iscsi/sys/cam/ctl/ctl_ha.h
projects/cxl_iscsi/sys/cam/ctl/ctl_io.h
projects/cxl_iscsi/sys/cam/ctl/ctl_ioctl.h
projects/cxl_iscsi/sys/cam/ctl/ctl_private.h
projects/cxl_iscsi/sys/cam/ctl/ctl_scsi_all.c
projects/cxl_iscsi/sys/cam/ctl/ctl_ser_table.c
projects/cxl_iscsi/sys/cam/ctl/ctl_tpc.c
projects/cxl_iscsi/sys/cam/ctl/ctl_tpc_local.c
projects/cxl_iscsi/sys/cam/ctl/ctl_util.c
projects/cxl_iscsi/sys/cam/ctl/ctl_util.h
projects/cxl_iscsi/sys/cam/ctl/scsi_ctl.c
projects/cxl_iscsi/sys/cam/scsi/scsi_all.c
projects/cxl_iscsi/sys/cam/scsi/scsi_all.h
projects/cxl_iscsi/sys/cam/scsi/scsi_cd.h
projects/cxl_iscsi/sys/cam/scsi/scsi_ch.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/common/avl/avl.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h
projects/cxl_iscsi/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
projects/cxl_iscsi/sys/compat/linux/linux_dtrace.h
projects/cxl_iscsi/sys/conf/files
projects/cxl_iscsi/sys/conf/files.amd64
projects/cxl_iscsi/sys/conf/files.arm
projects/cxl_iscsi/sys/conf/files.i386
projects/cxl_iscsi/sys/conf/files.mips
projects/cxl_iscsi/sys/conf/files.pc98
projects/cxl_iscsi/sys/conf/files.powerpc
projects/cxl_iscsi/sys/conf/files.sparc64
projects/cxl_iscsi/sys/conf/kern.post.mk
projects/cxl_iscsi/sys/conf/kmod.mk
projects/cxl_iscsi/sys/contrib/ipfilter/netinet/ip_nat.c
projects/cxl_iscsi/sys/contrib/ipfilter/netinet/ip_state.c
projects/cxl_iscsi/sys/dev/acpica/acpi_pcib.c
projects/cxl_iscsi/sys/dev/ahci/ahci_pci.c
projects/cxl_iscsi/sys/dev/ath/if_ath.c
projects/cxl_iscsi/sys/dev/ath/if_ath_beacon.c
projects/cxl_iscsi/sys/dev/ath/if_ath_keycache.c
projects/cxl_iscsi/sys/dev/ath/if_ath_tdma.c
projects/cxl_iscsi/sys/dev/ath/if_athvar.h
projects/cxl_iscsi/sys/dev/bwi/bwimac.c
projects/cxl_iscsi/sys/dev/bwi/bwiphy.c
projects/cxl_iscsi/sys/dev/bwi/bwirf.c
projects/cxl_iscsi/sys/dev/bwi/if_bwi.c
projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_ddp.c
projects/cxl_iscsi/sys/dev/drm2/drm_lock.c
projects/cxl_iscsi/sys/dev/drm2/radeon/radeon_device.c
projects/cxl_iscsi/sys/dev/dwc/if_dwc.c
projects/cxl_iscsi/sys/dev/dwc/if_dwc.h
projects/cxl_iscsi/sys/dev/ipw/if_ipw.c
projects/cxl_iscsi/sys/dev/iwi/if_iwi.c
projects/cxl_iscsi/sys/dev/iwm/if_iwm.c
projects/cxl_iscsi/sys/dev/iwn/if_iwn.c
projects/cxl_iscsi/sys/dev/malo/if_malo.c
projects/cxl_iscsi/sys/dev/malo/if_malo_pci.c
projects/cxl_iscsi/sys/dev/mwl/if_mwl.c
projects/cxl_iscsi/sys/dev/nxge/if_nxge.c
projects/cxl_iscsi/sys/dev/nxge/xgehal/xgehal-fifo.c
projects/cxl_iscsi/sys/dev/nxge/xgehal/xgehal-ring.c
projects/cxl_iscsi/sys/dev/pci/pci_pci.c
projects/cxl_iscsi/sys/dev/ral/rt2560.c
projects/cxl_iscsi/sys/dev/ral/rt2560var.h
projects/cxl_iscsi/sys/dev/ral/rt2661.c
projects/cxl_iscsi/sys/dev/ral/rt2860.c
projects/cxl_iscsi/sys/dev/re/if_re.c
projects/cxl_iscsi/sys/dev/rl/if_rlreg.h
projects/cxl_iscsi/sys/dev/uart/uart_bus_pci.c
projects/cxl_iscsi/sys/dev/usb/controller/uhci_pci.c
projects/cxl_iscsi/sys/dev/usb/controller/xhci_pci.c
projects/cxl_iscsi/sys/dev/usb/quirk/usb_quirk.c
projects/cxl_iscsi/sys/dev/usb/serial/u3g.c
projects/cxl_iscsi/sys/dev/usb/usbdevs
projects/cxl_iscsi/sys/dev/usb/wlan/if_rsu.c
projects/cxl_iscsi/sys/dev/usb/wlan/if_rsureg.h
projects/cxl_iscsi/sys/dev/usb/wlan/if_run.c
projects/cxl_iscsi/sys/dev/usb/wlan/if_runvar.h
projects/cxl_iscsi/sys/dev/usb/wlan/if_uath.c
projects/cxl_iscsi/sys/dev/usb/wlan/if_uathvar.h
projects/cxl_iscsi/sys/dev/usb/wlan/if_ural.c
projects/cxl_iscsi/sys/dev/usb/wlan/if_uralvar.h
projects/cxl_iscsi/sys/dev/usb/wlan/if_urtw.c
projects/cxl_iscsi/sys/dev/usb/wlan/if_urtwn.c
projects/cxl_iscsi/sys/dev/usb/wlan/if_urtwnreg.h
projects/cxl_iscsi/sys/dev/usb/wlan/if_zyd.c
projects/cxl_iscsi/sys/dev/wi/if_wivar.h
projects/cxl_iscsi/sys/dev/wpi/if_wpi.c
projects/cxl_iscsi/sys/dev/wpi/if_wpivar.h
projects/cxl_iscsi/sys/dev/wtap/if_wtap.c
projects/cxl_iscsi/sys/dev/wtap/if_wtapvar.h
projects/cxl_iscsi/sys/dev/xen/pcifront/pcifront.c
projects/cxl_iscsi/sys/fs/fifofs/fifo_vnops.c
projects/cxl_iscsi/sys/geom/geom_dev.c
projects/cxl_iscsi/sys/geom/nop/g_nop.c
projects/cxl_iscsi/sys/geom/nop/g_nop.h
projects/cxl_iscsi/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
projects/cxl_iscsi/sys/i386/i386/elf_machdep.c
projects/cxl_iscsi/sys/i386/i386/pmap.c
projects/cxl_iscsi/sys/i386/i386/trap.c
projects/cxl_iscsi/sys/i386/include/stack.h
projects/cxl_iscsi/sys/kern/kern_event.c
projects/cxl_iscsi/sys/kern/kern_exec.c
projects/cxl_iscsi/sys/kern/kern_exit.c
projects/cxl_iscsi/sys/kern/kern_fork.c
projects/cxl_iscsi/sys/kern/kern_linker.c
projects/cxl_iscsi/sys/kern/kern_proc.c
projects/cxl_iscsi/sys/kern/kern_racct.c
projects/cxl_iscsi/sys/kern/kern_rmlock.c
projects/cxl_iscsi/sys/kern/kern_shutdown.c
projects/cxl_iscsi/sys/kern/kern_sig.c
projects/cxl_iscsi/sys/kern/kern_sysctl.c
projects/cxl_iscsi/sys/kern/kern_tc.c
projects/cxl_iscsi/sys/kern/kern_timeout.c
projects/cxl_iscsi/sys/kern/link_elf.c
projects/cxl_iscsi/sys/kern/link_elf_obj.c
projects/cxl_iscsi/sys/kern/subr_param.c
projects/cxl_iscsi/sys/kern/subr_sbuf.c
projects/cxl_iscsi/sys/kern/subr_syscall.c
projects/cxl_iscsi/sys/kern/vfs_bio.c
projects/cxl_iscsi/sys/kern/vfs_cache.c
projects/cxl_iscsi/sys/kern/vfs_init.c
projects/cxl_iscsi/sys/kern/vfs_lookup.c
projects/cxl_iscsi/sys/kern/vfs_mountroot.c
projects/cxl_iscsi/sys/kern/vfs_subr.c
projects/cxl_iscsi/sys/kern/vfs_syscalls.c
projects/cxl_iscsi/sys/kern/vfs_vnops.c
projects/cxl_iscsi/sys/kern/vnode_if.src
projects/cxl_iscsi/sys/libkern/arm/memclr.S
projects/cxl_iscsi/sys/mips/adm5120/admpci.c
projects/cxl_iscsi/sys/mips/atheros/ar71xx_pci.c
projects/cxl_iscsi/sys/mips/atheros/ar724x_pci.c
projects/cxl_iscsi/sys/mips/atheros/qca955x_pci.c
projects/cxl_iscsi/sys/mips/cavium/octopci.c
projects/cxl_iscsi/sys/mips/idt/idtpci.c
projects/cxl_iscsi/sys/mips/malta/gt_pci.c
projects/cxl_iscsi/sys/mips/mips/elf_machdep.c
projects/cxl_iscsi/sys/mips/mips/pmap.c
projects/cxl_iscsi/sys/mips/mips/stack_machdep.c
projects/cxl_iscsi/sys/mips/mips/trap.c
projects/cxl_iscsi/sys/mips/nlm/xlp_pci.c
projects/cxl_iscsi/sys/mips/rmi/xlr_pci.c
projects/cxl_iscsi/sys/modules/Makefile
projects/cxl_iscsi/sys/modules/ctl/Makefile
projects/cxl_iscsi/sys/modules/netgraph/Makefile
projects/cxl_iscsi/sys/net/if.c
projects/cxl_iscsi/sys/net/if_arcsubr.c
projects/cxl_iscsi/sys/net/if_ethersubr.c
projects/cxl_iscsi/sys/net/if_fddisubr.c
projects/cxl_iscsi/sys/net/if_fwsubr.c
projects/cxl_iscsi/sys/net/if_gif.c
projects/cxl_iscsi/sys/net/if_gif.h
projects/cxl_iscsi/sys/net/if_iso88025subr.c
projects/cxl_iscsi/sys/net/if_llatbl.c
projects/cxl_iscsi/sys/net/if_llatbl.h
projects/cxl_iscsi/sys/net/if_var.h
projects/cxl_iscsi/sys/net/route.c
projects/cxl_iscsi/sys/net80211/_ieee80211.h
projects/cxl_iscsi/sys/net80211/ieee80211.h
projects/cxl_iscsi/sys/net80211/ieee80211_freebsd.c
projects/cxl_iscsi/sys/net80211/ieee80211_freebsd.h
projects/cxl_iscsi/sys/net80211/ieee80211_ht.c
projects/cxl_iscsi/sys/net80211/ieee80211_ht.h
projects/cxl_iscsi/sys/net80211/ieee80211_input.c
projects/cxl_iscsi/sys/net80211/ieee80211_mesh.c
projects/cxl_iscsi/sys/net80211/ieee80211_node.h
projects/cxl_iscsi/sys/net80211/ieee80211_output.c
projects/cxl_iscsi/sys/net80211/ieee80211_proto.c
projects/cxl_iscsi/sys/net80211/ieee80211_proto.h
projects/cxl_iscsi/sys/net80211/ieee80211_scan_sta.c
projects/cxl_iscsi/sys/net80211/ieee80211_superg.c
projects/cxl_iscsi/sys/net80211/ieee80211_var.h
projects/cxl_iscsi/sys/netgraph/ng_pppoe.c
projects/cxl_iscsi/sys/netgraph/ng_pppoe.h
projects/cxl_iscsi/sys/netinet/if_ether.c
projects/cxl_iscsi/sys/netinet/if_ether.h
projects/cxl_iscsi/sys/netinet/in.c
projects/cxl_iscsi/sys/netinet/in_kdtrace.c
projects/cxl_iscsi/sys/netinet/in_kdtrace.h
projects/cxl_iscsi/sys/netinet/ip_carp.c
projects/cxl_iscsi/sys/netinet/sctp.h
projects/cxl_iscsi/sys/netinet/sctp_auth.c
projects/cxl_iscsi/sys/netinet/sctp_constants.h
projects/cxl_iscsi/sys/netinet/sctp_header.h
projects/cxl_iscsi/sys/netinet/sctp_indata.c
projects/cxl_iscsi/sys/netinet/sctp_input.c
projects/cxl_iscsi/sys/netinet/sctp_output.c
projects/cxl_iscsi/sys/netinet/sctp_sysctl.h
projects/cxl_iscsi/sys/netinet/tcp_input.c
projects/cxl_iscsi/sys/netinet/tcp_output.c
projects/cxl_iscsi/sys/netinet/tcp_reass.c
projects/cxl_iscsi/sys/netinet/tcp_subr.c
projects/cxl_iscsi/sys/netinet/tcp_timer.c
projects/cxl_iscsi/sys/netinet/tcp_usrreq.c
projects/cxl_iscsi/sys/netinet/tcp_var.h
projects/cxl_iscsi/sys/netinet/toecore.c
projects/cxl_iscsi/sys/netinet6/icmp6.c
projects/cxl_iscsi/sys/netinet6/in6.c
projects/cxl_iscsi/sys/netinet6/in6_ifattach.c
projects/cxl_iscsi/sys/netinet6/in6_var.h
projects/cxl_iscsi/sys/netinet6/ip6_forward.c
projects/cxl_iscsi/sys/netinet6/ip6_output.c
projects/cxl_iscsi/sys/netinet6/nd6.c
projects/cxl_iscsi/sys/netinet6/nd6.h
projects/cxl_iscsi/sys/netinet6/nd6_nbr.c
projects/cxl_iscsi/sys/netinet6/nd6_rtr.c
projects/cxl_iscsi/sys/netinet6/udp6_usrreq.c
projects/cxl_iscsi/sys/netpfil/pf/pf.c
projects/cxl_iscsi/sys/nfs/nfs_diskless.c
projects/cxl_iscsi/sys/ofed/drivers/infiniband/core/addr.c
projects/cxl_iscsi/sys/ofed/drivers/infiniband/core/mad.c
projects/cxl_iscsi/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
projects/cxl_iscsi/sys/powerpc/include/spr.h
projects/cxl_iscsi/sys/powerpc/ofw/ofw_pci.c
projects/cxl_iscsi/sys/powerpc/powerpc/elf32_machdep.c
projects/cxl_iscsi/sys/powerpc/powerpc/elf64_machdep.c
projects/cxl_iscsi/sys/powerpc/powerpc/stack_machdep.c
projects/cxl_iscsi/sys/powerpc/powerpc/trap.c
projects/cxl_iscsi/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
projects/cxl_iscsi/sys/sparc64/ebus/ebus.c
projects/cxl_iscsi/sys/sparc64/include/smp.h
projects/cxl_iscsi/sys/sparc64/pci/fire.c
projects/cxl_iscsi/sys/sparc64/pci/firereg.h
projects/cxl_iscsi/sys/sparc64/pci/firevar.h
projects/cxl_iscsi/sys/sparc64/pci/ofw_pci.h
projects/cxl_iscsi/sys/sparc64/pci/psycho.c
projects/cxl_iscsi/sys/sparc64/pci/psychoreg.h
projects/cxl_iscsi/sys/sparc64/pci/psychovar.h
projects/cxl_iscsi/sys/sparc64/pci/schizo.c
projects/cxl_iscsi/sys/sparc64/pci/schizoreg.h
projects/cxl_iscsi/sys/sparc64/pci/schizovar.h
projects/cxl_iscsi/sys/sparc64/sparc64/elf_machdep.c
projects/cxl_iscsi/sys/sparc64/sparc64/stack_machdep.c
projects/cxl_iscsi/sys/sparc64/sparc64/trap.c
projects/cxl_iscsi/sys/sys/conf.h
projects/cxl_iscsi/sys/sys/elf_common.h
projects/cxl_iscsi/sys/sys/linker.h
projects/cxl_iscsi/sys/sys/reboot.h
projects/cxl_iscsi/sys/sys/stack.h
projects/cxl_iscsi/sys/sys/sysctl.h
projects/cxl_iscsi/sys/sys/systm.h
projects/cxl_iscsi/sys/sys/types.h
projects/cxl_iscsi/sys/sys/vmmeter.h
projects/cxl_iscsi/sys/sys/vnode.h
projects/cxl_iscsi/sys/tools/vnode_if.awk
projects/cxl_iscsi/sys/vm/uma_core.c
projects/cxl_iscsi/sys/vm/vm_kern.c
projects/cxl_iscsi/sys/vm/vm_map.c
projects/cxl_iscsi/sys/vm/vm_meter.c
projects/cxl_iscsi/sys/vm/vm_page.c
projects/cxl_iscsi/sys/vm/vm_page.h
projects/cxl_iscsi/sys/vm/vm_pageout.c
projects/cxl_iscsi/sys/vm/vm_param.h
projects/cxl_iscsi/sys/x86/acpica/madt.c
projects/cxl_iscsi/sys/x86/include/apicvar.h
projects/cxl_iscsi/sys/x86/iommu/intel_ctx.c
projects/cxl_iscsi/sys/x86/pci/pci_bus.c
projects/cxl_iscsi/sys/x86/pci/qpi.c
projects/cxl_iscsi/sys/x86/x86/local_apic.c
projects/cxl_iscsi/sys/x86/x86/mp_x86.c
projects/cxl_iscsi/sys/x86/x86/mptable_pci.c
projects/cxl_iscsi/targets/pseudo/bootstrap-tools/Makefile (contents, props changed)
projects/cxl_iscsi/targets/pseudo/bootstrap-tools/Makefile.depend.host (contents, props changed)
projects/cxl_iscsi/targets/pseudo/clang/Makefile.depend
projects/cxl_iscsi/targets/pseudo/gcc/Makefile.depend
projects/cxl_iscsi/targets/pseudo/hosttools/Makefile.depend
projects/cxl_iscsi/targets/pseudo/kernel/Makefile.depend
projects/cxl_iscsi/targets/pseudo/the-lot/Makefile.depend
projects/cxl_iscsi/targets/pseudo/toolchain/Makefile.depend
projects/cxl_iscsi/targets/pseudo/universe/Makefile.depend
projects/cxl_iscsi/targets/pseudo/userland/Makefile.depend
projects/cxl_iscsi/targets/pseudo/userland/cddl/Makefile.depend
projects/cxl_iscsi/targets/pseudo/userland/games/Makefile.depend
projects/cxl_iscsi/targets/pseudo/userland/gnu/Makefile.depend
projects/cxl_iscsi/targets/pseudo/userland/include/Makefile.depend
projects/cxl_iscsi/targets/pseudo/userland/kerberos5/Makefile.depend
projects/cxl_iscsi/targets/pseudo/userland/lib/Makefile.depend
projects/cxl_iscsi/targets/pseudo/userland/libexec/Makefile.depend
projects/cxl_iscsi/targets/pseudo/userland/misc/Makefile.depend
projects/cxl_iscsi/targets/pseudo/userland/secure/Makefile.depend
projects/cxl_iscsi/targets/pseudo/userland/share/Makefile.depend
projects/cxl_iscsi/tests/sys/kern/ptrace_test.c
projects/cxl_iscsi/tools/build/Makefile.depend
projects/cxl_iscsi/tools/build/mk/OptionalObsoleteFiles.inc
projects/cxl_iscsi/tools/build/options/WITH_META_MODE
projects/cxl_iscsi/tools/build/options/makeman
projects/cxl_iscsi/tools/regression/include/stdatomic/Makefile.depend
projects/cxl_iscsi/tools/tools/ath/ath_ee_9300_print/Makefile.depend
projects/cxl_iscsi/tools/tools/drm/radeon/mkregtable/Makefile.depend
projects/cxl_iscsi/tools/tools/makeroot/Makefile.depend
projects/cxl_iscsi/tools/tools/usbtest/Makefile
projects/cxl_iscsi/tools/tools/usbtest/Makefile.depend
projects/cxl_iscsi/usr.bin/bmake/Makefile.inc
projects/cxl_iscsi/usr.bin/ctlstat/ctlstat.8
projects/cxl_iscsi/usr.bin/ctlstat/ctlstat.c
projects/cxl_iscsi/usr.bin/elfdump/elfdump.c
projects/cxl_iscsi/usr.bin/lex/Makefile.depend
projects/cxl_iscsi/usr.bin/login/login.c
projects/cxl_iscsi/usr.bin/login/login_fbtab.c
projects/cxl_iscsi/usr.bin/man/man.sh
projects/cxl_iscsi/usr.bin/mkcsmapper_static/Makefile.depend
projects/cxl_iscsi/usr.bin/netstat/Makefile.depend
projects/cxl_iscsi/usr.bin/netstat/flowtable.c
projects/cxl_iscsi/usr.bin/netstat/if.c
projects/cxl_iscsi/usr.bin/netstat/inet.c
projects/cxl_iscsi/usr.bin/netstat/inet6.c
projects/cxl_iscsi/usr.bin/netstat/main.c
projects/cxl_iscsi/usr.bin/netstat/mbuf.c
projects/cxl_iscsi/usr.bin/netstat/mroute.c
projects/cxl_iscsi/usr.bin/netstat/mroute6.c
projects/cxl_iscsi/usr.bin/netstat/netstat.h
projects/cxl_iscsi/usr.bin/netstat/sctp.c
projects/cxl_iscsi/usr.bin/pamtest/Makefile.depend
projects/cxl_iscsi/usr.bin/procstat/Makefile.depend
projects/cxl_iscsi/usr.bin/rctl/rctl.8
projects/cxl_iscsi/usr.bin/setchannel/Makefile.depend
projects/cxl_iscsi/usr.bin/smbutil/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/Makefile
projects/cxl_iscsi/usr.bin/svn/lib/libapr/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/lib/libapr_util/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/lib/libserf/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/lib/libsvn_client/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/lib/libsvn_delta/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/lib/libsvn_diff/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/lib/libsvn_fs/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/lib/libsvn_fs_fs/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/lib/libsvn_fs_util/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/lib/libsvn_ra/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/lib/libsvn_ra_local/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/lib/libsvn_ra_serf/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/lib/libsvn_ra_svn/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/lib/libsvn_repos/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/lib/libsvn_subr/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/lib/libsvn_wc/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/svn/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/svnadmin/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/svndumpfilter/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/svnlook/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/svnmucc/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/svnrdump/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/svnserve/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/svnsync/Makefile.depend
projects/cxl_iscsi/usr.bin/svn/svnversion/Makefile.depend
projects/cxl_iscsi/usr.bin/systat/Makefile
projects/cxl_iscsi/usr.bin/systat/cmdtab.c
projects/cxl_iscsi/usr.bin/systat/extern.h
projects/cxl_iscsi/usr.bin/systat/iostat.c
projects/cxl_iscsi/usr.bin/systat/main.c
projects/cxl_iscsi/usr.bin/systat/netstat.c
projects/cxl_iscsi/usr.bin/systat/pigs.c
projects/cxl_iscsi/usr.bin/systat/systat.1
projects/cxl_iscsi/usr.bin/systat/systat.h
projects/cxl_iscsi/usr.bin/systat/vmstat.c
projects/cxl_iscsi/usr.bin/tip/tip/Makefile
projects/cxl_iscsi/usr.bin/usbhidaction/usbhidaction.c
projects/cxl_iscsi/usr.bin/vgrind/RETEST/Makefile.depend
projects/cxl_iscsi/usr.bin/vmstat/vmstat.c
projects/cxl_iscsi/usr.bin/w/Makefile
projects/cxl_iscsi/usr.bin/w/w.c
projects/cxl_iscsi/usr.bin/wc/Makefile.depend
projects/cxl_iscsi/usr.bin/xinstall/install.1
projects/cxl_iscsi/usr.bin/xinstall/xinstall.c
projects/cxl_iscsi/usr.bin/yacc/tests/Makefile
projects/cxl_iscsi/usr.sbin/Makefile.mips
projects/cxl_iscsi/usr.sbin/acpi/acpiconf/acpiconf.8
projects/cxl_iscsi/usr.sbin/amd/Makefile
projects/cxl_iscsi/usr.sbin/apmd/Makefile.depend
projects/cxl_iscsi/usr.sbin/arp/arp.c
projects/cxl_iscsi/usr.sbin/bhyve/acpi.c
projects/cxl_iscsi/usr.sbin/bluetooth/hccontrol/le.c
projects/cxl_iscsi/usr.sbin/boot98cfg/Makefile.depend
projects/cxl_iscsi/usr.sbin/bsdconfig/packages/Makefile.depend
projects/cxl_iscsi/usr.sbin/bsdconfig/packages/include/Makefile.depend
projects/cxl_iscsi/usr.sbin/bsdconfig/share/common.subr
projects/cxl_iscsi/usr.sbin/bsdconfig/share/packages/Makefile.depend
projects/cxl_iscsi/usr.sbin/bsdinstall/Makefile
projects/cxl_iscsi/usr.sbin/bsdinstall/Makefile.depend
projects/cxl_iscsi/usr.sbin/bsdinstall/scripts/auto
projects/cxl_iscsi/usr.sbin/bsdinstall/scripts/config
projects/cxl_iscsi/usr.sbin/bsdinstall/scripts/docsinstall
projects/cxl_iscsi/usr.sbin/bsdinstall/scripts/hostname
projects/cxl_iscsi/usr.sbin/bsdinstall/scripts/jail
projects/cxl_iscsi/usr.sbin/bsdinstall/scripts/keymap
projects/cxl_iscsi/usr.sbin/bsdinstall/scripts/netconfig_ipv4
projects/cxl_iscsi/usr.sbin/bsdinstall/scripts/netconfig_ipv6
projects/cxl_iscsi/usr.sbin/bsdinstall/scripts/rootpass
projects/cxl_iscsi/usr.sbin/bsdinstall/scripts/script
projects/cxl_iscsi/usr.sbin/bsdinstall/scripts/wlanconfig
projects/cxl_iscsi/usr.sbin/bsdinstall/scripts/zfsboot
projects/cxl_iscsi/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend
projects/cxl_iscsi/usr.sbin/ctladm/ctladm.8
projects/cxl_iscsi/usr.sbin/ctladm/ctladm.c
projects/cxl_iscsi/usr.sbin/ctld/ctl.conf.5
projects/cxl_iscsi/usr.sbin/ctld/ctld.c
projects/cxl_iscsi/usr.sbin/ctld/ctld.h
projects/cxl_iscsi/usr.sbin/ctld/kernel.c
projects/cxl_iscsi/usr.sbin/ctld/login.c
projects/cxl_iscsi/usr.sbin/ctld/parse.y
projects/cxl_iscsi/usr.sbin/ctld/token.l
projects/cxl_iscsi/usr.sbin/eeprom/Makefile.depend
projects/cxl_iscsi/usr.sbin/fifolog/Makefile
projects/cxl_iscsi/usr.sbin/fstyp/Makefile
projects/cxl_iscsi/usr.sbin/fstyp/zfs.c
projects/cxl_iscsi/usr.sbin/gssd/gssd.c
projects/cxl_iscsi/usr.sbin/gstat/gstat.c
projects/cxl_iscsi/usr.sbin/i2c/i2c.c
projects/cxl_iscsi/usr.sbin/inetd/inetd.c
projects/cxl_iscsi/usr.sbin/kgzip/Makefile.depend
projects/cxl_iscsi/usr.sbin/lpr/Makefile
projects/cxl_iscsi/usr.sbin/lpr/filters.ru/Makefile.depend
projects/cxl_iscsi/usr.sbin/mount_smbfs/Makefile.depend
projects/cxl_iscsi/usr.sbin/ndiscvt/inf.c
projects/cxl_iscsi/usr.sbin/ndiscvt/inf.h
projects/cxl_iscsi/usr.sbin/ndp/ndp.c
projects/cxl_iscsi/usr.sbin/ngctl/dot.c
projects/cxl_iscsi/usr.sbin/nmtree/Makefile.depend
projects/cxl_iscsi/usr.sbin/ntp/ntpdc/Makefile
projects/cxl_iscsi/usr.sbin/ofwdump/Makefile.depend
projects/cxl_iscsi/usr.sbin/pc-sysinstall/Makefile
projects/cxl_iscsi/usr.sbin/pnpinfo/Makefile.depend
projects/cxl_iscsi/usr.sbin/pw/pw_user.c
projects/cxl_iscsi/usr.sbin/rtsold/Makefile
projects/cxl_iscsi/usr.sbin/rtsold/if.c
projects/cxl_iscsi/usr.sbin/rtsold/rtsold.c
projects/cxl_iscsi/usr.sbin/sesutil/Makefile
projects/cxl_iscsi/usr.sbin/sesutil/sesutil.8
projects/cxl_iscsi/usr.sbin/sesutil/sesutil.c
projects/cxl_iscsi/usr.sbin/sysrc/Makefile
projects/cxl_iscsi/usr.sbin/unbound/Makefile
projects/cxl_iscsi/usr.sbin/unbound/local-setup/local-unbound-setup.sh
projects/cxl_iscsi/usr.sbin/vigr/Makefile
projects/cxl_iscsi/usr.sbin/wlconfig/Makefile.depend
projects/cxl_iscsi/usr.sbin/wpa/Makefile
projects/cxl_iscsi/usr.sbin/yppoll/Makefile.depend
Directory Properties:
projects/cxl_iscsi/ (props changed)
projects/cxl_iscsi/cddl/ (props changed)
projects/cxl_iscsi/cddl/contrib/opensolaris/ (props changed)
projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zfs/ (props changed)
projects/cxl_iscsi/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
projects/cxl_iscsi/contrib/binutils/ (props changed)
projects/cxl_iscsi/contrib/elftoolchain/ (props changed)
projects/cxl_iscsi/contrib/elftoolchain/elfdump/ (props changed)
projects/cxl_iscsi/contrib/file/ (props changed)
projects/cxl_iscsi/contrib/libcxxrt/ (props changed)
projects/cxl_iscsi/contrib/llvm/ (props changed)
projects/cxl_iscsi/contrib/llvm/projects/libunwind/ (props changed)
projects/cxl_iscsi/contrib/netcat/ (props changed)
projects/cxl_iscsi/contrib/openpam/ (props changed)
projects/cxl_iscsi/contrib/unbound/ (props changed)
projects/cxl_iscsi/etc/ (props changed)
projects/cxl_iscsi/gnu/lib/ (props changed)
projects/cxl_iscsi/gnu/usr.bin/binutils/ (props changed)
projects/cxl_iscsi/gnu/usr.bin/cc/cc_tools/ (props changed)
projects/cxl_iscsi/include/ (props changed)
projects/cxl_iscsi/lib/libc/ (props changed)
projects/cxl_iscsi/lib/libc/stdtime/ (props changed)
projects/cxl_iscsi/lib/libz/ (props changed)
projects/cxl_iscsi/sbin/ (props changed)
projects/cxl_iscsi/share/ (props changed)
projects/cxl_iscsi/share/man/man4/ (props changed)
projects/cxl_iscsi/sys/ (props changed)
projects/cxl_iscsi/sys/boot/ (props changed)
projects/cxl_iscsi/sys/cddl/contrib/opensolaris/ (props changed)
projects/cxl_iscsi/sys/conf/ (props changed)
projects/cxl_iscsi/sys/contrib/ipfilter/ (props changed)
projects/cxl_iscsi/targets/ (props changed)
projects/cxl_iscsi/usr.bin/procstat/ (props changed)
projects/cxl_iscsi/usr.sbin/bhyve/ (props changed)
projects/cxl_iscsi/usr.sbin/ndiscvt/ (props changed)
projects/cxl_iscsi/usr.sbin/rtsold/ (props changed)
Modified: projects/cxl_iscsi/Makefile
==============================================================================
--- projects/cxl_iscsi/Makefile Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/Makefile Mon Sep 28 17:30:07 2015 (r288343)
@@ -381,17 +381,8 @@ kernel-toolchains:
# existing system is.
#
.if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets)
-# XXX Add arm64 to universe only if we have an external binutils installed.
-# It does not build with the in-tree linker.
-.if exists(/usr/local/aarch64-freebsd/bin/ld)
-UNIVERSE_arm64=arm64
-.elif empty(${TARGETS})
-universe: universe_arm64_skip
-universe_epilogue: universe_arm64_skip
-universe_arm64_skip: universe_prologue
- @echo ">> arm64 skipped - install aarch64-binutils port or package to build"
-.endif
-TARGETS?=amd64 arm ${UNIVERSE_arm64} i386 mips pc98 powerpc sparc64
+TARGETS?=amd64 arm arm64 i386 mips pc98 powerpc sparc64
+_UNIVERSE_TARGETS= ${TARGETS}
TARGET_ARCHES_arm?= arm armeb armv6 armv6hf
TARGET_ARCHES_arm64?= aarch64
TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32
@@ -401,6 +392,16 @@ TARGET_ARCHES_pc98?= i386
TARGET_ARCHES_${target}?= ${target}
.endfor
+# XXX Add arm64 to universe only if we have an external binutils installed.
+# It does not build with the in-tree linker.
+.if !exists(/usr/local/aarch64-freebsd/bin/ld) && empty(${TARGETS})
+_UNIVERSE_TARGETS:= ${_UNIVERSE_TARGETS:Narm64}
+universe: universe_arm64_skip
+universe_epilogue: universe_arm64_skip
+universe_arm64_skip: universe_prologue
+ @echo ">> arm64 skipped - install aarch64-binutils port or package to build"
+.endif
+
.if defined(UNIVERSE_TARGET)
MAKE_JUST_WORLDS= YES
.else
@@ -432,7 +433,7 @@ universe_prologue:
.if defined(DOING_TINDERBOX)
@rm -f ${FAILFILE}
.endif
-.for target in ${TARGETS}
+.for target in ${_UNIVERSE_TARGETS}
universe: universe_${target}
universe_epilogue: universe_${target}
universe_${target}: universe_${target}_prologue
Modified: projects/cxl_iscsi/Makefile.inc1
==============================================================================
--- projects/cxl_iscsi/Makefile.inc1 Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/Makefile.inc1 Mon Sep 28 17:30:07 2015 (r288343)
@@ -257,9 +257,8 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/i
WORLDTMP=${WORLDTMP} \
VERSION="${VERSION}" \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
-BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
- ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
- DESTDIR= \
+# need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile
+BSARGS= DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
MK_HTML=no NO_LINT=yes MK_MAN=no \
@@ -267,7 +266,11 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
MK_LLDB=no MK_TESTS=no \
- MK_INCLUDES=yes
+ MK_INCLUDES=yes
+
+BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
+ ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
+ ${BSARGS}
# build-tools stage
TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -330,6 +333,7 @@ CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN
# support the target architecture), provide a default cross-binutils prefix.
# This allows aarch64 builds, for example, to automatically use the
# aarch64-binutils port or package.
+.if !make(showconfig)
.if !empty(BROKEN_OPTIONS:MBINUTILS_BOOTSTRAP) && \
!defined(CROSS_BINUTILS_PREFIX)
CROSS_BINUTILS_PREFIX=/usr/local/${TARGET_ARCH}-freebsd/bin/
@@ -337,6 +341,7 @@ CROSS_BINUTILS_PREFIX=/usr/local/${TARGE
.error In-tree binutils does not support the ${TARGET_ARCH} architecture. Install the ${TARGET_ARCH}-binutils port or package or set CROSS_BINUTILS_PREFIX.
.endif
.endif
+.endif
XCOMPILERS= CC CXX CPP
.for COMPILER in ${XCOMPILERS}
@@ -1253,12 +1258,12 @@ update:
# ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
.if ${BOOTSTRAPPING} < 1100006
-_elftoolchain_libs= lib/libelf lib/libdwarf
+_elftoolchain_libs= lib/libelf lib/libdwarf
.endif
legacy:
.if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0
- @echo "ERROR: Source upgrades from versions prior to 8.0 not supported."; \
+ @echo "ERROR: Source upgrades from versions prior to 8.0 are not supported."; \
false
.endif
.for _tool in tools/build ${_elftoolchain_libs}
@@ -1277,7 +1282,7 @@ legacy:
# binaries is usually quite narrow. Bootstrap tools use the host's compiler and
# libraries, augmented by -legacy.
#
-_bt= _bootstrap-tools
+_bt= _bootstrap-tools
.if ${MK_GAMES} != "no"
_strfile= games/fortune/strfile
@@ -1355,20 +1360,6 @@ ${_bt}-usr.bin/clang/clang-tblgen: ${_bt
${_bt}-usr.bin/clang/tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/libllvmsupport
.endif
-# ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
-# dtrace tools are required for older bootstrap env and cross-build
-# pre libdwarf
-.if ${BOOTSTRAPPING} < 1100006 || (${MACHINE} != ${TARGET} || \
- ${MACHINE_ARCH} != ${TARGET_ARCH})
-.if ${MK_CDDL} != "no"
-_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf cddl/usr.bin/ctfconvert \
- cddl/usr.bin/ctfmerge
-
-${_bt}-cddl/usr.bin/ctfconvert: ${_bt}-cddl/lib/libctf
-${_bt}-cddl/usr.bin/ctfmerge: ${_bt}-cddl/lib/libctf
-.endif
-.endif
-
# Default to building the GPL DTC, but build the BSDL one if users explicitly
# request it.
_dtc= usr.bin/dtc
@@ -1408,7 +1399,6 @@ bootstrap-tools: .PHONY
.for _tool in \
${_clang_tblgen} \
${_kerberos5_bootstrap_tools} \
- ${_dtrace_tools} \
${_strfile} \
${_gperf} \
${_groff} \
@@ -1504,6 +1494,13 @@ _btxld= usr.sbin/btxld
.endif
.endif
+# Rebuild ctfconvert and ctfmerge to avoid difficult-to-diagnose failures
+# resulting from missing bug fixes or ELF Toolchain updates.
+.if ${MK_CDDL} != "no"
+_dtrace_tools= cddl/lib/libctf cddl/usr.bin/ctfconvert \
+ cddl/usr.bin/ctfmerge
+.endif
+
# If we're given an XAS, don't build binutils.
.if ${XAS:M/*} == ""
.if ${MK_BINUTILS_BOOTSTRAP} != "no"
@@ -1547,6 +1544,7 @@ cross-tools: .MAKE
${_clang} \
${_binutils} \
${_elftctools} \
+ ${_dtrace_tools} \
${_cc} \
${_btxld} \
${_crunchide} \
Modified: projects/cxl_iscsi/ObsoleteFiles.inc
==============================================================================
--- projects/cxl_iscsi/ObsoleteFiles.inc Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/ObsoleteFiles.inc Mon Sep 28 17:30:07 2015 (r288343)
@@ -38,6 +38,14 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20150928: unused sgsmsg utility is removed
+OLD_FILES+=usr/bin/sgsmsg
+# 20150926: remove links to removed/unimplemented mbuf(9) macros
+OLD_FILES+=usr/share/man/man9/MEXT_ADD_REF.9.gz
+OLD_FILES+=usr/share/man/man9/MEXTFREE.9.gz
+OLD_FILES+=usr/share/man/man9/MEXT_IS_REF.9.gz
+OLD_FILES+=usr/share/man/man9/MEXT_REM_REF.9.gz
+OLD_FILES+=usr/share/man/man9/MFREE.9.gz
# 20150818: *allocm() are gone in jemalloc 4.0.0
OLD_FILES+=usr/share/man/man3/allocm.3.gz
OLD_FILES+=usr/share/man/man3/dallocm.3.gz
@@ -483,8 +491,6 @@ OLD_FILES+=usr/share/man/man9/splstatclo
OLD_FILES+=usr/share/man/man9/spltty.9.gz
OLD_FILES+=usr/share/man/man9/splvm.9.gz
OLD_FILES+=usr/share/man/man9/splx.9.gz
-# 20150122: callout changes reverted
-OLD_FILES+=usr/share/man/man9/callout_drain_async.9.gz
# 20150118: toeplitz.c moved from netinet to net
OLD_FILES+=usr/include/netinet/toeplitz.h
# 20150118: new clang import which bumps version from 3.5.0 to 3.5.1.
@@ -7236,6 +7242,12 @@ OLD_LIBS+=usr/lib/libposix1e.so.2
OLD_LIBS+=usr/lib/libskey.so.2
OLD_LIBS+=usr/lib/libusbhid.so.0
OLD_LIBS+=usr/lib/libvgl.so.2
+# 20030218: OpenSSL 0.9.7 import
+OLD_FILES+=usr/include/des.h
+OLD_FILES+=usr/lib/libdes.a
+OLD_FILES+=usr/lib/libdes.so
+OLD_LIBS+=usr/lib/libdes.so.3
+OLD_FILES+=usr/lib/libdes_p.a
# 200302XX
OLD_LIBS+=usr/lib/libacl.so.3
OLD_LIBS+=usr/lib/libasn1.so.5
@@ -7294,6 +7306,8 @@ OLD_LIBS+=usr/lib/libtermcap.so.2
OLD_LIBS+=usr/lib/libutil.so.2
OLD_LIBS+=usr/lib/libvgl.so.1
OLD_LIBS+=usr/lib/libwrap.so.2
+# 19991216
+OLD_FILES+=usr/sbin/xntpdc
# 199909XX
OLD_LIBS+=usr/lib/libc_r.so.3
# ???
Modified: projects/cxl_iscsi/UPDATING
==============================================================================
--- projects/cxl_iscsi/UPDATING Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/UPDATING Mon Sep 28 17:30:07 2015 (r288343)
@@ -31,6 +31,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20150924:
+ Kernel debug files have been moved to /usr/lib/debug/boot/kernel/,
+ and renamed from .symbols to .debug. This reduces the size requirements
+ on the boot partition or file system and provides consistency with
+ userland debug files.
+
+ When using the supported kernel installation method the
+ /usr/lib/debug/boot/kernel directory will be renamed (to kernel.old)
+ as is done with /boot/kernel.
+
+ Developers wishing to maintain the historical behavior of installing
+ debug files in /boot/kernel/ can set KERN_DEBUGDIR="" in src.conf(5).
+
20150827:
The wireless drivers had undergone changes that remove the 'parent
interface' from the ifconfig -l output. The rc.d network scripts
Modified: projects/cxl_iscsi/bin/ls/Makefile
==============================================================================
--- projects/cxl_iscsi/bin/ls/Makefile Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/bin/ls/Makefile Mon Sep 28 17:30:07 2015 (r288343)
@@ -13,4 +13,8 @@ CFLAGS+= -DCOLORLS
LIBADD+= termcapw
.endif
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Modified: projects/cxl_iscsi/bin/ls/ls.1
==============================================================================
--- projects/cxl_iscsi/bin/ls/ls.1 Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/bin/ls/ls.1 Mon Sep 28 17:30:07 2015 (r288343)
@@ -32,7 +32,7 @@
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
.\" $FreeBSD$
.\"
-.Dd June 8, 2015
+.Dd September 27, 2015
.Dt LS 1
.Os
.Sh NAME
@@ -296,9 +296,9 @@ subsection below, except (if the long fo
the directory totals are not output when the output is in a
single column, even if multi-column output is requested.
.It Fl t
-Sort by descending time modified (most recently modified first). If two files
-have the same modification timestamp, sort their names in ascending
-lexicographical order.
+Sort by descending time modified (most recently modified first).
+If two files have the same modification timestamp, sort their names
+in ascending lexicographical order.
The
.Fl r
option reverses both of these sort orders.
@@ -320,7 +320,7 @@ or use the
option.
This causes
.Nm
-to reverse the lexicographal sort order when sorting files with the
+to reverse the lexicographical sort order when sorting files with the
same modification timestamp.
.It Fl u
Use time of last access,
Modified: projects/cxl_iscsi/bin/ps/Makefile.depend
==============================================================================
--- projects/cxl_iscsi/bin/ps/Makefile.depend Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/bin/ps/Makefile.depend Mon Sep 28 17:30:07 2015 (r288343)
@@ -11,6 +11,7 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libjail \
lib/libkvm \
+ lib/libutil \
lib/libxo \
lib/msun \
Modified: projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Sep 28 17:30:07 2015 (r288343)
@@ -1205,7 +1205,9 @@ snprintf_blkptr_compact(char *blkbuf, si
if (BP_IS_HOLE(bp)) {
(void) snprintf(blkbuf + strlen(blkbuf),
- buflen - strlen(blkbuf), "B=%llu",
+ buflen - strlen(blkbuf),
+ "%llxL B=%llu",
+ (u_longlong_t)BP_GET_LSIZE(bp),
(u_longlong_t)bp->blk_birth);
} else {
(void) snprintf(blkbuf + strlen(blkbuf),
Modified: projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Mon Sep 28 17:30:07 2015 (r288343)
@@ -31,7 +31,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd July 30, 2015
+.Dd September 14, 2015
.Dt ZFS 8
.Os
.Sh NAME
@@ -2144,7 +2144,8 @@ Property name
.It value
Property value
.It source
-Property source. Can either be local, default, temporary, inherited, or none
+Property source. Can either be local, default, temporary, inherited, received,
+or none
(\&-).
.El
.Pp
@@ -2210,8 +2211,11 @@ The default value is all sources.
.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ...
.Xc
.Pp
-Clears the specified property, causing it to be inherited from an ancestor. If
-no ancestor has the property set, then the default value is used. See the
+Clears the specified property, causing it to be inherited from an ancestor,
+restored to default if no ancestor has the property set, or with the
+.Fl S
+option reverted to the received value if one exists.
+See the
.Qq Sx Properties
section for a listing of default values, and details on which properties can be
inherited.
@@ -2219,8 +2223,10 @@ inherited.
.It Fl r
Recursively inherit the given property for all children.
.It Fl S
-For properties with a received value, revert to this value. This flag has no
-effect on properties that do not have a received value.
+Revert the property to the received value if one exists; otherwise operate as
+if the
+.Fl S
+option was not specified.
.El
.It Xo
.Nm
Modified: projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Sep 28 17:30:07 2015 (r288343)
@@ -1928,9 +1928,13 @@ zfs_do_inherit(int argc, char **argv)
if (prop == ZFS_PROP_QUOTA ||
prop == ZFS_PROP_RESERVATION ||
prop == ZFS_PROP_REFQUOTA ||
- prop == ZFS_PROP_REFRESERVATION)
+ prop == ZFS_PROP_REFRESERVATION) {
(void) fprintf(stderr, gettext("use 'zfs set "
"%s=none' to clear\n"), propname);
+ (void) fprintf(stderr, gettext("use 'zfs "
+ "inherit -S %s' to revert to received "
+ "value\n"), propname);
+ }
return (1);
}
if (received && (prop == ZFS_PROP_VOLSIZE ||
Modified: projects/cxl_iscsi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
==============================================================================
--- projects/cxl_iscsi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c Mon Sep 28 17:30:07 2015 (r288343)
@@ -55,7 +55,6 @@
#include "zfs_prop.h"
#include "zfeature_common.h"
-int aok;
int
libzfs_errno(libzfs_handle_t *hdl)
Modified: projects/cxl_iscsi/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==============================================================================
--- projects/cxl_iscsi/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Mon Sep 28 17:30:07 2015 (r288343)
@@ -45,7 +45,9 @@
* Emulation of kernel services in userland.
*/
+#ifndef __FreeBSD__
int aok;
+#endif
uint64_t physmem;
vnode_t *rootdir = (vnode_t *)0xabcd1234;
char hw_serial[HW_HOSTID_LEN];
Modified: projects/cxl_iscsi/cddl/lib/libdtrace/Makefile
==============================================================================
--- projects/cxl_iscsi/cddl/lib/libdtrace/Makefile Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/cddl/lib/libdtrace/Makefile Mon Sep 28 17:30:07 2015 (r288343)
@@ -56,6 +56,10 @@ DSRCS= errno.d \
udp.d \
unistd.d
+FILES= ${DSRCS}
+FILESDIR= /usr/lib/dtrace
+FILESMODE= ${NOBINMODE}
+
WARNS?= 1
CFLAGS+= -I${.OBJDIR} -I${.CURDIR} \
@@ -120,11 +124,4 @@ dt_names.c:
beforedepend: dt_errtags.c dt_names.c
-beforeinstall:
-.if !defined(LIBRARIES_ONLY) && exists(${DESTDIR}/usr/lib/dtrace)
-.for file in ${DSRCS}
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} ${.CURDIR}/${file} ${DESTDIR}/usr/lib/dtrace
-.endfor
-.endif
-
.include <bsd.lib.mk>
Modified: projects/cxl_iscsi/cddl/lib/libdtrace/ip.d
==============================================================================
--- projects/cxl_iscsi/cddl/lib/libdtrace/ip.d Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/cddl/lib/libdtrace/ip.d Mon Sep 28 17:30:07 2015 (r288343)
@@ -110,7 +110,6 @@ typedef struct ipv4info {
* These values are NULL if the packet is not IPv6.
*/
typedef struct in6_addr in6_addr_t;
-typedef struct ip6_hdr ip6_t;
typedef struct ipv6info {
uint8_t ipv6_ver; /* IP version (6) */
uint8_t ipv6_tclass; /* traffic class */
@@ -123,7 +122,7 @@ typedef struct ipv6info {
in6_addr_t *ipv6_dst; /* destination address */
string ipv6_saddr; /* source address, string */
string ipv6_daddr; /* destination address, string */
- ip6_t *ipv6_hdr; /* pointer to raw header */
+ struct ip6_hdr *ipv6_hdr; /* pointer to raw header */
} ipv6info_t;
#pragma D binding "1.5" IPPROTO_IP
@@ -282,5 +281,5 @@ translator ipv6info_t < struct ip6_hdr *
ipv6_dst = p == NULL ? 0 : (in6_addr_t *)&p->ip6_dst;
ipv6_saddr = p == NULL ? 0 : inet_ntoa6(&p->ip6_src);
ipv6_daddr = p == NULL ? 0 : inet_ntoa6(&p->ip6_dst);
- ipv6_hdr = (ip6_t *)p;
+ ipv6_hdr = p;
};
Modified: projects/cxl_iscsi/cddl/lib/libdtrace/tcp.d
==============================================================================
--- projects/cxl_iscsi/cddl/lib/libdtrace/tcp.d Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/cddl/lib/libdtrace/tcp.d Mon Sep 28 17:30:07 2015 (r288343)
@@ -103,11 +103,15 @@ typedef struct tcpsinfo {
int32_t tcps_state; /* TCP state */
uint32_t tcps_iss; /* Initial sequence # sent */
uint32_t tcps_suna; /* sequence # sent but unacked */
+ uint32_t tcps_smax; /* highest sequence number sent */
uint32_t tcps_snxt; /* next sequence # to send */
uint32_t tcps_rack; /* sequence # we have acked */
uint32_t tcps_rnxt; /* next sequence # expected */
uint32_t tcps_swnd; /* send window size */
int32_t tcps_snd_ws; /* send window scaling */
+ uint32_t tcps_swl1; /* window update seg seq number */
+ uint32_t tcps_swl2; /* window update seg ack number */
+ uint32_t tcps_rup; /* receive urgent pointer */
uint32_t tcps_rwnd; /* receive window size */
int32_t tcps_rcv_ws; /* receive window scaling */
uint32_t tcps_cwnd; /* congestion window */
@@ -117,7 +121,8 @@ typedef struct tcpsinfo {
uint32_t tcps_rto; /* round-trip timeout, msec */
uint32_t tcps_mss; /* max segment size */
int tcps_retransmit; /* retransmit send event, boolean */
- int tcps_srtt; /* smoothed RTT in units of (TCP_RTT_SCALE*hz) */
+ int tcps_srtt; /* smoothed RTT in units of (TCP_RTT_SCALE*hz) */
+ int tcps_debug; /* socket has SO_DEBUG set */
} tcpsinfo_t;
/*
@@ -188,12 +193,16 @@ translator tcpsinfo_t < struct tcpcb *p
tcps_state = p == NULL ? -1 : p->t_state;
tcps_iss = p == NULL ? 0 : p->iss;
tcps_suna = p == NULL ? 0 : p->snd_una;
+ tcps_smax = p == NULL ? 0 : p->snd_max;
tcps_snxt = p == NULL ? 0 : p->snd_nxt;
tcps_rack = p == NULL ? 0 : p->last_ack_sent;
tcps_rnxt = p == NULL ? 0 : p->rcv_nxt;
tcps_swnd = p == NULL ? -1 : p->snd_wnd;
tcps_snd_ws = p == NULL ? -1 : p->snd_scale;
+ tcps_swl1 = p == NULL ? -1 : p->snd_wl1;
+ tcps_swl2 = p == NULL ? -1 : p->snd_wl2;
tcps_rwnd = p == NULL ? -1 : p->rcv_wnd;
+ tcps_rup = p == NULL ? -1 : p->rcv_up;
tcps_rcv_ws = p == NULL ? -1 : p->rcv_scale;
tcps_cwnd = p == NULL ? -1 : p->snd_cwnd;
tcps_cwnd_ssthresh = p == NULL ? -1 : p->snd_ssthresh;
@@ -203,6 +212,8 @@ translator tcpsinfo_t < struct tcpcb *p
tcps_mss = p == NULL ? -1 : p->t_maxseg;
tcps_retransmit = p == NULL ? -1 : p->t_rxtshift > 0 ? 1 : 0;
tcps_srtt = p == NULL ? -1 : p->t_srtt; /* smoothed RTT in units of (TCP_RTT_SCALE*hz) */
+ tcps_debug = p == NULL ? 0 :
+ p->t_inpcb->inp_socket->so_options & 1;
};
#pragma D binding "1.6.3" translator
@@ -242,3 +253,123 @@ translator tcpinfoh_t < struct tcphdr *p
translator tcplsinfo_t < int s > {
tcps_state = s;
};
+
+
+/* Support for TCP debug */
+
+#pragma D binding "1.12.1" TA_INPUT
+inline int TA_INPUT = 0;
+#pragma D binding "1.12.1" TA_OUTPUT
+inline int TA_OUTPUT = 1;
+#pragma D binding "1.12.1" TA_USER
+inline int TA_USER = 2;
+#pragma D binding "1.12.1" TA_RESPOND
+inline int TA_RESPOND = 3;
+#pragma D binding "1.12.1" TA_DROP
+inline int TA_DROP = 4;
+
+/* direction strings. */
+
+#pragma D binding "1.12.1" tcpdebug_dir_string
+inline string tcpdebug_dir_string[uint8_t direction] =
+ direction == TA_INPUT ? "input" :
+ direction == TA_OUTPUT ? "output" :
+ direction == TA_USER ? "user" :
+ direction == TA_RESPOND ? "respond" :
+ direction == TA_OUTPUT ? "drop" :
+ "unknown" ;
+
+#pragma D binding "1.12.1" tcpflag_string
+inline string tcpflag_string[uint8_t flags] =
+ flags & TH_FIN ? "FIN" :
+ flags & TH_SYN ? "SYN" :
+ flags & TH_RST ? "RST" :
+ flags & TH_PUSH ? "PUSH" :
+ flags & TH_ACK ? "ACK" :
+ flags & TH_URG ? "URG" :
+ flags & TH_ECE ? "ECE" :
+ flags & TH_CWR ? "CWR" :
+ "unknown" ;
+
+#pragma D binding "1.12.1" PRU_ATTACH
+inline int PRU_ATTACH = 0;
+#pragma D binding "1.12.1" PRU_DETACH
+inline int PRU_DETACH = 1;
+#pragma D binding "1.12.1" PRU_BIND
+inline int PRU_BIND = 2;
+#pragma D binding "1.12.1" PRU_LISTEN
+inline int PRU_LISTEN = 3;
+#pragma D binding "1.12.1" PRU_CONNECT
+inline int PRU_CONNECT = 4;
+#pragma D binding "1.12.1" PRU_ACCEPT
+inline int PRU_ACCEPT = 5 ;
+#pragma D binding "1.12.1" PRU_DISCONNECT
+inline int PRU_DISCONNECT= 6;
+#pragma D binding "1.12.1" PRU_SHUTDOWN
+inline int PRU_SHUTDOWN = 7;
+#pragma D binding "1.12.1" PRU_RCVD
+inline int PRU_RCVD = 8;
+#pragma D binding "1.12.1" PRU_SEND
+inline int PRU_SEND = 9;
+#pragma D binding "1.12.1" PRU_ABORT
+inline int PRU_ABORT = 10;
+#pragma D binding "1.12.1" PRU_CONTROL
+inline int PRU_CONTROL = 11;
+#pragma D binding "1.12.1" PRU_SENSE
+inline int PRU_SENSE = 12;
+#pragma D binding "1.12.1" PRU_RCVOOB
+inline int PRU_RCVOOB = 13;
+#pragma D binding "1.12.1" PRU_SENDOOB
+inline int PRU_SENDOOB = 14;
+#pragma D binding "1.12.1" PRU_SOCKADDR
+inline int PRU_SOCKADDR = 15;
+#pragma D binding "1.12.1" PRU_PEERADDR
+inline int PRU_PEERADDR = 16;
+#pragma D binding "1.12.1" PRU_CONNECT2
+inline int PRU_CONNECT2 = 17;
+#pragma D binding "1.12.1" PRU_FASTTIMO
+inline int PRU_FASTTIMO = 18;
+#pragma D binding "1.12.1" PRU_SLOWTIMO
+inline int PRU_SLOWTIMO = 19;
+#pragma D binding "1.12.1" PRU_PROTORCV
+inline int PRU_PROTORCV = 20;
+#pragma D binding "1.12.1" PRU_PROTOSEND
+inline int PRU_PROTOSEND = 21;
+#pragma D binding "1.12.1" PRU_SEND_EOF
+inline int PRU_SEND_EOF = 22;
+#pragma D binding "1.12.1" PRU_SOSETLABEL
+inline int PRU_SOSETLABEL = 23;
+#pragma D binding "1.12.1" PRU_CLOSE
+inline int PRU_CLOSE = 24;
+#pragma D binding "1.12.1" PRU_FLUSH
+inline int PRU_FLUSH = 25;
+
+#pragma D binding "1.12.1" prureq_string
+inline string prureq_string[uint8_t req] =
+ req == PRU_ATTACH ? "ATTACH" :
+ req == PRU_DETACH ? "DETACH" :
+ req == PRU_BIND ? "BIND" :
+ req == PRU_LISTEN ? "LISTEN" :
+ req == PRU_CONNECT ? "CONNECT" :
+ req == PRU_ACCEPT ? "ACCEPT" :
+ req == PRU_DISCONNECT ? "DISCONNECT" :
+ req == PRU_SHUTDOWN ? "SHUTDOWN" :
+ req == PRU_RCVD ? "RCVD" :
+ req == PRU_SEND ? "SEND" :
+ req == PRU_ABORT ? "ABORT" :
+ req == PRU_CONTROL ? "CONTROL" :
+ req == PRU_SENSE ? "SENSE" :
+ req == PRU_RCVOOB ? "RCVOOB" :
+ req == PRU_SENDOOB ? "SENDOOB" :
+ req == PRU_SOCKADDR ? "SOCKADDR" :
+ req == PRU_PEERADDR ? "PEERADDR" :
+ req == PRU_CONNECT2 ? "CONNECT2" :
+ req == PRU_FASTTIMO ? "FASTTIMO" :
+ req == PRU_SLOWTIMO ? "SLOWTIMO" :
+ req == PRU_PROTORCV ? "PROTORCV" :
+ req == PRU_PROTOSEND ? "PROTOSEND" :
+ req == PRU_SEND ? "SEND_EOF" :
+ req == PRU_SOSETLABEL ? "SOSETLABEL" :
+ req == PRU_CLOSE ? "CLOSE" :
+ req == PRU_FLUSH ? "FLUSE" :
+ "unknown" ;
Modified: projects/cxl_iscsi/cddl/usr.bin/Makefile
==============================================================================
--- projects/cxl_iscsi/cddl/usr.bin/Makefile Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/cddl/usr.bin/Makefile Mon Sep 28 17:30:07 2015 (r288343)
@@ -6,7 +6,6 @@ SUBDIR= \
ctfconvert \
ctfdump \
ctfmerge \
- sgsmsg \
${_tests} \
${_zinject} \
${_zlook} \
Modified: projects/cxl_iscsi/cddl/usr.bin/ctfconvert/Makefile.depend
==============================================================================
--- projects/cxl_iscsi/cddl/usr.bin/ctfconvert/Makefile.depend Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/cddl/usr.bin/ctfconvert/Makefile.depend Mon Sep 28 17:30:07 2015 (r288343)
@@ -1,8 +1,6 @@
# $FreeBSD$
# Autogenerated - do NOT edit!
-DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-
DIRDEPS = \
cddl/lib/libctf \
gnu/lib/csu \
Modified: projects/cxl_iscsi/cddl/usr.bin/ctfdump/Makefile.depend
==============================================================================
--- projects/cxl_iscsi/cddl/usr.bin/ctfdump/Makefile.depend Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/cddl/usr.bin/ctfdump/Makefile.depend Mon Sep 28 17:30:07 2015 (r288343)
@@ -1,8 +1,6 @@
# $FreeBSD$
# Autogenerated - do NOT edit!
-DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-
DIRDEPS = \
gnu/lib/csu \
gnu/lib/libgcc \
Modified: projects/cxl_iscsi/cddl/usr.bin/ctfmerge/Makefile.depend
==============================================================================
--- projects/cxl_iscsi/cddl/usr.bin/ctfmerge/Makefile.depend Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/cddl/usr.bin/ctfmerge/Makefile.depend Mon Sep 28 17:30:07 2015 (r288343)
@@ -1,8 +1,6 @@
# $FreeBSD$
# Autogenerated - do NOT edit!
-DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-
DIRDEPS = \
cddl/lib/libctf \
gnu/lib/csu \
Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/Makefile.depend
==============================================================================
--- projects/cxl_iscsi/cddl/usr.sbin/dtrace/Makefile.depend Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/Makefile.depend Mon Sep 28 17:30:07 2015 (r288343)
@@ -1,8 +1,6 @@
# $FreeBSD$
# Autogenerated - do NOT edit!
-DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-
DIRDEPS = \
cddl/lib/libctf \
cddl/lib/libdtrace \
Modified: projects/cxl_iscsi/cddl/usr.sbin/dtruss/Makefile.depend
==============================================================================
--- projects/cxl_iscsi/cddl/usr.sbin/dtruss/Makefile.depend Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/cddl/usr.sbin/dtruss/Makefile.depend Mon Sep 28 17:30:07 2015 (r288343)
@@ -1,8 +1,6 @@
# $FreeBSD$
# Autogenerated - do NOT edit!
-DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-
DIRDEPS = \
Modified: projects/cxl_iscsi/contrib/binutils/opcodes/arm-dis.c
==============================================================================
--- projects/cxl_iscsi/contrib/binutils/opcodes/arm-dis.c Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/contrib/binutils/opcodes/arm-dis.c Mon Sep 28 17:30:07 2015 (r288343)
@@ -1767,7 +1767,7 @@ print_insn_coprocessor (bfd_vma pc, stru
/* Is ``imm'' a negative number? */
if (imm & 0x40)
- imm |= (-1 << 7);
+ imm |= -(1 << 7);
func (stream, "%d", imm);
}
Modified: projects/cxl_iscsi/contrib/elftoolchain/addr2line/addr2line.c
==============================================================================
--- projects/cxl_iscsi/contrib/elftoolchain/addr2line/addr2line.c Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/contrib/elftoolchain/addr2line/addr2line.c Mon Sep 28 17:30:07 2015 (r288343)
@@ -248,7 +248,13 @@ translate(Dwarf_Debug dbg, const char* a
continue;
}
- if (dwarf_srclines(die, &lbuf, &lcount, &de) != DW_DLV_OK) {
+ switch (dwarf_srclines(die, &lbuf, &lcount, &de)) {
+ case DW_DLV_OK:
+ break;
+ case DW_DLV_NO_ENTRY:
+ /* If one CU lacks debug info, just skip it. */
+ continue;
+ default:
warnx("dwarf_srclines: %s", dwarf_errmsg(de));
goto out;
}
Modified: projects/cxl_iscsi/contrib/elftoolchain/elfdump/elfdump.c
==============================================================================
--- projects/cxl_iscsi/contrib/elftoolchain/elfdump/elfdump.c Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/contrib/elftoolchain/elfdump/elfdump.c Mon Sep 28 17:30:07 2015 (r288343)
@@ -272,7 +272,7 @@ static const char *ei_data[] = {
};
static const char *ei_abis[] = {
- "ELFOSABI_SYSV", "ELFOSABI_HPUX", "ELFOSABI_NETBSD", "ELFOSABI_LINUX",
+ "ELFOSABI_NONE", "ELFOSABI_HPUX", "ELFOSABI_NETBSD", "ELFOSABI_LINUX",
"ELFOSABI_HURD", "ELFOSABI_86OPEN", "ELFOSABI_SOLARIS",
"ELFOSABI_MONTEREY", "ELFOSABI_IRIX", "ELFOSABI_FREEBSD",
"ELFOSABI_TRU64", "ELFOSABI_MODESTO", "ELFOSABI_OPENBSD"
Modified: projects/cxl_iscsi/contrib/elftoolchain/readelf/readelf.c
==============================================================================
--- projects/cxl_iscsi/contrib/elftoolchain/readelf/readelf.c Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/contrib/elftoolchain/readelf/readelf.c Mon Sep 28 17:30:07 2015 (r288343)
@@ -414,8 +414,8 @@ elf_osabi(unsigned int abi)
static char s_abi[32];
switch(abi) {
- case ELFOSABI_SYSV: return "SYSV";
- case ELFOSABI_HPUX: return "HPUS";
+ case ELFOSABI_NONE: return "NONE";
+ case ELFOSABI_HPUX: return "HPUX";
case ELFOSABI_NETBSD: return "NetBSD";
case ELFOSABI_GNU: return "GNU";
case ELFOSABI_HURD: return "HURD";
Modified: projects/cxl_iscsi/contrib/file/ChangeLog
==============================================================================
--- projects/cxl_iscsi/contrib/file/ChangeLog Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/contrib/file/ChangeLog Mon Sep 28 17:30:07 2015 (r288343)
@@ -1,3 +1,19 @@
+2015-09-16 9:50 Christos Zoulas <christos@zoulas.com>
+
+ * release 5.25
+
+2015-09-11 13:25 Christos Zoulas <christos@zoulas.com>
+
+ * add a limit to the length of regex searches
+
+2015-09-08 9:50 Christos Zoulas <christos@zoulas.com>
+
+ * fix problems with --parameter (Christoph Biedl)
+
+2015-07-11 10:35 Christos Zoulas <christos@zoulas.com>
+
+ * Windows fixes PR/466 (Jason Hood)
+
2015-07-09 10:35 Christos Zoulas <christos@zoulas.com>
* release 5.24
Modified: projects/cxl_iscsi/contrib/file/configure
==============================================================================
--- projects/cxl_iscsi/contrib/file/configure Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/contrib/file/configure Mon Sep 28 17:30:07 2015 (r288343)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for file 5.24.
+# Generated by GNU Autoconf 2.69 for file 5.25.
#
# Report bugs to <christos@astron.com>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='file'
PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.24'
-PACKAGE_STRING='file 5.24'
+PACKAGE_VERSION='5.25'
+PACKAGE_STRING='file 5.25'
PACKAGE_BUGREPORT='christos@astron.com'
PACKAGE_URL=''
@@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures file 5.24 to adapt to many kinds of systems.
+\`configure' configures file 5.25 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1397,7 +1397,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of file 5.24:";;
+ short | recursive ) echo "Configuration of file 5.25:";;
esac
cat <<\_ACEOF
@@ -1507,7 +1507,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-file configure 5.24
+file configure 5.25
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2163,7 +2163,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by file $as_me 5.24, which was
+It was created by file $as_me 5.25, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3029,7 +3029,7 @@ fi
# Define the identity of the package.
PACKAGE='file'
- VERSION='5.24'
+ VERSION='5.25'
cat >>confdefs.h <<_ACEOF
@@ -15036,7 +15036,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by file $as_me 5.24, which was
+This file was extended by file $as_me 5.25, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15102,7 +15102,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-file config.status 5.24
+file config.status 5.25
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: projects/cxl_iscsi/contrib/file/configure.ac
==============================================================================
--- projects/cxl_iscsi/contrib/file/configure.ac Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/contrib/file/configure.ac Mon Sep 28 17:30:07 2015 (r288343)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([file],[5.24],[christos@astron.com])
+AC_INIT([file],[5.25],[christos@astron.com])
AM_INIT_AUTOMAKE([subdir-objects foreign])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
Modified: projects/cxl_iscsi/contrib/file/doc/file.man
==============================================================================
--- projects/cxl_iscsi/contrib/file/doc/file.man Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/contrib/file/doc/file.man Mon Sep 28 17:30:07 2015 (r288343)
@@ -1,5 +1,5 @@
-.\" $File: file.man,v 1.117 2015/06/03 19:51:27 christos Exp $
-.Dd June 3, 2015
+.\" $File: file.man,v 1.118 2015/09/11 17:24:09 christos Exp $
+.Dd September 11, 2015
.Dt FILE __CSECTION__
.Os
.Sh NAME
@@ -316,6 +316,7 @@ Set various parameter limits.
.It Li elf_notes Ta 256 Ta max ELF notes processed
.It Li elf_phnum Ta 128 Ta max ELF program sections processed
.It Li elf_shnum Ta 32768 Ta max ELF sections processed
+.It Li regex Ta 8192 Ta length limit for regex searches
.El
.It Fl r , Fl Fl raw
Don't translate unprintable characters to \eooo.
Modified: projects/cxl_iscsi/contrib/file/doc/libmagic.man
==============================================================================
--- projects/cxl_iscsi/contrib/file/doc/libmagic.man Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/contrib/file/doc/libmagic.man Mon Sep 28 17:30:07 2015 (r288343)
@@ -1,4 +1,4 @@
-.\" $File: libmagic.man,v 1.37 2015/06/03 18:21:24 christos Exp $
+.\" $File: libmagic.man,v 1.38 2015/09/11 17:24:09 christos Exp $
.\"
.\" Copyright (c) Christos Zoulas 2003.
.\" All Rights Reserved.
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd June 3, 2015
+.Dd September 11, 2015
.Dt LIBMAGIC 3
.Os
.Sh NAME
@@ -291,6 +291,7 @@ library.
.It Li MAGIC_PARAM_ELF_NOTES_MAX Ta size_t Ta 256
.It Li MAGIC_PARAM_ELF_PHNUM_MAX Ta size_t Ta 128
.It Li MAGIC_PARAM_ELF_SHNUM_MAX Ta size_t Ta 32768
+.It Li MAGIC_PARAM_REGEX_MAX Ta size_t Ta 8192
.El
.Pp
The
Modified: projects/cxl_iscsi/contrib/file/doc/magic.man
==============================================================================
--- projects/cxl_iscsi/contrib/file/doc/magic.man Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/contrib/file/doc/magic.man Mon Sep 28 17:30:07 2015 (r288343)
@@ -1,4 +1,4 @@
-.\" $File: magic.man,v 1.85 2015/01/01 17:07:34 christos Exp $
+.\" $File: magic.man,v 1.86 2015/09/08 13:48:44 christos Exp $
.Dd January 1, 2015
.Dt MAGIC __FSECTION__
.Os
@@ -200,7 +200,7 @@ interpreted as a UNIX-style date, but in
than UTC.
.It Dv indirect
Starting at the given offset, consult the magic database again.
-The offset of th
+The offset of the
.Dv indirect
magic is by default absolute in the file, but one can specify
.Dv /r
Modified: projects/cxl_iscsi/contrib/file/magic/Magdir/adventure
==============================================================================
--- projects/cxl_iscsi/contrib/file/magic/Magdir/adventure Mon Sep 28 17:25:48 2015 (r288342)
+++ projects/cxl_iscsi/contrib/file/magic/Magdir/adventure Mon Sep 28 17:30:07 2015 (r288343)
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: adventure,v 1.14 2012/06/21 01:32:26 christos Exp $
+# $File: adventure,v 1.15 2015/09/07 10:03:21 christos Exp $
# adventure: file(1) magic for Adventure game files
#
# from Allen Garvin <earendil@faeryland.tamu-commerce.edu>
@@ -17,6 +17,7 @@
# Infocom (see z-machine)
#------------------------------------------------------------------------------
# Z-machine: file(1) magic for Z-machine binaries.
+# Sanity checks by David Griffith <dave@661.org>
# Updated by Adam Buchbinder <adam.buchbinder@gmail.com>
#
#http://www.gnelson.demon.co.uk/zspec/sect11.html
@@ -41,10 +42,12 @@
>>>>>>>2 ubeshort < 10 Release %d /
>>>>>>>>18 string >\0 Serial %.6s)
!:strength + 40
+!:mime application/x-zmachine
#------------------------------------------------------------------------------
# Glulx: file(1) magic for Glulx binaries.
#
+# David Griffith <dave@661.org>
# I haven't checked for false matches yet.
#
0 string Glul Glulx game data
@@ -52,7 +55,7 @@
>>6 byte x \b.%d
>>8 byte x \b.%d)
>36 string Info Compiled by Inform
-
+!:mime application/x-glulx
# For Quetzal and blorb magic see iff
@@ -66,11 +69,13 @@
>9 belong !0x0A0D1A00 game data, CORRUPTED
>9 belong 0x0A0D1A00
>>13 string >\0 %s game data
+!:mime application/x-tads
# Resource files start with "TADS2 rsc\n\r\032\0" then the compiler version.
0 string TADS2\ rsc TADS
>9 belong !0x0A0D1A00 resource data, CORRUPTED
>9 belong 0x0A0D1A00
>>13 string >\0 %s resource data
+!:mime application/x-tads
# Some saved game files start with "TADS2 save/g\n\r\032\0", a little-endian
# 2-byte length N, the N-char name of the game file *without* a NUL (darn!),
# "TADS2 save\n\r\032\0" and the interpreter version.
@@ -78,12 +83,14 @@
>12 belong !0x0A0D1A00 saved game data, CORRUPTED
>12 belong 0x0A0D1A00
>>(16.s+32) string >\0 %s saved game data
+!:mime application/x-tads
# Other saved game files start with "TADS2 save\n\r\032\0" and the interpreter
# version.
0 string TADS2\ save TADS
>10 belong !0x0A0D1A00 saved game data, CORRUPTED
>10 belong 0x0A0D1A00
>>14 string >\0 %s saved game data
+!:mime application/x-tads
# TADS (Text Adventure Development System) version 3
# Game files start with "T3-image\015\012\032"
@@ -97,14 +104,18 @@
>>11 byte x \b%c
>>12 byte x \b%c
>>13 byte x \b%c)
+!:mime application/x-t3vm-image
+# edited by David Griffith <dave@661.org>
# Danny Milosavljevic <danny.milo@gmx.net>
-# this are adrift (adventure game standard) game files, extension .taf
-# depending on version magic continues with 0x93453E6139FA (V 4.0)
-# 0x9445376139FA (V 3.90)
-# 0x9445366139FA (V 3.80)
-# this is from source (http://www.adrift.org.uk/) and I have some taf
-# files, and checked them.
-#0 belong 0x3C423FC9
-#>4 belong 0x6A87C2CF Adrift game file
-#!:mime application/x-adrift
+# These are ADRIFT (adventure game standard) game files, extension .taf
+# Checked from source at (http://www.adrift.co/) and various taf files
+# found at the Interactive Fiction Archive (http://ifarchive.org/)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@freebsd.org Tue Sep 29 21:07:35 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1E504A0C07E
for <svn-src-projects@mailman.ysv.freebsd.org>;
Tue, 29 Sep 2015 21:07:35 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 0EF1E1843;
Tue, 29 Sep 2015 21:07:35 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8TL7YCt080700;
Tue, 29 Sep 2015 21:07:34 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8TL7YqT080698;
Tue, 29 Sep 2015 21:07:34 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201509292107.t8TL7YqT080698@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org
using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Tue, 29 Sep 2015 21:07:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r288394 - projects/cxl_iscsi/sys/dev/cxgbe/cxgbei
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Sep 2015 21:07:35 -0000
Author: np
Date: Tue Sep 29 21:07:33 2015
New Revision: 288394
URL: https://svnweb.freebsd.org/changeset/base/288394
Log:
- Remove unused or write-only fields from ulp_mbuf_cb.
- Remove write-only SBUF_ULP_FLAG_COALESCE_OFF flag.
- Failure to allocate ulp_mbuf_cb during rx is a hard error. Panic
instead of just freeing the mbuf and pretending nothing happened. The
payload in the mbuf is precious because it has been ACK'ed by the TOE.
(ulp_mbuf_cb is going to go away soon and so will these potential
failures during rx.)
Modified:
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.h
Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c
==============================================================================
--- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c Tue Sep 29 19:15:08 2015 (r288393)
+++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c Tue Sep 29 21:07:33 2015 (r288394)
@@ -570,11 +570,8 @@ process_rx_iscsi_hdr(struct toepcb *toep
/* allocate m_tag to hold ulp info */
cb = get_ulp_mbuf_cb(m);
- if (cb == NULL) {
- printf("%s: Error allocation m_tag\n", __func__);
- goto err_out1;
- }
- cb->seq = ntohl(cpl->seq);
+ if (cb == NULL)
+ CXGBE_UNIMPLEMENTED(__func__);
/* strip off CPL header */
m_adj(m, sizeof(*cpl));
@@ -585,41 +582,35 @@ process_rx_iscsi_hdr(struct toepcb *toep
isock->mbuf_ulp_lhdr = lmbuf = m;
lcb = cb;
- cb->flags = SBUF_ULP_FLAG_HDR_RCVD |
- SBUF_ULP_FLAG_COALESCE_OFF;
+ cb->flags = SBUF_ULP_FLAG_HDR_RCVD;
/* we only update tp->rcv_nxt once per pdu */
- if (cb->seq != tp->rcv_nxt) {
- CTR3(KTR_CXGBE,
- "tid 0x%x, CPL_ISCSI_HDR, BAD seq got 0x%x exp 0x%x.",
- toep->tid, cb->seq, tp->rcv_nxt);
- goto err_out1;
+ if (__predict_false(ntohl(cpl->seq) != tp->rcv_nxt)) {
+ panic("%s: seq# 0x%x (expected 0x%x) for tid %u",
+ __func__, ntohl(cpl->seq), tp->rcv_nxt, toep->tid);
}
byte = m->m_data;
hlen = ntohs(cpl->len);
dlen = ntohl(*(unsigned int *)(byte + 4)) & 0xFFFFFF;
plen = ntohs(cpl->pdu_len_ddp);
- lcb->ulp.iscsi.pdulen = (hlen + dlen + 3) & (~0x3);
+ lcb->pdulen = (hlen + dlen + 3) & (~0x3);
/* workaround for cpl->pdu_len_ddp since it does not include
the data digest count */
if (dlen)
- lcb->ulp.iscsi.pdulen += isock->s_dcrc_len;
+ lcb->pdulen += isock->s_dcrc_len;
- tp->rcv_nxt += lcb->ulp.iscsi.pdulen;
- if (tp->rcv_wnd <= lcb->ulp.iscsi.pdulen)
+ tp->rcv_nxt += lcb->pdulen;
+ if (tp->rcv_wnd <= lcb->pdulen)
CTR3(KTR_CXGBE, "%s: Neg rcv_wnd:0x%lx pdulen:0x%x",
- __func__, tp->rcv_wnd, lcb->ulp.iscsi.pdulen);
- tp->rcv_wnd -= lcb->ulp.iscsi.pdulen;
+ __func__, tp->rcv_wnd, lcb->pdulen);
+ tp->rcv_wnd -= lcb->pdulen;
tp->t_rcvtime = ticks;
} else {
lmbuf = isock->mbuf_ulp_lhdr;
lcb = find_ulp_mbuf_cb(lmbuf);
- if (lcb == NULL) {
- printf("%s: lmbuf:%p lcb is NULL\n", __func__, lmbuf);
- goto err_out1;
- }
- lcb->flags |= SBUF_ULP_FLAG_DATA_RCVD |
- SBUF_ULP_FLAG_COALESCE_OFF;
+ if (lcb == NULL)
+ CXGBE_UNIMPLEMENTED(__func__);
+ lcb->flags |= SBUF_ULP_FLAG_DATA_RCVD;
cb->flags = SBUF_ULP_FLAG_DATA_RCVD;
/* padding */
@@ -629,11 +620,6 @@ process_rx_iscsi_hdr(struct toepcb *toep
}
mbufq_enqueue(&isock->iscsi_rcvq, m);
mtx_unlock(&isock->iscsi_rcvq_lock);
- return;
-
-err_out1:
- mtx_unlock(&isock->iscsi_rcvq_lock);
- m_freem(m);
}
/* hand over received PDU to iscsi_initiator */
@@ -663,7 +649,7 @@ iscsi_conn_receive_pdu(struct iscsi_sock
}
/* BHS */
mbufq_dequeue(&isock->iscsi_rcvq);
- data_len = cb->ulp.iscsi.pdulen;
+ data_len = cb->pdulen;
CTR5(KTR_CXGBE, "%s: response:%p m:%p m_len:%d data_len:%d",
__func__, response, m, m->m_len, data_len);
@@ -723,15 +709,15 @@ process_rx_data_ddp(struct toepcb *toep,
lcb->flags |= SBUF_ULP_FLAG_STATUS_RCVD;
isock->mbuf_ulp_lhdr = NULL;
- if (ntohs(cpl->len) != lcb->ulp.iscsi.pdulen) {
+ if (ntohs(cpl->len) != lcb->pdulen) {
CTR3(KTR_CXGBE, "tid 0x%x, RX_DATA_DDP pdulen %u != %u.",
- toep->tid, ntohs(cpl->len), lcb->ulp.iscsi.pdulen);
+ toep->tid, ntohs(cpl->len), lcb->pdulen);
CTR4(KTR_CXGBE, "%s: lmbuf:%p lcb:%p lcb->flags:0x%x",
__func__, lmbuf, lcb, lcb->flags);
}
- lcb->ulp.iscsi.ddigest = ntohl(cpl->ulp_crc);
- pdulen = lcb->ulp.iscsi.pdulen;
+ lcb->ddigest = ntohl(cpl->ulp_crc);
+ pdulen = lcb->pdulen;
val = ntohl(cpl->ddpvld);
if (val & F_DDP_PADDING_ERR)
Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.h
==============================================================================
--- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.h Tue Sep 29 19:15:08 2015 (r288393)
+++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.h Tue Sep 29 21:07:33 2015 (r288394)
@@ -72,7 +72,6 @@ struct cxgbei_sgl {
#define SBUF_ULP_FLAG_HDR_RCVD 0x1
#define SBUF_ULP_FLAG_DATA_RCVD 0x2
#define SBUF_ULP_FLAG_STATUS_RCVD 0x4
-#define SBUF_ULP_FLAG_COALESCE_OFF 0x8
#define SBUF_ULP_FLAG_HCRC_ERROR 0x10
#define SBUF_ULP_FLAG_DCRC_ERROR 0x20
#define SBUF_ULP_FLAG_PAD_ERROR 0x40
@@ -83,21 +82,11 @@ struct cxgbei_sgl {
* etc.
*/
struct ulp_mbuf_cb {
- uint8_t ulp_mode; /* ULP mode/submode of sk_buff */
- uint8_t flags; /* TCP-like flags */
- uint32_t seq; /* TCP sequence number */
- union { /* ULP-specific fields */
- struct {
- uint32_t ddigest; /* ULP rx_data_ddp selected field*/
- uint32_t pdulen; /* ULP rx_data_ddp selected field*/
- } iscsi;
- struct {
- uint32_t offset; /* ULP DDP offset notification */
- uint8_t flags; /* ULP DDP flags ... */
- } ddp;
- } ulp;
- uint8_t ulp_data[16]; /* scratch area for ULP */
- void *pdu; /* pdu pointer */
+ uint8_t ulp_mode; /* ULP mode/submode of sk_buff */
+ uint8_t flags; /* TCP-like flags */
+ uint32_t ddigest; /* ULP rx_data_ddp selected field*/
+ uint32_t pdulen; /* ULP rx_data_ddp selected field*/
+ void *pdu; /* pdu pointer */
};
/* private data for each scsi task */
From owner-svn-src-projects@freebsd.org Tue Sep 29 21:16:36 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81301A0C780
for <svn-src-projects@mailman.ysv.freebsd.org>;
Tue, 29 Sep 2015 21:16:36 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 6F7301EA4;
Tue, 29 Sep 2015 21:16:36 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8TLGa1K084725;
Tue, 29 Sep 2015 21:16:36 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8TLGaf5084724;
Tue, 29 Sep 2015 21:16:36 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201509292116.t8TLGaf5084724@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org
using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Tue, 29 Sep 2015 21:16:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r288395 - projects/cxl_iscsi/sys/dev/cxgbe/cxgbei
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Sep 2015 21:16:36 -0000
Author: np
Date: Tue Sep 29 21:16:35 2015
New Revision: 288395
URL: https://svnweb.freebsd.org/changeset/base/288395
Log:
Use the base driver's malloc type instead of creating a new one.
Modified:
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
==============================================================================
--- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c Tue Sep 29 21:07:33 2015 (r288394)
+++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c Tue Sep 29 21:16:35 2015 (r288395)
@@ -64,6 +64,8 @@ __FBSDID("$FreeBSD$");
#include <dev/iscsi/icl.h>
#include <dev/iscsi/iscsi_proto.h>
#include <icl_conn_if.h>
+
+#include "common/common.h"
#include "cxgbei.h"
SYSCTL_NODE(_kern_icl, OID_AUTO, cxgbei, CTLFLAG_RD, 0, "Chelsio iSCSI offload");
@@ -81,7 +83,6 @@ static int recvspace = 1048576;
SYSCTL_INT(_kern_icl_cxgbei, OID_AUTO, recvspace, CTLFLAG_RWTUN,
&recvspace, 0, "Default receive socket buffer size");
-static MALLOC_DEFINE(M_ICL_CXGBEI, "icl_cxgbei", "iSCSI software backend");
static uma_zone_t icl_pdu_zone;
static uma_zone_t icl_transfer_zone;
@@ -419,7 +420,7 @@ icl_cxgbei_new_conn(const char *name, st
refcount_acquire(&icl_ncons);
- ic = (struct icl_conn *)kobj_create(&icl_cxgbei_class, M_ICL_CXGBEI, M_WAITOK | M_ZERO);
+ ic = (struct icl_conn *)kobj_create(&icl_cxgbei_class, M_CXGBE, M_WAITOK | M_ZERO);
STAILQ_INIT(&ic->ic_to_send);
ic->ic_lock = lock;
@@ -441,7 +442,7 @@ icl_cxgbei_conn_free(struct icl_conn *ic
cv_destroy(&ic->ic_send_cv);
cv_destroy(&ic->ic_receive_cv);
- kobj_delete((struct kobj *)ic, M_ICL_CXGBEI);
+ kobj_delete((struct kobj *)ic, M_CXGBE);
refcount_release(&icl_ncons);
}
From owner-svn-src-projects@freebsd.org Tue Sep 29 21:57:53 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74870A0C322
for <svn-src-projects@mailman.ysv.freebsd.org>;
Tue, 29 Sep 2015 21:57:53 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 4BA131CB5;
Tue, 29 Sep 2015 21:57:53 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8TLvrrG001549;
Tue, 29 Sep 2015 21:57:53 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8TLvrQM001548;
Tue, 29 Sep 2015 21:57:53 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201509292157.t8TLvrQM001548@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org
using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Tue, 29 Sep 2015 21:57:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r288402 - projects/cxl_iscsi/sys/dev/cxgbe/cxgbei
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Sep 2015 21:57:53 -0000
Author: np
Date: Tue Sep 29 21:57:52 2015
New Revision: 288402
URL: https://svnweb.freebsd.org/changeset/base/288402
Log:
- Fix minor memory leak (ic_offload is never freed).
- Remove unused icl_pdu_stailq.
- Do not use the same names as icl_soft for the global connection
counter or for the per-connection send/recv CVs.
Modified:
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
==============================================================================
--- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c Tue Sep 29 21:55:45 2015 (r288401)
+++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c Tue Sep 29 21:57:52 2015 (r288402)
@@ -86,15 +86,13 @@ SYSCTL_INT(_kern_icl_cxgbei, OID_AUTO, r
static uma_zone_t icl_pdu_zone;
static uma_zone_t icl_transfer_zone;
-static volatile u_int icl_ncons;
+static volatile u_int icl_cxgbei_ncons;
#define ICL_CONN_LOCK(X) mtx_lock(X->ic_lock)
#define ICL_CONN_UNLOCK(X) mtx_unlock(X->ic_lock)
#define ICL_CONN_LOCK_ASSERT(X) mtx_assert(X->ic_lock, MA_OWNED)
#define ICL_CONN_LOCK_ASSERT_NOT(X) mtx_assert(X->ic_lock, MA_NOTOWNED)
-STAILQ_HEAD(icl_pdu_stailq, icl_pdu);
-
static icl_conn_new_pdu_t icl_cxgbei_conn_new_pdu;
static icl_conn_pdu_free_t icl_cxgbei_conn_pdu_free;
static icl_conn_pdu_data_segment_length_t
@@ -418,20 +416,20 @@ icl_cxgbei_new_conn(const char *name, st
{
struct icl_conn *ic;
- refcount_acquire(&icl_ncons);
+ refcount_acquire(&icl_cxgbei_ncons);
ic = (struct icl_conn *)kobj_create(&icl_cxgbei_class, M_CXGBE, M_WAITOK | M_ZERO);
STAILQ_INIT(&ic->ic_to_send);
ic->ic_lock = lock;
- cv_init(&ic->ic_send_cv, "icl_tx");
- cv_init(&ic->ic_receive_cv, "icl_rx");
+ cv_init(&ic->ic_send_cv, "icl_cxgbei_tx");
+ cv_init(&ic->ic_receive_cv, "icl_cxgbei_rx");
#ifdef DIAGNOSTIC
refcount_init(&ic->ic_outstanding_pdus, 0);
#endif
ic->ic_max_data_segment_length = ICL_MAX_DATA_SEGMENT_LENGTH;
ic->ic_name = name;
- ic->ic_offload = strdup("cxgbei", M_TEMP);;
+ ic->ic_offload = "cxgbei";
return (ic);
}
@@ -443,7 +441,7 @@ icl_cxgbei_conn_free(struct icl_conn *ic
cv_destroy(&ic->ic_send_cv);
cv_destroy(&ic->ic_receive_cv);
kobj_delete((struct kobj *)ic, M_CXGBE);
- refcount_release(&icl_ncons);
+ refcount_release(&icl_cxgbei_ncons);
}
/* XXXNP: what is this for? There's no conn_start method. */
@@ -749,7 +747,7 @@ icl_cxgbei_load(void)
16 * 1024, NULL, NULL, NULL, NULL,
UMA_ALIGN_PTR, 0);
- refcount_init(&icl_ncons, 0);
+ refcount_init(&icl_cxgbei_ncons, 0);
/*
* The reason we call this "none" is that to the user,
@@ -766,7 +764,7 @@ static int
icl_cxgbei_unload(void)
{
- if (icl_ncons != 0)
+ if (icl_cxgbei_ncons != 0)
return (EBUSY);
icl_unregister("cxgbei");
From owner-svn-src-projects@freebsd.org Tue Sep 29 22:33:28 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F5CCA0BDCD
for <svn-src-projects@mailman.ysv.freebsd.org>;
Tue, 29 Sep 2015 22:33:28 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 F15F21F9D;
Tue, 29 Sep 2015 22:33:27 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8TMXR2r017568;
Tue, 29 Sep 2015 22:33:27 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8TMXR2G017566;
Tue, 29 Sep 2015 22:33:27 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201509292233.t8TMXR2G017566@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org
using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Tue, 29 Sep 2015 22:33:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r288404 - projects/cxl_iscsi/sys/dev/cxgbe/cxgbei
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Sep 2015 22:33:28 -0000
Author: np
Date: Tue Sep 29 22:33:26 2015
New Revision: 288404
URL: https://svnweb.freebsd.org/changeset/base/288404
Log:
- Allocate more space than needed for icl_conn and icl_pdu. The extra
space will be used for driver specific items.
- Do not use the same name as icl_soft for the PDU zone.
Modified:
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.h
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.h
==============================================================================
--- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.h Tue Sep 29 22:00:03 2015 (r288403)
+++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.h Tue Sep 29 22:33:26 2015 (r288404)
@@ -1,9 +1,7 @@
/*-
- * Copyright (c) 2012 Chelsio Communications, Inc.
+ * Copyright (c) 2012, 2015 Chelsio Communications, Inc.
* All rights reserved.
*
- * Chelsio T5xx iSCSI driver
- *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -29,6 +27,8 @@
#ifndef __CXGBEI_OFLD_H__
#define __CXGBEI_OFLD_H__
+#include <dev/iscsi/icl.h>
+
struct iscsi_socket {
u_char s_dcrc_len;
void *s_conn; /* ic_conn pointer */
@@ -52,6 +52,20 @@ struct iscsi_socket {
struct mbuf *mbuf_ulp_ldata;
};
+struct icl_cxgbei_conn {
+ struct icl_conn ic;
+
+ /* cxgbei specific stuff goes here. */
+ uint32_t icc_signature;
+};
+
+struct icl_cxgbei_pdu {
+ struct icl_pdu ip;
+
+ /* cxgbei specific stuff goes here. */
+ uint32_t icp_signature;
+};
+
struct cxgbei_sgl {
int sg_flag;
void *sg_addr;
@@ -123,9 +137,6 @@ struct cxgbei_data {
struct cxgbei_ulp2_tag_format tag_format;
};
-struct icl_conn;
-struct icl_pdu;
-
struct ulp_mbuf_cb *get_ulp_mbuf_cb(struct mbuf *);
int cxgbei_conn_handoff(struct icl_conn *);
int cxgbei_conn_close(struct icl_conn *);
Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
==============================================================================
--- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c Tue Sep 29 22:00:03 2015 (r288403)
+++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c Tue Sep 29 22:33:26 2015 (r288404)
@@ -1,5 +1,6 @@
/*-
* Copyright (c) 2012 The FreeBSD Foundation
+ * Copyright (c) 2015 Chelsio Communications, Inc.
* All rights reserved.
*
* This software was developed by Edward Tomasz Napierala under sponsorship
@@ -83,7 +84,7 @@ static int recvspace = 1048576;
SYSCTL_INT(_kern_icl_cxgbei, OID_AUTO, recvspace, CTLFLAG_RWTUN,
&recvspace, 0, "Default receive socket buffer size");
-static uma_zone_t icl_pdu_zone;
+static uma_zone_t icl_cxgbei_pdu_zone;
static uma_zone_t icl_transfer_zone;
static volatile u_int icl_cxgbei_ncons;
@@ -126,28 +127,32 @@ static kobj_method_t icl_cxgbei_methods[
{ 0, 0 }
};
-DEFINE_CLASS(icl_cxgbei, icl_cxgbei_methods, sizeof(struct icl_conn));
+DEFINE_CLASS(icl_cxgbei, icl_cxgbei_methods, sizeof(struct icl_cxgbei_conn));
struct icl_pdu * icl_pdu_new_empty(struct icl_conn *ic, int flags);
void icl_pdu_free(struct icl_pdu *ip);
+#define CXGBEI_PDU_SIGNATURE 0x12344321
+
struct icl_pdu *
icl_pdu_new_empty(struct icl_conn *ic, int flags)
{
+ struct icl_cxgbei_pdu *icp;
struct icl_pdu *ip;
#ifdef DIAGNOSTIC
refcount_acquire(&ic->ic_outstanding_pdus);
#endif
- ip = uma_zalloc(icl_pdu_zone, flags | M_ZERO);
- if (ip == NULL) {
- ICL_WARN("failed to allocate %zd bytes", sizeof(*ip));
+ icp = uma_zalloc(icl_cxgbei_pdu_zone, flags | M_ZERO);
+ if (icp == NULL) {
#ifdef DIAGNOSTIC
refcount_release(&ic->ic_outstanding_pdus);
#endif
return (NULL);
}
+ icp->icp_signature = CXGBEI_PDU_SIGNATURE;
+ ip = &icp->ip;
ip->ip_conn = ic;
return (ip);
@@ -157,13 +162,16 @@ void
icl_pdu_free(struct icl_pdu *ip)
{
struct icl_conn *ic;
+ struct icl_cxgbei_pdu *icp;
+ icp = (void *)ip;
+ MPASS(icp->icp_signature == CXGBEI_PDU_SIGNATURE);
ic = ip->ip_conn;
m_freem(ip->ip_bhs_mbuf);
m_freem(ip->ip_ahs_mbuf);
m_freem(ip->ip_data_mbuf);
- uma_zfree(icl_pdu_zone, ip);
+ uma_zfree(icl_cxgbei_pdu_zone, ip);
#ifdef DIAGNOSTIC
refcount_release(&ic->ic_outstanding_pdus);
#endif
@@ -411,15 +419,21 @@ icl_cxgbei_conn_pdu_queue(struct icl_con
icl_pdu_queue(ip);
}
+#define CXGBEI_CONN_SIGNATURE 0x56788765
+
static struct icl_conn *
icl_cxgbei_new_conn(const char *name, struct mtx *lock)
{
+ struct icl_cxgbei_conn *icc;
struct icl_conn *ic;
refcount_acquire(&icl_cxgbei_ncons);
- ic = (struct icl_conn *)kobj_create(&icl_cxgbei_class, M_CXGBE, M_WAITOK | M_ZERO);
+ icc = (struct icl_cxgbei_conn *)kobj_create(&icl_cxgbei_class, M_CXGBE,
+ M_WAITOK | M_ZERO);
+ icc->icc_signature = CXGBEI_CONN_SIGNATURE;
+ ic = &icc->ic;
STAILQ_INIT(&ic->ic_to_send);
ic->ic_lock = lock;
cv_init(&ic->ic_send_cv, "icl_cxgbei_tx");
@@ -437,10 +451,13 @@ icl_cxgbei_new_conn(const char *name, st
void
icl_cxgbei_conn_free(struct icl_conn *ic)
{
+ struct icl_cxgbei_conn *icc = (void *)ic;
+
+ MPASS(icc->icc_signature == CXGBEI_CONN_SIGNATURE);
cv_destroy(&ic->ic_send_cv);
cv_destroy(&ic->ic_receive_cv);
- kobj_delete((struct kobj *)ic, M_CXGBE);
+ kobj_delete((struct kobj *)icc, M_CXGBE);
refcount_release(&icl_cxgbei_ncons);
}
@@ -740,8 +757,8 @@ icl_cxgbei_load(void)
{
int error;
- icl_pdu_zone = uma_zcreate("icl_pdu",
- sizeof(struct icl_pdu), NULL, NULL, NULL, NULL,
+ icl_cxgbei_pdu_zone = uma_zcreate("icl_cxgbei_pdu",
+ sizeof(struct icl_cxgbei_pdu), NULL, NULL, NULL, NULL,
UMA_ALIGN_PTR, 0);
icl_transfer_zone = uma_zcreate("icl_transfer",
16 * 1024, NULL, NULL, NULL, NULL,
@@ -749,12 +766,8 @@ icl_cxgbei_load(void)
refcount_init(&icl_cxgbei_ncons, 0);
- /*
- * The reason we call this "none" is that to the user,
- * it's known as "offload driver"; "offload driver: soft"
- * doesn't make much sense.
- */
- error = icl_register("cxgbei", 100, icl_cxgbei_limits, icl_cxgbei_new_conn);
+ error = icl_register("cxgbei", 100, icl_cxgbei_limits,
+ icl_cxgbei_new_conn);
KASSERT(error == 0, ("failed to register"));
return (error);
@@ -769,7 +782,7 @@ icl_cxgbei_unload(void)
icl_unregister("cxgbei");
- uma_zdestroy(icl_pdu_zone);
+ uma_zdestroy(icl_cxgbei_pdu_zone);
uma_zdestroy(icl_transfer_zone);
return (0);
From owner-svn-src-projects@freebsd.org Thu Oct 1 09:36:56 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9026EA0C2F1
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 1 Oct 2015 09:36:56 +0000 (UTC)
(envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 7D45B13DF;
Thu, 1 Oct 2015 09:36:56 +0000 (UTC)
(envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t919auwk003611;
Thu, 1 Oct 2015 09:36:56 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id t919ajaX003572;
Thu, 1 Oct 2015 09:36:45 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201510010936.t919ajaX003572@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 1 Oct 2015 09:36:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r288441 - in projects/release-pkg: . bin/ls bin/ls/tests
bin/ps bin/sh cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs
cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scal...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Oct 2015 09:36:56 -0000
Author: bapt
Date: Thu Oct 1 09:36:43 2015
New Revision: 288441
URL: https://svnweb.freebsd.org/changeset/base/288441
Log:
Merge from head
Added:
projects/release-pkg/bin/ls/tests/
- copied from r288439, head/bin/ls/tests/
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh
- copied unchanged from r288439, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d
- copied unchanged from r288439, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d
- copied unchanged from r288439, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d
projects/release-pkg/contrib/llvm/projects/
- copied from r288439, head/contrib/llvm/projects/
projects/release-pkg/contrib/unbound/compat/reallocarray.c
- copied unchanged from r288439, head/contrib/unbound/compat/reallocarray.c
projects/release-pkg/contrib/unbound/libunbound/python/file_py3.i
- copied unchanged from r288439, head/contrib/unbound/libunbound/python/file_py3.i
projects/release-pkg/contrib/unbound/sldns/
- copied from r288439, head/contrib/unbound/sldns/
projects/release-pkg/gnu/usr.bin/groff/tmac/fr.ISO8859-1.in
- copied unchanged from r288439, head/gnu/usr.bin/groff/tmac/fr.ISO8859-1.in
projects/release-pkg/gnu/usr.bin/groff/tmac/mdoc.local.in
- copied unchanged from r288439, head/gnu/usr.bin/groff/tmac/mdoc.local.in
projects/release-pkg/gnu/usr.bin/groff/tmac/ru.KOI8-R.in
- copied unchanged from r288439, head/gnu/usr.bin/groff/tmac/ru.KOI8-R.in
projects/release-pkg/release/arm/BANANAPI.conf
- copied unchanged from r288439, head/release/arm/BANANAPI.conf
projects/release-pkg/release/arm/CUBIEBOARD.conf
- copied unchanged from r288439, head/release/arm/CUBIEBOARD.conf
projects/release-pkg/release/arm/CUBIEBOARD2.conf
- copied unchanged from r288439, head/release/arm/CUBIEBOARD2.conf
projects/release-pkg/share/dtrace/tcpdebug
- copied unchanged from r288439, head/share/dtrace/tcpdebug
projects/release-pkg/share/man/man4/otus.4
- copied unchanged from r288439, head/share/man/man4/otus.4
projects/release-pkg/share/man/man4/otusfw.4
- copied unchanged from r288439, head/share/man/man4/otusfw.4
projects/release-pkg/share/man/man9/bus_get_resource.9
- copied unchanged from r288439, head/share/man/man9/bus_get_resource.9
projects/release-pkg/share/vt/fonts/vgarom-16x32.hex
- copied unchanged from r288439, head/share/vt/fonts/vgarom-16x32.hex
projects/release-pkg/sys/arm/allwinner/a20/a20_if_dwc.c
- copied unchanged from r288439, head/sys/arm/allwinner/a20/a20_if_dwc.c
projects/release-pkg/sys/contrib/dev/otus/
- copied from r288439, head/sys/contrib/dev/otus/
projects/release-pkg/sys/dev/dwc/if_dwc_if.m
- copied unchanged from r288439, head/sys/dev/dwc/if_dwc_if.m
projects/release-pkg/sys/dev/dwc/if_dwcvar.h
- copied unchanged from r288439, head/sys/dev/dwc/if_dwcvar.h
projects/release-pkg/sys/dev/otus/
- copied from r288439, head/sys/dev/otus/
projects/release-pkg/sys/modules/otus/
- copied from r288439, head/sys/modules/otus/
projects/release-pkg/sys/modules/otusfw/
- copied from r288439, head/sys/modules/otusfw/
projects/release-pkg/sys/sparc64/pci/ofw_pci.c
- copied unchanged from r288439, head/sys/sparc64/pci/ofw_pci.c
projects/release-pkg/usr.bin/numactl/Makefile.depend
- copied unchanged from r288439, head/usr.bin/numactl/Makefile.depend
projects/release-pkg/usr.bin/systat/zarc.c
- copied unchanged from r288439, head/usr.bin/systat/zarc.c
projects/release-pkg/usr.sbin/sesutil/Makefile.depend
- copied unchanged from r288439, head/usr.sbin/sesutil/Makefile.depend
projects/release-pkg/usr.sbin/sesutil/eltsub.c
- copied unchanged from r288439, head/usr.sbin/sesutil/eltsub.c
projects/release-pkg/usr.sbin/sesutil/eltsub.h
- copied unchanged from r288439, head/usr.sbin/sesutil/eltsub.h
Deleted:
projects/release-pkg/cddl/contrib/opensolaris/cmd/sgs/
projects/release-pkg/cddl/contrib/opensolaris/common/avl/avl.c
projects/release-pkg/cddl/usr.bin/sgsmsg/
projects/release-pkg/contrib/unbound/ldns/
projects/release-pkg/gnu/usr.bin/groff/tmac/fr.ISO8859-1
projects/release-pkg/gnu/usr.bin/groff/tmac/mdoc.local
projects/release-pkg/gnu/usr.bin/groff/tmac/ru.KOI8-R
projects/release-pkg/sbin/ipf/ipsend/
projects/release-pkg/sbin/ipf/iptest/
projects/release-pkg/sbin/ipf/rules/
Modified:
projects/release-pkg/Makefile
projects/release-pkg/Makefile.inc1
projects/release-pkg/ObsoleteFiles.inc
projects/release-pkg/UPDATING
projects/release-pkg/bin/ls/Makefile
projects/release-pkg/bin/ls/ls.1
projects/release-pkg/bin/ps/Makefile.depend
projects/release-pkg/bin/sh/builtins.def
projects/release-pkg/bin/sh/expand.c
projects/release-pkg/bin/sh/parser.c
projects/release-pkg/bin/sh/parser.h
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
projects/release-pkg/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
projects/release-pkg/cddl/contrib/opensolaris/cmd/zdb/zdb.c
projects/release-pkg/cddl/contrib/opensolaris/cmd/zfs/zfs.8
projects/release-pkg/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
projects/release-pkg/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
projects/release-pkg/cddl/lib/libdtrace/Makefile
projects/release-pkg/cddl/lib/libdtrace/ip.d
projects/release-pkg/cddl/lib/libdtrace/tcp.d
projects/release-pkg/cddl/usr.bin/Makefile
projects/release-pkg/cddl/usr.bin/ctfconvert/Makefile.depend
projects/release-pkg/cddl/usr.bin/ctfdump/Makefile.depend
projects/release-pkg/cddl/usr.bin/ctfmerge/Makefile.depend
projects/release-pkg/cddl/usr.sbin/dtrace/Makefile.depend
projects/release-pkg/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
projects/release-pkg/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
projects/release-pkg/cddl/usr.sbin/dtruss/Makefile.depend
projects/release-pkg/contrib/binutils/opcodes/arm-dis.c
projects/release-pkg/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S
projects/release-pkg/contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S
projects/release-pkg/contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S
projects/release-pkg/contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S
projects/release-pkg/contrib/elftoolchain/addr2line/addr2line.c
projects/release-pkg/contrib/elftoolchain/elfdump/elfdump.c
projects/release-pkg/contrib/elftoolchain/readelf/readelf.c
projects/release-pkg/contrib/file/ChangeLog
projects/release-pkg/contrib/file/configure
projects/release-pkg/contrib/file/configure.ac
projects/release-pkg/contrib/file/doc/file.man
projects/release-pkg/contrib/file/doc/libmagic.man
projects/release-pkg/contrib/file/doc/magic.man
projects/release-pkg/contrib/file/magic/Magdir/adventure
projects/release-pkg/contrib/file/magic/Magdir/apple
projects/release-pkg/contrib/file/magic/Magdir/archive
projects/release-pkg/contrib/file/magic/Magdir/c-lang
projects/release-pkg/contrib/file/magic/Magdir/c64
projects/release-pkg/contrib/file/magic/Magdir/compress
projects/release-pkg/contrib/file/magic/Magdir/database
projects/release-pkg/contrib/file/magic/Magdir/filesystems
projects/release-pkg/contrib/file/magic/Magdir/frame
projects/release-pkg/contrib/file/magic/Magdir/iff
projects/release-pkg/contrib/file/magic/Magdir/images
projects/release-pkg/contrib/file/magic/Magdir/karma
projects/release-pkg/contrib/file/magic/Magdir/linux
projects/release-pkg/contrib/file/magic/Magdir/make
projects/release-pkg/contrib/file/magic/Magdir/map
projects/release-pkg/contrib/file/magic/Magdir/msdos
projects/release-pkg/contrib/file/magic/Magdir/netscape
projects/release-pkg/contrib/file/magic/Magdir/python
projects/release-pkg/contrib/file/magic/Magdir/scientific
projects/release-pkg/contrib/file/magic/Magdir/sgi
projects/release-pkg/contrib/file/magic/Magdir/sgml
projects/release-pkg/contrib/file/magic/Magdir/windows
projects/release-pkg/contrib/file/src/apprentice.c
projects/release-pkg/contrib/file/src/file.c
projects/release-pkg/contrib/file/src/file.h
projects/release-pkg/contrib/file/src/file_opts.h
projects/release-pkg/contrib/file/src/funcs.c
projects/release-pkg/contrib/file/src/gmtime_r.c
projects/release-pkg/contrib/file/src/localtime_r.c
projects/release-pkg/contrib/file/src/magic.c
projects/release-pkg/contrib/file/src/magic.h
projects/release-pkg/contrib/file/src/magic.h.in
projects/release-pkg/contrib/file/src/print.c
projects/release-pkg/contrib/file/src/readelf.c
projects/release-pkg/contrib/file/src/softmagic.c
projects/release-pkg/contrib/gcc/config/arm/crti.asm
projects/release-pkg/contrib/gcc/config/arm/crtn.asm
projects/release-pkg/contrib/gcc/config/arm/lib1funcs.asm
projects/release-pkg/contrib/jemalloc/ChangeLog
projects/release-pkg/contrib/jemalloc/FREEBSD-diffs
projects/release-pkg/contrib/jemalloc/VERSION
projects/release-pkg/contrib/jemalloc/doc/jemalloc.3
projects/release-pkg/contrib/jemalloc/include/jemalloc/internal/arena.h
projects/release-pkg/contrib/jemalloc/include/jemalloc/internal/huge.h
projects/release-pkg/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h
projects/release-pkg/contrib/jemalloc/include/jemalloc/internal/private_namespace.h
projects/release-pkg/contrib/jemalloc/include/jemalloc/internal/prof.h
projects/release-pkg/contrib/jemalloc/include/jemalloc/internal/size_classes.h
projects/release-pkg/contrib/jemalloc/include/jemalloc/internal/tcache.h
projects/release-pkg/contrib/jemalloc/include/jemalloc/internal/tsd.h
projects/release-pkg/contrib/jemalloc/include/jemalloc/jemalloc.h
projects/release-pkg/contrib/jemalloc/src/arena.c
projects/release-pkg/contrib/jemalloc/src/chunk_dss.c
projects/release-pkg/contrib/jemalloc/src/chunk_mmap.c
projects/release-pkg/contrib/jemalloc/src/huge.c
projects/release-pkg/contrib/jemalloc/src/jemalloc.c
projects/release-pkg/contrib/jemalloc/src/prof.c
projects/release-pkg/contrib/jemalloc/src/tcache.c
projects/release-pkg/contrib/libcxxrt/exception.cc
projects/release-pkg/contrib/netcat/nc.1
projects/release-pkg/contrib/netcat/netcat.c
projects/release-pkg/contrib/netcat/socks.c
projects/release-pkg/contrib/openpam/lib/libpam/openpam_constants.c
projects/release-pkg/contrib/unbound/Makefile.in
projects/release-pkg/contrib/unbound/acx_nlnetlabs.m4
projects/release-pkg/contrib/unbound/compat/getentropy_linux.c
projects/release-pkg/contrib/unbound/config.h
projects/release-pkg/contrib/unbound/config.h.in
projects/release-pkg/contrib/unbound/configure
projects/release-pkg/contrib/unbound/configure.ac
projects/release-pkg/contrib/unbound/daemon/cachedump.c
projects/release-pkg/contrib/unbound/daemon/daemon.c
projects/release-pkg/contrib/unbound/daemon/remote.c
projects/release-pkg/contrib/unbound/daemon/stats.c
projects/release-pkg/contrib/unbound/daemon/stats.h
projects/release-pkg/contrib/unbound/daemon/worker.c
projects/release-pkg/contrib/unbound/daemon/worker.h
projects/release-pkg/contrib/unbound/dns64/dns64.c
projects/release-pkg/contrib/unbound/dnstap/dnstap.c
projects/release-pkg/contrib/unbound/doc/Changelog
projects/release-pkg/contrib/unbound/doc/README
projects/release-pkg/contrib/unbound/doc/example.conf
projects/release-pkg/contrib/unbound/doc/example.conf.in
projects/release-pkg/contrib/unbound/doc/libunbound.3
projects/release-pkg/contrib/unbound/doc/libunbound.3.in
projects/release-pkg/contrib/unbound/doc/unbound-anchor.8
projects/release-pkg/contrib/unbound/doc/unbound-anchor.8.in
projects/release-pkg/contrib/unbound/doc/unbound-checkconf.8
projects/release-pkg/contrib/unbound/doc/unbound-checkconf.8.in
projects/release-pkg/contrib/unbound/doc/unbound-control.8
projects/release-pkg/contrib/unbound/doc/unbound-control.8.in
projects/release-pkg/contrib/unbound/doc/unbound-host.1
projects/release-pkg/contrib/unbound/doc/unbound-host.1.in
projects/release-pkg/contrib/unbound/doc/unbound.8
projects/release-pkg/contrib/unbound/doc/unbound.8.in
projects/release-pkg/contrib/unbound/doc/unbound.conf.5
projects/release-pkg/contrib/unbound/doc/unbound.conf.5.in
projects/release-pkg/contrib/unbound/freebsd-configure.sh
projects/release-pkg/contrib/unbound/iterator/iter_delegpt.c
projects/release-pkg/contrib/unbound/iterator/iter_fwd.c
projects/release-pkg/contrib/unbound/iterator/iter_hints.c
projects/release-pkg/contrib/unbound/iterator/iter_priv.c
projects/release-pkg/contrib/unbound/iterator/iter_resptype.c
projects/release-pkg/contrib/unbound/iterator/iter_scrub.c
projects/release-pkg/contrib/unbound/iterator/iter_utils.c
projects/release-pkg/contrib/unbound/iterator/iter_utils.h
projects/release-pkg/contrib/unbound/iterator/iterator.c
projects/release-pkg/contrib/unbound/iterator/iterator.h
projects/release-pkg/contrib/unbound/libunbound/context.c
projects/release-pkg/contrib/unbound/libunbound/libunbound.c
projects/release-pkg/contrib/unbound/libunbound/libworker.c
projects/release-pkg/contrib/unbound/libunbound/python/Makefile
projects/release-pkg/contrib/unbound/libunbound/python/examples/async-lookup.py
projects/release-pkg/contrib/unbound/libunbound/python/examples/dns-lookup.py
projects/release-pkg/contrib/unbound/libunbound/python/examples/dnssec-valid.py
projects/release-pkg/contrib/unbound/libunbound/python/examples/dnssec_test.py
projects/release-pkg/contrib/unbound/libunbound/python/examples/example8-1.py
projects/release-pkg/contrib/unbound/libunbound/python/examples/idn-lookup.py
projects/release-pkg/contrib/unbound/libunbound/python/examples/mx-lookup.py
projects/release-pkg/contrib/unbound/libunbound/python/examples/ns-lookup.py
projects/release-pkg/contrib/unbound/libunbound/python/examples/reverse-lookup.py
projects/release-pkg/contrib/unbound/libunbound/python/libunbound.i
projects/release-pkg/contrib/unbound/libunbound/worker.h
projects/release-pkg/contrib/unbound/services/cache/dns.c
projects/release-pkg/contrib/unbound/services/cache/infra.c
projects/release-pkg/contrib/unbound/services/cache/infra.h
projects/release-pkg/contrib/unbound/services/cache/rrset.c
projects/release-pkg/contrib/unbound/services/listen_dnsport.c
projects/release-pkg/contrib/unbound/services/listen_dnsport.h
projects/release-pkg/contrib/unbound/services/localzone.c
projects/release-pkg/contrib/unbound/services/localzone.h
projects/release-pkg/contrib/unbound/services/mesh.c
projects/release-pkg/contrib/unbound/services/outside_network.c
projects/release-pkg/contrib/unbound/smallapp/unbound-anchor.c
projects/release-pkg/contrib/unbound/smallapp/unbound-checkconf.c
projects/release-pkg/contrib/unbound/smallapp/unbound-control-setup.sh
projects/release-pkg/contrib/unbound/smallapp/unbound-control-setup.sh.in
projects/release-pkg/contrib/unbound/smallapp/unbound-control.c
projects/release-pkg/contrib/unbound/smallapp/unbound-host.c
projects/release-pkg/contrib/unbound/util/alloc.c
projects/release-pkg/contrib/unbound/util/alloc.h
projects/release-pkg/contrib/unbound/util/config_file.c
projects/release-pkg/contrib/unbound/util/config_file.h
projects/release-pkg/contrib/unbound/util/configlexer.lex
projects/release-pkg/contrib/unbound/util/configparser.y
projects/release-pkg/contrib/unbound/util/data/dname.c
projects/release-pkg/contrib/unbound/util/data/msgencode.c
projects/release-pkg/contrib/unbound/util/data/msgparse.c
projects/release-pkg/contrib/unbound/util/data/msgparse.h
projects/release-pkg/contrib/unbound/util/data/msgreply.c
projects/release-pkg/contrib/unbound/util/data/msgreply.h
projects/release-pkg/contrib/unbound/util/data/packed_rrset.c
projects/release-pkg/contrib/unbound/util/data/packed_rrset.h
projects/release-pkg/contrib/unbound/util/fptr_wlist.c
projects/release-pkg/contrib/unbound/util/iana_ports.inc
projects/release-pkg/contrib/unbound/util/log.c
projects/release-pkg/contrib/unbound/util/log.h
projects/release-pkg/contrib/unbound/util/net_help.c
projects/release-pkg/contrib/unbound/util/netevent.c
projects/release-pkg/contrib/unbound/util/netevent.h
projects/release-pkg/contrib/unbound/validator/autotrust.c
projects/release-pkg/contrib/unbound/validator/val_anchor.c
projects/release-pkg/contrib/unbound/validator/val_kentry.c
projects/release-pkg/contrib/unbound/validator/val_neg.c
projects/release-pkg/contrib/unbound/validator/val_nsec3.c
projects/release-pkg/contrib/unbound/validator/val_secalgo.c
projects/release-pkg/contrib/unbound/validator/val_sigcrypt.c
projects/release-pkg/contrib/unbound/validator/validator.c
projects/release-pkg/etc/mtree/BSD.debug.dist
projects/release-pkg/etc/mtree/BSD.tests.dist
projects/release-pkg/etc/rc.d/automount
projects/release-pkg/etc/rc.d/automountd
projects/release-pkg/etc/rc.d/autounmountd
projects/release-pkg/etc/rc.d/ugidfw
projects/release-pkg/etc/rc.subr
projects/release-pkg/etc/sendmail/Makefile.depend
projects/release-pkg/gnu/lib/csu/Makefile
projects/release-pkg/gnu/lib/libreadline/readline/Makefile
projects/release-pkg/gnu/lib/libssp/Makefile.depend
projects/release-pkg/gnu/usr.bin/binutils/ld/Makefile
projects/release-pkg/gnu/usr.bin/binutils/ld/Makefile.amd64
projects/release-pkg/gnu/usr.bin/binutils/ld/Makefile.mips
projects/release-pkg/gnu/usr.bin/binutils/ld/Makefile.powerpc64
projects/release-pkg/gnu/usr.bin/binutils/ld/Makefile.sparc64
projects/release-pkg/gnu/usr.bin/binutils/libbfd/Makefile.i386
projects/release-pkg/gnu/usr.bin/cc/c++/Makefile.depend
projects/release-pkg/gnu/usr.bin/cc/cc/Makefile.depend
projects/release-pkg/gnu/usr.bin/cc/cc1/Makefile.depend
projects/release-pkg/gnu/usr.bin/cc/cc1plus/Makefile.depend
projects/release-pkg/gnu/usr.bin/cc/cc_int/Makefile.depend
projects/release-pkg/gnu/usr.bin/cc/cc_tools/Makefile
projects/release-pkg/gnu/usr.bin/cc/cc_tools/Makefile.depend
projects/release-pkg/gnu/usr.bin/cc/cpp/Makefile.depend
projects/release-pkg/gnu/usr.bin/cc/gcov/Makefile.depend
projects/release-pkg/gnu/usr.bin/cc/include/Makefile.depend
projects/release-pkg/gnu/usr.bin/cc/libcpp/Makefile.depend
projects/release-pkg/gnu/usr.bin/cc/libdecnumber/Makefile.depend
projects/release-pkg/gnu/usr.bin/cc/libiberty/Makefile.depend
projects/release-pkg/gnu/usr.bin/diff/Makefile.depend
projects/release-pkg/gnu/usr.bin/dtc/Makefile.depend
projects/release-pkg/gnu/usr.bin/gdb/kgdb/trgt_amd64.c
projects/release-pkg/gnu/usr.bin/gperf/Makefile.depend
projects/release-pkg/gnu/usr.bin/grep/Makefile.depend
projects/release-pkg/gnu/usr.bin/groff/src/utils/indxbib/Makefile
projects/release-pkg/gnu/usr.bin/groff/tmac/Makefile
projects/release-pkg/include/Makefile
projects/release-pkg/kerberos5/Makefile
projects/release-pkg/kerberos5/lib/Makefile
projects/release-pkg/kerberos5/libexec/Makefile
projects/release-pkg/kerberos5/libexec/kdigest/Makefile
projects/release-pkg/kerberos5/tools/Makefile
projects/release-pkg/kerberos5/usr.bin/Makefile
projects/release-pkg/kerberos5/usr.bin/hxtool/Makefile
projects/release-pkg/kerberos5/usr.bin/kadmin/Makefile
projects/release-pkg/kerberos5/usr.bin/kcc/Makefile
projects/release-pkg/kerberos5/usr.sbin/Makefile
projects/release-pkg/kerberos5/usr.sbin/iprop-log/Makefile
projects/release-pkg/kerberos5/usr.sbin/ktutil/Makefile
projects/release-pkg/lib/clang/include/Makefile
projects/release-pkg/lib/clang/libllvmdebuginfo/Makefile.depend
projects/release-pkg/lib/clang/libllvminterpreter/Makefile.depend
projects/release-pkg/lib/csu/Makefile.inc
projects/release-pkg/lib/csu/aarch64/Makefile
projects/release-pkg/lib/csu/amd64/Makefile
projects/release-pkg/lib/csu/arm/Makefile
projects/release-pkg/lib/csu/arm/Makefile.depend
projects/release-pkg/lib/csu/arm/crti.S
projects/release-pkg/lib/csu/arm/crtn.S
projects/release-pkg/lib/csu/i386/Makefile
projects/release-pkg/lib/csu/i386/Makefile.depend
projects/release-pkg/lib/csu/mips/Makefile
projects/release-pkg/lib/csu/mips/Makefile.depend
projects/release-pkg/lib/csu/powerpc/Makefile
projects/release-pkg/lib/csu/powerpc/Makefile.depend
projects/release-pkg/lib/csu/powerpc64/Makefile
projects/release-pkg/lib/csu/powerpc64/Makefile.depend
projects/release-pkg/lib/csu/sparc64/Makefile
projects/release-pkg/lib/csu/sparc64/Makefile.depend
projects/release-pkg/lib/libblocksruntime/Makefile.depend
projects/release-pkg/lib/libc/Makefile.depend
projects/release-pkg/lib/libc/aarch64/gen/_set_tp.c
projects/release-pkg/lib/libc/amd64/gen/_set_tp.c
projects/release-pkg/lib/libc/arm/aeabi/aeabi_asm_double.S
projects/release-pkg/lib/libc/arm/aeabi/aeabi_asm_float.S
projects/release-pkg/lib/libc/arm/aeabi/aeabi_vfp_double.S
projects/release-pkg/lib/libc/arm/aeabi/aeabi_vfp_float.S
projects/release-pkg/lib/libc/arm/gen/__aeabi_read_tp.S
projects/release-pkg/lib/libc/arm/gen/_ctx_start.S
projects/release-pkg/lib/libc/arm/gen/_set_tp.c
projects/release-pkg/lib/libc/arm/gen/_setjmp.S
projects/release-pkg/lib/libc/arm/gen/alloca.S
projects/release-pkg/lib/libc/arm/gen/divsi3.S
projects/release-pkg/lib/libc/arm/gen/setjmp.S
projects/release-pkg/lib/libc/arm/gen/sigsetjmp.S
projects/release-pkg/lib/libc/arm/string/ffs.S
projects/release-pkg/lib/libc/arm/string/memcmp.S
projects/release-pkg/lib/libc/arm/string/memcpy_arm.S
projects/release-pkg/lib/libc/arm/string/memcpy_xscale.S
projects/release-pkg/lib/libc/arm/string/memmove.S
projects/release-pkg/lib/libc/arm/string/memset.S
projects/release-pkg/lib/libc/arm/string/strcmp.S
projects/release-pkg/lib/libc/arm/string/strlen.S
projects/release-pkg/lib/libc/arm/string/strncmp.S
projects/release-pkg/lib/libc/arm/sys/Ovfork.S
projects/release-pkg/lib/libc/arm/sys/brk.S
projects/release-pkg/lib/libc/arm/sys/cerror.S
projects/release-pkg/lib/libc/arm/sys/pipe.S
projects/release-pkg/lib/libc/arm/sys/ptrace.S
projects/release-pkg/lib/libc/arm/sys/sbrk.S
projects/release-pkg/lib/libc/arm/sys/shmat.S
projects/release-pkg/lib/libc/arm/sys/sigreturn.S
projects/release-pkg/lib/libc/arm/sys/syscall.S
projects/release-pkg/lib/libc/compat-43/creat.c
projects/release-pkg/lib/libc/compat-43/sigcompat.c
projects/release-pkg/lib/libc/db/hash/ndbm.c
projects/release-pkg/lib/libc/db/recno/rec_open.c
projects/release-pkg/lib/libc/gdtoa/_ldtoa.c
projects/release-pkg/lib/libc/gen/alarm.c
projects/release-pkg/lib/libc/gen/assert.c
projects/release-pkg/lib/libc/gen/clock.c
projects/release-pkg/lib/libc/gen/dlfcn.c
projects/release-pkg/lib/libc/gen/dup3.c
projects/release-pkg/lib/libc/gen/elf_utils.c
projects/release-pkg/lib/libc/gen/err.c
projects/release-pkg/lib/libc/gen/exec.c
projects/release-pkg/lib/libc/gen/feature_present.c
projects/release-pkg/lib/libc/gen/fmtcheck.c
projects/release-pkg/lib/libc/gen/fnmatch.c
projects/release-pkg/lib/libc/gen/ftok.c
projects/release-pkg/lib/libc/gen/fts-compat.c
projects/release-pkg/lib/libc/gen/fts.c
projects/release-pkg/lib/libc/gen/getbsize.c
projects/release-pkg/lib/libc/gen/getcwd.c
projects/release-pkg/lib/libc/gen/getdomainname.c
projects/release-pkg/lib/libc/gen/getgrent.c
projects/release-pkg/lib/libc/gen/gethostname.c
projects/release-pkg/lib/libc/gen/getloadavg.c
projects/release-pkg/lib/libc/gen/getmntinfo.c
projects/release-pkg/lib/libc/gen/getpagesize.c
projects/release-pkg/lib/libc/gen/getpwent.c
projects/release-pkg/lib/libc/gen/getusershell.c
projects/release-pkg/lib/libc/gen/getvfsbyname.c
projects/release-pkg/lib/libc/gen/glob.c
projects/release-pkg/lib/libc/gen/initgroups.c
projects/release-pkg/lib/libc/gen/isatty.c
projects/release-pkg/lib/libc/gen/nlist.c
projects/release-pkg/lib/libc/gen/pause.c
projects/release-pkg/lib/libc/gen/popen.c
projects/release-pkg/lib/libc/gen/psignal.c
projects/release-pkg/lib/libc/gen/raise.c
projects/release-pkg/lib/libc/gen/readdir.c
projects/release-pkg/lib/libc/gen/rewinddir.c
projects/release-pkg/lib/libc/gen/seekdir.c
projects/release-pkg/lib/libc/gen/semctl.c
projects/release-pkg/lib/libc/gen/setjmperr.c
projects/release-pkg/lib/libc/gen/sigsetops.c
projects/release-pkg/lib/libc/gen/sleep.c
projects/release-pkg/lib/libc/gen/strtofflags.c
projects/release-pkg/lib/libc/gen/sysconf.c
projects/release-pkg/lib/libc/gen/telldir.c
projects/release-pkg/lib/libc/gen/tls.c
projects/release-pkg/lib/libc/gen/ttyslot.c
projects/release-pkg/lib/libc/gen/ualarm.c
projects/release-pkg/lib/libc/gen/uname.c
projects/release-pkg/lib/libc/gen/unvis-compat.c
projects/release-pkg/lib/libc/gen/usleep.c
projects/release-pkg/lib/libc/gen/utime.c
projects/release-pkg/lib/libc/gen/wait.c
projects/release-pkg/lib/libc/gen/wait3.c
projects/release-pkg/lib/libc/gen/waitid.c
projects/release-pkg/lib/libc/gen/waitpid.c
projects/release-pkg/lib/libc/gen/wordexp.3
projects/release-pkg/lib/libc/gen/wordexp.c
projects/release-pkg/lib/libc/gmon/gmon.c
projects/release-pkg/lib/libc/inet/inet_lnaof.c
projects/release-pkg/lib/libc/inet/inet_makeaddr.c
projects/release-pkg/lib/libc/inet/inet_net_ntop.c
projects/release-pkg/lib/libc/inet/inet_neta.c
projects/release-pkg/lib/libc/inet/inet_netof.c
projects/release-pkg/lib/libc/inet/inet_network.c
projects/release-pkg/lib/libc/isc/ev_timers.c
projects/release-pkg/lib/libc/locale/isctype.c
projects/release-pkg/lib/libc/locale/iswctype.c
projects/release-pkg/lib/libc/locale/setlocale.c
projects/release-pkg/lib/libc/locale/tolower.c
projects/release-pkg/lib/libc/locale/toupper.c
projects/release-pkg/lib/libc/mips/gen/_set_tp.c
projects/release-pkg/lib/libc/net/getaddrinfo.3
projects/release-pkg/lib/libc/net/getaddrinfo.c
projects/release-pkg/lib/libc/net/gethostbydns.c
projects/release-pkg/lib/libc/net/gethostnamadr.c
projects/release-pkg/lib/libc/net/getnameinfo.3
projects/release-pkg/lib/libc/net/getnameinfo.c
projects/release-pkg/lib/libc/net/getnetbydns.c
projects/release-pkg/lib/libc/net/getnetnamadr.c
projects/release-pkg/lib/libc/net/getproto.c
projects/release-pkg/lib/libc/net/getservent.c
projects/release-pkg/lib/libc/net/linkaddr.c
projects/release-pkg/lib/libc/net/map_v4v6.c
projects/release-pkg/lib/libc/net/netdb_private.h
projects/release-pkg/lib/libc/net/nscache.c
projects/release-pkg/lib/libc/net/nslexer.l
projects/release-pkg/lib/libc/net/nsparser.y
projects/release-pkg/lib/libc/net/nss_compat.c
projects/release-pkg/lib/libc/net/ntoh.c
projects/release-pkg/lib/libc/net/rcmd.c
projects/release-pkg/lib/libc/net/recv.c
projects/release-pkg/lib/libc/net/rthdr.c
projects/release-pkg/lib/libc/net/send.c
projects/release-pkg/lib/libc/net/sockatmark.c
projects/release-pkg/lib/libc/posix1e/acl_compat.c
projects/release-pkg/lib/libc/posix1e/acl_support.h
projects/release-pkg/lib/libc/powerpc/gen/_set_tp.c
projects/release-pkg/lib/libc/powerpc64/gen/_set_tp.c
projects/release-pkg/lib/libc/resolv/h_errno.c
projects/release-pkg/lib/libc/resolv/res_debug.c
projects/release-pkg/lib/libc/resolv/res_init.c
projects/release-pkg/lib/libc/resolv/res_mkupdate.c
projects/release-pkg/lib/libc/resolv/res_send.c
projects/release-pkg/lib/libc/rpc/auth_unix.c
projects/release-pkg/lib/libc/rpc/authdes_prot.c
projects/release-pkg/lib/libc/rpc/authunix_prot.c
projects/release-pkg/lib/libc/rpc/bindresvport.c
projects/release-pkg/lib/libc/rpc/clnt_bcast.c
projects/release-pkg/lib/libc/rpc/clnt_perror.c
projects/release-pkg/lib/libc/rpc/clnt_raw.c
projects/release-pkg/lib/libc/rpc/clnt_simple.c
projects/release-pkg/lib/libc/rpc/clnt_vc.c
projects/release-pkg/lib/libc/rpc/des_crypt.c
projects/release-pkg/lib/libc/rpc/getnetconfig.c
projects/release-pkg/lib/libc/rpc/getnetpath.c
projects/release-pkg/lib/libc/rpc/getrpcent.c
projects/release-pkg/lib/libc/rpc/getrpcport.c
projects/release-pkg/lib/libc/rpc/mt_misc.c
projects/release-pkg/lib/libc/rpc/netname.c
projects/release-pkg/lib/libc/rpc/netnamer.c
projects/release-pkg/lib/libc/rpc/pmap_getmaps.c
projects/release-pkg/lib/libc/rpc/pmap_getport.c
projects/release-pkg/lib/libc/rpc/pmap_prot.c
projects/release-pkg/lib/libc/rpc/pmap_prot2.c
projects/release-pkg/lib/libc/rpc/pmap_rmt.c
projects/release-pkg/lib/libc/rpc/rpc_callmsg.c
projects/release-pkg/lib/libc/rpc/rpc_generic.c
projects/release-pkg/lib/libc/rpc/rpc_prot.c
projects/release-pkg/lib/libc/rpc/rpc_soc.c
projects/release-pkg/lib/libc/rpc/rpcb_clnt.c
projects/release-pkg/lib/libc/rpc/rpcb_prot.c
projects/release-pkg/lib/libc/rpc/rpcb_st_xdr.c
projects/release-pkg/lib/libc/rpc/svc.c
projects/release-pkg/lib/libc/rpc/svc_auth.c
projects/release-pkg/lib/libc/rpc/svc_auth_unix.c
projects/release-pkg/lib/libc/rpc/svc_generic.c
projects/release-pkg/lib/libc/rpc/svc_raw.c
projects/release-pkg/lib/libc/rpc/svc_run.c
projects/release-pkg/lib/libc/rpc/svc_simple.c
projects/release-pkg/lib/libc/sparc64/gen/_set_tp.c
projects/release-pkg/lib/libc/stdio/_flock_stub.c
projects/release-pkg/lib/libc/stdio/fgetwln.c
projects/release-pkg/lib/libc/stdio/findfp.c
projects/release-pkg/lib/libc/stdio/getchar.c
projects/release-pkg/lib/libc/stdio/vfscanf.c
projects/release-pkg/lib/libc/stdlib/abort.c
projects/release-pkg/lib/libc/stdlib/abs.c
projects/release-pkg/lib/libc/stdlib/atexit.c
projects/release-pkg/lib/libc/stdlib/atof.c
projects/release-pkg/lib/libc/stdlib/atoi.c
projects/release-pkg/lib/libc/stdlib/atol.c
projects/release-pkg/lib/libc/stdlib/atoll.c
projects/release-pkg/lib/libc/stdlib/bsearch.c
projects/release-pkg/lib/libc/stdlib/exit.c
projects/release-pkg/lib/libc/stdlib/heapsort.c
projects/release-pkg/lib/libc/stdlib/labs.c
projects/release-pkg/lib/libc/stdlib/merge.c
projects/release-pkg/lib/libc/stdlib/qsort.c
projects/release-pkg/lib/libc/stdlib/radixsort.c
projects/release-pkg/lib/libc/stdlib/rand.c
projects/release-pkg/lib/libc/stdlib/tfind.c
projects/release-pkg/lib/libc/stdtime/strftime.c
projects/release-pkg/lib/libc/string/strchrnul.c
projects/release-pkg/lib/libc/sys/Makefile.inc
projects/release-pkg/lib/libc/sys/__error.c
projects/release-pkg/lib/libc/sys/close.c
projects/release-pkg/lib/libc/sys/fsync.c
projects/release-pkg/lib/libc/sys/msync.c
projects/release-pkg/lib/libc/sys/readv.c
projects/release-pkg/lib/libc/sys/reboot.2
projects/release-pkg/lib/libc/sys/setuid.2
projects/release-pkg/lib/libc/sys/writev.c
projects/release-pkg/lib/libc/tests/gen/posix_spawn/Makefile
projects/release-pkg/lib/libc/tests/stdio/fmemopen2_test.c
projects/release-pkg/lib/libc/xdr/xdr_float.c
projects/release-pkg/lib/libcompiler_rt/Makefile
projects/release-pkg/lib/libcrypt/tests/Makefile.depend
projects/release-pkg/lib/libcuse/Makefile.depend
projects/release-pkg/lib/libcxxrt/Makefile.depend.host
projects/release-pkg/lib/libevent/Makefile.depend
projects/release-pkg/lib/libfetch/common.c
projects/release-pkg/lib/libgpib/Makefile.depend
projects/release-pkg/lib/libiconv_modules/BIG5/Makefile.depend
projects/release-pkg/lib/libiconv_modules/DECHanyu/Makefile.depend
projects/release-pkg/lib/libiconv_modules/EUC/Makefile.depend
projects/release-pkg/lib/libiconv_modules/EUCTW/Makefile.depend
projects/release-pkg/lib/libiconv_modules/GBK2K/Makefile.depend
projects/release-pkg/lib/libiconv_modules/HZ/Makefile.depend
projects/release-pkg/lib/libiconv_modules/ISO2022/Makefile.depend
projects/release-pkg/lib/libiconv_modules/JOHAB/Makefile.depend
projects/release-pkg/lib/libiconv_modules/MSKanji/Makefile.depend
projects/release-pkg/lib/libiconv_modules/UES/Makefile.depend
projects/release-pkg/lib/libiconv_modules/UTF1632/Makefile.depend
projects/release-pkg/lib/libiconv_modules/UTF7/Makefile.depend
projects/release-pkg/lib/libiconv_modules/UTF8/Makefile.depend
projects/release-pkg/lib/libiconv_modules/VIQR/Makefile.depend
projects/release-pkg/lib/libiconv_modules/ZW/Makefile.depend
projects/release-pkg/lib/libiconv_modules/iconv_none/Makefile.depend
projects/release-pkg/lib/libiconv_modules/iconv_std/Makefile.depend
projects/release-pkg/lib/libiconv_modules/mapper_646/Makefile.depend
projects/release-pkg/lib/libiconv_modules/mapper_none/Makefile.depend
projects/release-pkg/lib/libiconv_modules/mapper_parallel/Makefile.depend
projects/release-pkg/lib/libiconv_modules/mapper_serial/Makefile.depend
projects/release-pkg/lib/libiconv_modules/mapper_std/Makefile.depend
projects/release-pkg/lib/libiconv_modules/mapper_zone/Makefile.depend
projects/release-pkg/lib/liblzma/Makefile
projects/release-pkg/lib/libmagic/config.h
projects/release-pkg/lib/libmilter/Makefile.depend
projects/release-pkg/lib/libpam/Makefile.inc
projects/release-pkg/lib/libpam/libpam/Makefile
projects/release-pkg/lib/librpcsec_gss/Makefile.depend
projects/release-pkg/lib/libsm/Makefile.depend
projects/release-pkg/lib/libsmb/Makefile.depend
projects/release-pkg/lib/libstand/Makefile.depend
projects/release-pkg/lib/libstdbuf/Makefile.depend
projects/release-pkg/lib/libstdthreads/Makefile.depend
projects/release-pkg/lib/libugidfw/ugidfw.c
projects/release-pkg/lib/libunbound/Makefile
projects/release-pkg/lib/libunbound/Makefile.depend
projects/release-pkg/lib/libusb/Makefile
projects/release-pkg/lib/libvgl/Makefile.depend
projects/release-pkg/lib/libxo/Makefile.depend
projects/release-pkg/lib/libz/Makefile
projects/release-pkg/lib/ncurses/form/Makefile.depend
projects/release-pkg/lib/ncurses/formw/Makefile.depend
projects/release-pkg/lib/ncurses/menu/Makefile.depend
projects/release-pkg/lib/ncurses/menuw/Makefile.depend
projects/release-pkg/lib/ncurses/ncurses/Makefile
projects/release-pkg/libexec/bootpd/Makefile.depend
projects/release-pkg/libexec/rtld-elf/Makefile
projects/release-pkg/libexec/rtld-elf/arm/rtld_start.S
projects/release-pkg/release/arm/BEAGLEBONE.conf
projects/release-pkg/release/arm/CUBOX-HUMMINGBOARD.conf
projects/release-pkg/release/arm/GUMSTIX.conf
projects/release-pkg/release/arm/PANDABOARD.conf
projects/release-pkg/release/arm/RPI-B.conf
projects/release-pkg/release/arm/RPI2.conf
projects/release-pkg/release/arm/WANDBOARD.conf
projects/release-pkg/release/doc/en_US.ISO8859-1/hardware/article.xml
projects/release-pkg/release/doc/share/misc/dev.archlist.txt
projects/release-pkg/release/release.sh
projects/release-pkg/release/tools/vmimage.subr
projects/release-pkg/rescue/librescue/Makefile.depend
projects/release-pkg/sbin/fdisk_pc98/Makefile.depend
projects/release-pkg/sbin/geom/class/nop/geom_nop.c
projects/release-pkg/sbin/geom/class/nop/gnop.8
projects/release-pkg/sbin/ifconfig/af_inet6.c
projects/release-pkg/sbin/ifconfig/carp.c
projects/release-pkg/sbin/ifconfig/ifbridge.c
projects/release-pkg/sbin/ifconfig/ifclone.c
projects/release-pkg/sbin/ifconfig/ifconfig.c
projects/release-pkg/sbin/ifconfig/iffib.c
projects/release-pkg/sbin/ifconfig/ifgre.c
projects/release-pkg/sbin/ifconfig/ifgroup.c
projects/release-pkg/sbin/ifconfig/ifieee80211.c
projects/release-pkg/sbin/ifconfig/iflagg.c
projects/release-pkg/sbin/ifconfig/ifmac.c
projects/release-pkg/sbin/ifconfig/ifmedia.c
projects/release-pkg/sbin/ifconfig/ifpfsync.c
projects/release-pkg/sbin/ifconfig/ifvlan.c
projects/release-pkg/sbin/ifconfig/ifvxlan.c
projects/release-pkg/sbin/ipf/Makefile
projects/release-pkg/sbin/ipf/ipftest/Makefile.depend
projects/release-pkg/sbin/natd/natd.c
projects/release-pkg/sbin/route/route.c
projects/release-pkg/sbin/routed/Makefile.depend
projects/release-pkg/sbin/savecore/Makefile.depend
projects/release-pkg/sbin/sconfig/Makefile.depend
projects/release-pkg/sbin/sunlabel/Makefile.depend
projects/release-pkg/secure/lib/libcrypto/Makefile
projects/release-pkg/share/doc/legal/realtek/Makefile.depend
projects/release-pkg/share/doc/llvm/Makefile.depend
projects/release-pkg/share/examples/libvgl/Makefile.depend
projects/release-pkg/share/examples/mdoc/example.4
projects/release-pkg/share/man/man4/Makefile
projects/release-pkg/share/man/man4/ctl.4
projects/release-pkg/share/man/man4/dtrace_ip.4
projects/release-pkg/share/man/man4/man4.arm/Makefile.depend
projects/release-pkg/share/man/man4/man4.i386/Makefile.depend
projects/release-pkg/share/man/man4/man4.powerpc/Makefile.depend
projects/release-pkg/share/man/man4/man4.sparc64/Makefile.depend
projects/release-pkg/share/man/man4/ng_pppoe.4
projects/release-pkg/share/man/man4/rsu.4
projects/release-pkg/share/man/man4/usb_quirk.4
projects/release-pkg/share/man/man5/Makefile
projects/release-pkg/share/man/man5/src.conf.5
projects/release-pkg/share/man/man7/hier.7
projects/release-pkg/share/man/man9/Makefile
projects/release-pkg/share/man/man9/VOP_ADVISE.9
projects/release-pkg/share/man/man9/mbuf.9
projects/release-pkg/share/man/man9/timeout.9
projects/release-pkg/share/mk/Makefile
projects/release-pkg/share/mk/bsd.README
projects/release-pkg/share/mk/bsd.files.mk
projects/release-pkg/share/mk/bsd.incs.mk
projects/release-pkg/share/mk/bsd.lib.mk
projects/release-pkg/share/mk/bsd.prog.mk
projects/release-pkg/share/mk/bsd.progs.mk
projects/release-pkg/share/mk/bsd.subdir.mk
projects/release-pkg/share/mk/bsd.sys.mk
projects/release-pkg/share/mk/bsd.test.mk
projects/release-pkg/share/mk/local.gendirdeps.mk
projects/release-pkg/share/mk/local.init.mk
projects/release-pkg/share/mk/local.meta.sys.mk
projects/release-pkg/share/mk/src.sys.env.mk
projects/release-pkg/share/mk/src.sys.mk
projects/release-pkg/share/mk/suite.test.mk
projects/release-pkg/share/mk/sys.mk
projects/release-pkg/share/msgdef/Makefile
projects/release-pkg/share/security/Makefile.depend
projects/release-pkg/share/vt/fonts/Makefile
projects/release-pkg/sys/amd64/amd64/elf_machdep.c
projects/release-pkg/sys/amd64/amd64/pmap.c
projects/release-pkg/sys/amd64/include/smp.h
projects/release-pkg/sys/arm/allwinner/a20/files.a20
projects/release-pkg/sys/arm/altera/socfpga/files.socfpga
projects/release-pkg/sys/arm/amlogic/aml8726/files.aml8726
projects/release-pkg/sys/arm/arm/elf_machdep.c
projects/release-pkg/sys/arm/arm/pmap-v6-new.c
projects/release-pkg/sys/arm/arm/pmap-v6.c
projects/release-pkg/sys/arm/arm/stdatomic.c
projects/release-pkg/sys/arm/conf/A20
projects/release-pkg/sys/arm/versatile/versatile_pci.c
projects/release-pkg/sys/arm/xscale/i80321/i80321_pci.c
projects/release-pkg/sys/arm/xscale/i8134x/i81342_pci.c
projects/release-pkg/sys/arm64/arm64/exception.S
projects/release-pkg/sys/arm64/arm64/gic_v3_its.c
projects/release-pkg/sys/arm64/arm64/gic_v3_var.h
projects/release-pkg/sys/arm64/arm64/machdep.c
projects/release-pkg/sys/arm64/arm64/mp_machdep.c
projects/release-pkg/sys/arm64/arm64/pmap.c
projects/release-pkg/sys/arm64/arm64/trap.c
projects/release-pkg/sys/arm64/cavium/thunder_pcie_pem.c
projects/release-pkg/sys/arm64/conf/GENERIC
projects/release-pkg/sys/arm64/include/cpu.h
projects/release-pkg/sys/arm64/include/cpufunc.h
projects/release-pkg/sys/boot/efi/boot1/Makefile
projects/release-pkg/sys/boot/efi/libefi/Makefile.depend
projects/release-pkg/sys/boot/efi/loader/Makefile
projects/release-pkg/sys/boot/efi/loader/copy.c
projects/release-pkg/sys/boot/fdt/dts/arm/bcm2836.dtsi
projects/release-pkg/sys/boot/fdt/dts/arm/cubieboard2.dts
projects/release-pkg/sys/boot/ficl/Makefile.depend
projects/release-pkg/sys/boot/i386/boot0/Makefile.depend
projects/release-pkg/sys/boot/i386/boot0sio/Makefile.depend
projects/release-pkg/sys/boot/i386/boot2/Makefile.depend
projects/release-pkg/sys/boot/i386/loader/Makefile.depend
projects/release-pkg/sys/boot/i386/zfsloader/Makefile.depend
projects/release-pkg/sys/boot/usb/usbcore.mk
projects/release-pkg/sys/cam/cam_compat.c
projects/release-pkg/sys/cam/cam_periph.c
projects/release-pkg/sys/cam/cam_periph.h
projects/release-pkg/sys/cam/cam_xpt.c
projects/release-pkg/sys/cam/ctl/README.ctl.txt
projects/release-pkg/sys/cam/ctl/ctl.c
projects/release-pkg/sys/cam/ctl/ctl.h
projects/release-pkg/sys/cam/ctl/ctl_backend.c
projects/release-pkg/sys/cam/ctl/ctl_backend.h
projects/release-pkg/sys/cam/ctl/ctl_backend_block.c
projects/release-pkg/sys/cam/ctl/ctl_backend_ramdisk.c
projects/release-pkg/sys/cam/ctl/ctl_cmd_table.c
projects/release-pkg/sys/cam/ctl/ctl_error.c
projects/release-pkg/sys/cam/ctl/ctl_error.h
projects/release-pkg/sys/cam/ctl/ctl_frontend.c
projects/release-pkg/sys/cam/ctl/ctl_frontend.h
projects/release-pkg/sys/cam/ctl/ctl_frontend_cam_sim.c
projects/release-pkg/sys/cam/ctl/ctl_frontend_ioctl.c
projects/release-pkg/sys/cam/ctl/ctl_frontend_iscsi.c
projects/release-pkg/sys/cam/ctl/ctl_ha.c
projects/release-pkg/sys/cam/ctl/ctl_ha.h
projects/release-pkg/sys/cam/ctl/ctl_io.h
projects/release-pkg/sys/cam/ctl/ctl_ioctl.h
projects/release-pkg/sys/cam/ctl/ctl_private.h
projects/release-pkg/sys/cam/ctl/ctl_ser_table.c
projects/release-pkg/sys/cam/ctl/ctl_tpc.c
projects/release-pkg/sys/cam/ctl/ctl_tpc_local.c
projects/release-pkg/sys/cam/ctl/ctl_util.c
projects/release-pkg/sys/cam/ctl/ctl_util.h
projects/release-pkg/sys/cam/ctl/scsi_ctl.c
projects/release-pkg/sys/cam/scsi/scsi_all.c
projects/release-pkg/sys/cam/scsi/scsi_all.h
projects/release-pkg/sys/cam/scsi/scsi_cd.h
projects/release-pkg/sys/cam/scsi/scsi_ch.c
projects/release-pkg/sys/cam/scsi/scsi_pass.c
projects/release-pkg/sys/cam/scsi/scsi_sg.c
projects/release-pkg/sys/cam/scsi/scsi_target.c
projects/release-pkg/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h
projects/release-pkg/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
projects/release-pkg/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
projects/release-pkg/sys/cddl/dev/sdt/sdt.c
projects/release-pkg/sys/compat/linux/linux_dtrace.h
projects/release-pkg/sys/conf/files
projects/release-pkg/sys/conf/files.amd64
projects/release-pkg/sys/conf/files.arm
projects/release-pkg/sys/conf/files.i386
projects/release-pkg/sys/conf/files.mips
projects/release-pkg/sys/conf/files.pc98
projects/release-pkg/sys/conf/files.powerpc
projects/release-pkg/sys/conf/files.sparc64
projects/release-pkg/sys/conf/kern.post.mk
projects/release-pkg/sys/conf/kmod.mk
projects/release-pkg/sys/contrib/ipfilter/netinet/ip_nat.c
projects/release-pkg/sys/dev/acpica/acpi_pcib.c
projects/release-pkg/sys/dev/ahci/ahci_pci.c
projects/release-pkg/sys/dev/ath/if_ath.c
projects/release-pkg/sys/dev/ath/if_ath_ahb.c
projects/release-pkg/sys/dev/ath/if_ath_beacon.c
projects/release-pkg/sys/dev/ath/if_ath_keycache.c
projects/release-pkg/sys/dev/ath/if_ath_pci.c
projects/release-pkg/sys/dev/ath/if_ath_tdma.c
projects/release-pkg/sys/dev/ath/if_athvar.h
projects/release-pkg/sys/dev/bwi/bwimac.c
projects/release-pkg/sys/dev/bwi/bwiphy.c
projects/release-pkg/sys/dev/bwi/bwirf.c
projects/release-pkg/sys/dev/bwi/if_bwi.c
projects/release-pkg/sys/dev/drm2/drm_lock.c
projects/release-pkg/sys/dev/dwc/if_dwc.c
projects/release-pkg/sys/dev/dwc/if_dwc.h
projects/release-pkg/sys/dev/ipw/if_ipw.c
projects/release-pkg/sys/dev/iwi/if_iwi.c
projects/release-pkg/sys/dev/iwm/if_iwm.c
projects/release-pkg/sys/dev/iwn/if_iwn.c
projects/release-pkg/sys/dev/malo/if_malo.c
projects/release-pkg/sys/dev/malo/if_malo_pci.c
projects/release-pkg/sys/dev/mwl/if_mwl.c
projects/release-pkg/sys/dev/nxge/if_nxge.c
projects/release-pkg/sys/dev/nxge/xgehal/xgehal-fifo.c
projects/release-pkg/sys/dev/nxge/xgehal/xgehal-ring.c
projects/release-pkg/sys/dev/pci/pci_pci.c
projects/release-pkg/sys/dev/ral/rt2560.c
projects/release-pkg/sys/dev/ral/rt2560var.h
projects/release-pkg/sys/dev/ral/rt2661.c
projects/release-pkg/sys/dev/ral/rt2860.c
projects/release-pkg/sys/dev/re/if_re.c
projects/release-pkg/sys/dev/rl/if_rlreg.h
projects/release-pkg/sys/dev/uart/uart_bus_pci.c
projects/release-pkg/sys/dev/usb/controller/uhci_pci.c
projects/release-pkg/sys/dev/usb/controller/xhci_pci.c
projects/release-pkg/sys/dev/usb/quirk/usb_quirk.c
projects/release-pkg/sys/dev/usb/serial/u3g.c
projects/release-pkg/sys/dev/usb/usbdevs
projects/release-pkg/sys/dev/usb/wlan/if_rsu.c
projects/release-pkg/sys/dev/usb/wlan/if_rsureg.h
projects/release-pkg/sys/dev/usb/wlan/if_run.c
projects/release-pkg/sys/dev/usb/wlan/if_runvar.h
projects/release-pkg/sys/dev/usb/wlan/if_uath.c
projects/release-pkg/sys/dev/usb/wlan/if_uathvar.h
projects/release-pkg/sys/dev/usb/wlan/if_ural.c
projects/release-pkg/sys/dev/usb/wlan/if_uralvar.h
projects/release-pkg/sys/dev/usb/wlan/if_urtw.c
projects/release-pkg/sys/dev/usb/wlan/if_urtwn.c
projects/release-pkg/sys/dev/usb/wlan/if_urtwnreg.h
projects/release-pkg/sys/dev/usb/wlan/if_zyd.c
projects/release-pkg/sys/dev/wi/if_wivar.h
projects/release-pkg/sys/dev/wpi/if_wpi.c
projects/release-pkg/sys/dev/wpi/if_wpivar.h
projects/release-pkg/sys/dev/wtap/if_wtap.c
projects/release-pkg/sys/dev/wtap/if_wtapvar.h
projects/release-pkg/sys/dev/xen/pcifront/pcifront.c
projects/release-pkg/sys/fs/fifofs/fifo_vnops.c
projects/release-pkg/sys/geom/geom_dev.c
projects/release-pkg/sys/geom/nop/g_nop.c
projects/release-pkg/sys/geom/nop/g_nop.h
projects/release-pkg/sys/i386/i386/elf_machdep.c
projects/release-pkg/sys/i386/i386/pmap.c
projects/release-pkg/sys/kern/kern_event.c
projects/release-pkg/sys/kern/kern_exec.c
projects/release-pkg/sys/kern/kern_exit.c
projects/release-pkg/sys/kern/kern_fork.c
projects/release-pkg/sys/kern/kern_linker.c
projects/release-pkg/sys/kern/kern_proc.c
projects/release-pkg/sys/kern/kern_racct.c
projects/release-pkg/sys/kern/kern_rmlock.c
projects/release-pkg/sys/kern/kern_shutdown.c
projects/release-pkg/sys/kern/kern_sig.c
projects/release-pkg/sys/kern/kern_sysctl.c
projects/release-pkg/sys/kern/kern_tc.c
projects/release-pkg/sys/kern/kern_timeout.c
projects/release-pkg/sys/kern/link_elf.c
projects/release-pkg/sys/kern/link_elf_obj.c
projects/release-pkg/sys/kern/subr_param.c
projects/release-pkg/sys/kern/subr_sbuf.c
projects/release-pkg/sys/kern/subr_syscall.c
projects/release-pkg/sys/kern/vfs_bio.c
projects/release-pkg/sys/kern/vfs_cache.c
projects/release-pkg/sys/kern/vfs_default.c
projects/release-pkg/sys/kern/vfs_init.c
projects/release-pkg/sys/kern/vfs_lookup.c
projects/release-pkg/sys/kern/vfs_mountroot.c
projects/release-pkg/sys/kern/vfs_subr.c
projects/release-pkg/sys/kern/vfs_syscalls.c
projects/release-pkg/sys/kern/vfs_vnops.c
projects/release-pkg/sys/kern/vnode_if.src
projects/release-pkg/sys/libkern/arm/memclr.S
projects/release-pkg/sys/mips/adm5120/admpci.c
projects/release-pkg/sys/mips/atheros/ar71xx_pci.c
projects/release-pkg/sys/mips/atheros/ar724x_pci.c
projects/release-pkg/sys/mips/atheros/qca955x_pci.c
projects/release-pkg/sys/mips/cavium/octopci.c
projects/release-pkg/sys/mips/idt/idtpci.c
projects/release-pkg/sys/mips/malta/gt_pci.c
projects/release-pkg/sys/mips/mips/elf_machdep.c
projects/release-pkg/sys/mips/mips/pmap.c
projects/release-pkg/sys/mips/nlm/xlp_pci.c
projects/release-pkg/sys/mips/rmi/xlr_pci.c
projects/release-pkg/sys/modules/Makefile
projects/release-pkg/sys/modules/netgraph/Makefile
projects/release-pkg/sys/modules/usb/rsu/Makefile
projects/release-pkg/sys/modules/usb/urtwn/Makefile
projects/release-pkg/sys/net/if.c
projects/release-pkg/sys/net/if_arcsubr.c
projects/release-pkg/sys/net/if_ethersubr.c
projects/release-pkg/sys/net/if_fddisubr.c
projects/release-pkg/sys/net/if_fwsubr.c
projects/release-pkg/sys/net/if_iso88025subr.c
projects/release-pkg/sys/net/if_llatbl.c
projects/release-pkg/sys/net/if_llatbl.h
projects/release-pkg/sys/net/if_var.h
projects/release-pkg/sys/net/route.c
projects/release-pkg/sys/net80211/_ieee80211.h
projects/release-pkg/sys/net80211/ieee80211.h
projects/release-pkg/sys/net80211/ieee80211_freebsd.c
projects/release-pkg/sys/net80211/ieee80211_freebsd.h
projects/release-pkg/sys/net80211/ieee80211_ht.c
projects/release-pkg/sys/net80211/ieee80211_ht.h
projects/release-pkg/sys/net80211/ieee80211_input.c
projects/release-pkg/sys/net80211/ieee80211_mesh.c
projects/release-pkg/sys/net80211/ieee80211_node.h
projects/release-pkg/sys/net80211/ieee80211_output.c
projects/release-pkg/sys/net80211/ieee80211_proto.c
projects/release-pkg/sys/net80211/ieee80211_proto.h
projects/release-pkg/sys/net80211/ieee80211_scan_sta.c
projects/release-pkg/sys/net80211/ieee80211_superg.c
projects/release-pkg/sys/net80211/ieee80211_var.h
projects/release-pkg/sys/netinet/if_ether.c
projects/release-pkg/sys/netinet/if_ether.h
projects/release-pkg/sys/netinet/in.c
projects/release-pkg/sys/netinet/in_kdtrace.c
projects/release-pkg/sys/netinet/in_kdtrace.h
projects/release-pkg/sys/netinet/ip_carp.c
projects/release-pkg/sys/netinet/ip_ipsec.c
projects/release-pkg/sys/netinet/sctp.h
projects/release-pkg/sys/netinet/sctp_auth.c
projects/release-pkg/sys/netinet/sctp_header.h
projects/release-pkg/sys/netinet/sctp_indata.c
projects/release-pkg/sys/netinet/sctp_input.c
projects/release-pkg/sys/netinet/sctp_sysctl.h
projects/release-pkg/sys/netinet/tcp_input.c
projects/release-pkg/sys/netinet/tcp_output.c
projects/release-pkg/sys/netinet/tcp_reass.c
projects/release-pkg/sys/netinet/tcp_subr.c
projects/release-pkg/sys/netinet/tcp_timer.c
projects/release-pkg/sys/netinet/tcp_usrreq.c
projects/release-pkg/sys/netinet/tcp_var.h
projects/release-pkg/sys/netinet/toecore.c
projects/release-pkg/sys/netinet6/icmp6.c
projects/release-pkg/sys/netinet6/in6.c
projects/release-pkg/sys/netinet6/ip6_forward.c
projects/release-pkg/sys/netinet6/ip6_ipsec.c
projects/release-pkg/sys/netinet6/ip6_output.c
projects/release-pkg/sys/netinet6/nd6.c
projects/release-pkg/sys/netinet6/nd6.h
projects/release-pkg/sys/netinet6/nd6_nbr.c
projects/release-pkg/sys/netinet6/nd6_rtr.c
projects/release-pkg/sys/netinet6/udp6_usrreq.c
projects/release-pkg/sys/netipsec/ipsec_output.c
projects/release-pkg/sys/netipsec/xform_ah.c
projects/release-pkg/sys/netipsec/xform_esp.c
projects/release-pkg/sys/netipsec/xform_ipcomp.c
projects/release-pkg/sys/netpfil/pf/pf.c
projects/release-pkg/sys/nfs/nfs_diskless.c
projects/release-pkg/sys/ofed/drivers/infiniband/core/addr.c
projects/release-pkg/sys/ofed/drivers/infiniband/core/mad.c
projects/release-pkg/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
projects/release-pkg/sys/powerpc/ofw/ofw_pci.c
projects/release-pkg/sys/powerpc/powerpc/elf32_machdep.c
projects/release-pkg/sys/powerpc/powerpc/elf64_machdep.c
projects/release-pkg/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
projects/release-pkg/sys/sparc64/ebus/ebus.c
projects/release-pkg/sys/sparc64/include/smp.h
projects/release-pkg/sys/sparc64/pci/fire.c
projects/release-pkg/sys/sparc64/pci/firereg.h
projects/release-pkg/sys/sparc64/pci/firevar.h
projects/release-pkg/sys/sparc64/pci/ofw_pci.h
projects/release-pkg/sys/sparc64/pci/psycho.c
projects/release-pkg/sys/sparc64/pci/psychoreg.h
projects/release-pkg/sys/sparc64/pci/psychovar.h
projects/release-pkg/sys/sparc64/pci/schizo.c
projects/release-pkg/sys/sparc64/pci/schizoreg.h
projects/release-pkg/sys/sparc64/pci/schizovar.h
projects/release-pkg/sys/sparc64/sparc64/elf_machdep.c
projects/release-pkg/sys/sys/buf.h
projects/release-pkg/sys/sys/elf_common.h
projects/release-pkg/sys/sys/file.h
projects/release-pkg/sys/sys/linker.h
projects/release-pkg/sys/sys/reboot.h
projects/release-pkg/sys/sys/sdt.h
projects/release-pkg/sys/sys/sysctl.h
projects/release-pkg/sys/sys/systm.h
projects/release-pkg/sys/sys/types.h
projects/release-pkg/sys/sys/vnode.h
projects/release-pkg/sys/tools/vnode_if.awk
projects/release-pkg/sys/vm/uma_core.c
projects/release-pkg/sys/vm/vm_kern.c
projects/release-pkg/sys/vm/vm_object.c
projects/release-pkg/sys/vm/vm_object.h
projects/release-pkg/sys/vm/vm_page.c
projects/release-pkg/sys/vm/vm_page.h
projects/release-pkg/sys/vm/vm_pageout.c
projects/release-pkg/sys/x86/acpica/madt.c
projects/release-pkg/sys/x86/iommu/intel_ctx.c
projects/release-pkg/sys/x86/pci/pci_bus.c
projects/release-pkg/sys/x86/pci/qpi.c
projects/release-pkg/sys/x86/x86/mptable_pci.c
projects/release-pkg/targets/pseudo/bootstrap-tools/Makefile (contents, props changed)
projects/release-pkg/targets/pseudo/bootstrap-tools/Makefile.depend.host (contents, props changed)
projects/release-pkg/targets/pseudo/clang/Makefile.depend
projects/release-pkg/targets/pseudo/gcc/Makefile.depend
projects/release-pkg/targets/pseudo/hosttools/Makefile.depend
projects/release-pkg/targets/pseudo/kernel/Makefile.depend
projects/release-pkg/targets/pseudo/the-lot/Makefile.depend
projects/release-pkg/targets/pseudo/toolchain/Makefile.depend
projects/release-pkg/targets/pseudo/universe/Makefile.depend
projects/release-pkg/targets/pseudo/userland/Makefile.depend
projects/release-pkg/targets/pseudo/userland/cddl/Makefile.depend
projects/release-pkg/targets/pseudo/userland/games/Makefile.depend
projects/release-pkg/targets/pseudo/userland/gnu/Makefile.depend
projects/release-pkg/targets/pseudo/userland/include/Makefile.depend
projects/release-pkg/targets/pseudo/userland/kerberos5/Makefile.depend
projects/release-pkg/targets/pseudo/userland/lib/Makefile.depend
projects/release-pkg/targets/pseudo/userland/libexec/Makefile.depend
projects/release-pkg/targets/pseudo/userland/misc/Makefile.depend
projects/release-pkg/targets/pseudo/userland/secure/Makefile.depend
projects/release-pkg/targets/pseudo/userland/share/Makefile.depend
projects/release-pkg/tools/build/Makefile.depend
projects/release-pkg/tools/build/mk/OptionalObsoleteFiles.inc
projects/release-pkg/tools/build/options/WITH_META_MODE
projects/release-pkg/tools/build/options/makeman
projects/release-pkg/tools/regression/include/stdatomic/Makefile.depend
projects/release-pkg/tools/tools/ath/ath_ee_9300_print/Makefile.depend
projects/release-pkg/tools/tools/drm/radeon/mkregtable/Makefile.depend
projects/release-pkg/tools/tools/makeroot/Makefile.depend
projects/release-pkg/tools/tools/usbtest/Makefile
projects/release-pkg/tools/tools/usbtest/Makefile.depend
projects/release-pkg/usr.bin/bmake/Makefile.inc
projects/release-pkg/usr.bin/ctlstat/ctlstat.8
projects/release-pkg/usr.bin/ctlstat/ctlstat.c
projects/release-pkg/usr.bin/elfdump/elfdump.c
projects/release-pkg/usr.bin/lex/Makefile.depend
projects/release-pkg/usr.bin/man/man.sh
projects/release-pkg/usr.bin/mkcsmapper_static/Makefile.depend
projects/release-pkg/usr.bin/netstat/Makefile.depend
projects/release-pkg/usr.bin/pamtest/Makefile.depend
projects/release-pkg/usr.bin/procstat/Makefile.depend
projects/release-pkg/usr.bin/rctl/rctl.8
projects/release-pkg/usr.bin/setchannel/Makefile.depend
projects/release-pkg/usr.bin/smbutil/Makefile.depend
projects/release-pkg/usr.bin/svn/Makefile
projects/release-pkg/usr.bin/svn/lib/libapr/Makefile.depend
projects/release-pkg/usr.bin/svn/lib/libapr_util/Makefile.depend
projects/release-pkg/usr.bin/svn/lib/libserf/Makefile.depend
projects/release-pkg/usr.bin/svn/lib/libsvn_client/Makefile.depend
projects/release-pkg/usr.bin/svn/lib/libsvn_delta/Makefile.depend
projects/release-pkg/usr.bin/svn/lib/libsvn_diff/Makefile.depend
projects/release-pkg/usr.bin/svn/lib/libsvn_fs/Makefile.depend
projects/release-pkg/usr.bin/svn/lib/libsvn_fs_fs/Makefile.depend
projects/release-pkg/usr.bin/svn/lib/libsvn_fs_util/Makefile.depend
projects/release-pkg/usr.bin/svn/lib/libsvn_ra/Makefile.depend
projects/release-pkg/usr.bin/svn/lib/libsvn_ra_local/Makefile.depend
projects/release-pkg/usr.bin/svn/lib/libsvn_ra_serf/Makefile.depend
projects/release-pkg/usr.bin/svn/lib/libsvn_ra_svn/Makefile.depend
projects/release-pkg/usr.bin/svn/lib/libsvn_repos/Makefile.depend
projects/release-pkg/usr.bin/svn/lib/libsvn_subr/Makefile.depend
projects/release-pkg/usr.bin/svn/lib/libsvn_wc/Makefile.depend
projects/release-pkg/usr.bin/svn/svn/Makefile.depend
projects/release-pkg/usr.bin/svn/svnadmin/Makefile.depend
projects/release-pkg/usr.bin/svn/svndumpfilter/Makefile.depend
projects/release-pkg/usr.bin/svn/svnlook/Makefile.depend
projects/release-pkg/usr.bin/svn/svnmucc/Makefile.depend
projects/release-pkg/usr.bin/svn/svnrdump/Makefile.depend
projects/release-pkg/usr.bin/svn/svnserve/Makefile.depend
projects/release-pkg/usr.bin/svn/svnsync/Makefile.depend
projects/release-pkg/usr.bin/svn/svnversion/Makefile.depend
projects/release-pkg/usr.bin/systat/Makefile
projects/release-pkg/usr.bin/systat/cmdtab.c
projects/release-pkg/usr.bin/systat/extern.h
projects/release-pkg/usr.bin/systat/main.c
projects/release-pkg/usr.bin/systat/systat.1
projects/release-pkg/usr.bin/systat/systat.h
projects/release-pkg/usr.bin/tip/tip/Makefile
projects/release-pkg/usr.bin/truss/amd64-fbsd.c
projects/release-pkg/usr.bin/truss/amd64-fbsd32.c
projects/release-pkg/usr.bin/truss/amd64-linux32.c
projects/release-pkg/usr.bin/truss/arm-fbsd.c
projects/release-pkg/usr.bin/truss/extern.h
projects/release-pkg/usr.bin/truss/i386-fbsd.c
projects/release-pkg/usr.bin/truss/i386-linux.c
projects/release-pkg/usr.bin/truss/main.c
projects/release-pkg/usr.bin/truss/mips-fbsd.c
projects/release-pkg/usr.bin/truss/powerpc-fbsd.c
projects/release-pkg/usr.bin/truss/powerpc64-fbsd.c
projects/release-pkg/usr.bin/truss/setup.c
projects/release-pkg/usr.bin/truss/sparc64-fbsd.c
projects/release-pkg/usr.bin/truss/syscall.h
projects/release-pkg/usr.bin/truss/syscalls.c
projects/release-pkg/usr.bin/truss/truss.h
projects/release-pkg/usr.bin/usbhidaction/usbhidaction.c
projects/release-pkg/usr.bin/vgrind/RETEST/Makefile.depend
projects/release-pkg/usr.bin/wc/Makefile.depend
projects/release-pkg/usr.bin/xinstall/install.1
projects/release-pkg/usr.bin/xinstall/xinstall.c
projects/release-pkg/usr.bin/yacc/tests/Makefile
projects/release-pkg/usr.sbin/Makefile.mips
projects/release-pkg/usr.sbin/acpi/acpiconf/acpiconf.8
projects/release-pkg/usr.sbin/amd/Makefile
projects/release-pkg/usr.sbin/apmd/Makefile.depend
projects/release-pkg/usr.sbin/arp/arp.c
projects/release-pkg/usr.sbin/bhyve/acpi.c
projects/release-pkg/usr.sbin/boot98cfg/Makefile.depend
projects/release-pkg/usr.sbin/bsdconfig/packages/Makefile.depend
projects/release-pkg/usr.sbin/bsdconfig/packages/include/Makefile.depend
projects/release-pkg/usr.sbin/bsdconfig/share/common.subr
projects/release-pkg/usr.sbin/bsdconfig/share/packages/Makefile.depend
projects/release-pkg/usr.sbin/bsdinstall/Makefile
projects/release-pkg/usr.sbin/bsdinstall/Makefile.depend
projects/release-pkg/usr.sbin/bsdinstall/scripts/auto
projects/release-pkg/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend
projects/release-pkg/usr.sbin/ctladm/ctladm.8
projects/release-pkg/usr.sbin/ctladm/ctladm.c
projects/release-pkg/usr.sbin/ctld/ctl.conf.5
projects/release-pkg/usr.sbin/ctld/ctld.c
projects/release-pkg/usr.sbin/ctld/ctld.h
projects/release-pkg/usr.sbin/ctld/kernel.c
projects/release-pkg/usr.sbin/ctld/login.c
projects/release-pkg/usr.sbin/ctld/parse.y
projects/release-pkg/usr.sbin/ctld/token.l
projects/release-pkg/usr.sbin/eeprom/Makefile.depend
projects/release-pkg/usr.sbin/etcupdate/etcupdate.8
projects/release-pkg/usr.sbin/fifolog/Makefile
projects/release-pkg/usr.sbin/fstyp/Makefile
projects/release-pkg/usr.sbin/fstyp/zfs.c
projects/release-pkg/usr.sbin/gssd/gssd.c
projects/release-pkg/usr.sbin/i2c/i2c.c
projects/release-pkg/usr.sbin/inetd/inetd.c
projects/release-pkg/usr.sbin/kgzip/Makefile.depend
projects/release-pkg/usr.sbin/lpr/Makefile
projects/release-pkg/usr.sbin/lpr/filters.ru/Makefile.depend
projects/release-pkg/usr.sbin/mergemaster/mergemaster.8
projects/release-pkg/usr.sbin/mount_smbfs/Makefile.depend
projects/release-pkg/usr.sbin/ndiscvt/inf.c
projects/release-pkg/usr.sbin/ndiscvt/inf.h
projects/release-pkg/usr.sbin/ndp/ndp.c
projects/release-pkg/usr.sbin/ngctl/dot.c
projects/release-pkg/usr.sbin/nmtree/Makefile.depend
projects/release-pkg/usr.sbin/ntp/ntpdc/Makefile
projects/release-pkg/usr.sbin/ofwdump/Makefile.depend
projects/release-pkg/usr.sbin/pc-sysinstall/Makefile
projects/release-pkg/usr.sbin/pnpinfo/Makefile.depend
projects/release-pkg/usr.sbin/pw/pw_user.c
projects/release-pkg/usr.sbin/rpcbind/rpcb_svc_com.c
projects/release-pkg/usr.sbin/sesutil/Makefile
projects/release-pkg/usr.sbin/sesutil/sesutil.8
projects/release-pkg/usr.sbin/sesutil/sesutil.c
projects/release-pkg/usr.sbin/sysrc/Makefile
projects/release-pkg/usr.sbin/unbound/Makefile
projects/release-pkg/usr.sbin/unbound/local-setup/local-unbound-setup.sh
projects/release-pkg/usr.sbin/vigr/Makefile
projects/release-pkg/usr.sbin/wlconfig/Makefile.depend
projects/release-pkg/usr.sbin/wpa/Makefile
projects/release-pkg/usr.sbin/yppoll/Makefile.depend
Directory Properties:
projects/release-pkg/ (props changed)
projects/release-pkg/cddl/ (props changed)
projects/release-pkg/cddl/contrib/opensolaris/ (props changed)
projects/release-pkg/cddl/contrib/opensolaris/cmd/zfs/ (props changed)
projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
projects/release-pkg/contrib/binutils/ (props changed)
projects/release-pkg/contrib/compiler-rt/ (props changed)
projects/release-pkg/contrib/elftoolchain/ (props changed)
projects/release-pkg/contrib/elftoolchain/elfdump/ (props changed)
projects/release-pkg/contrib/file/ (props changed)
projects/release-pkg/contrib/gcc/ (props changed)
projects/release-pkg/contrib/libcxxrt/ (props changed)
projects/release-pkg/contrib/llvm/ (props changed)
projects/release-pkg/contrib/llvm/projects/libunwind/ (props changed)
projects/release-pkg/contrib/netcat/ (props changed)
projects/release-pkg/contrib/openpam/ (props changed)
projects/release-pkg/contrib/unbound/ (props changed)
projects/release-pkg/etc/ (props changed)
projects/release-pkg/gnu/lib/ (props changed)
projects/release-pkg/gnu/usr.bin/binutils/ (props changed)
projects/release-pkg/gnu/usr.bin/cc/cc_tools/ (props changed)
projects/release-pkg/gnu/usr.bin/gdb/ (props changed)
projects/release-pkg/include/ (props changed)
projects/release-pkg/lib/libc/ (props changed)
projects/release-pkg/lib/libc/stdtime/ (props changed)
projects/release-pkg/lib/libz/ (props changed)
projects/release-pkg/sbin/ (props changed)
projects/release-pkg/sbin/ipfw/ (props changed)
projects/release-pkg/share/ (props changed)
projects/release-pkg/share/man/man4/ (props changed)
projects/release-pkg/sys/ (props changed)
projects/release-pkg/sys/boot/ (props changed)
projects/release-pkg/sys/cddl/contrib/opensolaris/ (props changed)
projects/release-pkg/sys/conf/ (props changed)
projects/release-pkg/sys/contrib/ipfilter/ (props changed)
projects/release-pkg/targets/ (props changed)
projects/release-pkg/usr.bin/calendar/ (props changed)
projects/release-pkg/usr.bin/mkimg/ (props changed)
projects/release-pkg/usr.bin/procstat/ (props changed)
projects/release-pkg/usr.sbin/bhyve/ (props changed)
projects/release-pkg/usr.sbin/ndiscvt/ (props changed)
Modified: projects/release-pkg/Makefile
==============================================================================
--- projects/release-pkg/Makefile Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/Makefile Thu Oct 1 09:36:43 2015 (r288441)
@@ -244,9 +244,9 @@ cleanworld:
# Handle the user-driven targets, using the source relative mk files.
#
-.if empty(.MAKEFLAGS:M-n)
+.if !(!empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n")
# skip this for -n to avoid changing previous behavior of
-# 'make -n buildworld' etc.
+# 'make -n buildworld' etc. Using -n -n will run it.
${TGTS}: .MAKE
tinderbox toolchains kernel-toolchains: .MAKE
.endif
@@ -382,17 +382,8 @@ kernel-toolchains:
# existing system is.
#
.if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets)
-# XXX Add arm64 to universe only if we have an external binutils installed.
-# It does not build with the in-tree linker.
-.if exists(/usr/local/aarch64-freebsd/bin/ld)
-UNIVERSE_arm64=arm64
-.elif empty(${TARGETS})
-universe: universe_arm64_skip
-universe_epilogue: universe_arm64_skip
-universe_arm64_skip: universe_prologue
- @echo ">> arm64 skipped - install aarch64-binutils port or package to build"
-.endif
-TARGETS?=amd64 arm ${UNIVERSE_arm64} i386 mips pc98 powerpc sparc64
+TARGETS?=amd64 arm arm64 i386 mips pc98 powerpc sparc64
+_UNIVERSE_TARGETS= ${TARGETS}
TARGET_ARCHES_arm?= arm armeb armv6 armv6hf
TARGET_ARCHES_arm64?= aarch64
TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32
@@ -402,6 +393,16 @@ TARGET_ARCHES_pc98?= i386
TARGET_ARCHES_${target}?= ${target}
.endfor
+# XXX Add arm64 to universe only if we have an external binutils installed.
+# It does not build with the in-tree linker.
+.if !exists(/usr/local/aarch64-freebsd/bin/ld) && empty(${TARGETS})
+_UNIVERSE_TARGETS:= ${_UNIVERSE_TARGETS:Narm64}
+universe: universe_arm64_skip
+universe_epilogue: universe_arm64_skip
+universe_arm64_skip: universe_prologue
+ @echo ">> arm64 skipped - install aarch64-binutils port or package to build"
+.endif
+
.if defined(UNIVERSE_TARGET)
MAKE_JUST_WORLDS= YES
.else
@@ -433,7 +434,7 @@ universe_prologue:
.if defined(DOING_TINDERBOX)
@rm -f ${FAILFILE}
.endif
-.for target in ${TARGETS}
+.for target in ${_UNIVERSE_TARGETS}
universe: universe_${target}
universe_epilogue: universe_${target}
universe_${target}: universe_${target}_prologue
Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1 Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/Makefile.inc1 Thu Oct 1 09:36:43 2015 (r288441)
@@ -272,9 +272,8 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/i
WORLDTMP=${WORLDTMP} \
VERSION="${VERSION}" \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
-BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
- ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
- DESTDIR= \
+# need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile
+BSARGS= DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
MK_HTML=no NO_LINT=yes MK_MAN=no \
@@ -282,7 +281,11 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
MK_LLDB=no MK_TESTS=no \
- MK_INCLUDES=yes
+ MK_INCLUDES=yes
+
+BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
+ ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
+ ${BSARGS}
# build-tools stage
TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -345,6 +348,7 @@ CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN
# support the target architecture), provide a default cross-binutils prefix.
# This allows aarch64 builds, for example, to automatically use the
# aarch64-binutils port or package.
+.if !make(showconfig)
.if !empty(BROKEN_OPTIONS:MBINUTILS_BOOTSTRAP) && \
!defined(CROSS_BINUTILS_PREFIX)
CROSS_BINUTILS_PREFIX=/usr/local/${TARGET_ARCH}-freebsd/bin/
@@ -352,6 +356,7 @@ CROSS_BINUTILS_PREFIX=/usr/local/${TARGE
.error In-tree binutils does not support the ${TARGET_ARCH} architecture. Install the ${TARGET_ARCH}-binutils port or package or set CROSS_BINUTILS_PREFIX.
.endif
.endif
+.endif
XCOMPILERS= CC CXX CPP
.for COMPILER in ${XCOMPILERS}
@@ -1377,12 +1382,12 @@ update:
# ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
.if ${BOOTSTRAPPING} < 1100006
-_elftoolchain_libs= lib/libelf lib/libdwarf
+_elftoolchain_libs= lib/libelf lib/libdwarf
.endif
legacy:
.if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0
- @echo "ERROR: Source upgrades from versions prior to 8.0 not supported."; \
+ @echo "ERROR: Source upgrades from versions prior to 8.0 are not supported."; \
false
.endif
.for _tool in tools/build ${_elftoolchain_libs}
@@ -1401,7 +1406,7 @@ legacy:
# binaries is usually quite narrow. Bootstrap tools use the host's compiler and
# libraries, augmented by -legacy.
#
-_bt= _bootstrap-tools
+_bt= _bootstrap-tools
.if ${MK_GAMES} != "no"
_strfile= games/fortune/strfile
@@ -1479,20 +1484,6 @@ ${_bt}-usr.bin/clang/clang-tblgen: ${_bt
${_bt}-usr.bin/clang/tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/libllvmsupport
.endif
-# ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
-# dtrace tools are required for older bootstrap env and cross-build
-# pre libdwarf
-.if ${BOOTSTRAPPING} < 1100006 || (${MACHINE} != ${TARGET} || \
- ${MACHINE_ARCH} != ${TARGET_ARCH})
-.if ${MK_CDDL} != "no"
-_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf cddl/usr.bin/ctfconvert \
- cddl/usr.bin/ctfmerge
-
-${_bt}-cddl/usr.bin/ctfconvert: ${_bt}-cddl/lib/libctf
-${_bt}-cddl/usr.bin/ctfmerge: ${_bt}-cddl/lib/libctf
-.endif
-.endif
-
# Default to building the GPL DTC, but build the BSDL one if users explicitly
# request it.
_dtc= usr.bin/dtc
@@ -1532,7 +1523,6 @@ bootstrap-tools: .PHONY
.for _tool in \
${_clang_tblgen} \
${_kerberos5_bootstrap_tools} \
- ${_dtrace_tools} \
${_strfile} \
${_gperf} \
${_groff} \
@@ -1628,6 +1618,13 @@ _btxld= usr.sbin/btxld
.endif
.endif
+# Rebuild ctfconvert and ctfmerge to avoid difficult-to-diagnose failures
+# resulting from missing bug fixes or ELF Toolchain updates.
+.if ${MK_CDDL} != "no"
+_dtrace_tools= cddl/lib/libctf cddl/usr.bin/ctfconvert \
+ cddl/usr.bin/ctfmerge
+.endif
+
# If we're given an XAS, don't build binutils.
.if ${XAS:M/*} == ""
.if ${MK_BINUTILS_BOOTSTRAP} != "no"
@@ -1671,6 +1668,7 @@ cross-tools: .MAKE
${_clang} \
${_binutils} \
${_elftctools} \
+ ${_dtrace_tools} \
${_cc} \
${_btxld} \
${_crunchide} \
Modified: projects/release-pkg/ObsoleteFiles.inc
==============================================================================
--- projects/release-pkg/ObsoleteFiles.inc Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/ObsoleteFiles.inc Thu Oct 1 09:36:43 2015 (r288441)
@@ -38,6 +38,14 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20150928: unused sgsmsg utility is removed
+OLD_FILES+=usr/bin/sgsmsg
+# 20150926: remove links to removed/unimplemented mbuf(9) macros
+OLD_FILES+=usr/share/man/man9/MEXT_ADD_REF.9.gz
+OLD_FILES+=usr/share/man/man9/MEXTFREE.9.gz
+OLD_FILES+=usr/share/man/man9/MEXT_IS_REF.9.gz
+OLD_FILES+=usr/share/man/man9/MEXT_REM_REF.9.gz
+OLD_FILES+=usr/share/man/man9/MFREE.9.gz
# 20150818: *allocm() are gone in jemalloc 4.0.0
OLD_FILES+=usr/share/man/man3/allocm.3.gz
OLD_FILES+=usr/share/man/man3/dallocm.3.gz
@@ -483,8 +491,6 @@ OLD_FILES+=usr/share/man/man9/splstatclo
OLD_FILES+=usr/share/man/man9/spltty.9.gz
OLD_FILES+=usr/share/man/man9/splvm.9.gz
OLD_FILES+=usr/share/man/man9/splx.9.gz
-# 20150122: callout changes reverted
-OLD_FILES+=usr/share/man/man9/callout_drain_async.9.gz
# 20150118: toeplitz.c moved from netinet to net
OLD_FILES+=usr/include/netinet/toeplitz.h
# 20150118: new clang import which bumps version from 3.5.0 to 3.5.1.
@@ -7236,6 +7242,12 @@ OLD_LIBS+=usr/lib/libposix1e.so.2
OLD_LIBS+=usr/lib/libskey.so.2
OLD_LIBS+=usr/lib/libusbhid.so.0
OLD_LIBS+=usr/lib/libvgl.so.2
+# 20030218: OpenSSL 0.9.7 import
+OLD_FILES+=usr/include/des.h
+OLD_FILES+=usr/lib/libdes.a
+OLD_FILES+=usr/lib/libdes.so
+OLD_LIBS+=usr/lib/libdes.so.3
+OLD_FILES+=usr/lib/libdes_p.a
# 200302XX
OLD_LIBS+=usr/lib/libacl.so.3
OLD_LIBS+=usr/lib/libasn1.so.5
@@ -7294,6 +7306,8 @@ OLD_LIBS+=usr/lib/libtermcap.so.2
OLD_LIBS+=usr/lib/libutil.so.2
OLD_LIBS+=usr/lib/libvgl.so.1
OLD_LIBS+=usr/lib/libwrap.so.2
+# 19991216
+OLD_FILES+=usr/sbin/xntpdc
# 199909XX
OLD_LIBS+=usr/lib/libc_r.so.3
# ???
Modified: projects/release-pkg/UPDATING
==============================================================================
--- projects/release-pkg/UPDATING Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/UPDATING Thu Oct 1 09:36:43 2015 (r288441)
@@ -31,6 +31,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20150924:
+ Kernel debug files have been moved to /usr/lib/debug/boot/kernel/,
+ and renamed from .symbols to .debug. This reduces the size requirements
+ on the boot partition or file system and provides consistency with
+ userland debug files.
+
+ When using the supported kernel installation method the
+ /usr/lib/debug/boot/kernel directory will be renamed (to kernel.old)
+ as is done with /boot/kernel.
+
+ Developers wishing to maintain the historical behavior of installing
+ debug files in /boot/kernel/ can set KERN_DEBUGDIR="" in src.conf(5).
+
20150827:
The wireless drivers had undergone changes that remove the 'parent
interface' from the ifconfig -l output. The rc.d network scripts
Modified: projects/release-pkg/bin/ls/Makefile
==============================================================================
--- projects/release-pkg/bin/ls/Makefile Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/bin/ls/Makefile Thu Oct 1 09:36:43 2015 (r288441)
@@ -13,4 +13,8 @@ CFLAGS+= -DCOLORLS
LIBADD+= termcapw
.endif
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Modified: projects/release-pkg/bin/ls/ls.1
==============================================================================
--- projects/release-pkg/bin/ls/ls.1 Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/bin/ls/ls.1 Thu Oct 1 09:36:43 2015 (r288441)
@@ -32,7 +32,7 @@
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
.\" $FreeBSD$
.\"
-.Dd June 8, 2015
+.Dd September 27, 2015
.Dt LS 1
.Os
.Sh NAME
@@ -296,9 +296,9 @@ subsection below, except (if the long fo
the directory totals are not output when the output is in a
single column, even if multi-column output is requested.
.It Fl t
-Sort by descending time modified (most recently modified first). If two files
-have the same modification timestamp, sort their names in ascending
-lexicographical order.
+Sort by descending time modified (most recently modified first).
+If two files have the same modification timestamp, sort their names
+in ascending lexicographical order.
The
.Fl r
option reverses both of these sort orders.
@@ -320,7 +320,7 @@ or use the
option.
This causes
.Nm
-to reverse the lexicographal sort order when sorting files with the
+to reverse the lexicographical sort order when sorting files with the
same modification timestamp.
.It Fl u
Use time of last access,
Modified: projects/release-pkg/bin/ps/Makefile.depend
==============================================================================
--- projects/release-pkg/bin/ps/Makefile.depend Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/bin/ps/Makefile.depend Thu Oct 1 09:36:43 2015 (r288441)
@@ -11,6 +11,7 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libjail \
lib/libkvm \
+ lib/libutil \
lib/libxo \
lib/msun \
Modified: projects/release-pkg/bin/sh/builtins.def
==============================================================================
--- projects/release-pkg/bin/sh/builtins.def Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/bin/sh/builtins.def Thu Oct 1 09:36:43 2015 (r288441)
@@ -65,6 +65,7 @@ exportcmd -s export -s readonly
#exprcmd expr
falsecmd false
fgcmd -j fg
+freebsd_wordexpcmd freebsd_wordexp
getoptscmd getopts
hashcmd hash
histcmd -h fc
Modified: projects/release-pkg/bin/sh/expand.c
==============================================================================
--- projects/release-pkg/bin/sh/expand.c Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/bin/sh/expand.c Thu Oct 1 09:36:43 2015 (r288441)
@@ -1656,3 +1656,57 @@ wordexpcmd(int argc, char **argv)
outbin(argv[i], strlen(argv[i]) + 1, out1);
return (0);
}
+
+/*
+ * Do most of the work for wordexp(3), new version.
+ */
+
+int
+freebsd_wordexpcmd(int argc __unused, char **argv __unused)
+{
+ struct arglist arglist;
+ union node *args, *n;
+ struct strlist *sp;
+ size_t count, len;
+ int ch;
+ int protected = 0;
+ int fd = -1;
+
+ while ((ch = nextopt("f:p")) != '\0') {
+ switch (ch) {
+ case 'f':
+ fd = number(shoptarg);
+ break;
+ case 'p':
+ protected = 1;
+ break;
+ }
+ }
+ if (*argptr != NULL)
+ error("wrong number of arguments");
+ if (fd < 0)
+ error("missing fd");
+ INTOFF;
+ setinputfd(fd, 1);
+ INTON;
+ args = parsewordexp();
+ popfile(); /* will also close fd */
+ if (protected)
+ for (n = args; n != NULL; n = n->narg.next) {
+ if (n->narg.backquote != NULL) {
+ outcslow('C', out1);
+ error("command substitution disabled");
+ }
+ }
+ outcslow(' ', out1);
+ arglist.lastp = &arglist.list;
+ for (n = args; n != NULL; n = n->narg.next)
+ expandarg(n, &arglist, EXP_FULL | EXP_TILDE);
+ *arglist.lastp = NULL;
+ for (sp = arglist.list, count = len = 0; sp; sp = sp->next)
+ count++, len += strlen(sp->text);
+ out1fmt("%016zx %016zx", count, len);
+ for (sp = arglist.list; sp; sp = sp->next)
+ outbin(sp->text, strlen(sp->text) + 1, out1);
+ return (0);
+}
Modified: projects/release-pkg/bin/sh/parser.c
==============================================================================
--- projects/release-pkg/bin/sh/parser.c Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/bin/sh/parser.c Thu Oct 1 09:36:43 2015 (r288441)
@@ -231,6 +231,39 @@ parsecmd(int interact)
}
+/*
+ * Read and parse words for wordexp.
+ * Returns a list of NARG nodes; NULL if there are no words.
+ */
+union node *
+parsewordexp(void)
+{
+ union node *n, *first = NULL, **pnext;
+ int t;
+
+ /* This assumes the parser is not re-entered,
+ * which could happen if we add command substitution on PS1/PS2.
+ */
+ parser_temp_free_all();
+ heredoclist = NULL;
+
+ tokpushback = 0;
+ checkkwd = 0;
+ doprompt = 0;
+ setprompt(0);
+ needprompt = 0;
+ pnext = &first;
+ while ((t = readtoken()) != TEOF) {
+ if (t != TWORD)
+ synexpect(TWORD);
+ n = makename();
+ *pnext = n;
+ pnext = &n->narg.next;
+ }
+ return first;
+}
+
+
static union node *
list(int nlflag)
{
Modified: projects/release-pkg/bin/sh/parser.h
==============================================================================
--- projects/release-pkg/bin/sh/parser.h Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/bin/sh/parser.h Thu Oct 1 09:36:43 2015 (r288441)
@@ -76,6 +76,7 @@ extern const char *const parsekwd[];
union node *parsecmd(int);
+union node *parsewordexp(void);
void forcealias(void);
void fixredir(union node *, const char *, int);
int goodname(const char *);
Copied: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh (from r288439, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh Thu Oct 1 09:36:43 2015 (r288441, copy of r288439, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh)
@@ -0,0 +1,112 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source. A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2015, Joyent, Inc. All rights reserved.
+#
+
+err=/tmp/err.$$
+
+ppriv -s A=basic,dtrace_user $$
+
+#
+# When we lack dtrace_kernel, we expect to not be able to get at kernel memory
+# via any subroutine or other vector.
+#
+# trace(func((void *)&\`utsname)); }
+/usr/sbin/dtrace -wq -Cs /dev/stdin 2> $err <<EOF
+
+#define FAIL \
+ printf("able to read kernel memory via %s!\n", badsubr); \
+ exit(2);
+
+#define CANTREAD1(func) \
+ BEGIN { badsubr = "func()"; func((void *)&\`utsname); FAIL }
+
+#define CANTREAD2(func, arg1) \
+ BEGIN { badsubr = "func()"; func((void *)&\`utsname, arg1); FAIL }
+
+#define CANTREAD2ARG1(func, arg0) \
+ BEGIN { badsubr = "func() (arg1)"; func(arg0, (void *)&\`utsname); FAIL }
+
+#define CANTREAD3(func, arg1, arg2) \
+ BEGIN { badsubr = "func()"; func((void *)&\`utsname, arg1, arg2); FAIL }
+
+CANTREAD1(mutex_owned)
+CANTREAD1(mutex_owner)
+CANTREAD1(mutex_type_adaptive)
+CANTREAD1(mutex_type_spin)
+CANTREAD1(rw_read_held)
+CANTREAD1(rw_write_held)
+CANTREAD1(rw_iswriter)
+CANTREAD3(bcopy, alloca(1), 1)
+CANTREAD1(msgsize)
+CANTREAD1(msgdsize)
+CANTREAD1(strlen)
+CANTREAD2(strchr, '!')
+CANTREAD2(strrchr, '!')
+CANTREAD2(strstr, "doogle")
+CANTREAD2ARG1(strstr, "doogle")
+CANTREAD2(index, "bagnoogle")
+CANTREAD2ARG1(index, "bagnoogle")
+CANTREAD2(rindex, "bagnoogle")
+CANTREAD2ARG1(rindex, "bagnoogle")
+CANTREAD2(strtok, "doogle")
+CANTREAD2ARG1(strtok, "doogle")
+CANTREAD2(json, "doogle")
+CANTREAD2ARG1(json, "doogle")
+CANTREAD1(toupper)
+CANTREAD1(tolower)
+CANTREAD2(ddi_pathname, 1)
+CANTREAD2(strjoin, "doogle")
+CANTREAD2ARG1(strjoin, "doogle")
+CANTREAD1(strtoll)
+CANTREAD1(dirname)
+CANTREAD1(basename)
+CANTREAD1(cleanpath)
+
+#if defined(__amd64)
+CANTREAD3(copyout, uregs[R_R9], 1)
+CANTREAD3(copyoutstr, uregs[R_R9], 1)
+#else
+#if defined(__i386)
+CANTREAD3(copyout, uregs[R_ESP], 1)
+CANTREAD3(copyoutstr, uregs[R_ESP], 1)
+#endif
+#endif
+
+BEGIN
+{
+ exit(0);
+}
+
+ERROR
+/arg4 != DTRACEFLT_KPRIV/
+{
+ printf("bad error code via %s (expected %d, found %d)\n",
+ badsubr, DTRACEFLT_KPRIV, arg4);
+ exit(3);
+}
+
+ERROR
+/arg4 == DTRACEFLT_KPRIV/
+{
+ printf("illegal kernel access properly prevented from %s\n", badsubr);
+}
+EOF
+
+status=$?
+
+if [[ $status -eq 1 ]]; then
+ cat $err
+fi
+
+exit $status
Copied: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d (from r288439, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d Thu Oct 1 09:36:43 2015 (r288441, copy of r288439, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d)
@@ -0,0 +1,26 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source. A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2015, Joyent, Inc. All rights reserved.
+ */
+
+struct mrbig {
+ char toomany[100000];
+};
+
+struct mrbig mrbig;
+
+BEGIN
+{
+ mrbig.toomany[0] = '!';
+ exit(0);
+}
Copied: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d (from r288439, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d Thu Oct 1 09:36:43 2015 (r288441, copy of r288439, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d)
@@ -0,0 +1,26 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source. A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2015, Joyent, Inc. All rights reserved.
+ */
+
+struct mrbig {
+ char toomany[100000];
+};
+
+this struct mrbig mrbig;
+
+BEGIN
+{
+ this->mrbig.toomany[0] = '!';
+ exit(0);
+}
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -69,7 +69,7 @@ prov.h: prov.d
$dtrace -h -s prov.d
prov.o: prov.d main.o
- $dtrace -G -32 -s prov.d main.o
+ $dtrace -G -s prov.d main.o
EOF
cat > prov.d <<EOF
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -77,7 +77,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -66,7 +66,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -82,7 +82,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -75,7 +75,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -76,7 +76,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -70,7 +70,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -67,7 +67,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -69,7 +69,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -70,7 +70,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -71,7 +71,7 @@ EOF
exit 1
fi
- $dtrace -G -32 -s $oogle.d $oogle.o -o $oogle.d.o
+ $dtrace -G -s $oogle.d $oogle.o -o $oogle.d.o
if [ $? -ne 0 ]; then
print -u2 "failed to process $oogle.d"
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -47,7 +47,7 @@ provider doogle {
EOF
cc -c test.c
-$dtrace -G -32 -s doogle.d test.o -o doogle.d.o
+$dtrace -G -s doogle.d test.o -o doogle.d.o
if [ $? -eq 0 ]; then
print -u2 "dtrace succeeded despite having no probe sites"
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -67,7 +67,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -57,7 +57,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -68,7 +68,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -72,13 +72,13 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create initial DOF"
exit 1
fi
rm -f prov.o
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create final DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh Thu Oct 1 09:36:43 2015 (r288441)
@@ -67,7 +67,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 Thu Oct 1 09:36:43 2015 (r288441)
@@ -21,7 +21,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 24, 2015
+.Dd September 29, 2015
.Dt LOCKSTAT 1
.Os
.Sh NAME
@@ -38,7 +38,7 @@
.Op Fl d Ar duration
.Op Fl f Ar function Oo Ns , Ns Ar size Oc
.Op Fl T
-.Op Fl ckgwWRpP
+.Op Fl kgwWRpP
.Op Fl D Ar count
.Op Fl o filename
.Op Fl x Ar opt Oo Ns = Ns Ar val Oc
@@ -172,8 +172,6 @@ This is off by default.
.El
.Ss Data Reporting
.Bl -tag -width indent
-.It Fl c
-Coalesce lock data for lock arrays.
.It Fl D Ar count
Only display the top
.Ar count
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c Thu Oct 1 09:36:18 2015 (r288440)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c Thu Oct 1 09:36:43 2015 (r288441)
@@ -65,7 +65,11 @@ typedef uintptr_t pc_t;
typedef struct lsrec {
struct lsrec *ls_next; /* next in hash chain */
+#ifdef illumos
uintptr_t ls_lock; /* lock address */
+#else
+ char *ls_lock; /* lock name */
+#endif
uintptr_t ls_caller; /* caller address */
uint32_t ls_count; /* cumulative event count */
uint32_t ls_event; /* type of event */
@@ -338,7 +342,9 @@ usage(void)
" -d duration only watch events longer than <duration>\n"
" -T trace (rather than sample) events\n"
"\nData reporting options:\n\n"
+#ifdef illumos
" -c coalesce lock data for arrays like pse_mutex[]\n"
+#endif
" -k coalesce PCs within functions\n"
" -g show total events generated by function\n"
" -w wherever: don't distinguish events by caller\n"
@@ -381,12 +387,16 @@ lockcmp(lsrec_t *a, lsrec_t *b)
if (a->ls_caller > b->ls_caller)
return (1);
+#ifdef illumos
if (a->ls_lock < b->ls_lock)
return (-1);
if (a->ls_lock > b->ls_lock)
return (1);
return (0);
+#else
+ return (strcmp(a->ls_lock, b->ls_lock));
+#endif
}
static int
@@ -424,26 +434,40 @@ lockcmp_anywhere(lsrec_t *a, lsrec_t *b)
if (a->ls_event > b->ls_event)
return (1);
+#ifdef illumos
if (a->ls_lock < b->ls_lock)
return (-1);
if (a->ls_lock > b->ls_lock)
return (1);
return (0);
+#else
+ return (strcmp(a->ls_lock, b->ls_lock));
+#endif
}
static int
lock_and_count_cmp_anywhere(lsrec_t *a, lsrec_t *b)
{
+#ifndef illumos
+ int cmp;
+#endif
+
if (a->ls_event < b->ls_event)
return (-1);
if (a->ls_event > b->ls_event)
return (1);
+#ifdef illumos
if (a->ls_lock < b->ls_lock)
return (-1);
if (a->ls_lock > b->ls_lock)
return (1);
+#else
+ cmp = strcmp(a->ls_lock, b->ls_lock);
+ if (cmp != 0)
+ return (cmp);
+#endif
return (b->ls_count - a->ls_count);
}
@@ -698,7 +722,11 @@ dprog_addevent(int event)
caller = "(uintptr_t)arg0";
arg1 = "arg2";
} else {
+#ifdef illumos
arg0 = "(uintptr_t)arg0";
+#else
+ arg0 = "stringof(args[0]->lock_object.lo_name)";
+#endif
caller = "caller";
}
@@ -912,12 +940,17 @@ lsrec_fill(lsrec_t *lsrec, const dtrace_
lsrec->ls_event = (uint32_t)*((uint64_t *)(data + rec->dtrd_offset));
rec++;
+#ifdef illumos
if (rec->dtrd_size != sizeof (uintptr_t))
fail(0, "bad lock address size in second record");
/* LINTED - alignment */
lsrec->ls_lock = *((uintptr_t *)(data + rec->dtrd_offset));
rec++;
+#else
+ lsrec->ls_lock = strdup((const char *)(data + rec->dtrd_offset));
+ rec++;
+#endif
if (rec->dtrd_size != sizeof (uintptr_t))
fail(0, "bad caller size in third record");
@@ -1224,9 +1257,11 @@ main(int argc, char **argv)
events_specified = 1;
break;
+#ifdef illumos
case 'c':
g_cflag = 1;
break;
+#endif
case 'k':
g_kflag = 1;
@@ -1539,6 +1574,9 @@ main(int argc, char **argv)
caller_in_stack = 1;
bcopy(oldlsp, lsp, LS_TIME);
lsp->ls_caller = oldlsp->ls_stack[fr];
+#ifndef illumos
+ lsp->ls_lock = strdup(oldlsp->ls_lock);
+#endif
/* LINTED - alignment */
lsp = (lsrec_t *)((char *)lsp + LS_TIME);
}
@@ -1547,6 +1585,9 @@ main(int argc, char **argv)
/* LINTED - alignment */
lsp = (lsrec_t *)((char *)lsp + LS_TIME);
}
+#ifndef illumos
+ free(oldlsp->ls_lock);
+#endif
}
g_nrecs = g_nrecs_used =
((uintptr_t)lsp - (uintptr_t)newlsp) / LS_TIME;
@@ -1604,8 +1645,10 @@ main(int argc, char **argv)
for (i = 0; i < g_nrecs_used; i++) {
int fr;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@freebsd.org Thu Oct 1 19:03:01 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 058E3A0D787
for <svn-src-projects@mailman.ysv.freebsd.org>;
Thu, 1 Oct 2015 19:03:01 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 E73501232;
Thu, 1 Oct 2015 19:03:00 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t91J30qT047556;
Thu, 1 Oct 2015 19:03:00 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id t91J2l9A047500;
Thu, 1 Oct 2015 19:02:47 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201510011902.t91J2l9A047500@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 1 Oct 2015 19:02:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r288457 - in projects/clang370-import: . bin/ls
bin/ls/tests bin/sh cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs
cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Oct 2015 19:03:01 -0000
Author: dim
Date: Thu Oct 1 19:02:45 2015
New Revision: 288457
URL: https://svnweb.freebsd.org/changeset/base/288457
Log:
Merge ^/head r288197 through r288456.
Added:
projects/clang370-import/bin/ls/tests/
- copied from r288456, head/bin/ls/tests/
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh
- copied unchanged from r288456, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d
- copied unchanged from r288456, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d
- copied unchanged from r288456, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d
projects/clang370-import/gnu/usr.bin/groff/tmac/fr.ISO8859-1.in
- copied unchanged from r288456, head/gnu/usr.bin/groff/tmac/fr.ISO8859-1.in
projects/clang370-import/gnu/usr.bin/groff/tmac/mdoc.local.in
- copied unchanged from r288456, head/gnu/usr.bin/groff/tmac/mdoc.local.in
projects/clang370-import/gnu/usr.bin/groff/tmac/ru.KOI8-R.in
- copied unchanged from r288456, head/gnu/usr.bin/groff/tmac/ru.KOI8-R.in
projects/clang370-import/release/arm/BANANAPI.conf
- copied unchanged from r288456, head/release/arm/BANANAPI.conf
projects/clang370-import/release/arm/CUBIEBOARD.conf
- copied unchanged from r288456, head/release/arm/CUBIEBOARD.conf
projects/clang370-import/release/arm/CUBIEBOARD2.conf
- copied unchanged from r288456, head/release/arm/CUBIEBOARD2.conf
projects/clang370-import/share/man/man4/otus.4
- copied unchanged from r288456, head/share/man/man4/otus.4
projects/clang370-import/share/man/man4/otusfw.4
- copied unchanged from r288456, head/share/man/man4/otusfw.4
projects/clang370-import/share/man/man9/bus_get_resource.9
- copied unchanged from r288456, head/share/man/man9/bus_get_resource.9
projects/clang370-import/share/vt/fonts/vgarom-16x32.hex
- copied unchanged from r288456, head/share/vt/fonts/vgarom-16x32.hex
projects/clang370-import/sys/contrib/dev/otus/
- copied from r288456, head/sys/contrib/dev/otus/
projects/clang370-import/sys/dev/otus/
- copied from r288456, head/sys/dev/otus/
projects/clang370-import/sys/modules/otus/
- copied from r288456, head/sys/modules/otus/
projects/clang370-import/sys/modules/otusfw/
- copied from r288456, head/sys/modules/otusfw/
projects/clang370-import/usr.bin/systat/zarc.c
- copied unchanged from r288456, head/usr.bin/systat/zarc.c
projects/clang370-import/usr.sbin/Makefile.arm64
- copied unchanged from r288456, head/usr.sbin/Makefile.arm64
Deleted:
projects/clang370-import/cddl/contrib/opensolaris/cmd/sgs/
projects/clang370-import/cddl/contrib/opensolaris/common/avl/avl.c
projects/clang370-import/cddl/usr.bin/sgsmsg/
projects/clang370-import/gnu/usr.bin/groff/tmac/fr.ISO8859-1
projects/clang370-import/gnu/usr.bin/groff/tmac/mdoc.local
projects/clang370-import/gnu/usr.bin/groff/tmac/ru.KOI8-R
projects/clang370-import/sbin/ipf/ipsend/
projects/clang370-import/sbin/ipf/iptest/
projects/clang370-import/sbin/ipf/rules/
Modified:
projects/clang370-import/Makefile
projects/clang370-import/Makefile.inc1
projects/clang370-import/ObsoleteFiles.inc
projects/clang370-import/bin/ls/Makefile
projects/clang370-import/bin/ls/ls.1
projects/clang370-import/bin/sh/builtins.def
projects/clang370-import/bin/sh/expand.c
projects/clang370-import/bin/sh/parser.c
projects/clang370-import/bin/sh/parser.h
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh
projects/clang370-import/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
projects/clang370-import/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
projects/clang370-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
projects/clang370-import/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
projects/clang370-import/cddl/usr.bin/Makefile
projects/clang370-import/cddl/usr.bin/ctfconvert/Makefile.depend
projects/clang370-import/cddl/usr.bin/ctfdump/Makefile.depend
projects/clang370-import/cddl/usr.bin/ctfmerge/Makefile.depend
projects/clang370-import/cddl/usr.sbin/dtrace/Makefile.depend
projects/clang370-import/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
projects/clang370-import/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
projects/clang370-import/cddl/usr.sbin/dtruss/Makefile.depend
projects/clang370-import/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S
projects/clang370-import/contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S
projects/clang370-import/contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S
projects/clang370-import/contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S
projects/clang370-import/contrib/gcc/config/arm/crti.asm
projects/clang370-import/contrib/gcc/config/arm/crtn.asm
projects/clang370-import/contrib/gcc/config/arm/lib1funcs.asm
projects/clang370-import/contrib/libcxxrt/exception.cc
projects/clang370-import/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c
projects/clang370-import/contrib/netcat/nc.1
projects/clang370-import/contrib/netcat/netcat.c
projects/clang370-import/contrib/netcat/socks.c
projects/clang370-import/etc/etc.aarch64/ttys
projects/clang370-import/etc/mtree/BSD.tests.dist
projects/clang370-import/etc/rc.d/ugidfw
projects/clang370-import/etc/rc.subr
projects/clang370-import/etc/sendmail/Makefile.depend
projects/clang370-import/gnu/lib/csu/Makefile
projects/clang370-import/gnu/lib/libreadline/readline/Makefile
projects/clang370-import/gnu/lib/libssp/Makefile.depend
projects/clang370-import/gnu/usr.bin/binutils/ld/Makefile
projects/clang370-import/gnu/usr.bin/binutils/ld/Makefile.amd64
projects/clang370-import/gnu/usr.bin/binutils/ld/Makefile.mips
projects/clang370-import/gnu/usr.bin/binutils/ld/Makefile.powerpc64
projects/clang370-import/gnu/usr.bin/binutils/ld/Makefile.sparc64
projects/clang370-import/gnu/usr.bin/binutils/libbfd/Makefile.i386
projects/clang370-import/gnu/usr.bin/cc/c++/Makefile.depend
projects/clang370-import/gnu/usr.bin/cc/cc/Makefile.depend
projects/clang370-import/gnu/usr.bin/cc/cc1/Makefile.depend
projects/clang370-import/gnu/usr.bin/cc/cc1plus/Makefile.depend
projects/clang370-import/gnu/usr.bin/cc/cc_int/Makefile.depend
projects/clang370-import/gnu/usr.bin/cc/cc_tools/Makefile
projects/clang370-import/gnu/usr.bin/cc/cc_tools/Makefile.depend
projects/clang370-import/gnu/usr.bin/cc/cpp/Makefile.depend
projects/clang370-import/gnu/usr.bin/cc/gcov/Makefile.depend
projects/clang370-import/gnu/usr.bin/cc/include/Makefile.depend
projects/clang370-import/gnu/usr.bin/cc/libcpp/Makefile.depend
projects/clang370-import/gnu/usr.bin/cc/libdecnumber/Makefile.depend
projects/clang370-import/gnu/usr.bin/cc/libiberty/Makefile.depend
projects/clang370-import/gnu/usr.bin/diff/Makefile.depend
projects/clang370-import/gnu/usr.bin/dtc/Makefile.depend
projects/clang370-import/gnu/usr.bin/gdb/kgdb/trgt_amd64.c
projects/clang370-import/gnu/usr.bin/gperf/Makefile.depend
projects/clang370-import/gnu/usr.bin/grep/Makefile.depend
projects/clang370-import/gnu/usr.bin/groff/tmac/Makefile
projects/clang370-import/kerberos5/Makefile
projects/clang370-import/kerberos5/lib/Makefile
projects/clang370-import/kerberos5/libexec/Makefile
projects/clang370-import/kerberos5/libexec/kdigest/Makefile
projects/clang370-import/kerberos5/tools/Makefile
projects/clang370-import/kerberos5/usr.bin/Makefile
projects/clang370-import/kerberos5/usr.bin/hxtool/Makefile
projects/clang370-import/kerberos5/usr.bin/kadmin/Makefile
projects/clang370-import/kerberos5/usr.bin/kcc/Makefile
projects/clang370-import/kerberos5/usr.sbin/Makefile
projects/clang370-import/kerberos5/usr.sbin/iprop-log/Makefile
projects/clang370-import/kerberos5/usr.sbin/ktutil/Makefile
projects/clang370-import/lib/clang/include/Makefile
projects/clang370-import/lib/clang/libllvminterpreter/Makefile.depend
projects/clang370-import/lib/csu/arm/Makefile.depend
projects/clang370-import/lib/csu/arm/crti.S
projects/clang370-import/lib/csu/arm/crtn.S
projects/clang370-import/lib/csu/i386/Makefile.depend
projects/clang370-import/lib/csu/mips/Makefile.depend
projects/clang370-import/lib/csu/powerpc/Makefile.depend
projects/clang370-import/lib/csu/powerpc64/Makefile.depend
projects/clang370-import/lib/csu/sparc64/Makefile.depend
projects/clang370-import/lib/libblocksruntime/Makefile.depend
projects/clang370-import/lib/libc/arm/aeabi/aeabi_asm_double.S
projects/clang370-import/lib/libc/arm/aeabi/aeabi_asm_float.S
projects/clang370-import/lib/libc/arm/aeabi/aeabi_vfp_double.S
projects/clang370-import/lib/libc/arm/aeabi/aeabi_vfp_float.S
projects/clang370-import/lib/libc/arm/gen/__aeabi_read_tp.S
projects/clang370-import/lib/libc/arm/gen/_ctx_start.S
projects/clang370-import/lib/libc/arm/gen/_setjmp.S
projects/clang370-import/lib/libc/arm/gen/alloca.S
projects/clang370-import/lib/libc/arm/gen/divsi3.S
projects/clang370-import/lib/libc/arm/gen/setjmp.S
projects/clang370-import/lib/libc/arm/gen/sigsetjmp.S
projects/clang370-import/lib/libc/arm/string/ffs.S
projects/clang370-import/lib/libc/arm/string/memcmp.S
projects/clang370-import/lib/libc/arm/string/memcpy_arm.S
projects/clang370-import/lib/libc/arm/string/memcpy_xscale.S
projects/clang370-import/lib/libc/arm/string/memmove.S
projects/clang370-import/lib/libc/arm/string/memset.S
projects/clang370-import/lib/libc/arm/string/strcmp.S
projects/clang370-import/lib/libc/arm/string/strlen.S
projects/clang370-import/lib/libc/arm/string/strncmp.S
projects/clang370-import/lib/libc/arm/sys/Ovfork.S
projects/clang370-import/lib/libc/arm/sys/brk.S
projects/clang370-import/lib/libc/arm/sys/cerror.S
projects/clang370-import/lib/libc/arm/sys/pipe.S
projects/clang370-import/lib/libc/arm/sys/ptrace.S
projects/clang370-import/lib/libc/arm/sys/sbrk.S
projects/clang370-import/lib/libc/arm/sys/shmat.S
projects/clang370-import/lib/libc/arm/sys/sigreturn.S
projects/clang370-import/lib/libc/arm/sys/syscall.S
projects/clang370-import/lib/libc/gen/fnmatch.c
projects/clang370-import/lib/libc/gen/fts-compat.c
projects/clang370-import/lib/libc/gen/wordexp.3
projects/clang370-import/lib/libc/gen/wordexp.c
projects/clang370-import/lib/libc/sys/Makefile.inc
projects/clang370-import/lib/libc/tests/gen/posix_spawn/Makefile
projects/clang370-import/lib/libc/tests/stdio/fmemopen2_test.c
projects/clang370-import/lib/libcompiler_rt/Makefile
projects/clang370-import/lib/libcrypt/tests/Makefile.depend
projects/clang370-import/lib/libcuse/Makefile.depend
projects/clang370-import/lib/libcxxrt/Makefile.depend.host
projects/clang370-import/lib/libevent/Makefile.depend
projects/clang370-import/lib/libfetch/common.c
projects/clang370-import/lib/libgpib/Makefile.depend
projects/clang370-import/lib/libiconv_modules/BIG5/Makefile.depend
projects/clang370-import/lib/libiconv_modules/DECHanyu/Makefile.depend
projects/clang370-import/lib/libiconv_modules/EUC/Makefile.depend
projects/clang370-import/lib/libiconv_modules/EUCTW/Makefile.depend
projects/clang370-import/lib/libiconv_modules/GBK2K/Makefile.depend
projects/clang370-import/lib/libiconv_modules/HZ/Makefile.depend
projects/clang370-import/lib/libiconv_modules/ISO2022/Makefile.depend
projects/clang370-import/lib/libiconv_modules/JOHAB/Makefile.depend
projects/clang370-import/lib/libiconv_modules/MSKanji/Makefile.depend
projects/clang370-import/lib/libiconv_modules/UES/Makefile.depend
projects/clang370-import/lib/libiconv_modules/UTF1632/Makefile.depend
projects/clang370-import/lib/libiconv_modules/UTF7/Makefile.depend
projects/clang370-import/lib/libiconv_modules/UTF8/Makefile.depend
projects/clang370-import/lib/libiconv_modules/VIQR/Makefile.depend
projects/clang370-import/lib/libiconv_modules/ZW/Makefile.depend
projects/clang370-import/lib/libiconv_modules/iconv_none/Makefile.depend
projects/clang370-import/lib/libiconv_modules/iconv_std/Makefile.depend
projects/clang370-import/lib/libiconv_modules/mapper_646/Makefile.depend
projects/clang370-import/lib/libiconv_modules/mapper_none/Makefile.depend
projects/clang370-import/lib/libiconv_modules/mapper_parallel/Makefile.depend
projects/clang370-import/lib/libiconv_modules/mapper_serial/Makefile.depend
projects/clang370-import/lib/libiconv_modules/mapper_std/Makefile.depend
projects/clang370-import/lib/libiconv_modules/mapper_zone/Makefile.depend
projects/clang370-import/lib/libmilter/Makefile.depend
projects/clang370-import/lib/librpcsec_gss/Makefile.depend
projects/clang370-import/lib/libsmb/Makefile.depend
projects/clang370-import/lib/libstand/Makefile.depend
projects/clang370-import/lib/libstdbuf/Makefile.depend
projects/clang370-import/lib/libstdthreads/Makefile.depend
projects/clang370-import/lib/libugidfw/ugidfw.c
projects/clang370-import/lib/libunbound/Makefile.depend
projects/clang370-import/lib/libvgl/Makefile.depend
projects/clang370-import/lib/ncurses/form/Makefile.depend
projects/clang370-import/lib/ncurses/formw/Makefile.depend
projects/clang370-import/lib/ncurses/menu/Makefile.depend
projects/clang370-import/lib/ncurses/menuw/Makefile.depend
projects/clang370-import/lib/ncurses/ncurses/Makefile
projects/clang370-import/libexec/bootpd/Makefile.depend
projects/clang370-import/libexec/rtld-elf/arm/rtld_start.S
projects/clang370-import/release/arm/BEAGLEBONE.conf
projects/clang370-import/release/arm/CUBOX-HUMMINGBOARD.conf
projects/clang370-import/release/arm/GUMSTIX.conf
projects/clang370-import/release/arm/PANDABOARD.conf
projects/clang370-import/release/arm/RPI-B.conf
projects/clang370-import/release/arm/RPI2.conf
projects/clang370-import/release/arm/WANDBOARD.conf
projects/clang370-import/release/doc/en_US.ISO8859-1/hardware/article.xml
projects/clang370-import/release/doc/share/misc/dev.archlist.txt
projects/clang370-import/release/release.sh
projects/clang370-import/release/tools/vmimage.subr
projects/clang370-import/rescue/librescue/Makefile.depend
projects/clang370-import/sbin/fdisk_pc98/Makefile.depend
projects/clang370-import/sbin/ifconfig/af_inet6.c
projects/clang370-import/sbin/ifconfig/carp.c
projects/clang370-import/sbin/ifconfig/ifbridge.c
projects/clang370-import/sbin/ifconfig/ifclone.c
projects/clang370-import/sbin/ifconfig/ifconfig.c
projects/clang370-import/sbin/ifconfig/iffib.c
projects/clang370-import/sbin/ifconfig/ifgre.c
projects/clang370-import/sbin/ifconfig/ifgroup.c
projects/clang370-import/sbin/ifconfig/ifieee80211.c
projects/clang370-import/sbin/ifconfig/iflagg.c
projects/clang370-import/sbin/ifconfig/ifmac.c
projects/clang370-import/sbin/ifconfig/ifmedia.c
projects/clang370-import/sbin/ifconfig/ifpfsync.c
projects/clang370-import/sbin/ifconfig/ifvlan.c
projects/clang370-import/sbin/ifconfig/ifvxlan.c
projects/clang370-import/sbin/init/init.c
projects/clang370-import/sbin/ipf/Makefile
projects/clang370-import/sbin/natd/natd.c
projects/clang370-import/sbin/routed/Makefile.depend
projects/clang370-import/sbin/sconfig/Makefile.depend
projects/clang370-import/sbin/sunlabel/Makefile.depend
projects/clang370-import/share/doc/legal/realtek/Makefile.depend
projects/clang370-import/share/doc/llvm/Makefile.depend
projects/clang370-import/share/examples/libvgl/Makefile.depend
projects/clang370-import/share/examples/mdoc/example.4
projects/clang370-import/share/man/man4/Makefile
projects/clang370-import/share/man/man4/ctl.4
projects/clang370-import/share/man/man4/man4.arm/Makefile.depend
projects/clang370-import/share/man/man4/man4.i386/Makefile.depend
projects/clang370-import/share/man/man4/man4.powerpc/Makefile.depend
projects/clang370-import/share/man/man4/man4.sparc64/Makefile.depend
projects/clang370-import/share/man/man4/usb_quirk.4
projects/clang370-import/share/man/man9/Makefile
projects/clang370-import/share/man/man9/VOP_ADVISE.9
projects/clang370-import/share/man/man9/mbuf.9
projects/clang370-import/share/mk/bsd.README
projects/clang370-import/share/mk/bsd.files.mk
projects/clang370-import/share/mk/bsd.incs.mk
projects/clang370-import/share/mk/bsd.progs.mk
projects/clang370-import/share/mk/bsd.subdir.mk
projects/clang370-import/share/mk/local.gendirdeps.mk
projects/clang370-import/share/mk/local.init.mk
projects/clang370-import/share/mk/local.meta.sys.mk
projects/clang370-import/share/mk/suite.test.mk
projects/clang370-import/share/mk/sys.mk
projects/clang370-import/share/security/Makefile.depend
projects/clang370-import/share/vt/fonts/Makefile
projects/clang370-import/sys/amd64/amd64/pmap.c
projects/clang370-import/sys/arm/arm/pmap-v6-new.c
projects/clang370-import/sys/arm/arm/pmap-v6.c
projects/clang370-import/sys/arm/broadcom/bcm2835/bcm2836_mp.c
projects/clang370-import/sys/arm/mv/mpic.c
projects/clang370-import/sys/arm64/arm64/exception.S
projects/clang370-import/sys/arm64/arm64/mp_machdep.c
projects/clang370-import/sys/arm64/arm64/pmap.c
projects/clang370-import/sys/boot/efi/libefi/Makefile.depend
projects/clang370-import/sys/boot/efi/loader/copy.c
projects/clang370-import/sys/boot/fdt/dts/arm/bcm2836.dtsi
projects/clang370-import/sys/boot/ficl/Makefile.depend
projects/clang370-import/sys/boot/i386/boot0/Makefile.depend
projects/clang370-import/sys/boot/i386/boot0sio/Makefile.depend
projects/clang370-import/sys/boot/i386/boot2/Makefile.depend
projects/clang370-import/sys/boot/i386/loader/Makefile.depend
projects/clang370-import/sys/boot/i386/zfsloader/Makefile.depend
projects/clang370-import/sys/cam/cam_compat.c
projects/clang370-import/sys/cam/cam_periph.c
projects/clang370-import/sys/cam/cam_periph.h
projects/clang370-import/sys/cam/cam_xpt.c
projects/clang370-import/sys/cam/ctl/README.ctl.txt
projects/clang370-import/sys/cam/ctl/ctl.c
projects/clang370-import/sys/cam/ctl/ctl.h
projects/clang370-import/sys/cam/ctl/ctl_backend.c
projects/clang370-import/sys/cam/ctl/ctl_backend.h
projects/clang370-import/sys/cam/ctl/ctl_backend_block.c
projects/clang370-import/sys/cam/ctl/ctl_backend_ramdisk.c
projects/clang370-import/sys/cam/ctl/ctl_cmd_table.c
projects/clang370-import/sys/cam/ctl/ctl_error.c
projects/clang370-import/sys/cam/ctl/ctl_error.h
projects/clang370-import/sys/cam/ctl/ctl_frontend.c
projects/clang370-import/sys/cam/ctl/ctl_frontend.h
projects/clang370-import/sys/cam/ctl/ctl_frontend_cam_sim.c
projects/clang370-import/sys/cam/ctl/ctl_frontend_ioctl.c
projects/clang370-import/sys/cam/ctl/ctl_frontend_iscsi.c
projects/clang370-import/sys/cam/ctl/ctl_ha.c
projects/clang370-import/sys/cam/ctl/ctl_io.h
projects/clang370-import/sys/cam/ctl/ctl_ioctl.h
projects/clang370-import/sys/cam/ctl/ctl_private.h
projects/clang370-import/sys/cam/ctl/ctl_ser_table.c
projects/clang370-import/sys/cam/ctl/ctl_tpc.c
projects/clang370-import/sys/cam/ctl/ctl_tpc_local.c
projects/clang370-import/sys/cam/ctl/ctl_util.c
projects/clang370-import/sys/cam/ctl/ctl_util.h
projects/clang370-import/sys/cam/scsi/scsi_cd.h
projects/clang370-import/sys/cam/scsi/scsi_pass.c
projects/clang370-import/sys/cam/scsi/scsi_sg.c
projects/clang370-import/sys/cam/scsi/scsi_target.c
projects/clang370-import/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c
projects/clang370-import/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
projects/clang370-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
projects/clang370-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
projects/clang370-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
projects/clang370-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
projects/clang370-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
projects/clang370-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
projects/clang370-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h
projects/clang370-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
projects/clang370-import/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
projects/clang370-import/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
projects/clang370-import/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
projects/clang370-import/sys/cddl/dev/sdt/sdt.c
projects/clang370-import/sys/compat/linux/linux_dtrace.h
projects/clang370-import/sys/contrib/ipfilter/netinet/ip_nat.c
projects/clang370-import/sys/dev/acpica/acpi.c
projects/clang370-import/sys/dev/ath/if_ath_ahb.c
projects/clang370-import/sys/dev/ath/if_ath_pci.c
projects/clang370-import/sys/dev/ath/if_athvar.h
projects/clang370-import/sys/dev/drm2/i915/i915_gem_execbuffer.c
projects/clang370-import/sys/dev/iwn/if_iwn.c
projects/clang370-import/sys/dev/nxge/if_nxge.c
projects/clang370-import/sys/dev/nxge/xgehal/xgehal-fifo.c
projects/clang370-import/sys/dev/nxge/xgehal/xgehal-ring.c
projects/clang370-import/sys/dev/usb/usbdevs
projects/clang370-import/sys/dev/usb/wlan/if_rsu.c
projects/clang370-import/sys/dev/usb/wlan/if_rsureg.h
projects/clang370-import/sys/dev/usb/wlan/if_urtwn.c
projects/clang370-import/sys/dev/wpi/if_wpi.c
projects/clang370-import/sys/i386/i386/pmap.c
projects/clang370-import/sys/kern/kern_exec.c
projects/clang370-import/sys/kern/kern_exit.c
projects/clang370-import/sys/kern/kern_fork.c
projects/clang370-import/sys/kern/kern_proc.c
projects/clang370-import/sys/kern/kern_racct.c
projects/clang370-import/sys/kern/kern_shutdown.c
projects/clang370-import/sys/kern/kern_sig.c
projects/clang370-import/sys/kern/kern_tc.c
projects/clang370-import/sys/kern/kern_timeout.c
projects/clang370-import/sys/kern/subr_sbuf.c
projects/clang370-import/sys/kern/vfs_bio.c
projects/clang370-import/sys/kern/vfs_cache.c
projects/clang370-import/sys/kern/vfs_default.c
projects/clang370-import/sys/kern/vfs_lookup.c
projects/clang370-import/sys/kern/vfs_subr.c
projects/clang370-import/sys/kern/vfs_syscalls.c
projects/clang370-import/sys/kern/vfs_vnops.c
projects/clang370-import/sys/mips/mips/pmap.c
projects/clang370-import/sys/modules/Makefile
projects/clang370-import/sys/modules/netgraph/Makefile
projects/clang370-import/sys/modules/usb/rsu/Makefile
projects/clang370-import/sys/modules/usb/urtwn/Makefile
projects/clang370-import/sys/net/if_llatbl.c
projects/clang370-import/sys/net/if_llatbl.h
projects/clang370-import/sys/net80211/_ieee80211.h
projects/clang370-import/sys/net80211/ieee80211_freebsd.c
projects/clang370-import/sys/net80211/ieee80211_freebsd.h
projects/clang370-import/sys/net80211/ieee80211_ht.c
projects/clang370-import/sys/net80211/ieee80211_ht.h
projects/clang370-import/sys/net80211/ieee80211_input.c
projects/clang370-import/sys/net80211/ieee80211_node.h
projects/clang370-import/sys/net80211/ieee80211_output.c
projects/clang370-import/sys/net80211/ieee80211_proto.c
projects/clang370-import/sys/net80211/ieee80211_proto.h
projects/clang370-import/sys/net80211/ieee80211_superg.c
projects/clang370-import/sys/net80211/ieee80211_var.h
projects/clang370-import/sys/netinet/in.c
projects/clang370-import/sys/netinet/ip_ipsec.c
projects/clang370-import/sys/netinet/tcp_input.c
projects/clang370-import/sys/netinet/tcp_reass.c
projects/clang370-import/sys/netinet/tcp_subr.c
projects/clang370-import/sys/netinet/tcp_var.h
projects/clang370-import/sys/netinet6/in6.c
projects/clang370-import/sys/netinet6/ip6_ipsec.c
projects/clang370-import/sys/netinet6/nd6.c
projects/clang370-import/sys/netinet6/nd6.h
projects/clang370-import/sys/netinet6/nd6_nbr.c
projects/clang370-import/sys/netipsec/ipsec_output.c
projects/clang370-import/sys/netipsec/xform_ah.c
projects/clang370-import/sys/netipsec/xform_esp.c
projects/clang370-import/sys/netipsec/xform_ipcomp.c
projects/clang370-import/sys/nfs/nfs_diskless.c
projects/clang370-import/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
projects/clang370-import/sys/sys/buf.h
projects/clang370-import/sys/sys/file.h
projects/clang370-import/sys/sys/sdt.h
projects/clang370-import/sys/sys/systm.h
projects/clang370-import/sys/sys/types.h
projects/clang370-import/sys/tools/vnode_if.awk
projects/clang370-import/sys/vm/uma_core.c
projects/clang370-import/sys/vm/vm_kern.c
projects/clang370-import/sys/vm/vm_object.c
projects/clang370-import/sys/vm/vm_object.h
projects/clang370-import/sys/vm/vm_page.c
projects/clang370-import/sys/vm/vm_page.h
projects/clang370-import/targets/pseudo/bootstrap-tools/Makefile (contents, props changed)
projects/clang370-import/targets/pseudo/bootstrap-tools/Makefile.depend.host (contents, props changed)
projects/clang370-import/targets/pseudo/clang/Makefile.depend
projects/clang370-import/targets/pseudo/gcc/Makefile.depend
projects/clang370-import/targets/pseudo/hosttools/Makefile.depend
projects/clang370-import/targets/pseudo/kernel/Makefile.depend
projects/clang370-import/targets/pseudo/the-lot/Makefile.depend
projects/clang370-import/targets/pseudo/toolchain/Makefile.depend
projects/clang370-import/targets/pseudo/universe/Makefile.depend
projects/clang370-import/targets/pseudo/userland/Makefile.depend
projects/clang370-import/targets/pseudo/userland/cddl/Makefile.depend
projects/clang370-import/targets/pseudo/userland/games/Makefile.depend
projects/clang370-import/targets/pseudo/userland/gnu/Makefile.depend
projects/clang370-import/targets/pseudo/userland/include/Makefile.depend
projects/clang370-import/targets/pseudo/userland/kerberos5/Makefile.depend
projects/clang370-import/targets/pseudo/userland/lib/Makefile.depend
projects/clang370-import/targets/pseudo/userland/libexec/Makefile.depend
projects/clang370-import/targets/pseudo/userland/misc/Makefile.depend
projects/clang370-import/targets/pseudo/userland/secure/Makefile.depend
projects/clang370-import/targets/pseudo/userland/share/Makefile.depend
projects/clang370-import/tools/build/Makefile.depend
projects/clang370-import/tools/build/mk/OptionalObsoleteFiles.inc
projects/clang370-import/tools/regression/include/stdatomic/Makefile.depend
projects/clang370-import/tools/tools/ath/ath_ee_9300_print/Makefile.depend
projects/clang370-import/tools/tools/drm/radeon/mkregtable/Makefile.depend
projects/clang370-import/tools/tools/makeroot/Makefile.depend
projects/clang370-import/tools/tools/usbtest/Makefile.depend
projects/clang370-import/usr.bin/lex/Makefile.depend
projects/clang370-import/usr.bin/mkcsmapper_static/Makefile.depend
projects/clang370-import/usr.bin/pamtest/Makefile.depend
projects/clang370-import/usr.bin/setchannel/Makefile.depend
projects/clang370-import/usr.bin/smbutil/Makefile.depend
projects/clang370-import/usr.bin/svn/Makefile
projects/clang370-import/usr.bin/svn/lib/libapr/Makefile.depend
projects/clang370-import/usr.bin/svn/lib/libapr_util/Makefile.depend
projects/clang370-import/usr.bin/svn/lib/libserf/Makefile.depend
projects/clang370-import/usr.bin/svn/lib/libsvn_client/Makefile.depend
projects/clang370-import/usr.bin/svn/lib/libsvn_delta/Makefile.depend
projects/clang370-import/usr.bin/svn/lib/libsvn_diff/Makefile.depend
projects/clang370-import/usr.bin/svn/lib/libsvn_fs/Makefile.depend
projects/clang370-import/usr.bin/svn/lib/libsvn_fs_fs/Makefile.depend
projects/clang370-import/usr.bin/svn/lib/libsvn_fs_util/Makefile.depend
projects/clang370-import/usr.bin/svn/lib/libsvn_ra/Makefile.depend
projects/clang370-import/usr.bin/svn/lib/libsvn_ra_local/Makefile.depend
projects/clang370-import/usr.bin/svn/lib/libsvn_ra_serf/Makefile.depend
projects/clang370-import/usr.bin/svn/lib/libsvn_ra_svn/Makefile.depend
projects/clang370-import/usr.bin/svn/lib/libsvn_repos/Makefile.depend
projects/clang370-import/usr.bin/svn/lib/libsvn_subr/Makefile.depend
projects/clang370-import/usr.bin/svn/lib/libsvn_wc/Makefile.depend
projects/clang370-import/usr.bin/svn/svn/Makefile.depend
projects/clang370-import/usr.bin/svn/svnadmin/Makefile.depend
projects/clang370-import/usr.bin/svn/svndumpfilter/Makefile.depend
projects/clang370-import/usr.bin/svn/svnlook/Makefile.depend
projects/clang370-import/usr.bin/svn/svnmucc/Makefile.depend
projects/clang370-import/usr.bin/svn/svnrdump/Makefile.depend
projects/clang370-import/usr.bin/svn/svnserve/Makefile.depend
projects/clang370-import/usr.bin/svn/svnsync/Makefile.depend
projects/clang370-import/usr.bin/svn/svnversion/Makefile.depend
projects/clang370-import/usr.bin/systat/Makefile
projects/clang370-import/usr.bin/systat/cmdtab.c
projects/clang370-import/usr.bin/systat/extern.h
projects/clang370-import/usr.bin/systat/main.c
projects/clang370-import/usr.bin/systat/systat.1
projects/clang370-import/usr.bin/systat/systat.h
projects/clang370-import/usr.bin/truss/amd64-fbsd.c
projects/clang370-import/usr.bin/truss/amd64-fbsd32.c
projects/clang370-import/usr.bin/truss/amd64-linux32.c
projects/clang370-import/usr.bin/truss/arm-fbsd.c
projects/clang370-import/usr.bin/truss/extern.h
projects/clang370-import/usr.bin/truss/i386-fbsd.c
projects/clang370-import/usr.bin/truss/i386-linux.c
projects/clang370-import/usr.bin/truss/main.c
projects/clang370-import/usr.bin/truss/mips-fbsd.c
projects/clang370-import/usr.bin/truss/powerpc-fbsd.c
projects/clang370-import/usr.bin/truss/powerpc64-fbsd.c
projects/clang370-import/usr.bin/truss/setup.c
projects/clang370-import/usr.bin/truss/sparc64-fbsd.c
projects/clang370-import/usr.bin/truss/syscall.h
projects/clang370-import/usr.bin/truss/syscalls.c
projects/clang370-import/usr.bin/truss/truss.h
projects/clang370-import/usr.bin/usbhidaction/usbhidaction.c
projects/clang370-import/usr.bin/vgrind/RETEST/Makefile.depend
projects/clang370-import/usr.bin/xinstall/install.1
projects/clang370-import/usr.bin/xinstall/xinstall.c
projects/clang370-import/usr.bin/yacc/tests/Makefile
projects/clang370-import/usr.sbin/Makefile.mips
projects/clang370-import/usr.sbin/amd/Makefile
projects/clang370-import/usr.sbin/apmd/Makefile.depend
projects/clang370-import/usr.sbin/arp/arp.c
projects/clang370-import/usr.sbin/boot98cfg/Makefile.depend
projects/clang370-import/usr.sbin/bsdconfig/packages/Makefile.depend
projects/clang370-import/usr.sbin/bsdconfig/packages/include/Makefile.depend
projects/clang370-import/usr.sbin/bsdconfig/share/packages/Makefile.depend
projects/clang370-import/usr.sbin/bsdinstall/Makefile
projects/clang370-import/usr.sbin/bsdinstall/Makefile.depend
projects/clang370-import/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend
projects/clang370-import/usr.sbin/ctladm/ctladm.8
projects/clang370-import/usr.sbin/ctladm/ctladm.c
projects/clang370-import/usr.sbin/ctld/ctl.conf.5
projects/clang370-import/usr.sbin/ctld/ctld.c
projects/clang370-import/usr.sbin/ctld/ctld.h
projects/clang370-import/usr.sbin/ctld/kernel.c
projects/clang370-import/usr.sbin/ctld/parse.y
projects/clang370-import/usr.sbin/ctld/token.l
projects/clang370-import/usr.sbin/eeprom/Makefile.depend
projects/clang370-import/usr.sbin/etcupdate/etcupdate.8
projects/clang370-import/usr.sbin/fifolog/Makefile
projects/clang370-import/usr.sbin/gssd/gssd.c
projects/clang370-import/usr.sbin/kgzip/Makefile.depend
projects/clang370-import/usr.sbin/lpr/Makefile
projects/clang370-import/usr.sbin/lpr/filters.ru/Makefile.depend
projects/clang370-import/usr.sbin/mergemaster/mergemaster.8
projects/clang370-import/usr.sbin/mount_smbfs/Makefile.depend
projects/clang370-import/usr.sbin/ndp/ndp.c
projects/clang370-import/usr.sbin/nmtree/Makefile.depend
projects/clang370-import/usr.sbin/ofwdump/Makefile.depend
projects/clang370-import/usr.sbin/pc-sysinstall/Makefile
projects/clang370-import/usr.sbin/pnpinfo/Makefile.depend
projects/clang370-import/usr.sbin/rpcbind/rpcb_svc_com.c
projects/clang370-import/usr.sbin/unbound/Makefile
projects/clang370-import/usr.sbin/vigr/Makefile
projects/clang370-import/usr.sbin/wlconfig/Makefile.depend
projects/clang370-import/usr.sbin/wpa/Makefile
Directory Properties:
projects/clang370-import/ (props changed)
projects/clang370-import/cddl/ (props changed)
projects/clang370-import/cddl/contrib/opensolaris/ (props changed)
projects/clang370-import/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
projects/clang370-import/contrib/compiler-rt/ (props changed)
projects/clang370-import/contrib/gcc/ (props changed)
projects/clang370-import/contrib/libcxxrt/ (props changed)
projects/clang370-import/contrib/netcat/ (props changed)
projects/clang370-import/etc/ (props changed)
projects/clang370-import/gnu/lib/ (props changed)
projects/clang370-import/gnu/usr.bin/binutils/ (props changed)
projects/clang370-import/gnu/usr.bin/cc/cc_tools/ (props changed)
projects/clang370-import/gnu/usr.bin/gdb/ (props changed)
projects/clang370-import/lib/libc/ (props changed)
projects/clang370-import/sbin/ (props changed)
projects/clang370-import/share/ (props changed)
projects/clang370-import/share/man/man4/ (props changed)
projects/clang370-import/sys/ (props changed)
projects/clang370-import/sys/boot/ (props changed)
projects/clang370-import/sys/cddl/contrib/opensolaris/ (props changed)
projects/clang370-import/sys/contrib/ipfilter/ (props changed)
projects/clang370-import/targets/ (props changed)
Modified: projects/clang370-import/Makefile
==============================================================================
--- projects/clang370-import/Makefile Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/Makefile Thu Oct 1 19:02:45 2015 (r288457)
@@ -243,9 +243,9 @@ cleanworld:
# Handle the user-driven targets, using the source relative mk files.
#
-.if empty(.MAKEFLAGS:M-n)
+.if !(!empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n")
# skip this for -n to avoid changing previous behavior of
-# 'make -n buildworld' etc.
+# 'make -n buildworld' etc. Using -n -n will run it.
${TGTS}: .MAKE
tinderbox toolchains kernel-toolchains: .MAKE
.endif
Modified: projects/clang370-import/Makefile.inc1
==============================================================================
--- projects/clang370-import/Makefile.inc1 Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/Makefile.inc1 Thu Oct 1 19:02:45 2015 (r288457)
@@ -257,9 +257,8 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/i
WORLDTMP=${WORLDTMP} \
VERSION="${VERSION}" \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
-BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
- ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
- DESTDIR= \
+# need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile
+BSARGS= DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
MK_HTML=no NO_LINT=yes MK_MAN=no \
@@ -267,7 +266,11 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
MK_LLDB=no MK_TESTS=no \
- MK_INCLUDES=yes
+ MK_INCLUDES=yes
+
+BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
+ ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
+ ${BSARGS}
# build-tools stage
TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -1255,7 +1258,7 @@ update:
# ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
.if ${BOOTSTRAPPING} < 1100006
-_elftoolchain_libs= lib/libelf lib/libdwarf
+_elftoolchain_libs= lib/libelf lib/libdwarf
.endif
legacy:
@@ -1279,7 +1282,7 @@ legacy:
# binaries is usually quite narrow. Bootstrap tools use the host's compiler and
# libraries, augmented by -legacy.
#
-_bt= _bootstrap-tools
+_bt= _bootstrap-tools
.if ${MK_GAMES} != "no"
_strfile= games/fortune/strfile
@@ -1494,7 +1497,7 @@ _btxld= usr.sbin/btxld
# Rebuild ctfconvert and ctfmerge to avoid difficult-to-diagnose failures
# resulting from missing bug fixes or ELF Toolchain updates.
.if ${MK_CDDL} != "no"
-_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf cddl/usr.bin/ctfconvert \
+_dtrace_tools= cddl/lib/libctf cddl/usr.bin/ctfconvert \
cddl/usr.bin/ctfmerge
.endif
Modified: projects/clang370-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang370-import/ObsoleteFiles.inc Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/ObsoleteFiles.inc Thu Oct 1 19:02:45 2015 (r288457)
@@ -101,6 +101,14 @@ OLD_FILES+=usr/lib/clang/3.6.1/lib/freeb
OLD_DIRS+=usr/lib/clang/3.6.1/lib/freebsd
OLD_DIRS+=usr/lib/clang/3.6.1/lib
OLD_DIRS+=usr/lib/clang/3.6.1
+# 20150928: unused sgsmsg utility is removed
+OLD_FILES+=usr/bin/sgsmsg
+# 20150926: remove links to removed/unimplemented mbuf(9) macros
+OLD_FILES+=usr/share/man/man9/MEXT_ADD_REF.9.gz
+OLD_FILES+=usr/share/man/man9/MEXTFREE.9.gz
+OLD_FILES+=usr/share/man/man9/MEXT_IS_REF.9.gz
+OLD_FILES+=usr/share/man/man9/MEXT_REM_REF.9.gz
+OLD_FILES+=usr/share/man/man9/MFREE.9.gz
# 20150818: *allocm() are gone in jemalloc 4.0.0
OLD_FILES+=usr/share/man/man3/allocm.3.gz
OLD_FILES+=usr/share/man/man3/dallocm.3.gz
Modified: projects/clang370-import/bin/ls/Makefile
==============================================================================
--- projects/clang370-import/bin/ls/Makefile Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/bin/ls/Makefile Thu Oct 1 19:02:45 2015 (r288457)
@@ -13,4 +13,8 @@ CFLAGS+= -DCOLORLS
LIBADD+= termcapw
.endif
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Modified: projects/clang370-import/bin/ls/ls.1
==============================================================================
--- projects/clang370-import/bin/ls/ls.1 Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/bin/ls/ls.1 Thu Oct 1 19:02:45 2015 (r288457)
@@ -32,7 +32,7 @@
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
.\" $FreeBSD$
.\"
-.Dd June 8, 2015
+.Dd September 27, 2015
.Dt LS 1
.Os
.Sh NAME
@@ -296,9 +296,9 @@ subsection below, except (if the long fo
the directory totals are not output when the output is in a
single column, even if multi-column output is requested.
.It Fl t
-Sort by descending time modified (most recently modified first). If two files
-have the same modification timestamp, sort their names in ascending
-lexicographical order.
+Sort by descending time modified (most recently modified first).
+If two files have the same modification timestamp, sort their names
+in ascending lexicographical order.
The
.Fl r
option reverses both of these sort orders.
@@ -320,7 +320,7 @@ or use the
option.
This causes
.Nm
-to reverse the lexicographal sort order when sorting files with the
+to reverse the lexicographical sort order when sorting files with the
same modification timestamp.
.It Fl u
Use time of last access,
Modified: projects/clang370-import/bin/sh/builtins.def
==============================================================================
--- projects/clang370-import/bin/sh/builtins.def Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/bin/sh/builtins.def Thu Oct 1 19:02:45 2015 (r288457)
@@ -65,6 +65,7 @@ exportcmd -s export -s readonly
#exprcmd expr
falsecmd false
fgcmd -j fg
+freebsd_wordexpcmd freebsd_wordexp
getoptscmd getopts
hashcmd hash
histcmd -h fc
Modified: projects/clang370-import/bin/sh/expand.c
==============================================================================
--- projects/clang370-import/bin/sh/expand.c Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/bin/sh/expand.c Thu Oct 1 19:02:45 2015 (r288457)
@@ -1656,3 +1656,57 @@ wordexpcmd(int argc, char **argv)
outbin(argv[i], strlen(argv[i]) + 1, out1);
return (0);
}
+
+/*
+ * Do most of the work for wordexp(3), new version.
+ */
+
+int
+freebsd_wordexpcmd(int argc __unused, char **argv __unused)
+{
+ struct arglist arglist;
+ union node *args, *n;
+ struct strlist *sp;
+ size_t count, len;
+ int ch;
+ int protected = 0;
+ int fd = -1;
+
+ while ((ch = nextopt("f:p")) != '\0') {
+ switch (ch) {
+ case 'f':
+ fd = number(shoptarg);
+ break;
+ case 'p':
+ protected = 1;
+ break;
+ }
+ }
+ if (*argptr != NULL)
+ error("wrong number of arguments");
+ if (fd < 0)
+ error("missing fd");
+ INTOFF;
+ setinputfd(fd, 1);
+ INTON;
+ args = parsewordexp();
+ popfile(); /* will also close fd */
+ if (protected)
+ for (n = args; n != NULL; n = n->narg.next) {
+ if (n->narg.backquote != NULL) {
+ outcslow('C', out1);
+ error("command substitution disabled");
+ }
+ }
+ outcslow(' ', out1);
+ arglist.lastp = &arglist.list;
+ for (n = args; n != NULL; n = n->narg.next)
+ expandarg(n, &arglist, EXP_FULL | EXP_TILDE);
+ *arglist.lastp = NULL;
+ for (sp = arglist.list, count = len = 0; sp; sp = sp->next)
+ count++, len += strlen(sp->text);
+ out1fmt("%016zx %016zx", count, len);
+ for (sp = arglist.list; sp; sp = sp->next)
+ outbin(sp->text, strlen(sp->text) + 1, out1);
+ return (0);
+}
Modified: projects/clang370-import/bin/sh/parser.c
==============================================================================
--- projects/clang370-import/bin/sh/parser.c Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/bin/sh/parser.c Thu Oct 1 19:02:45 2015 (r288457)
@@ -231,6 +231,39 @@ parsecmd(int interact)
}
+/*
+ * Read and parse words for wordexp.
+ * Returns a list of NARG nodes; NULL if there are no words.
+ */
+union node *
+parsewordexp(void)
+{
+ union node *n, *first = NULL, **pnext;
+ int t;
+
+ /* This assumes the parser is not re-entered,
+ * which could happen if we add command substitution on PS1/PS2.
+ */
+ parser_temp_free_all();
+ heredoclist = NULL;
+
+ tokpushback = 0;
+ checkkwd = 0;
+ doprompt = 0;
+ setprompt(0);
+ needprompt = 0;
+ pnext = &first;
+ while ((t = readtoken()) != TEOF) {
+ if (t != TWORD)
+ synexpect(TWORD);
+ n = makename();
+ *pnext = n;
+ pnext = &n->narg.next;
+ }
+ return first;
+}
+
+
static union node *
list(int nlflag)
{
Modified: projects/clang370-import/bin/sh/parser.h
==============================================================================
--- projects/clang370-import/bin/sh/parser.h Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/bin/sh/parser.h Thu Oct 1 19:02:45 2015 (r288457)
@@ -76,6 +76,7 @@ extern const char *const parsekwd[];
union node *parsecmd(int);
+union node *parsewordexp(void);
void forcealias(void);
void fixredir(union node *, const char *, int);
int goodname(const char *);
Copied: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh (from r288456, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh Thu Oct 1 19:02:45 2015 (r288457, copy of r288456, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh)
@@ -0,0 +1,112 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source. A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2015, Joyent, Inc. All rights reserved.
+#
+
+err=/tmp/err.$$
+
+ppriv -s A=basic,dtrace_user $$
+
+#
+# When we lack dtrace_kernel, we expect to not be able to get at kernel memory
+# via any subroutine or other vector.
+#
+# trace(func((void *)&\`utsname)); }
+/usr/sbin/dtrace -wq -Cs /dev/stdin 2> $err <<EOF
+
+#define FAIL \
+ printf("able to read kernel memory via %s!\n", badsubr); \
+ exit(2);
+
+#define CANTREAD1(func) \
+ BEGIN { badsubr = "func()"; func((void *)&\`utsname); FAIL }
+
+#define CANTREAD2(func, arg1) \
+ BEGIN { badsubr = "func()"; func((void *)&\`utsname, arg1); FAIL }
+
+#define CANTREAD2ARG1(func, arg0) \
+ BEGIN { badsubr = "func() (arg1)"; func(arg0, (void *)&\`utsname); FAIL }
+
+#define CANTREAD3(func, arg1, arg2) \
+ BEGIN { badsubr = "func()"; func((void *)&\`utsname, arg1, arg2); FAIL }
+
+CANTREAD1(mutex_owned)
+CANTREAD1(mutex_owner)
+CANTREAD1(mutex_type_adaptive)
+CANTREAD1(mutex_type_spin)
+CANTREAD1(rw_read_held)
+CANTREAD1(rw_write_held)
+CANTREAD1(rw_iswriter)
+CANTREAD3(bcopy, alloca(1), 1)
+CANTREAD1(msgsize)
+CANTREAD1(msgdsize)
+CANTREAD1(strlen)
+CANTREAD2(strchr, '!')
+CANTREAD2(strrchr, '!')
+CANTREAD2(strstr, "doogle")
+CANTREAD2ARG1(strstr, "doogle")
+CANTREAD2(index, "bagnoogle")
+CANTREAD2ARG1(index, "bagnoogle")
+CANTREAD2(rindex, "bagnoogle")
+CANTREAD2ARG1(rindex, "bagnoogle")
+CANTREAD2(strtok, "doogle")
+CANTREAD2ARG1(strtok, "doogle")
+CANTREAD2(json, "doogle")
+CANTREAD2ARG1(json, "doogle")
+CANTREAD1(toupper)
+CANTREAD1(tolower)
+CANTREAD2(ddi_pathname, 1)
+CANTREAD2(strjoin, "doogle")
+CANTREAD2ARG1(strjoin, "doogle")
+CANTREAD1(strtoll)
+CANTREAD1(dirname)
+CANTREAD1(basename)
+CANTREAD1(cleanpath)
+
+#if defined(__amd64)
+CANTREAD3(copyout, uregs[R_R9], 1)
+CANTREAD3(copyoutstr, uregs[R_R9], 1)
+#else
+#if defined(__i386)
+CANTREAD3(copyout, uregs[R_ESP], 1)
+CANTREAD3(copyoutstr, uregs[R_ESP], 1)
+#endif
+#endif
+
+BEGIN
+{
+ exit(0);
+}
+
+ERROR
+/arg4 != DTRACEFLT_KPRIV/
+{
+ printf("bad error code via %s (expected %d, found %d)\n",
+ badsubr, DTRACEFLT_KPRIV, arg4);
+ exit(3);
+}
+
+ERROR
+/arg4 == DTRACEFLT_KPRIV/
+{
+ printf("illegal kernel access properly prevented from %s\n", badsubr);
+}
+EOF
+
+status=$?
+
+if [[ $status -eq 1 ]]; then
+ cat $err
+fi
+
+exit $status
Copied: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d (from r288456, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d Thu Oct 1 19:02:45 2015 (r288457, copy of r288456, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d)
@@ -0,0 +1,26 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source. A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2015, Joyent, Inc. All rights reserved.
+ */
+
+struct mrbig {
+ char toomany[100000];
+};
+
+struct mrbig mrbig;
+
+BEGIN
+{
+ mrbig.toomany[0] = '!';
+ exit(0);
+}
Copied: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d (from r288456, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d Thu Oct 1 19:02:45 2015 (r288457, copy of r288456, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d)
@@ -0,0 +1,26 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source. A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2015, Joyent, Inc. All rights reserved.
+ */
+
+struct mrbig {
+ char toomany[100000];
+};
+
+this struct mrbig mrbig;
+
+BEGIN
+{
+ this->mrbig.toomany[0] = '!';
+ exit(0);
+}
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -69,7 +69,7 @@ prov.h: prov.d
$dtrace -h -s prov.d
prov.o: prov.d main.o
- $dtrace -G -32 -s prov.d main.o
+ $dtrace -G -s prov.d main.o
EOF
cat > prov.d <<EOF
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -77,7 +77,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -66,7 +66,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -82,7 +82,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -75,7 +75,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -76,7 +76,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -70,7 +70,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -67,7 +67,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -69,7 +69,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -70,7 +70,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -71,7 +71,7 @@ EOF
exit 1
fi
- $dtrace -G -32 -s $oogle.d $oogle.o -o $oogle.d.o
+ $dtrace -G -s $oogle.d $oogle.o -o $oogle.d.o
if [ $? -ne 0 ]; then
print -u2 "failed to process $oogle.d"
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -47,7 +47,7 @@ provider doogle {
EOF
cc -c test.c
-$dtrace -G -32 -s doogle.d test.o -o doogle.d.o
+$dtrace -G -s doogle.d test.o -o doogle.d.o
if [ $? -eq 0 ]; then
print -u2 "dtrace succeeded despite having no probe sites"
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -67,7 +67,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -57,7 +57,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -68,7 +68,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -72,13 +72,13 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create initial DOF"
exit 1
fi
rm -f prov.o
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create final DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh Thu Oct 1 19:02:45 2015 (r288457)
@@ -67,7 +67,7 @@ if [ $? -ne 0 ]; then
print -u2 "failed to compile test.c"
exit 1
fi
-$dtrace -G -32 -s prov.d test.o
+$dtrace -G -s prov.d test.o
if [ $? -ne 0 ]; then
print -u2 "failed to create DOF"
exit 1
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 Thu Oct 1 19:02:45 2015 (r288457)
@@ -21,7 +21,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 24, 2015
+.Dd September 29, 2015
.Dt LOCKSTAT 1
.Os
.Sh NAME
@@ -38,7 +38,7 @@
.Op Fl d Ar duration
.Op Fl f Ar function Oo Ns , Ns Ar size Oc
.Op Fl T
-.Op Fl ckgwWRpP
+.Op Fl kgwWRpP
.Op Fl D Ar count
.Op Fl o filename
.Op Fl x Ar opt Oo Ns = Ns Ar val Oc
@@ -172,8 +172,6 @@ This is off by default.
.El
.Ss Data Reporting
.Bl -tag -width indent
-.It Fl c
-Coalesce lock data for lock arrays.
.It Fl D Ar count
Only display the top
.Ar count
Modified: projects/clang370-import/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c Thu Oct 1 19:02:45 2015 (r288457)
@@ -65,7 +65,11 @@ typedef uintptr_t pc_t;
typedef struct lsrec {
struct lsrec *ls_next; /* next in hash chain */
+#ifdef illumos
uintptr_t ls_lock; /* lock address */
+#else
+ char *ls_lock; /* lock name */
+#endif
uintptr_t ls_caller; /* caller address */
uint32_t ls_count; /* cumulative event count */
uint32_t ls_event; /* type of event */
@@ -338,7 +342,9 @@ usage(void)
" -d duration only watch events longer than <duration>\n"
" -T trace (rather than sample) events\n"
"\nData reporting options:\n\n"
+#ifdef illumos
" -c coalesce lock data for arrays like pse_mutex[]\n"
+#endif
" -k coalesce PCs within functions\n"
" -g show total events generated by function\n"
" -w wherever: don't distinguish events by caller\n"
@@ -381,12 +387,16 @@ lockcmp(lsrec_t *a, lsrec_t *b)
if (a->ls_caller > b->ls_caller)
return (1);
+#ifdef illumos
if (a->ls_lock < b->ls_lock)
return (-1);
if (a->ls_lock > b->ls_lock)
return (1);
return (0);
+#else
+ return (strcmp(a->ls_lock, b->ls_lock));
+#endif
}
static int
@@ -424,26 +434,40 @@ lockcmp_anywhere(lsrec_t *a, lsrec_t *b)
if (a->ls_event > b->ls_event)
return (1);
+#ifdef illumos
if (a->ls_lock < b->ls_lock)
return (-1);
if (a->ls_lock > b->ls_lock)
return (1);
return (0);
+#else
+ return (strcmp(a->ls_lock, b->ls_lock));
+#endif
}
static int
lock_and_count_cmp_anywhere(lsrec_t *a, lsrec_t *b)
{
+#ifndef illumos
+ int cmp;
+#endif
+
if (a->ls_event < b->ls_event)
return (-1);
if (a->ls_event > b->ls_event)
return (1);
+#ifdef illumos
if (a->ls_lock < b->ls_lock)
return (-1);
if (a->ls_lock > b->ls_lock)
return (1);
+#else
+ cmp = strcmp(a->ls_lock, b->ls_lock);
+ if (cmp != 0)
+ return (cmp);
+#endif
return (b->ls_count - a->ls_count);
}
@@ -698,7 +722,11 @@ dprog_addevent(int event)
caller = "(uintptr_t)arg0";
arg1 = "arg2";
} else {
+#ifdef illumos
arg0 = "(uintptr_t)arg0";
+#else
+ arg0 = "stringof(args[0]->lock_object.lo_name)";
+#endif
caller = "caller";
}
@@ -912,12 +940,17 @@ lsrec_fill(lsrec_t *lsrec, const dtrace_
lsrec->ls_event = (uint32_t)*((uint64_t *)(data + rec->dtrd_offset));
rec++;
+#ifdef illumos
if (rec->dtrd_size != sizeof (uintptr_t))
fail(0, "bad lock address size in second record");
/* LINTED - alignment */
lsrec->ls_lock = *((uintptr_t *)(data + rec->dtrd_offset));
rec++;
+#else
+ lsrec->ls_lock = strdup((const char *)(data + rec->dtrd_offset));
+ rec++;
+#endif
if (rec->dtrd_size != sizeof (uintptr_t))
fail(0, "bad caller size in third record");
@@ -1224,9 +1257,11 @@ main(int argc, char **argv)
events_specified = 1;
break;
+#ifdef illumos
case 'c':
g_cflag = 1;
break;
+#endif
case 'k':
g_kflag = 1;
@@ -1539,6 +1574,9 @@ main(int argc, char **argv)
caller_in_stack = 1;
bcopy(oldlsp, lsp, LS_TIME);
lsp->ls_caller = oldlsp->ls_stack[fr];
+#ifndef illumos
+ lsp->ls_lock = strdup(oldlsp->ls_lock);
+#endif
/* LINTED - alignment */
lsp = (lsrec_t *)((char *)lsp + LS_TIME);
}
@@ -1547,6 +1585,9 @@ main(int argc, char **argv)
/* LINTED - alignment */
lsp = (lsrec_t *)((char *)lsp + LS_TIME);
}
+#ifndef illumos
+ free(oldlsp->ls_lock);
+#endif
}
g_nrecs = g_nrecs_used =
((uintptr_t)lsp - (uintptr_t)newlsp) / LS_TIME;
@@ -1604,8 +1645,10 @@ main(int argc, char **argv)
for (i = 0; i < g_nrecs_used; i++) {
int fr;
lsp = sort_buf[i];
+#ifdef illumos
if (g_cflag)
coalesce_symbol(&lsp->ls_lock);
+#endif
if (g_kflag) {
for (fr = 0; fr < g_stkdepth; fr++)
coalesce_symbol(&lsp->ls_stack[fr]);
@@ -1659,6 +1702,15 @@ main(int argc, char **argv)
first = current;
}
+#ifndef illumos
+ /*
+ * Free lock name buffers
+ */
+ for (i = 0, lsp = (lsrec_t *)data_buf; i < g_nrecs_used; i++,
+ lsp = (lsrec_t *)((char *)lsp + g_recsize))
+ free(lsp->ls_lock);
+#endif
+
return (0);
}
@@ -1748,8 +1800,12 @@ report_stats(FILE *out, lsrec_t **sort_b
(void) fprintf(out, "%u %u",
lsp->ls_event, lsp->ls_count);
+#ifdef illumos
(void) fprintf(out, " %s",
format_symbol(buf, lsp->ls_lock, g_cflag));
+#else
+ (void) fprintf(out, " %s", lsp->ls_lock);
+#endif
(void) fprintf(out, " %s",
format_symbol(buf, lsp->ls_caller, 0));
(void) fprintf(out, " %f",
@@ -1811,8 +1867,12 @@ report_stats(FILE *out, lsrec_t **sort_b
(void) fprintf(out, "%4.2f %8s ",
(double)lsp->ls_refcnt / lsp->ls_count, buf);
+#ifdef illumos
(void) fprintf(out, "%-22s ",
format_symbol(buf, lsp->ls_lock, g_cflag));
+#else
+ (void) fprintf(out, "%-22s ", lsp->ls_lock);
+#endif
(void) fprintf(out, "%-24s\n",
format_symbol(buf, lsp->ls_caller, 0));
@@ -1908,7 +1968,11 @@ report_trace(FILE *out, lsrec_t **sort_b
(void) fprintf(out, "%2d %10llu %11p %-24s %-24s\n",
lsp->ls_event, (unsigned long long)lsp->ls_time,
(void *)lsp->ls_next,
+#ifdef illumos
format_symbol(buf, lsp->ls_lock, 0),
+#else
+ lsp->ls_lock,
+#endif
format_symbol(buf2, lsp->ls_caller, 0));
if (rectype <= LS_STACK(0))
Modified: projects/clang370-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c Thu Oct 1 19:02:45 2015 (r288457)
@@ -55,7 +55,6 @@
#include "zfs_prop.h"
#include "zfeature_common.h"
-int aok;
int
libzfs_errno(libzfs_handle_t *hdl)
Modified: projects/clang370-import/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==============================================================================
--- projects/clang370-import/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Thu Oct 1 19:02:45 2015 (r288457)
@@ -45,7 +45,9 @@
* Emulation of kernel services in userland.
*/
+#ifndef __FreeBSD__
int aok;
+#endif
uint64_t physmem;
vnode_t *rootdir = (vnode_t *)0xabcd1234;
char hw_serial[HW_HOSTID_LEN];
Modified: projects/clang370-import/cddl/usr.bin/Makefile
==============================================================================
--- projects/clang370-import/cddl/usr.bin/Makefile Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/usr.bin/Makefile Thu Oct 1 19:02:45 2015 (r288457)
@@ -6,7 +6,6 @@ SUBDIR= \
ctfconvert \
ctfdump \
ctfmerge \
- sgsmsg \
${_tests} \
${_zinject} \
${_zlook} \
Modified: projects/clang370-import/cddl/usr.bin/ctfconvert/Makefile.depend
==============================================================================
--- projects/clang370-import/cddl/usr.bin/ctfconvert/Makefile.depend Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/usr.bin/ctfconvert/Makefile.depend Thu Oct 1 19:02:45 2015 (r288457)
@@ -1,8 +1,6 @@
# $FreeBSD$
# Autogenerated - do NOT edit!
-DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-
DIRDEPS = \
cddl/lib/libctf \
gnu/lib/csu \
Modified: projects/clang370-import/cddl/usr.bin/ctfdump/Makefile.depend
==============================================================================
--- projects/clang370-import/cddl/usr.bin/ctfdump/Makefile.depend Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/usr.bin/ctfdump/Makefile.depend Thu Oct 1 19:02:45 2015 (r288457)
@@ -1,8 +1,6 @@
# $FreeBSD$
# Autogenerated - do NOT edit!
-DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-
DIRDEPS = \
gnu/lib/csu \
gnu/lib/libgcc \
Modified: projects/clang370-import/cddl/usr.bin/ctfmerge/Makefile.depend
==============================================================================
--- projects/clang370-import/cddl/usr.bin/ctfmerge/Makefile.depend Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/usr.bin/ctfmerge/Makefile.depend Thu Oct 1 19:02:45 2015 (r288457)
@@ -1,8 +1,6 @@
# $FreeBSD$
# Autogenerated - do NOT edit!
-DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-
DIRDEPS = \
cddl/lib/libctf \
gnu/lib/csu \
Modified: projects/clang370-import/cddl/usr.sbin/dtrace/Makefile.depend
==============================================================================
--- projects/clang370-import/cddl/usr.sbin/dtrace/Makefile.depend Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/usr.sbin/dtrace/Makefile.depend Thu Oct 1 19:02:45 2015 (r288457)
@@ -1,8 +1,6 @@
# $FreeBSD$
# Autogenerated - do NOT edit!
-DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-
DIRDEPS = \
cddl/lib/libctf \
cddl/lib/libdtrace \
Modified: projects/clang370-import/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
==============================================================================
--- projects/clang370-import/cddl/usr.sbin/dtrace/tests/common/privs/Makefile Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/usr.sbin/dtrace/tests/common/privs/Makefile Thu Oct 1 19:02:45 2015 (r288457)
@@ -8,6 +8,7 @@ TESTFILES= \
tst.fds.ksh \
tst.func_access.ksh \
tst.getf.ksh \
+ tst.kpriv.ksh \
tst.op_access.ksh \
tst.procpriv.ksh \
tst.providers.ksh \
Modified: projects/clang370-import/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
==============================================================================
--- projects/clang370-import/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile Thu Oct 1 19:02:45 2015 (r288457)
@@ -14,6 +14,8 @@ TESTFILES= \
err.D_OP_INCOMPAT.dupltype.d \
err.D_OP_INCOMPAT.dupttype.d \
err.D_SYNTAX.declare.d \
+ err.bigglobal.d \
+ err.biglocal.d \
tst.basicvar.d \
tst.basicvar.d.out \
tst.localvar.d \
Modified: projects/clang370-import/cddl/usr.sbin/dtruss/Makefile.depend
==============================================================================
--- projects/clang370-import/cddl/usr.sbin/dtruss/Makefile.depend Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/cddl/usr.sbin/dtruss/Makefile.depend Thu Oct 1 19:02:45 2015 (r288457)
@@ -1,8 +1,6 @@
# $FreeBSD$
# Autogenerated - do NOT edit!
-DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-
DIRDEPS = \
Modified: projects/clang370-import/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S
==============================================================================
--- projects/clang370-import/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S Thu Oct 1 18:18:58 2015 (r288456)
+++ projects/clang370-import/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S Thu Oct 1 19:02:45 2015 (r288457)
@@ -18,3 +18,5 @@ END_COMPILERRT_FUNCTION(__aeabi_memcmp)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@freebsd.org Sat Oct 3 07:22:14 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 11046A0DD1D
for <svn-src-projects@mailman.ysv.freebsd.org>;
Sat, 3 Oct 2015 07:22:14 +0000 (UTC)
(envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 F2C3215E2;
Sat, 3 Oct 2015 07:22:13 +0000 (UTC)
(envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t937MDmm062318;
Sat, 3 Oct 2015 07:22:13 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id t937M8fd062289;
Sat, 3 Oct 2015 07:22:08 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201510030722.t937M8fd062289@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 3 Oct 2015 07:22:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r288540 - in projects/release-pkg: .
contrib/netbsd-tests/lib/libc/sys etc/etc.aarch64 games release/arm sbin/init
sbin/ipf/ipftest share/mk sys/arm/arm sys/arm/broadcom/bcm2835 sys/arm...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Oct 2015 07:22:14 -0000
Author: bapt
Date: Sat Oct 3 07:22:07 2015
New Revision: 288540
URL: https://svnweb.freebsd.org/changeset/base/288540
Log:
Remerge as previous one was broken
Added:
projects/release-pkg/usr.bin/caesar/
- copied from r288493, head/usr.bin/caesar/
projects/release-pkg/usr.bin/factor/
- copied from r288493, head/usr.bin/factor/
projects/release-pkg/usr.bin/fortune/
- copied from r288493, head/usr.bin/fortune/
projects/release-pkg/usr.bin/grdc/
- copied from r288493, head/usr.bin/grdc/
projects/release-pkg/usr.bin/morse/
- copied from r288493, head/usr.bin/morse/
projects/release-pkg/usr.bin/number/
- copied from r288493, head/usr.bin/number/
projects/release-pkg/usr.bin/pom/
- copied from r288493, head/usr.bin/pom/
projects/release-pkg/usr.bin/primes/
- copied from r288493, head/usr.bin/primes/
projects/release-pkg/usr.bin/random/
- copied from r288493, head/usr.bin/random/
projects/release-pkg/usr.bin/truss/aarch64-fbsd.c
- copied unchanged from r288493, head/usr.bin/truss/aarch64-fbsd.c
projects/release-pkg/usr.bin/truss/amd64-cloudabi64.c
- copied unchanged from r288493, head/usr.bin/truss/amd64-cloudabi64.c
projects/release-pkg/usr.bin/truss/amd64cloudabi64.conf
- copied unchanged from r288493, head/usr.bin/truss/amd64cloudabi64.conf
projects/release-pkg/usr.sbin/Makefile.arm64
- copied unchanged from r288493, head/usr.sbin/Makefile.arm64
Deleted:
projects/release-pkg/games/
Modified:
projects/release-pkg/Makefile.inc1
projects/release-pkg/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c
projects/release-pkg/etc/etc.aarch64/ttys
projects/release-pkg/release/arm/BANANAPI.conf
projects/release-pkg/release/arm/CUBIEBOARD.conf
projects/release-pkg/release/arm/CUBIEBOARD2.conf
projects/release-pkg/sbin/init/init.c
projects/release-pkg/sbin/ipf/ipftest/Makefile
projects/release-pkg/share/mk/meta.stage.mk
projects/release-pkg/sys/arm/arm/machdep.c
projects/release-pkg/sys/arm/arm/vm_machdep.c
projects/release-pkg/sys/arm/broadcom/bcm2835/bcm2836_mp.c
projects/release-pkg/sys/arm/include/atomic-v4.h
projects/release-pkg/sys/arm/include/atomic-v6.h
projects/release-pkg/sys/arm/include/atomic.h
projects/release-pkg/sys/arm/mv/mpic.c
projects/release-pkg/sys/arm64/arm64/exception.S
projects/release-pkg/sys/arm64/arm64/pmap.c
projects/release-pkg/sys/cam/ctl/ctl.c
projects/release-pkg/sys/cam/ctl/ctl_private.h
projects/release-pkg/sys/cam/ctl/ctl_tpc.c
projects/release-pkg/sys/dev/acpica/acpi.c
projects/release-pkg/sys/dev/drm2/i915/i915_gem_execbuffer.c
projects/release-pkg/sys/kern/kern_shutdown.c
projects/release-pkg/sys/kern/subr_sbuf.c
projects/release-pkg/sys/kern/vfs_default.c
projects/release-pkg/sys/net80211/ieee80211_crypto_ccmp.c
projects/release-pkg/sys/net80211/ieee80211_crypto_tkip.c
projects/release-pkg/sys/net80211/ieee80211_crypto_wep.c
projects/release-pkg/sys/sys/systm.h
projects/release-pkg/targets/pseudo/bootstrap-tools/Makefile
projects/release-pkg/targets/pseudo/stage/Makefile
projects/release-pkg/usr.bin/Makefile
projects/release-pkg/usr.bin/truss/Makefile
projects/release-pkg/usr.bin/truss/syscall.h
projects/release-pkg/usr.bin/truss/syscalls.c
projects/release-pkg/usr.sbin/bhyve/pci_virtio_net.c
projects/release-pkg/usr.sbin/ctld/ctl.conf.5
projects/release-pkg/usr.sbin/ctld/ctld.c
projects/release-pkg/usr.sbin/ctld/ctld.h
projects/release-pkg/usr.sbin/kldxref/kldxref.c
projects/release-pkg/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
Directory Properties:
projects/release-pkg/ (props changed)
projects/release-pkg/sbin/ (props changed)
projects/release-pkg/share/ (props changed)
projects/release-pkg/sys/ (props changed)
projects/release-pkg/targets/ (props changed)
projects/release-pkg/usr.sbin/bhyve/ (props changed)
Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1 Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/Makefile.inc1 Sat Oct 3 07:22:07 2015 (r288540)
@@ -61,9 +61,6 @@ SUBDIR= ${SUBDIR_OVERRIDE}
.else
SUBDIR= lib libexec
SUBDIR+=bin
-.if ${MK_GAMES} != "no"
-SUBDIR+=games
-.endif
.if ${MK_CDDL} != "no"
SUBDIR+=cddl
.endif
@@ -1409,7 +1406,7 @@ legacy:
_bt= _bootstrap-tools
.if ${MK_GAMES} != "no"
-_strfile= games/fortune/strfile
+_strfile= usr.bin/fortune/strfile
.endif
.if ${MK_GCC} != "no" && ${MK_CXX} != "no"
Modified: projects/release-pkg/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c
==============================================================================
--- projects/release-pkg/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c Sat Oct 3 07:22:07 2015 (r288540)
@@ -53,6 +53,8 @@ run(int n, ...)
va_start(va, n);
#if defined(__FreeBSD__) && defined(__amd64__)
for (i = 0; i < 5; i++) {
+#elif defined(__FreeBSD__) && defined(__aarch64__)
+ for (i = 0; i < 7; i++) {
#else
for (i = 0; i < 9; i++) {
#endif
@@ -116,6 +118,10 @@ ATF_TC_BODY(setcontext_link, tc)
/* FreeBSD/amd64 only permits up to 6 arguments. */
makecontext(&uc[i], (void *)run, 6, i,
0, 1, 2, 3, 4);
+#elif defined(__FreeBSD__) && defined(__aarch64__)
+ /* FreeBSD/arm64 only permits up to 8 arguments. */
+ makecontext(&uc[i], (void *)run, 8, i,
+ 0, 1, 2, 3, 4, 5, 6);
#else
makecontext(&uc[i], (void *)run, 10, i,
0, 1, 2, 3, 4, 5, 6, 7, 8);
Modified: projects/release-pkg/etc/etc.aarch64/ttys
==============================================================================
--- projects/release-pkg/etc/etc.aarch64/ttys Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/etc/etc.aarch64/ttys Sat Oct 3 07:22:07 2015 (r288540)
@@ -29,7 +29,7 @@
# when going to single-user mode.
console none unknown off secure
#
-ttyv0 "/usr/libexec/getty Pc" xterm off secure
+ttyv0 "/usr/libexec/getty Pc" xterm onifconsole secure
# Virtual terminals
ttyv1 "/usr/libexec/getty Pc" xterm off secure
ttyv2 "/usr/libexec/getty Pc" xterm off secure
@@ -41,9 +41,9 @@ ttyv7 "/usr/libexec/getty Pc" xterm off
#ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure
# Serial terminals
# The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyu0 "/usr/libexec/getty std.9600" vt100 on secure
-ttyu1 "/usr/libexec/getty std.9600" dialup off secure
-ttyu2 "/usr/libexec/getty std.9600" dialup off secure
-ttyu3 "/usr/libexec/getty std.9600" dialup off secure
+ttyu0 "/usr/libexec/getty 3wire" vt100 onifconsole secure
+ttyu1 "/usr/libexec/getty 3wire" vt100 onifconsole secure
+ttyu2 "/usr/libexec/getty 3wire" vt100 onifconsole secure
+ttyu3 "/usr/libexec/getty 3wire" vt100 onifconsole secure
# Dumb console
dcons "/usr/libexec/getty std.9600" vt100 off secure
Modified: projects/release-pkg/release/arm/BANANAPI.conf
==============================================================================
--- projects/release-pkg/release/arm/BANANAPI.conf Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/release/arm/BANANAPI.conf Sat Oct 3 07:22:07 2015 (r288540)
@@ -22,10 +22,8 @@ arm_install_uboot() {
UBOOT_FILES="u-boot.img"
FATMOUNT="${DESTDIR%${KERNEL}}/fat"
UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
- chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/sunxi-spl.bin \
- of=/dev/${mddev} bs=1k seek=8
- chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
- of=/dev/${mddev} bs=1k seek=40 conv=notrunc,sync
+ chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/u-boot-sunxi-with-spl.bin \
+ of=/dev/${mddev} bs=1k seek=8 conv=sync
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
Modified: projects/release-pkg/release/arm/CUBIEBOARD.conf
==============================================================================
--- projects/release-pkg/release/arm/CUBIEBOARD.conf Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/release/arm/CUBIEBOARD.conf Sat Oct 3 07:22:07 2015 (r288540)
@@ -21,10 +21,8 @@ arm_install_uboot() {
UBOOT_FILES="u-boot.img"
FATMOUNT="${DESTDIR%${KERNEL}}/fat"
UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
- chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/sunxi-spl.bin \
- of=/dev/${mddev} bs=1k seek=8
- chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
- of=/dev/${mddev} bs=1k seek=40 conv=notrunc,sync
+ chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/u-boot-sunxi-with-spl.bin \
+ of=/dev/${mddev} bs=1k seek=8 conv=sync
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
Modified: projects/release-pkg/release/arm/CUBIEBOARD2.conf
==============================================================================
--- projects/release-pkg/release/arm/CUBIEBOARD2.conf Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/release/arm/CUBIEBOARD2.conf Sat Oct 3 07:22:07 2015 (r288540)
@@ -22,10 +22,8 @@ arm_install_uboot() {
UBOOT_FILES="u-boot.img"
FATMOUNT="${DESTDIR%${KERNEL}}/fat"
UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
- chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/sunxi-spl.bin \
- of=/dev/${mddev} bs=1k seek=8
- chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
- of=/dev/${mddev} bs=1k seek=40 conv=notrunc,sync
+ chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/u-boot-sunxi-with-spl.bin \
+ of=/dev/${mddev} bs=1k seek=8 conv=sync
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
Modified: projects/release-pkg/sbin/init/init.c
==============================================================================
--- projects/release-pkg/sbin/init/init.c Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/sbin/init/init.c Sat Oct 3 07:22:07 2015 (r288540)
@@ -1487,6 +1487,15 @@ static state_func_t
death(void)
{
session_t *sp;
+ int block, blocked;
+ size_t len;
+
+ /* Temporarily block suspend. */
+ len = sizeof(blocked);
+ block = 1;
+ if (sysctlbyname("kern.suspend_blocked", &blocked, &len,
+ &block, sizeof(block)) == -1)
+ blocked = 0;
/*
* Also revoke the TTY here. Because runshutdown() may reopen
@@ -1503,6 +1512,11 @@ death(void)
/* Try to run the rc.shutdown script within a period of time */
runshutdown();
+ /* Unblock suspend if we blocked it. */
+ if (!blocked)
+ sysctlbyname("kern.suspend_blocked", NULL, NULL,
+ &blocked, sizeof(blocked));
+
return (state_func_t) death_single;
}
Modified: projects/release-pkg/sbin/ipf/ipftest/Makefile
==============================================================================
--- projects/release-pkg/sbin/ipf/ipftest/Makefile Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/sbin/ipf/ipftest/Makefile Sat Oct 3 07:22:07 2015 (r288540)
@@ -32,15 +32,19 @@ CLEANFILES+= ipnat.tab.c ipnat.tab.h
CLEANFILES+= ippool_y.c ippool_l.c
CLEANFILES+= ippool.tab.c ippool.tab.h
-ipnat_y.c: ipnat_y.y
+ipnat.tab.c ipnat.tab.h: ipnat_y.y
${YACC} -b ipnat -d ${.ALLSRC}
+
+ipnat_y.c: ipnat.tab.c
sed -e 's/yy/ipnat_yy/g' \
-e 's/y.tab.c/ipnat_y.c/' \
-e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \
ipnat.tab.c > ${.TARGET}
+
+ipnat_y.h: ipnat.tab.h
sed -e 's/yy/ipnat_yy/g' \
-e 's/y.tab.h/ipnat_y.h/' \
- ipnat.tab.h > ${.TARGET:.c=.h}
+ ipnat.tab.h > ${.TARGET}
ipnat_y.h: ipnat_y.c
@@ -54,13 +58,17 @@ ipnat_l.h: lexer.h
sed -e 's/yy/ipnat_yy/g' \
${.ALLSRC} > ${.TARGET}
-ippool_y.c: ippool_y.y
+ippool.tab.c ippool.tab.h: ippool_y.y
${YACC} -b ippool -d ${.ALLSRC}
+
+ippool_y.c: ippool.tab.c
sed -e 's/yy/ippool_yy/g' \
-e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \
ippool.tab.c > ${.TARGET}
+
+ippool_y.h: ippool.tab.h
sed -e 's/yy/ippool_yy/g' \
- ippool.tab.h > ${.TARGET:.c=.h}
+ ippool.tab.h > ${.TARGET}
ippool_y.h: ippool_y.c
@@ -74,13 +82,17 @@ ippool_l.h: lexer.h
sed -e 's/yy/ippool_yy/g' \
${.ALLSRC} > ${.TARGET}
-ipf_y.c: ipf_y.y
+ipf.tab.c ipf.tab.h: ipf_y.y
${YACC} -b ipf -d ${.ALLSRC}
+
+ipf_y.c: ipf.tab.c
sed -e 's/yy/ipf_yy/g' \
-e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \
ipf.tab.c > ${.TARGET}
+
+ipf_y.h: ipf.tab.h
sed -e 's/yy/ipf_yy/g' \
- ipf.tab.h > ${.TARGET:.c=.h}
+ ipf.tab.h > ${.TARGET}
ipf_y.h: ipf_y.c
Modified: projects/release-pkg/share/mk/meta.stage.mk
==============================================================================
--- projects/release-pkg/share/mk/meta.stage.mk Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/share/mk/meta.stage.mk Sat Oct 3 07:22:07 2015 (r288540)
@@ -237,10 +237,11 @@ stage_as.$s: .dirdep
CLEANFILES += ${STAGE_TARGETS} stage_incs stage_includes
# stage_*links usually needs to follow any others.
-.for t in ${STAGE_TARGETS:N*links:O:u}
-.ORDER: $t stage_links
-.ORDER: $t stage_symlinks
+.if !empty(STAGE_SETS) && !empty(STAGE_TARGETS:Nstage_links)
+.for s in ${STAGE_SETS:O:u}
+stage_links.$s: ${STAGE_TARGETS:Nstage_links:O:u}
.endfor
+.endif
# make sure this exists
staging:
Modified: projects/release-pkg/sys/arm/arm/machdep.c
==============================================================================
--- projects/release-pkg/sys/arm/arm/machdep.c Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/sys/arm/arm/machdep.c Sat Oct 3 07:22:07 2015 (r288540)
@@ -1069,7 +1069,7 @@ init_proc0(vm_offset_t kstack)
(thread0.td_kstack + kstack_pages * PAGE_SIZE) - 1;
thread0.td_pcb->pcb_flags = 0;
thread0.td_pcb->pcb_vfpcpu = -1;
- thread0.td_pcb->pcb_vfpstate.fpscr = VFPSCR_DN | VFPSCR_FZ;
+ thread0.td_pcb->pcb_vfpstate.fpscr = VFPSCR_DN;
thread0.td_frame = &proc0_tf;
pcpup->pc_curpcb = thread0.td_pcb;
}
Modified: projects/release-pkg/sys/arm/arm/vm_machdep.c
==============================================================================
--- projects/release-pkg/sys/arm/arm/vm_machdep.c Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/sys/arm/arm/vm_machdep.c Sat Oct 3 07:22:07 2015 (r288540)
@@ -134,7 +134,7 @@ cpu_fork(register struct thread *td1, re
pcb2->pcb_regs.sf_sp = STACKALIGN(td2->td_frame);
pcb2->pcb_vfpcpu = -1;
- pcb2->pcb_vfpstate.fpscr = VFPSCR_DN | VFPSCR_FZ;
+ pcb2->pcb_vfpstate.fpscr = VFPSCR_DN;
tf = td2->td_frame;
tf->tf_spsr &= ~PSR_C;
Modified: projects/release-pkg/sys/arm/broadcom/bcm2835/bcm2836_mp.c
==============================================================================
--- projects/release-pkg/sys/arm/broadcom/bcm2835/bcm2836_mp.c Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/sys/arm/broadcom/bcm2835/bcm2836_mp.c Sat Oct 3 07:22:07 2015 (r288540)
@@ -182,6 +182,8 @@ pic_ipi_read(int i)
if (val == 0)
return (0);
ipi = ffs(val) - 1;
+ BSWR4(MBOX0CLR_CORE(cpu), 1 << ipi);
+ dsb();
return (ipi);
}
return (0x3ff);
@@ -190,12 +192,6 @@ pic_ipi_read(int i)
void
pic_ipi_clear(int ipi)
{
- int cpu;
-
- cpu = PCPU_GET(cpuid);
- dsb();
- BSWR4(MBOX0CLR_CORE(cpu), 1 << ipi);
- wmb();
}
void
Modified: projects/release-pkg/sys/arm/include/atomic-v4.h
==============================================================================
--- projects/release-pkg/sys/arm/include/atomic-v4.h Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/sys/arm/include/atomic-v4.h Sat Oct 3 07:22:07 2015 (r288540)
@@ -439,4 +439,37 @@ atomic_subtract_long(volatile u_long *p,
atomic_subtract_32((volatile uint32_t *)p, v);
}
+/*
+ * ARMv5 does not support SMP. For both kernel and user modes, only a
+ * compiler barrier is needed for fences, since CPU is always
+ * self-consistent.
+ */
+static __inline void
+atomic_thread_fence_acq(void)
+{
+
+ __compiler_membar();
+}
+
+static __inline void
+atomic_thread_fence_rel(void)
+{
+
+ __compiler_membar();
+}
+
+static __inline void
+atomic_thread_fence_acq_rel(void)
+{
+
+ __compiler_membar();
+}
+
+static __inline void
+atomic_thread_fence_seq_cst(void)
+{
+
+ __compiler_membar();
+}
+
#endif /* _MACHINE_ATOMIC_H_ */
Modified: projects/release-pkg/sys/arm/include/atomic-v6.h
==============================================================================
--- projects/release-pkg/sys/arm/include/atomic-v6.h Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/sys/arm/include/atomic-v6.h Sat Oct 3 07:22:07 2015 (r288540)
@@ -596,4 +596,32 @@ atomic_store_rel_long(volatile u_long *p
#undef ATOMIC_ACQ_REL
#undef ATOMIC_ACQ_REL_LONG
+static __inline void
+atomic_thread_fence_acq(void)
+{
+
+ dmb();
+}
+
+static __inline void
+atomic_thread_fence_rel(void)
+{
+
+ dmb();
+}
+
+static __inline void
+atomic_thread_fence_acq_rel(void)
+{
+
+ dmb();
+}
+
+static __inline void
+atomic_thread_fence_seq_cst(void)
+{
+
+ dmb();
+}
+
#endif /* _MACHINE_ATOMIC_V6_H_ */
Modified: projects/release-pkg/sys/arm/include/atomic.h
==============================================================================
--- projects/release-pkg/sys/arm/include/atomic.h Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/sys/arm/include/atomic.h Sat Oct 3 07:22:07 2015 (r288540)
@@ -82,34 +82,6 @@ atomic_store_long(volatile u_long *dst,
*dst = src;
}
-static __inline void
-atomic_thread_fence_acq(void)
-{
-
- dmb();
-}
-
-static __inline void
-atomic_thread_fence_rel(void)
-{
-
- dmb();
-}
-
-static __inline void
-atomic_thread_fence_acq_rel(void)
-{
-
- dmb();
-}
-
-static __inline void
-atomic_thread_fence_seq_cst(void)
-{
-
- dmb();
-}
-
#define atomic_clear_ptr atomic_clear_32
#define atomic_set_ptr atomic_set_32
#define atomic_cmpset_ptr atomic_cmpset_32
Modified: projects/release-pkg/sys/arm/mv/mpic.c
==============================================================================
--- projects/release-pkg/sys/arm/mv/mpic.c Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/sys/arm/mv/mpic.c Sat Oct 3 07:22:07 2015 (r288540)
@@ -378,10 +378,14 @@ int
pic_ipi_read(int i __unused)
{
uint32_t val;
+ int ipi;
val = MPIC_CPU_READ(mv_mpic_sc, MPIC_IN_DRBL);
- if (val)
- return (ffs(val) - 1);
+ if (val) {
+ ipi = ffs(val) - 1;
+ MPIC_CPU_WRITE(mv_mpic_sc, MPIC_IN_DRBL, ~(1 << ipi));
+ return (ipi);
+ }
return (0x3ff);
}
@@ -389,10 +393,6 @@ pic_ipi_read(int i __unused)
void
pic_ipi_clear(int ipi)
{
- uint32_t val;
-
- val = ~(1 << ipi);
- MPIC_CPU_WRITE(mv_mpic_sc, MPIC_IN_DRBL, val);
}
#endif
Modified: projects/release-pkg/sys/arm64/arm64/exception.S
==============================================================================
--- projects/release-pkg/sys/arm64/arm64/exception.S Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/sys/arm64/arm64/exception.S Sat Oct 3 07:22:07 2015 (r288540)
@@ -131,45 +131,51 @@ __FBSDID("$FreeBSD$");
2:
.endm
-handle_el1h_sync:
+ENTRY(handle_el1h_sync)
save_registers 1
mov x0, sp
bl do_el1h_sync
restore_registers 1
eret
+END(handle_el1h_sync)
-handle_el1h_irq:
+ENTRY(handle_el1h_irq)
save_registers 1
mov x0, sp
bl arm_cpu_intr
restore_registers 1
eret
+END(handle_el1h_irq)
-handle_el1h_error:
+ENTRY(handle_el1h_error)
brk 0xf13
+END(handle_el1h_error)
-handle_el0_sync:
+ENTRY(handle_el0_sync)
save_registers 0
mov x0, sp
bl do_el0_sync
do_ast
restore_registers 0
eret
+END(handle_el0_sync)
-handle_el0_irq:
+ENTRY(handle_el0_irq)
save_registers 0
mov x0, sp
bl arm_cpu_intr
do_ast
restore_registers 0
eret
+END(handle_el0_irq)
-handle_el0_error:
+ENTRY(handle_el0_error)
save_registers 0
mov x0, sp
bl do_el0_error
brk 0xf23
1: b 1b
+END(handle_el0_error)
.macro vempty
.align 7
Modified: projects/release-pkg/sys/arm64/arm64/pmap.c
==============================================================================
--- projects/release-pkg/sys/arm64/arm64/pmap.c Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/sys/arm64/arm64/pmap.c Sat Oct 3 07:22:07 2015 (r288540)
@@ -243,6 +243,16 @@ static void _pmap_unwire_l3(pmap_t pmap,
struct spglist *free);
static int pmap_unuse_l3(pmap_t, vm_offset_t, pd_entry_t, struct spglist *);
+/*
+ * These load the old table data and store the new value.
+ * They need to be atomic as the System MMU may write to the table at
+ * the same time as the CPU.
+ */
+#define pmap_load_store(table, entry) atomic_swap_64(table, entry)
+#define pmap_set(table, mask) atomic_set_64(table, mask)
+#define pmap_load_clear(table) atomic_swap_64(table, 0)
+#define pmap_load(table) (*table)
+
/********************/
/* Inline functions */
/********************/
@@ -277,7 +287,7 @@ pmap_l1_to_l2(pd_entry_t *l1, vm_offset_
{
pd_entry_t *l2;
- l2 = (pd_entry_t *)PHYS_TO_DMAP(*l1 & ~ATTR_MASK);
+ l2 = (pd_entry_t *)PHYS_TO_DMAP(pmap_load(l1) & ~ATTR_MASK);
return (&l2[pmap_l2_index(va)]);
}
@@ -287,7 +297,7 @@ pmap_l2(pmap_t pmap, vm_offset_t va)
pd_entry_t *l1;
l1 = pmap_l1(pmap, va);
- if ((*l1 & ATTR_DESCR_MASK) != L1_TABLE)
+ if ((pmap_load(l1) & ATTR_DESCR_MASK) != L1_TABLE)
return (NULL);
return (pmap_l1_to_l2(l1, va));
@@ -298,7 +308,7 @@ pmap_l2_to_l3(pd_entry_t *l2, vm_offset_
{
pt_entry_t *l3;
- l3 = (pd_entry_t *)PHYS_TO_DMAP(*l2 & ~ATTR_MASK);
+ l3 = (pd_entry_t *)PHYS_TO_DMAP(pmap_load(l2) & ~ATTR_MASK);
return (&l3[pmap_l3_index(va)]);
}
@@ -308,7 +318,7 @@ pmap_l3(pmap_t pmap, vm_offset_t va)
pd_entry_t *l2;
l2 = pmap_l2(pmap, va);
- if (l2 == NULL || (*l2 & ATTR_DESCR_MASK) != L2_TABLE)
+ if (l2 == NULL || (pmap_load(l2) & ATTR_DESCR_MASK) != L2_TABLE)
return (NULL);
return (pmap_l2_to_l3(l2, va));
@@ -326,19 +336,19 @@ pmap_get_tables(pmap_t pmap, vm_offset_t
l1p = pmap_l1(pmap, va);
*l1 = l1p;
- if ((*l1p & ATTR_DESCR_MASK) == L1_BLOCK) {
+ if ((pmap_load(l1p) & ATTR_DESCR_MASK) == L1_BLOCK) {
*l2 = NULL;
*l3 = NULL;
return (true);
}
- if ((*l1p & ATTR_DESCR_MASK) != L1_TABLE)
+ if ((pmap_load(l1p) & ATTR_DESCR_MASK) != L1_TABLE)
return (false);
l2p = pmap_l1_to_l2(l1p, va);
*l2 = l2p;
- if ((*l2p & ATTR_DESCR_MASK) == L2_BLOCK) {
+ if ((pmap_load(l2p) & ATTR_DESCR_MASK) == L2_BLOCK) {
*l3 = NULL;
return (true);
}
@@ -348,16 +358,6 @@ pmap_get_tables(pmap_t pmap, vm_offset_t
return (true);
}
-/*
- * These load the old table data and store the new value.
- * They need to be atomic as the System MMU may write to the table at
- * the same time as the CPU.
- */
-#define pmap_load_store(table, entry) atomic_swap_64(table, entry)
-#define pmap_set(table, mask) atomic_set_64(table, mask)
-#define pmap_load_clear(table) atomic_swap_64(table, 0)
-#define pmap_load(table) (*table)
-
static __inline int
pmap_is_current(pmap_t pmap)
{
@@ -799,11 +799,11 @@ pmap_extract(pmap_t pmap, vm_offset_t va
*/
l2p = pmap_l2(pmap, va);
if (l2p != NULL) {
- l2 = *l2p;
+ l2 = pmap_load(l2p);
if ((l2 & ATTR_DESCR_MASK) == L2_TABLE) {
l3p = pmap_l2_to_l3(l2p, va);
if (l3p != NULL) {
- l3 = *l3p;
+ l3 = pmap_load(l3p);
if ((l3 & ATTR_DESCR_MASK) == L3_PAGE)
pa = (l3 & ~ATTR_MASK) |
@@ -852,23 +852,25 @@ retry:
vm_paddr_t
pmap_kextract(vm_offset_t va)
{
- pd_entry_t *l2;
+ pd_entry_t *l2p, l2;
pt_entry_t *l3;
vm_paddr_t pa;
if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS) {
pa = DMAP_TO_PHYS(va);
} else {
- l2 = pmap_l2(kernel_pmap, va);
- if (l2 == NULL)
+ l2p = pmap_l2(kernel_pmap, va);
+ if (l2p == NULL)
panic("pmap_kextract: No l2");
- if ((*l2 & ATTR_DESCR_MASK) == L2_BLOCK)
- return ((*l2 & ~ATTR_MASK) | (va & L2_OFFSET));
+ l2 = pmap_load(l2p);
+ if ((l2 & ATTR_DESCR_MASK) == L2_BLOCK)
+ return ((l2 & ~ATTR_MASK) |
+ (va & L2_OFFSET));
- l3 = pmap_l2_to_l3(l2, va);
+ l3 = pmap_l2_to_l3(l2p, va);
if (l3 == NULL)
panic("pmap_kextract: No l3...");
- pa = (*l3 & ~ATTR_MASK) | (va & PAGE_MASK);
+ pa = (pmap_load(l3) & ~ATTR_MASK) | (va & PAGE_MASK);
}
return (pa);
}
@@ -1242,11 +1244,11 @@ _pmap_alloc_l3(pmap_t pmap, vm_pindex_t
return (NULL);
}
} else {
- pdpg = PHYS_TO_VM_PAGE(*l1 & ~ATTR_MASK);
+ pdpg = PHYS_TO_VM_PAGE(pmap_load(l1) & ~ATTR_MASK);
pdpg->wire_count++;
}
- l2 = (pd_entry_t *)PHYS_TO_DMAP(*l1 & ~ATTR_MASK);
+ l2 = (pd_entry_t *)PHYS_TO_DMAP(pmap_load(l1) & ~ATTR_MASK);
l2 = &l2[ptepindex & Ln_ADDR_MASK];
pmap_load_store(l2, VM_PAGE_TO_PHYS(m) | L2_TABLE);
PTE_SYNC(l2);
@@ -1738,7 +1740,7 @@ pmap_remove(pmap_t pmap, vm_offset_t sva
if (l2 == NULL)
continue;
- l3_paddr = *l2;
+ l3_paddr = pmap_load(l2);
/*
* Weed out invalid mappings.
@@ -1805,7 +1807,7 @@ pmap_remove_all(vm_page_t m)
pv_entry_t pv;
pmap_t pmap;
pt_entry_t *l3, tl3;
- pd_entry_t *l2;
+ pd_entry_t *l2, tl2;
struct spglist free;
KASSERT((m->oflags & VPO_UNMANAGED) == 0,
@@ -1817,7 +1819,9 @@ pmap_remove_all(vm_page_t m)
PMAP_LOCK(pmap);
pmap_resident_count_dec(pmap, 1);
l2 = pmap_l2(pmap, pv->pv_va);
- KASSERT((*l2 & ATTR_DESCR_MASK) == L2_TABLE,
+ KASSERT(l2 != NULL, ("pmap_remove_all: no l2 table found"));
+ tl2 = pmap_load(l2);
+ KASSERT((tl2 & ATTR_DESCR_MASK) == L2_TABLE,
("pmap_remove_all: found a table when expecting "
"a block in %p's pv list", m));
l3 = pmap_l2_to_l3(l2, pv->pv_va);
@@ -1837,7 +1841,7 @@ pmap_remove_all(vm_page_t m)
*/
if (pmap_page_dirty(tl3))
vm_page_dirty(m);
- pmap_unuse_l3(pmap, pv->pv_va, *l2, &free);
+ pmap_unuse_l3(pmap, pv->pv_va, tl2, &free);
TAILQ_REMOVE(&m->md.pv_list, pv, pv_next);
m->md.pv_gen++;
free_pv_entry(pmap, pv);
@@ -1883,7 +1887,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sv
va_next = eva;
l2 = pmap_l1_to_l2(l1, sva);
- if (l2 == NULL || (*l2 & ATTR_DESCR_MASK) != L2_TABLE)
+ if (l2 == NULL || (pmap_load(l2) & ATTR_DESCR_MASK) != L2_TABLE)
continue;
if (va_next > eva)
@@ -2345,7 +2349,7 @@ pmap_unwire(pmap_t pmap, vm_offset_t sva
continue;
if ((pmap_load(l3) & ATTR_SW_WIRED) == 0)
panic("pmap_unwire: l3 %#jx is missing "
- "ATTR_SW_WIRED", (uintmax_t)*l3);
+ "ATTR_SW_WIRED", (uintmax_t)pmap_load(l3));
/*
* PG_W must be cleared atomically. Although the pmap
@@ -2836,7 +2840,7 @@ retry_pv_loop:
}
l3 = pmap_l3(pmap, pv->pv_va);
retry:
- oldl3 = *l3;
+ oldl3 = pmap_load(l3);
if ((oldl3 & ATTR_AP_RW_BIT) == ATTR_AP(ATTR_AP_RW)) {
if (!atomic_cmpset_long(l3, oldl3,
oldl3 | ATTR_AP(ATTR_AP_RO)))
@@ -2879,7 +2883,7 @@ pmap_ts_referenced(vm_page_t m)
pv_entry_t pv, pvf;
pmap_t pmap;
struct rwlock *lock;
- pd_entry_t *l2;
+ pd_entry_t *l2p, l2;
pt_entry_t *l3;
vm_paddr_t pa;
int cleared, md_gen, not_cleared;
@@ -2912,12 +2916,14 @@ retry:
goto retry;
}
}
- l2 = pmap_l2(pmap, pv->pv_va);
- KASSERT((*l2 & ATTR_DESCR_MASK) == L2_TABLE,
+ l2p = pmap_l2(pmap, pv->pv_va);
+ KASSERT(l2p != NULL, ("pmap_ts_referenced: no l2 table found"));
+ l2 = pmap_load(l2p);
+ KASSERT((l2 & ATTR_DESCR_MASK) == L2_TABLE,
("pmap_ts_referenced: found an invalid l2 table"));
- l3 = pmap_l2_to_l3(l2, pv->pv_va);
+ l3 = pmap_l2_to_l3(l2p, pv->pv_va);
if ((pmap_load(l3) & ATTR_AF) != 0) {
- if (safe_to_clear_referenced(pmap, *l3)) {
+ if (safe_to_clear_referenced(pmap, pmap_load(l3))) {
/*
* TODO: We don't handle the access flag
* at all. We need to be able to set it in
@@ -2931,8 +2937,8 @@ retry:
* them is wasted effort. We do the
* hard work for unwired pages only.
*/
- pmap_remove_l3(pmap, l3, pv->pv_va,
- *l2, &free, &lock);
+ pmap_remove_l3(pmap, l3, pv->pv_va, l2,
+ &free, &lock);
pmap_invalidate_page(pmap, pv->pv_va);
cleared++;
if (pvf == pv)
Modified: projects/release-pkg/sys/cam/ctl/ctl.c
==============================================================================
--- projects/release-pkg/sys/cam/ctl/ctl.c Sat Oct 3 07:21:27 2015 (r288539)
+++ projects/release-pkg/sys/cam/ctl/ctl.c Sat Oct 3 07:22:07 2015 (r288540)
@@ -781,9 +781,9 @@ alloc:
msg->hdr.nexus.targ_lun = lun->lun;
msg->hdr.nexus.targ_mapped_lun = lun->lun;
msg->lun.flags = lun->flags;
- msg->lun.pr_generation = lun->PRGeneration;
+ msg->lun.pr_generation = lun->pr_generation;
msg->lun.pr_res_idx = lun->pr_res_idx;
- msg->lun.pr_res_type = lun->res_type;
+ msg->lun.pr_res_type = lun->pr_res_type;
msg->lun.pr_key_count = lun->pr_key_count;
i = 0;
if (lun->lun_devid) {
@@ -1085,9 +1085,9 @@ ctl_isc_lun_sync(struct ctl_softc *softc
/* If peer is primary and we are not -- use data */
if ((lun->flags & CTL_LUN_PRIMARY_SC) == 0 &&
(lun->flags & CTL_LUN_PEER_SC_PRIMARY)) {
- lun->PRGeneration = msg->lun.pr_generation;
+ lun->pr_generation = msg->lun.pr_generation;
lun->pr_res_idx = msg->lun.pr_res_idx;
- lun->res_type = msg->lun.pr_res_type;
+ lun->pr_res_type = msg->lun.pr_res_type;
lun->pr_key_count = msg->lun.pr_key_count;
for (k = 0; k < CTL_MAX_INITIATORS; k++)
ctl_clr_prkey(lun, k);
@@ -5101,6 +5101,13 @@ ctl_scsi_reserve(struct ctl_scsiio *ctsi
ctl_set_reservation_conflict(ctsio);
goto bailout;
}
+
+ /* SPC-3 exceptions to SPC-2 RESERVE and RELEASE behavior. */
+ if (lun->flags & CTL_LUN_PR_RESERVED) {
+ ctl_set_success(ctsio);
+ goto bailout;
+ }
+
lun->flags |= CTL_LUN_RESERVED;
lun->res_idx = residx;
ctl_set_success(ctsio);
@@ -5130,7 +5137,7 @@ ctl_start_stop(struct ctl_scsiio *ctsio)
residx = ctl_get_initindex(&ctsio->io_hdr.nexus);
if (ctl_get_prkey(lun, residx) == 0 ||
- (lun->pr_res_idx != residx && lun->res_type < 4)) {
+ (lun->pr_res_idx != residx && lun->pr_res_type < 4)) {
ctl_set_reservation_conflict(ctsio);
ctl_done((union ctl_io *)ctsio);
@@ -7540,7 +7547,7 @@ retry:
goto retry;
}
- scsi_ulto4b(lun->PRGeneration, res_keys->header.generation);
+ scsi_ulto4b(lun->pr_generation, res_keys->header.generation);
scsi_ulto4b(sizeof(struct scsi_per_res_key) *
lun->pr_key_count, res_keys->header.length);
@@ -7571,7 +7578,7 @@ retry:
res = (struct scsi_per_res_in_rsrv *)ctsio->kern_data_ptr;
- scsi_ulto4b(lun->PRGeneration, res->header.generation);
+ scsi_ulto4b(lun->pr_generation, res->header.generation);
if (lun->flags & CTL_LUN_PR_RESERVED)
{
@@ -7614,7 +7621,7 @@ retry:
scsi_u64to8b(ctl_get_prkey(lun, lun->pr_res_idx),
res->data.reservation);
}
- res->data.scopetype = lun->res_type;
+ res->data.scopetype = lun->pr_res_type;
break;
}
case SPRI_RC: //report capabilities
@@ -7624,7 +7631,8 @@ retry:
res_cap = (struct scsi_per_res_cap *)ctsio->kern_data_ptr;
scsi_ulto2b(sizeof(*res_cap), res_cap->length);
- res_cap->flags2 |= SPRI_TMV | SPRI_ALLOW_5;
+ res_cap->flags1 = SPRI_CRH;
+ res_cap->flags2 = SPRI_TMV | SPRI_ALLOW_5;
type_mask = SPRI_TM_WR_EX_AR |
SPRI_TM_EX_AC_RO |
SPRI_TM_WR_EX_RO |
@@ -7659,7 +7667,7 @@ retry:
goto retry;
}
- scsi_ulto4b(lun->PRGeneration, res_status->header.generation);
+ scsi_ulto4b(lun->pr_generation, res_status->header.generation);
res_desc = &res_status->desc[0];
for (i = 0; i < CTL_MAX_INITIATORS; i++) {
@@ -7671,7 +7679,7 @@ retry:
(lun->pr_res_idx == i ||
lun->pr_res_idx == CTL_PR_ALL_REGISTRANTS)) {
res_desc->flags = SPRI_FULL_R_HOLDER;
- res_desc->scopetype = lun->res_type;
+ res_desc->scopetype = lun->pr_res_type;
}
scsi_ulto2b(i / CTL_MAX_INIT_PER_PORT,
res_desc->rel_trgt_port_id);
@@ -7760,11 +7768,11 @@ ctl_pro_preempt(struct ctl_softc *softc,
ctl_est_ua(lun, i, CTL_UA_REG_PREEMPT);
}
lun->pr_key_count = 1;
- lun->res_type = type;
- if (lun->res_type != SPR_TYPE_WR_EX_AR
- && lun->res_type != SPR_TYPE_EX_AC_AR)
+ lun->pr_res_type = type;
+ if (lun->pr_res_type != SPR_TYPE_WR_EX_AR &&
+ lun->pr_res_type != SPR_TYPE_EX_AC_AR)
lun->pr_res_idx = residx;
- lun->PRGeneration++;
+ lun->pr_generation++;
mtx_unlock(&lun->lun_lock);
/* send msg to other side */
@@ -7834,7 +7842,7 @@ ctl_pro_preempt(struct ctl_softc *softc,
ctl_done((union ctl_io *)ctsio);
return (CTL_RETVAL_COMPLETE);
}
- lun->PRGeneration++;
+ lun->pr_generation++;
mtx_unlock(&lun->lun_lock);
/* send msg to other side */
@@ -7900,19 +7908,19 @@ ctl_pro_preempt(struct ctl_softc *softc,
ctl_clr_prkey(lun, i);
lun->pr_key_count--;
ctl_est_ua(lun, i, CTL_UA_REG_PREEMPT);
- } else if (type != lun->res_type
- && (lun->res_type == SPR_TYPE_WR_EX_RO
- || lun->res_type ==SPR_TYPE_EX_AC_RO)){
+ } else if (type != lun->pr_res_type &&
+ (lun->pr_res_type == SPR_TYPE_WR_EX_RO ||
+ lun->pr_res_type == SPR_TYPE_EX_AC_RO)) {
ctl_est_ua(lun, i, CTL_UA_RES_RELEASE);
}
}
- lun->res_type = type;
- if (lun->res_type != SPR_TYPE_WR_EX_AR
- && lun->res_type != SPR_TYPE_EX_AC_AR)
+ lun->pr_res_type = type;
+ if (lun->pr_res_type != SPR_TYPE_WR_EX_AR &&
+ lun->pr_res_type != SPR_TYPE_EX_AC_AR)
lun->pr_res_idx = residx;
else
lun->pr_res_idx = CTL_PR_ALL_REGISTRANTS;
- lun->PRGeneration++;
+ lun->pr_generation++;
mtx_unlock(&lun->lun_lock);
persis_io.hdr.nexus = ctsio->io_hdr.nexus;
@@ -7949,7 +7957,7 @@ ctl_pro_preempt(struct ctl_softc *softc,
ctl_done((union ctl_io *)ctsio);
return (1);
}
- lun->PRGeneration++;
+ lun->pr_generation++;
mtx_unlock(&lun->lun_lock);
persis_io.hdr.nexus = ctsio->io_hdr.nexus;
@@ -7993,9 +8001,9 @@ ctl_pro_preempt_other(struct ctl_lun *lu
}
lun->pr_key_count = 1;
- lun->res_type = msg->pr.pr_info.res_type;
- if (lun->res_type != SPR_TYPE_WR_EX_AR
- && lun->res_type != SPR_TYPE_EX_AC_AR)
+ lun->pr_res_type = msg->pr.pr_info.res_type;
+ if (lun->pr_res_type != SPR_TYPE_WR_EX_AR &&
+ lun->pr_res_type != SPR_TYPE_EX_AC_AR)
lun->pr_res_idx = msg->pr.pr_info.residx;
} else {
for (i = 0; i < CTL_MAX_INITIATORS; i++) {
@@ -8017,20 +8025,20 @@ ctl_pro_preempt_other(struct ctl_lun *lu
ctl_clr_prkey(lun, i);
lun->pr_key_count--;
ctl_est_ua(lun, i, CTL_UA_REG_PREEMPT);
- } else if (msg->pr.pr_info.res_type != lun->res_type
- && (lun->res_type == SPR_TYPE_WR_EX_RO
- || lun->res_type == SPR_TYPE_EX_AC_RO)) {
+ } else if (msg->pr.pr_info.res_type != lun->pr_res_type
+ && (lun->pr_res_type == SPR_TYPE_WR_EX_RO ||
+ lun->pr_res_type == SPR_TYPE_EX_AC_RO)) {
ctl_est_ua(lun, i, CTL_UA_RES_RELEASE);
}
}
- lun->res_type = msg->pr.pr_info.res_type;
- if (lun->res_type != SPR_TYPE_WR_EX_AR
- && lun->res_type != SPR_TYPE_EX_AC_AR)
+ lun->pr_res_type = msg->pr.pr_info.res_type;
+ if (lun->pr_res_type != SPR_TYPE_WR_EX_AR &&
+ lun->pr_res_type != SPR_TYPE_EX_AC_AR)
lun->pr_res_idx = msg->pr.pr_info.residx;
else
lun->pr_res_idx = CTL_PR_ALL_REGISTRANTS;
}
- lun->PRGeneration++;
+ lun->pr_generation++;
}
@@ -8212,9 +8220,9 @@ ctl_persistent_reserve_out(struct ctl_sc
lun->flags &= ~CTL_LUN_PR_RESERVED;
lun->pr_res_idx = CTL_PR_NO_RESERVATION;
- if ((lun->res_type == SPR_TYPE_WR_EX_RO
- || lun->res_type == SPR_TYPE_EX_AC_RO)
- && lun->pr_key_count) {
+ if ((lun->pr_res_type == SPR_TYPE_WR_EX_RO ||
+ lun->pr_res_type == SPR_TYPE_EX_AC_RO) &&
+ lun->pr_key_count) {
/*
* If the reservation is a registrants
* only type we need to generate a UA
@@ -8230,15 +8238,15 @@ ctl_persistent_reserve_out(struct ctl_sc
CTL_UA_RES_RELEASE);
}
}
- lun->res_type = 0;
+ lun->pr_res_type = 0;
} else if (lun->pr_res_idx == CTL_PR_ALL_REGISTRANTS) {
if (lun->pr_key_count==0) {
lun->flags &= ~CTL_LUN_PR_RESERVED;
- lun->res_type = 0;
+ lun->pr_res_type = 0;
lun->pr_res_idx = CTL_PR_NO_RESERVATION;
}
}
- lun->PRGeneration++;
+ lun->pr_generation++;
mtx_unlock(&lun->lun_lock);
persis_io.hdr.nexus = ctsio->io_hdr.nexus;
@@ -8257,7 +8265,7 @@ ctl_persistent_reserve_out(struct ctl_sc
if (ctl_get_prkey(lun, residx) == 0)
lun->pr_key_count++;
ctl_set_prkey(lun, residx, sa_res_key);
- lun->PRGeneration++;
+ lun->pr_generation++;
mtx_unlock(&lun->lun_lock);
persis_io.hdr.nexus = ctsio->io_hdr.nexus;
@@ -8286,7 +8294,7 @@ ctl_persistent_reserve_out(struct ctl_sc
*/
if ((lun->pr_res_idx != residx
&& lun->pr_res_idx != CTL_PR_ALL_REGISTRANTS)
- || lun->res_type != type) {
+ || lun->pr_res_type != type) {
mtx_unlock(&lun->lun_lock);
free(ctsio->kern_data_ptr, M_CTL);
ctl_set_reservation_conflict(ctsio);
@@ -8306,7 +8314,7 @@ ctl_persistent_reserve_out(struct ctl_sc
lun->pr_res_idx = CTL_PR_ALL_REGISTRANTS;
lun->flags |= CTL_LUN_PR_RESERVED;
- lun->res_type = type;
+ lun->pr_res_type = type;
mtx_unlock(&lun->lun_lock);
@@ -8341,7 +8349,7 @@ ctl_persistent_reserve_out(struct ctl_sc
goto done;
}
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***