Date: Thu, 1 Oct 2015 19:02:47 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> 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... Message-ID: <201510011902.t91J2l9A047500@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510011902.t91J2l9A047500>