Date: Sat, 4 Jul 2015 21:50:41 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r285153 - in projects/clang-trunk: . bin/mv bin/sh cddl/contrib/opensolaris/lib/libdtrace/aarch64 cddl/contrib/opensolaris/lib/libdtrace/common cddl/lib cddl/lib/libdtrace cddl/usr.sbin... Message-ID: <201507042150.t64Lof7B051248@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sat Jul 4 21:50:39 2015 New Revision: 285153 URL: https://svnweb.freebsd.org/changeset/base/285153 Log: Merge ^/head r284737 through r285152. Added: projects/clang-trunk/cddl/contrib/opensolaris/lib/libdtrace/aarch64/ - copied from r285152, head/cddl/contrib/opensolaris/lib/libdtrace/aarch64/ projects/clang-trunk/contrib/llvm/patches/patch-10-llvm-r241142-r241143-mmx-undef.diff - copied unchanged from r285152, head/contrib/llvm/patches/patch-10-llvm-r241142-r241143-mmx-undef.diff projects/clang-trunk/lib/libc/aarch64/gen/fpgetmask.c - copied unchanged from r285152, head/lib/libc/aarch64/gen/fpgetmask.c projects/clang-trunk/lib/libc/aarch64/gen/fpsetmask.c - copied unchanged from r285152, head/lib/libc/aarch64/gen/fpsetmask.c projects/clang-trunk/release/Makefile.gce - copied unchanged from r285152, head/release/Makefile.gce projects/clang-trunk/release/Makefile.vagrant - copied unchanged from r285152, head/release/Makefile.vagrant projects/clang-trunk/release/scripts/atlas-upload.sh - copied unchanged from r285152, head/release/scripts/atlas-upload.sh projects/clang-trunk/release/tools/vagrant.conf - copied unchanged from r285152, head/release/tools/vagrant.conf projects/clang-trunk/share/man/man9/nv.9 - copied unchanged from r285152, head/share/man/man9/nv.9 projects/clang-trunk/sys/arm/allwinner/a10_ahci.c - copied unchanged from r285152, head/sys/arm/allwinner/a10_ahci.c projects/clang-trunk/sys/arm64/include/floatingpoint.h - copied unchanged from r285152, head/sys/arm64/include/floatingpoint.h projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/aarch64/ - copied from r285152, head/sys/cddl/contrib/opensolaris/uts/aarch64/ projects/clang-trunk/sys/cddl/dev/dtrace/aarch64/ - copied from r285152, head/sys/cddl/dev/dtrace/aarch64/ projects/clang-trunk/sys/cddl/dev/fbt/aarch64/ - copied from r285152, head/sys/cddl/dev/fbt/aarch64/ projects/clang-trunk/sys/contrib/libnv/ - copied from r285152, head/sys/contrib/libnv/ projects/clang-trunk/sys/dev/proto/proto_bus_isa.c - copied unchanged from r285152, head/sys/dev/proto/proto_bus_isa.c projects/clang-trunk/sys/dev/qlxgbe/ql_boot.c - copied unchanged from r285152, head/sys/dev/qlxgbe/ql_boot.c projects/clang-trunk/sys/dev/qlxgbe/ql_fw.c - copied unchanged from r285152, head/sys/dev/qlxgbe/ql_fw.c projects/clang-trunk/sys/dev/qlxgbe/ql_minidump.c - copied unchanged from r285152, head/sys/dev/qlxgbe/ql_minidump.c projects/clang-trunk/sys/dev/random/randomdev_none.c - copied unchanged from r285152, head/sys/dev/random/randomdev_none.c projects/clang-trunk/sys/mips/conf/BERI_SIM_VIRTIO - copied unchanged from r285152, head/sys/mips/conf/BERI_SIM_VIRTIO projects/clang-trunk/sys/mips/conf/TL-ARCHERC7V2 - copied unchanged from r285152, head/sys/mips/conf/TL-ARCHERC7V2 projects/clang-trunk/sys/mips/conf/TL-ARCHERC7V2.hints - copied unchanged from r285152, head/sys/mips/conf/TL-ARCHERC7V2.hints projects/clang-trunk/sys/modules/filemon/Makefile.depend - copied unchanged from r285152, head/sys/modules/filemon/Makefile.depend projects/clang-trunk/sys/net/altq/altq_fairq.c - copied unchanged from r285152, head/sys/net/altq/altq_fairq.c projects/clang-trunk/sys/net/altq/altq_fairq.h - copied unchanged from r285152, head/sys/net/altq/altq_fairq.h projects/clang-trunk/usr.sbin/bhyve/Makefile.depend - copied unchanged from r285152, head/usr.sbin/bhyve/Makefile.depend Deleted: projects/clang-trunk/lib/libnv/nv.3 projects/clang-trunk/release/tools/gce-package.sh projects/clang-trunk/sys/dev/random/dummy_rng.c projects/clang-trunk/sys/dev/random/live_entropy_sources.c projects/clang-trunk/sys/dev/random/live_entropy_sources.h projects/clang-trunk/sys/dev/random/random_adaptors.c projects/clang-trunk/sys/dev/random/random_adaptors.h projects/clang-trunk/sys/dev/random/randomdev_soft.c projects/clang-trunk/sys/dev/random/randomdev_soft.h projects/clang-trunk/sys/kern/subr_dnvlist.c projects/clang-trunk/sys/kern/subr_nvlist.c projects/clang-trunk/sys/kern/subr_nvpair.c projects/clang-trunk/sys/modules/random/Makefile projects/clang-trunk/sys/sys/nv_impl.h projects/clang-trunk/sys/sys/nvlist_impl.h projects/clang-trunk/sys/sys/nvpair_impl.h Modified: projects/clang-trunk/.arcconfig projects/clang-trunk/Makefile projects/clang-trunk/Makefile.inc1 projects/clang-trunk/ObsoleteFiles.inc projects/clang-trunk/UPDATING projects/clang-trunk/bin/mv/mv.c projects/clang-trunk/bin/sh/alias.c projects/clang-trunk/bin/sh/exec.c projects/clang-trunk/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/clang-trunk/cddl/lib/Makefile projects/clang-trunk/cddl/lib/libdtrace/Makefile projects/clang-trunk/cddl/usr.sbin/Makefile projects/clang-trunk/contrib/bmake/mk/meta2deps.sh projects/clang-trunk/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp projects/clang-trunk/contrib/llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp projects/clang-trunk/contrib/pf/pflogd/pflogd.8 projects/clang-trunk/contrib/tcpdump/tcpdump.c projects/clang-trunk/etc/defaults/rc.conf projects/clang-trunk/etc/rc.d/iovctl projects/clang-trunk/etc/rc.d/random projects/clang-trunk/etc/rc.firewall projects/clang-trunk/etc/services projects/clang-trunk/games/fortune/datfiles/fortunes projects/clang-trunk/gnu/usr.bin/gdb/kgdb/trgt.c projects/clang-trunk/include/stdio.h projects/clang-trunk/lib/Makefile projects/clang-trunk/lib/csu/aarch64/crt1.c projects/clang-trunk/lib/libc/aarch64/Symbol.map projects/clang-trunk/lib/libc/aarch64/gen/Makefile.inc projects/clang-trunk/lib/libc/aarch64/gen/_setjmp.S projects/clang-trunk/lib/libc/aarch64/gen/setjmp.S projects/clang-trunk/lib/libc/aarch64/gen/sigsetjmp.S projects/clang-trunk/lib/libc/aarch64/sys/brk.S projects/clang-trunk/lib/libc/aarch64/sys/sbrk.S projects/clang-trunk/lib/libc/stdio/Symbol.map projects/clang-trunk/lib/libc/stdio/fclose.3 projects/clang-trunk/lib/libc/stdio/fclose.c projects/clang-trunk/lib/libc/sys/ptrace.2 projects/clang-trunk/lib/libcapsicum/libcapsicum.c projects/clang-trunk/lib/libcapsicum/libcapsicum_dns.c projects/clang-trunk/lib/libcapsicum/libcapsicum_grp.c projects/clang-trunk/lib/libcapsicum/libcapsicum_pwd.c projects/clang-trunk/lib/libcapsicum/libcapsicum_random.c projects/clang-trunk/lib/libcapsicum/libcapsicum_service.c projects/clang-trunk/lib/libcapsicum/libcapsicum_sysctl.c projects/clang-trunk/lib/libcasper/libcasper.c projects/clang-trunk/lib/libfetch/http.c projects/clang-trunk/lib/libgpio/gpio.3 projects/clang-trunk/lib/libipsec/pfkey_dump.c projects/clang-trunk/lib/libnv/Makefile projects/clang-trunk/lib/libnv/tests/dnv_tests.cc projects/clang-trunk/lib/libnv/tests/nv_tests.cc projects/clang-trunk/lib/libnv/tests/nvlist_add_test.c projects/clang-trunk/lib/libnv/tests/nvlist_exists_test.c projects/clang-trunk/lib/libnv/tests/nvlist_free_test.c projects/clang-trunk/lib/libnv/tests/nvlist_get_test.c projects/clang-trunk/lib/libnv/tests/nvlist_move_test.c projects/clang-trunk/lib/libnv/tests/nvlist_send_recv_test.c projects/clang-trunk/lib/libproc/proc_bkpt.c projects/clang-trunk/lib/libproc/proc_regs.c projects/clang-trunk/lib/libugidfw/Makefile projects/clang-trunk/lib/libugidfw/ugidfw.c projects/clang-trunk/lib/libusb/libusb10.c projects/clang-trunk/lib/libusb/libusb20_desc.c projects/clang-trunk/lib/libutil/gr_util.c projects/clang-trunk/lib/libutil/pw_util.3 projects/clang-trunk/lib/libutil/pw_util.c projects/clang-trunk/lib/libvmmapi/Makefile.depend projects/clang-trunk/lib/msun/arm/Makefile.inc projects/clang-trunk/libexec/casper/dns/dns.c projects/clang-trunk/libexec/casper/grp/grp.c projects/clang-trunk/libexec/casper/pwd/pwd.c projects/clang-trunk/libexec/casper/random/random.c projects/clang-trunk/libexec/casper/sysctl/sysctl.c projects/clang-trunk/libexec/rtld-elf/aarch64/rtld_start.S projects/clang-trunk/release/Makefile.azure projects/clang-trunk/release/Makefile.ec2 projects/clang-trunk/release/Makefile.mirrors projects/clang-trunk/release/Makefile.vm projects/clang-trunk/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/clang-trunk/release/doc/share/xml/sponsor.ent projects/clang-trunk/release/tools/ec2.conf projects/clang-trunk/sbin/camcontrol/camcontrol.c projects/clang-trunk/sbin/casperd/casperd.c projects/clang-trunk/sbin/casperd/zygote.c projects/clang-trunk/sbin/casperd/zygote.h projects/clang-trunk/sbin/geom/class/eli/geli.8 projects/clang-trunk/sbin/newfs_nandfs/newfs_nandfs.c projects/clang-trunk/sbin/pfctl/parse.y projects/clang-trunk/sbin/pfctl/pfctl_altq.c projects/clang-trunk/sbin/pfctl/pfctl_parser.h projects/clang-trunk/sbin/pfctl/pfctl_qstats.c projects/clang-trunk/sbin/setkey/setkey.8 projects/clang-trunk/sbin/setkey/token.l projects/clang-trunk/share/dtrace/Makefile projects/clang-trunk/share/examples/csh/dot.cshrc projects/clang-trunk/share/examples/tests/tests/plain/cp_test.sh projects/clang-trunk/share/man/man3/Makefile projects/clang-trunk/share/man/man3/queue.3 projects/clang-trunk/share/man/man4/altq.4 projects/clang-trunk/share/man/man4/ctl.4 projects/clang-trunk/share/man/man4/em.4 projects/clang-trunk/share/man/man4/malo.4 projects/clang-trunk/share/man/man4/proto.4 projects/clang-trunk/share/man/man4/random.4 projects/clang-trunk/share/man/man5/rc.conf.5 projects/clang-trunk/share/man/man9/Makefile projects/clang-trunk/share/man/man9/crypto.9 projects/clang-trunk/share/man/man9/hash.9 projects/clang-trunk/share/man/man9/random.9 projects/clang-trunk/share/man/man9/random_harvest.9 projects/clang-trunk/share/misc/bsd-family-tree projects/clang-trunk/share/misc/committers-src.dot projects/clang-trunk/share/mk/bsd.cpu.mk projects/clang-trunk/share/mk/bsd.lib.mk projects/clang-trunk/share/mk/bsd.own.mk projects/clang-trunk/share/mk/suite.test.mk projects/clang-trunk/sys/amd64/amd64/atomic.c projects/clang-trunk/sys/amd64/amd64/genassym.c projects/clang-trunk/sys/amd64/amd64/ptrace_machdep.c projects/clang-trunk/sys/amd64/amd64/vm_machdep.c projects/clang-trunk/sys/amd64/amd64/xen-locore.S projects/clang-trunk/sys/amd64/conf/GENERIC projects/clang-trunk/sys/amd64/include/atomic.h projects/clang-trunk/sys/amd64/include/param.h projects/clang-trunk/sys/amd64/include/pcb.h projects/clang-trunk/sys/amd64/include/pmc_mdep.h projects/clang-trunk/sys/amd64/include/stack.h projects/clang-trunk/sys/amd64/linux32/linux32_machdep.c projects/clang-trunk/sys/amd64/vmm/vmm_instruction_emul.c projects/clang-trunk/sys/arm/allwinner/a10_clk.c projects/clang-trunk/sys/arm/allwinner/a10_clk.h projects/clang-trunk/sys/arm/allwinner/a10_gpio.c projects/clang-trunk/sys/arm/allwinner/a10_gpio.h projects/clang-trunk/sys/arm/allwinner/a10_mmc.c projects/clang-trunk/sys/arm/allwinner/a10_mmc.h projects/clang-trunk/sys/arm/allwinner/files.allwinner projects/clang-trunk/sys/arm/allwinner/if_emac.c projects/clang-trunk/sys/arm/arm/genassym.c projects/clang-trunk/sys/arm/conf/CUBIEBOARD projects/clang-trunk/sys/arm/conf/CUBIEBOARD2 projects/clang-trunk/sys/arm64/arm64/exception.S projects/clang-trunk/sys/arm64/arm64/machdep.c projects/clang-trunk/sys/arm64/arm64/pmap.c projects/clang-trunk/sys/arm64/arm64/trap.c projects/clang-trunk/sys/arm64/arm64/vfp.c projects/clang-trunk/sys/arm64/conf/GENERIC projects/clang-trunk/sys/arm64/include/ieeefp.h projects/clang-trunk/sys/boot/arm/uboot/Makefile projects/clang-trunk/sys/boot/fdt/dts/arm/cubieboard.dts projects/clang-trunk/sys/boot/fdt/dts/arm/sun4i-a10.dtsi projects/clang-trunk/sys/boot/fdt/dts/arm/sun7i-a20.dtsi projects/clang-trunk/sys/boot/fdt/dts/mips/beri-sim.dts projects/clang-trunk/sys/boot/forth/loader.conf projects/clang-trunk/sys/boot/forth/loader.conf.5 projects/clang-trunk/sys/boot/i386/boot2/boot2.c projects/clang-trunk/sys/boot/pc98/boot2/boot2.c projects/clang-trunk/sys/cam/ctl/ctl_backend_block.c projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/clang-trunk/sys/cddl/dev/dtrace/i386/dtrace_isa.c projects/clang-trunk/sys/cddl/dev/fbt/fbt.c projects/clang-trunk/sys/cddl/dev/fbt/fbt.h projects/clang-trunk/sys/cddl/dev/lockstat/lockstat.c projects/clang-trunk/sys/cddl/dev/profile/profile.c projects/clang-trunk/sys/compat/svr4/svr4_sysvec.c projects/clang-trunk/sys/conf/NOTES projects/clang-trunk/sys/conf/files projects/clang-trunk/sys/conf/files.arm64 projects/clang-trunk/sys/conf/kern.pre.mk projects/clang-trunk/sys/conf/kmod.mk projects/clang-trunk/sys/conf/ldscript.amd64 projects/clang-trunk/sys/conf/options projects/clang-trunk/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c projects/clang-trunk/sys/dev/ahci/ahci.c projects/clang-trunk/sys/dev/ahci/ahci.h projects/clang-trunk/sys/dev/ahci/ahci_pci.c projects/clang-trunk/sys/dev/ath/if_ath_ahb.c projects/clang-trunk/sys/dev/ath/if_ath_sysctl.c projects/clang-trunk/sys/dev/beri/virtio/virtio_mmio_platform.c projects/clang-trunk/sys/dev/bxe/bxe.c projects/clang-trunk/sys/dev/cxgbe/t4_netmap.c projects/clang-trunk/sys/dev/fe/if_fe_cbus.c projects/clang-trunk/sys/dev/glxsb/glxsb.c projects/clang-trunk/sys/dev/hifn/hifn7751.c projects/clang-trunk/sys/dev/hptnr/README projects/clang-trunk/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu projects/clang-trunk/sys/dev/hptnr/him.h projects/clang-trunk/sys/dev/hptnr/hptnr_config.c projects/clang-trunk/sys/dev/hptnr/hptnr_osm_bsd.c projects/clang-trunk/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu projects/clang-trunk/sys/dev/hptnr/ldm.h projects/clang-trunk/sys/dev/hptnr/osm.h projects/clang-trunk/sys/dev/hyperv/include/hyperv.h projects/clang-trunk/sys/dev/hyperv/netvsc/hv_net_vsc.c projects/clang-trunk/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/clang-trunk/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/clang-trunk/sys/dev/hyperv/netvsc/hv_rndis.h projects/clang-trunk/sys/dev/hyperv/netvsc/hv_rndis_filter.c projects/clang-trunk/sys/dev/hyperv/netvsc/hv_rndis_filter.h projects/clang-trunk/sys/dev/ichiic/ig4_iic.c projects/clang-trunk/sys/dev/ichiic/ig4_pci.c projects/clang-trunk/sys/dev/ichiic/ig4_var.h projects/clang-trunk/sys/dev/isp/isp.c projects/clang-trunk/sys/dev/isp/isp_freebsd.c projects/clang-trunk/sys/dev/isp/isp_library.c projects/clang-trunk/sys/dev/isp/ispvar.h projects/clang-trunk/sys/dev/mrsas/mrsas.c projects/clang-trunk/sys/dev/mrsas/mrsas.h projects/clang-trunk/sys/dev/nand/nand_generic.c projects/clang-trunk/sys/dev/proto/proto_busdma.c projects/clang-trunk/sys/dev/proto/proto_busdma.h projects/clang-trunk/sys/dev/proto/proto_core.c projects/clang-trunk/sys/dev/proto/proto_dev.h projects/clang-trunk/sys/dev/qlxgbe/ql_dbg.c projects/clang-trunk/sys/dev/qlxgbe/ql_dbg.h projects/clang-trunk/sys/dev/qlxgbe/ql_def.h projects/clang-trunk/sys/dev/qlxgbe/ql_glbl.h projects/clang-trunk/sys/dev/qlxgbe/ql_hw.c projects/clang-trunk/sys/dev/qlxgbe/ql_hw.h projects/clang-trunk/sys/dev/qlxgbe/ql_inline.h projects/clang-trunk/sys/dev/qlxgbe/ql_ioctl.c projects/clang-trunk/sys/dev/qlxgbe/ql_ioctl.h projects/clang-trunk/sys/dev/qlxgbe/ql_isr.c projects/clang-trunk/sys/dev/qlxgbe/ql_misc.c projects/clang-trunk/sys/dev/qlxgbe/ql_os.c projects/clang-trunk/sys/dev/qlxgbe/ql_os.h projects/clang-trunk/sys/dev/qlxgbe/ql_reset.c projects/clang-trunk/sys/dev/qlxgbe/ql_tmplt.h projects/clang-trunk/sys/dev/qlxgbe/ql_ver.h projects/clang-trunk/sys/dev/random/build.sh projects/clang-trunk/sys/dev/random/fortuna.c projects/clang-trunk/sys/dev/random/fortuna.h projects/clang-trunk/sys/dev/random/hash.c projects/clang-trunk/sys/dev/random/hash.h projects/clang-trunk/sys/dev/random/ivy.c projects/clang-trunk/sys/dev/random/nehemiah.c projects/clang-trunk/sys/dev/random/random_harvestq.c projects/clang-trunk/sys/dev/random/random_harvestq.h projects/clang-trunk/sys/dev/random/randomdev.c projects/clang-trunk/sys/dev/random/randomdev.h projects/clang-trunk/sys/dev/random/uint128.h projects/clang-trunk/sys/dev/random/unit_test.c projects/clang-trunk/sys/dev/random/unit_test.h projects/clang-trunk/sys/dev/random/yarrow.c projects/clang-trunk/sys/dev/random/yarrow.h projects/clang-trunk/sys/dev/rndtest/rndtest.c projects/clang-trunk/sys/dev/safe/safe.c projects/clang-trunk/sys/dev/sfxge/sfxge.c projects/clang-trunk/sys/dev/sound/midi/sequencer.c projects/clang-trunk/sys/dev/syscons/scmouse.c projects/clang-trunk/sys/dev/syscons/syscons.c projects/clang-trunk/sys/dev/ubsec/ubsec.c projects/clang-trunk/sys/dev/virtio/mmio/virtio_mmio.c projects/clang-trunk/sys/dev/virtio/mmio/virtio_mmio_if.m projects/clang-trunk/sys/dev/virtio/random/virtio_random.c projects/clang-trunk/sys/dev/vt/vt_core.c projects/clang-trunk/sys/dev/vt/vt_sysmouse.c projects/clang-trunk/sys/dev/xen/netfront/netfront.c projects/clang-trunk/sys/fs/nfsclient/nfs_clrpcops.c projects/clang-trunk/sys/fs/nfsclient/nfs_clvfsops.c projects/clang-trunk/sys/fs/tmpfs/tmpfs_subr.c projects/clang-trunk/sys/geom/eli/g_eli.c projects/clang-trunk/sys/i386/conf/GENERIC projects/clang-trunk/sys/i386/i386/machdep.c projects/clang-trunk/sys/i386/i386/ptrace_machdep.c projects/clang-trunk/sys/i386/i386/sys_machdep.c projects/clang-trunk/sys/i386/i386/vm_machdep.c projects/clang-trunk/sys/i386/include/atomic.h projects/clang-trunk/sys/i386/include/frame.h projects/clang-trunk/sys/i386/include/md_var.h projects/clang-trunk/sys/i386/include/npx.h projects/clang-trunk/sys/i386/include/param.h projects/clang-trunk/sys/i386/include/pmc_mdep.h projects/clang-trunk/sys/i386/include/stack.h projects/clang-trunk/sys/i386/isa/npx.c projects/clang-trunk/sys/kern/imgact_binmisc.c projects/clang-trunk/sys/kern/kern_cpuset.c projects/clang-trunk/sys/kern/kern_descrip.c projects/clang-trunk/sys/kern/kern_exec.c projects/clang-trunk/sys/kern/kern_intr.c projects/clang-trunk/sys/kern/kern_kthread.c projects/clang-trunk/sys/kern/kern_linker.c projects/clang-trunk/sys/kern/kern_mib.c projects/clang-trunk/sys/kern/kern_resource.c projects/clang-trunk/sys/kern/kern_sysctl.c projects/clang-trunk/sys/kern/subr_bus.c projects/clang-trunk/sys/kern/sysv_shm.c projects/clang-trunk/sys/kern/uipc_mbuf.c projects/clang-trunk/sys/kern/vfs_bio.c projects/clang-trunk/sys/kern/vfs_default.c projects/clang-trunk/sys/kern/vfs_init.c projects/clang-trunk/sys/kern/vfs_mount.c projects/clang-trunk/sys/libkern/arc4random.c projects/clang-trunk/sys/libkern/random.c projects/clang-trunk/sys/mips/atheros/ar71xx_chip.c projects/clang-trunk/sys/mips/atheros/ar71xx_cpudef.h projects/clang-trunk/sys/mips/atheros/ar71xx_ehci.c projects/clang-trunk/sys/mips/atheros/ar71xx_ohci.c projects/clang-trunk/sys/mips/atheros/ar71xx_pci.c projects/clang-trunk/sys/mips/atheros/ar724x_chip.c projects/clang-trunk/sys/mips/atheros/ar724x_pci.c projects/clang-trunk/sys/mips/atheros/ar91xx_chip.c projects/clang-trunk/sys/mips/atheros/ar933x_chip.c projects/clang-trunk/sys/mips/atheros/ar934x_chip.c projects/clang-trunk/sys/mips/atheros/if_arge.c projects/clang-trunk/sys/mips/atheros/qca955x_chip.c projects/clang-trunk/sys/mips/atheros/qca955x_pci.c projects/clang-trunk/sys/mips/atheros/qca955xreg.h projects/clang-trunk/sys/mips/cavium/octeon_rnd.c projects/clang-trunk/sys/mips/conf/AR71XX_BASE projects/clang-trunk/sys/mips/conf/AR724X_BASE projects/clang-trunk/sys/mips/conf/AR91XX_BASE projects/clang-trunk/sys/mips/conf/AR933X_BASE projects/clang-trunk/sys/mips/conf/AR934X_BASE projects/clang-trunk/sys/mips/conf/PB92 projects/clang-trunk/sys/mips/conf/QCA955X_BASE projects/clang-trunk/sys/mips/conf/QCA955X_BASE.hints projects/clang-trunk/sys/mips/conf/RT305X projects/clang-trunk/sys/modules/Makefile projects/clang-trunk/sys/modules/aesni/Makefile projects/clang-trunk/sys/modules/agp/Makefile projects/clang-trunk/sys/modules/crypto/Makefile projects/clang-trunk/sys/modules/dtrace/Makefile projects/clang-trunk/sys/modules/dtrace/dtraceall/dtraceall.c projects/clang-trunk/sys/modules/geom/geom_part/geom_part_apm/Makefile projects/clang-trunk/sys/modules/geom/geom_part/geom_part_bsd/Makefile projects/clang-trunk/sys/modules/geom/geom_part/geom_part_bsd64/Makefile projects/clang-trunk/sys/modules/geom/geom_part/geom_part_ebr/Makefile projects/clang-trunk/sys/modules/geom/geom_part/geom_part_gpt/Makefile projects/clang-trunk/sys/modules/geom/geom_part/geom_part_ldm/Makefile projects/clang-trunk/sys/modules/geom/geom_part/geom_part_mbr/Makefile projects/clang-trunk/sys/modules/geom/geom_part/geom_part_pc98/Makefile projects/clang-trunk/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile projects/clang-trunk/sys/modules/geom/geom_raid/Makefile projects/clang-trunk/sys/modules/hyperv/netvsc/Makefile projects/clang-trunk/sys/modules/ixv/Makefile projects/clang-trunk/sys/modules/kgssapi/Makefile projects/clang-trunk/sys/modules/kgssapi_krb5/Makefile projects/clang-trunk/sys/modules/ksyms/Makefile projects/clang-trunk/sys/modules/libiconv/Makefile projects/clang-trunk/sys/modules/mvs/Makefile projects/clang-trunk/sys/modules/nand/Makefile projects/clang-trunk/sys/modules/nandsim/Makefile projects/clang-trunk/sys/modules/proto/Makefile projects/clang-trunk/sys/modules/puc/Makefile projects/clang-trunk/sys/modules/qlxgbe/Makefile projects/clang-trunk/sys/modules/scc/Makefile projects/clang-trunk/sys/modules/uart/Makefile projects/clang-trunk/sys/modules/virtio/balloon/Makefile projects/clang-trunk/sys/modules/virtio/block/Makefile projects/clang-trunk/sys/modules/virtio/console/Makefile projects/clang-trunk/sys/modules/virtio/network/Makefile projects/clang-trunk/sys/modules/virtio/pci/Makefile projects/clang-trunk/sys/modules/virtio/random/Makefile projects/clang-trunk/sys/modules/virtio/scsi/Makefile projects/clang-trunk/sys/modules/virtio/virtio/Makefile projects/clang-trunk/sys/net/altq/altq.h projects/clang-trunk/sys/net/altq/altq_subr.c projects/clang-trunk/sys/net/altq/altq_var.h projects/clang-trunk/sys/net/if_ethersubr.c projects/clang-trunk/sys/net/if_tun.c projects/clang-trunk/sys/net/pfkeyv2.h projects/clang-trunk/sys/netgraph/ng_iface.c projects/clang-trunk/sys/netinet/ip_input.c projects/clang-trunk/sys/netinet/tcp_lro.c projects/clang-trunk/sys/netinet/tcp_output.c projects/clang-trunk/sys/netinet6/icmp6.c projects/clang-trunk/sys/netinet6/ip6_output.c projects/clang-trunk/sys/netipsec/ipsec.c projects/clang-trunk/sys/netpfil/pf/pf.c projects/clang-trunk/sys/netpfil/pf/pf_altq.h projects/clang-trunk/sys/netpfil/pf/pf_mtag.h projects/clang-trunk/sys/ofed/include/linux/device.h projects/clang-trunk/sys/ofed/include/linux/linux_compat.c projects/clang-trunk/sys/pc98/conf/GENERIC projects/clang-trunk/sys/powerpc/aim/mmu_oea.c projects/clang-trunk/sys/powerpc/aim/mmu_oea64.c projects/clang-trunk/sys/powerpc/booke/pmap.c projects/clang-trunk/sys/powerpc/conf/GENERIC projects/clang-trunk/sys/powerpc/include/pte.h projects/clang-trunk/sys/powerpc/include/spr.h projects/clang-trunk/sys/powerpc/powerpc/mmu_if.m projects/clang-trunk/sys/powerpc/powerpc/trap.c projects/clang-trunk/sys/sparc64/conf/GENERIC projects/clang-trunk/sys/sys/buf.h projects/clang-trunk/sys/sys/cdefs.h projects/clang-trunk/sys/sys/cpuset.h projects/clang-trunk/sys/sys/dnv.h projects/clang-trunk/sys/sys/kernel.h projects/clang-trunk/sys/sys/kthread.h projects/clang-trunk/sys/sys/linker_set.h projects/clang-trunk/sys/sys/mbuf.h projects/clang-trunk/sys/sys/queue.h projects/clang-trunk/sys/sys/random.h projects/clang-trunk/sys/sys/resourcevar.h projects/clang-trunk/sys/sys/sysctl.h projects/clang-trunk/sys/ufs/ffs/ffs_inode.c projects/clang-trunk/sys/ufs/ffs/ffs_vfsops.c projects/clang-trunk/sys/vm/uma_core.c projects/clang-trunk/sys/vm/uma_dbg.c projects/clang-trunk/sys/vm/vm_map.c projects/clang-trunk/sys/vm/vm_mmap.c projects/clang-trunk/sys/x86/include/ptrace.h projects/clang-trunk/sys/x86/iommu/busdma_dmar.c projects/clang-trunk/sys/x86/iommu/intel_ctx.c projects/clang-trunk/sys/x86/iommu/intel_dmar.h projects/clang-trunk/sys/x86/iommu/intel_drv.c projects/clang-trunk/sys/x86/iommu/intel_gas.c projects/clang-trunk/sys/x86/iommu/intel_idpgtbl.c projects/clang-trunk/sys/x86/iommu/intel_qi.c projects/clang-trunk/sys/x86/iommu/intel_utils.c projects/clang-trunk/sys/x86/isa/atrtc.c projects/clang-trunk/targets/pseudo/userland/Makefile.depend projects/clang-trunk/tests/sys/netinet/fibs_test.sh projects/clang-trunk/tools/bus_space/C/lang.c projects/clang-trunk/tools/bus_space/C/libbus.h projects/clang-trunk/tools/bus_space/Python/lang.c projects/clang-trunk/tools/bus_space/busdma.c projects/clang-trunk/tools/bus_space/busdma.h projects/clang-trunk/tools/regression/capsicum/libcapsicum/sysctl.c projects/clang-trunk/tools/tools/cxgbetool/cxgbetool.c projects/clang-trunk/usr.bin/ar/write.c projects/clang-trunk/usr.bin/calendar/calendars/calendar.computer projects/clang-trunk/usr.bin/kdump/kdump.c projects/clang-trunk/usr.bin/mkesdb/Makefile projects/clang-trunk/usr.bin/mkimg/gpt.c projects/clang-trunk/usr.bin/mkimg/mbr.c projects/clang-trunk/usr.bin/mkimg/scheme.c projects/clang-trunk/usr.bin/mkimg/scheme.h projects/clang-trunk/usr.bin/netstat/ipsec.c projects/clang-trunk/usr.bin/units/units.c projects/clang-trunk/usr.bin/xinstall/xinstall.c projects/clang-trunk/usr.sbin/bhyvectl/bhyvectl.c projects/clang-trunk/usr.sbin/bhyveload/bhyveload.8 projects/clang-trunk/usr.sbin/ctladm/ctladm.8 projects/clang-trunk/usr.sbin/ctld/Makefile projects/clang-trunk/usr.sbin/ctld/chap.c projects/clang-trunk/usr.sbin/ctld/ctl.conf.5 projects/clang-trunk/usr.sbin/ctld/ctld.h projects/clang-trunk/usr.sbin/ctld/kernel.c projects/clang-trunk/usr.sbin/dconschat/dconschat.c projects/clang-trunk/usr.sbin/iovctl/iovctl.c projects/clang-trunk/usr.sbin/iovctl/parse.c projects/clang-trunk/usr.sbin/iovctl/validate.c projects/clang-trunk/usr.sbin/iscsid/Makefile projects/clang-trunk/usr.sbin/iscsid/chap.c projects/clang-trunk/usr.sbin/iscsid/iscsid.h projects/clang-trunk/usr.sbin/mfiutil/mfi_foreign.c projects/clang-trunk/usr.sbin/mountd/mountd.c projects/clang-trunk/usr.sbin/ntp/config.h projects/clang-trunk/usr.sbin/pw/pw.c projects/clang-trunk/usr.sbin/pw/pw_group.c projects/clang-trunk/usr.sbin/pw/pw_user.c projects/clang-trunk/usr.sbin/pw/pwupd.h projects/clang-trunk/usr.sbin/pw/tests/pw_usermod.sh projects/clang-trunk/usr.sbin/pwd_mkdb/pwd_mkdb.c Directory Properties: projects/clang-trunk/ (props changed) projects/clang-trunk/cddl/ (props changed) projects/clang-trunk/cddl/contrib/opensolaris/ (props changed) projects/clang-trunk/contrib/bmake/ (props changed) projects/clang-trunk/contrib/llvm/ (props changed) projects/clang-trunk/contrib/pf/ (props changed) projects/clang-trunk/contrib/tcpdump/ (props changed) projects/clang-trunk/etc/ (props changed) projects/clang-trunk/gnu/usr.bin/gdb/ (props changed) projects/clang-trunk/include/ (props changed) projects/clang-trunk/lib/libc/ (props changed) projects/clang-trunk/lib/libutil/ (props changed) projects/clang-trunk/lib/libvmmapi/ (props changed) projects/clang-trunk/sbin/ (props changed) projects/clang-trunk/share/ (props changed) projects/clang-trunk/share/man/man4/ (props changed) projects/clang-trunk/sys/ (props changed) projects/clang-trunk/sys/amd64/vmm/ (props changed) projects/clang-trunk/sys/boot/ (props changed) projects/clang-trunk/sys/cddl/contrib/opensolaris/ (props changed) projects/clang-trunk/sys/conf/ (props changed) projects/clang-trunk/sys/dev/hyperv/ (props changed) projects/clang-trunk/sys/modules/hyperv/ (props changed) projects/clang-trunk/targets/ (props changed) projects/clang-trunk/usr.bin/calendar/ (props changed) projects/clang-trunk/usr.bin/mkimg/ (props changed) projects/clang-trunk/usr.sbin/bhyve/ (props changed) projects/clang-trunk/usr.sbin/bhyvectl/ (props changed) projects/clang-trunk/usr.sbin/bhyveload/ (props changed) Modified: projects/clang-trunk/.arcconfig ============================================================================== --- projects/clang-trunk/.arcconfig Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/.arcconfig Sat Jul 4 21:50:39 2015 (r285153) @@ -1,5 +1,6 @@ { "project.name": "S", + "repository.callsign" : "S", "phabricator.uri" : "https://reviews.freebsd.org/", "history.immutable" : true } Modified: projects/clang-trunk/Makefile ============================================================================== --- projects/clang-trunk/Makefile Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/Makefile Sat Jul 4 21:50:39 2015 (r285153) @@ -102,7 +102,7 @@ # Note: we use this awkward construct to be compatible with FreeBSD's # old make used in 10.0 and 9.2 and earlier. -.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes" +.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes" && !make(showconfig) # targets/Makefile plays the role of top-level .include "targets/Makefile" .else @@ -538,7 +538,9 @@ MK_META_MODE= no MK_STAGING= no # tell meta.autodep.mk to not even think about updating anything. UPDATE_DEPENDFILE= NO +.if !make(showconfig) .export MK_META_MODE MK_STAGING UPDATE_DEPENDFILE +.endif .if make(universe) # we do not want a failure of one branch abort all. Modified: projects/clang-trunk/Makefile.inc1 ============================================================================== --- projects/clang-trunk/Makefile.inc1 Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/Makefile.inc1 Sat Jul 4 21:50:39 2015 (r285153) @@ -297,7 +297,6 @@ KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOB # world stage WMAKEENV= ${CROSSENV} \ - _SHLIBDIRPREFIX=${WORLDTMP} \ _LDSCRIPTROOT= \ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -439,7 +438,6 @@ LIB32FLAGS+= --sysroot=${WORLDTMP} # Yes, the flags are redundant. LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${LIB32_OBJTREE} \ - _SHLIBDIRPREFIX=${LIB32TMP} \ _LDSCRIPTROOT=${LIB32TMP} \ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -1768,9 +1766,9 @@ cddl/lib/libctf__L: lib/libz__L .endif # cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built # on select architectures though (see cddl/lib/Makefile) -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ - ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \ - ${MACHINE_CPUARCH} == "arm" +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \ + ${MACHINE_CPUARCH} == "arm" || ${MACHINE_ARCH} == "i386" || \ + ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" _prebuild_libs+= lib/libproc lib/librtld_db .endif @@ -2123,7 +2121,6 @@ XDTP?=/usr/${XDDIR} CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ - _SHLIBDIRPREFIX=${XDDESTDIR} \ TOOLS_PREFIX=${XDTP} CD2CFLAGS=-isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib \ --sysroot=${XDDESTDIR}/ -B${XDDESTDIR}/usr/libexec \ Modified: projects/clang-trunk/ObsoleteFiles.inc ============================================================================== --- projects/clang-trunk/ObsoleteFiles.inc Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/ObsoleteFiles.inc Sat Jul 4 21:50:39 2015 (r285153) @@ -99,6 +99,72 @@ 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 +# 20150604: Move nvlist man pages to section 9. +OLD_FILES+=usr/share/man/man3/libnv.3.gz +OLD_FILES+=usr/share/man/man3/nvlist.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_add_binary.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_add_bool.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_add_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_add_null.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_add_number.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_add_nvlist.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_add_string.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_add_stringf.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_add_stringv.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_clone.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_create.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_destroy.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_dump.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_empty.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_error.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_exists.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_exists_binary.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_exists_bool.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_exists_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_exists_null.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_exists_number.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_exists_nvlist.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_exists_string.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_exists_type.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_fdump.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_flags.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_free.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_free_binary.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_free_bool.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_free_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_free_null.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_free_number.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_free_nvlist.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_free_string.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_free_type.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_get_binary.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_get_bool.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_get_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_get_number.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_get_nvlist.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_get_parent.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_get_string.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_move_binary.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_move_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_move_nvlist.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_move_string.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_next.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_pack.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_recv.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_send.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_set_error.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_size.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_take_binary.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_take_bool.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_take_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_take_number.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_take_nvlist.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_take_string.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_unpack.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_xfer.3.gz +# 20150702: Remove duplicated nvlist includes. +OLD_FILES+=usr/include/dnv.h +OLD_FILES+=usr/include/nv.h # 20150528: PCI IOV device driver methods moved to a separate kobj interface. OLD_FILES+=usr/share/man/man9/PCI_ADD_VF.9.gz OLD_FILES+=usr/share/man/man9/PCI_INIT_IOV.9.gz @@ -1081,6 +1147,7 @@ OLD_FILES+=usr/include/lwres/net.h OLD_FILES+=usr/include/lwres/netdb.h OLD_FILES+=usr/include/lwres/platform.h OLD_FILES+=usr/include/lwres/result.h +OLD_FILES+=usr/include/lwres/string.h OLD_FILES+=usr/include/lwres/version.h OLD_FILES+=usr/lib/liblwres.a OLD_FILES+=usr/lib/liblwres.so Modified: projects/clang-trunk/UPDATING ============================================================================== --- projects/clang-trunk/UPDATING Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/UPDATING Sat Jul 4 21:50:39 2015 (r285153) @@ -36,23 +36,45 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 20141231 entry below for information about prerequisites and upgrading, if you are not already using 3.5.0 or higher. -20150616: - /etc/make.conf now included earlier. - sys.mk now includes /etc/make.conf and {local,src}.sys.mk earlier - than previously. - This makes it simple to interpose external toolchains etc. - However it may cause problems for users who have things like:: - - INSTALL+= something - - in /etc/make.conf, since INSTALL is not yet defined. - A safe fix for that is to have:: +20150630: + The default kernel entropy-processing algorithm is now + Fortuna, replacing Yarrow. + + Assuming you have 'device random' in your kernel config + file, the configurations allow a kernel option to override + this default. You may choose *ONE* of: + + options RANDOM_YARROW # Legacy /dev/random algorithm. + options RANDOM_DUMMY # Blocking-only driver. + + If you have neither, you get Fortuna. For most people, + read no further, Fortuna will give a /dev/random that works + like it always used to, and the difference will be irrelevant. + + If you remove 'device random', you get *NO* kernel-processed + entopy at all. This may be acceptable to folks building + embedded systems, but has complications. Carry on reading, + and it is assumed you know what you need. + + *PLEASE* read random(4) and random(9) if you are in the + habit of tweeking kernel configs, and/or if you are a member + of the embedded community, wanting specific and not-usual + behaviour from your security subsystems. + + NOTE!! If you use RANDOM_DUMMY and/or have no 'device + random', you will NOT have a functioning /dev/random, and + many cryptographic features will not work, including SSH. + You may also find strange behaviour from the random(3) set + of library functions, in particular sranddev(3), srandomdev(3) + and arc4random(3). The reason for this is that the KERN_ARND + sysctl only returns entropy if it thinks it has some to + share, and with RANDOM_DUMMY or no 'device random' this + will never happen. + +20150623: + An additional fix for the issue described in the 20150614 sendmail + entry below has been been committed in revision 284717. - INSTALL?= install - INSTALL+= something - - which is equivalent to previous behavior. - 20150616: FreeBSD's old make (fmake) has been removed from the system. It is available as the devel/fmake port or via pkg install fmake. Modified: projects/clang-trunk/bin/mv/mv.c ============================================================================== --- projects/clang-trunk/bin/mv/mv.c Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/bin/mv/mv.c Sat Jul 4 21:50:39 2015 (r285153) @@ -122,7 +122,7 @@ main(int argc, char *argv[]) */ if (stat(argv[argc - 1], &sb) || !S_ISDIR(sb.st_mode)) { if (argc > 2) - usage(); + errx(1, "%s is not a directory", argv[argc - 1]); exit(do_move(argv[0], argv[1])); } Modified: projects/clang-trunk/bin/sh/alias.c ============================================================================== --- projects/clang-trunk/bin/sh/alias.c Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/bin/sh/alias.c Sat Jul 4 21:50:39 2015 (r285153) @@ -248,7 +248,7 @@ hashalias(const char *p) { unsigned int hashval; - hashval = *p << 4; + hashval = (unsigned char)*p << 4; while (*p) hashval+= *p++; return &atab[hashval % ATABSIZE]; Modified: projects/clang-trunk/bin/sh/exec.c ============================================================================== --- projects/clang-trunk/bin/sh/exec.c Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/bin/sh/exec.c Sat Jul 4 21:50:39 2015 (r285153) @@ -522,17 +522,16 @@ static struct tblentry **lastcmdentry; static struct tblentry * cmdlookup(const char *name, int add) { - int hashval; + unsigned int hashval; const char *p; struct tblentry *cmdp; struct tblentry **pp; size_t len; p = name; - hashval = *p << 4; + hashval = (unsigned char)*p << 4; while (*p) hashval += *p++; - hashval &= 0x7FFF; pp = &cmdtable[hashval % CMDTABLESIZE]; for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) { if (equal(cmdp->cmdname, name)) Modified: projects/clang-trunk/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/clang-trunk/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Sat Jul 4 21:50:39 2015 (r285153) @@ -227,7 +227,10 @@ prepare_elf32(dtrace_hdl_t *dtp, const d s = &dofs[dofrh->dofr_tgtsec]; for (j = 0; j < nrel; j++) { -#if defined(__arm__) +#if defined(__aarch64__) +/* XXX */ +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#elif defined(__arm__) /* XXX */ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); #elif defined(__i386) || defined(__amd64) @@ -426,7 +429,9 @@ prepare_elf64(dtrace_hdl_t *dtp, const d s = &dofs[dofrh->dofr_tgtsec]; for (j = 0; j < nrel; j++) { -#if defined(__arm__) +#if defined(__aarch64__) +/* XXX */ +#elif defined(__arm__) /* XXX */ #elif defined(__mips__) /* XXX */ @@ -822,7 +827,16 @@ dt_symtab_lookup(Elf_Data *data_sym, int return (ret); } -#if defined(__arm__) +#if defined(__aarch64__) +/* XXX */ +static int +dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela, + uint32_t *off) +{ +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + return (0); +} +#elif defined(__arm__) /* XXX */ static int dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela, Modified: projects/clang-trunk/cddl/lib/Makefile ============================================================================== --- projects/clang-trunk/cddl/lib/Makefile Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/cddl/lib/Makefile Sat Jul 4 21:50:39 2015 (r285153) @@ -26,9 +26,9 @@ _libzpool= libzpool .endif .endif -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ - ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \ - ${MACHINE_CPUARCH} == "arm" +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \ + ${MACHINE_CPUARCH} == "arm" || ${MACHINE_ARCH} == "i386" || \ + ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" _drti= drti _libdtrace= libdtrace .endif Modified: projects/clang-trunk/cddl/lib/libdtrace/Makefile ============================================================================== --- projects/clang-trunk/cddl/lib/libdtrace/Makefile Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/cddl/lib/libdtrace/Makefile Sat Jul 4 21:50:39 2015 (r285153) @@ -69,27 +69,31 @@ CFLAGS+= -I${.OBJDIR} -I${.CURDIR} \ #CFLAGS+= -DYYDEBUG -.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "aarch64" +CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/aarch64 +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/aarch64 +.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/aarch64 +.elif ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" CFLAGS+= -I${.CURDIR}/../../../sys/cddl/dev/dtrace/x86 CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel -DDIS_MEM .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/i386 .PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/${MACHINE_ARCH} .PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/x86 -.elif ${MACHINE_CPUARCH} == "sparc64" -CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/sparc -.elif ${MACHINE_CPUARCH} == "mips" -CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/mips -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/mips .elif ${MACHINE_CPUARCH} == "arm" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/arm .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/arm .PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/arm +.elif ${MACHINE_CPUARCH} == "mips" +CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/mips +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips +.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/mips .elif ${MACHINE_CPUARCH} == "powerpc" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/powerpc .PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/powerpc +.elif ${MACHINE_CPUARCH} == "sparc64" +CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/sparc .else # temporary hack CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel Modified: projects/clang-trunk/cddl/usr.sbin/Makefile ============================================================================== --- projects/clang-trunk/cddl/usr.sbin/Makefile Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/cddl/usr.sbin/Makefile Sat Jul 4 21:50:39 2015 (r285153) @@ -30,7 +30,7 @@ _plockstat= plockstat .endif .endif -.if ${MACHINE_CPUARCH} == "arm" +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" _dtrace= dtrace _dtruss= dtruss _lockstat= lockstat Modified: projects/clang-trunk/contrib/bmake/mk/meta2deps.sh ============================================================================== --- projects/clang-trunk/contrib/bmake/mk/meta2deps.sh Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/contrib/bmake/mk/meta2deps.sh Sat Jul 4 21:50:39 2015 (r285153) @@ -52,7 +52,7 @@ # $SB/obj-i386/bsd/gnu/lib/csu # $SB/obj-i386/bsd/gnu/lib/libgcc # $SB/obj-i386/bsd/include -# $SB/obj-i386/bsd/lib/csu/i386-elf +# $SB/obj-i386/bsd/lib/csu/i386 # $SB/obj-i386/bsd/lib/libc # $SB/src/bsd/include # $SB/src/bsd/sys/i386/include Modified: projects/clang-trunk/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp ============================================================================== --- projects/clang-trunk/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp Sat Jul 4 21:50:39 2015 (r285153) @@ -1055,7 +1055,7 @@ void SCCPSolver::visitLoadInst(LoadInst // load null -> null if (isa<ConstantPointerNull>(Ptr) && I.getPointerAddressSpace() == 0) - return markConstant(IV, &I, Constant::getNullValue(I.getType())); + return markConstant(IV, &I, UndefValue::get(I.getType())); // Transform load (constant global) into the value loaded. if (GlobalVariable *GV = dyn_cast<GlobalVariable>(Ptr)) { Modified: projects/clang-trunk/contrib/llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp ============================================================================== --- projects/clang-trunk/contrib/llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/contrib/llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp Sat Jul 4 21:50:39 2015 (r285153) @@ -86,7 +86,7 @@ static void ConnectProlog(Loop *L, Value if (L->contains(PN)) { NewPN->addIncoming(PN->getIncomingValueForBlock(NewPH), OrigPH); } else { - NewPN->addIncoming(Constant::getNullValue(PN->getType()), OrigPH); + NewPN->addIncoming(UndefValue::get(PN->getType()), OrigPH); } Value *V = PN->getIncomingValueForBlock(Latch); Copied: projects/clang-trunk/contrib/llvm/patches/patch-10-llvm-r241142-r241143-mmx-undef.diff (from r285152, head/contrib/llvm/patches/patch-10-llvm-r241142-r241143-mmx-undef.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang-trunk/contrib/llvm/patches/patch-10-llvm-r241142-r241143-mmx-undef.diff Sat Jul 4 21:50:39 2015 (r285153, copy of r285152, head/contrib/llvm/patches/patch-10-llvm-r241142-r241143-mmx-undef.diff) @@ -0,0 +1,88 @@ +Pull in r241142 from upstream llvm trunk (by David Majnemer): + + [SCCP] Turn loads of null into undef instead of zero initialized values + + Surprisingly, this is a correctness issue: the mmx type exists for + calling convention purposes, LLVM doesn't have a zero representation for + them. + + This partially fixes PR23999. + +Pull in r241143 from upstream llvm trunk (by David Majnemer): + + [LoopUnroll] Use undef for phis with no value live + + We would create a phi node with a zero initialized operand instead of + undef in the case where no value was originally available. This was + problematic for x86_mmx which has no null value. + +These fix a "Cannot create a null constant of that type!" error when +compiling the graphics/sdl2_gfx port with MMX enabled. + +Introduced here: http://svnweb.freebsd.org/changeset/base/285149 + +Index: lib/Transforms/Scalar/SCCP.cpp +=================================================================== +--- lib/Transforms/Scalar/SCCP.cpp ++++ lib/Transforms/Scalar/SCCP.cpp +@@ -1054,7 +1054,7 @@ + + // load null -> null + if (isa<ConstantPointerNull>(Ptr) && I.getPointerAddressSpace() == 0) +- return markConstant(IV, &I, Constant::getNullValue(I.getType())); ++ return markConstant(IV, &I, UndefValue::get(I.getType())); + + // Transform load (constant global) into the value loaded. + if (GlobalVariable *GV = dyn_cast<GlobalVariable>(Ptr)) { +Index: lib/Transforms/Utils/LoopUnrollRuntime.cpp +=================================================================== +--- lib/Transforms/Utils/LoopUnrollRuntime.cpp ++++ lib/Transforms/Utils/LoopUnrollRuntime.cpp +@@ -81,7 +81,7 @@ + if (L->contains(PN)) { + NewPN->addIncoming(PN->getIncomingValueForBlock(NewPH), OrigPH); + } else { +- NewPN->addIncoming(Constant::getNullValue(PN->getType()), OrigPH); ++ NewPN->addIncoming(UndefValue::get(PN->getType()), OrigPH); + } + + Value *V = PN->getIncomingValueForBlock(Latch); +Index: test/Transforms/LoopUnroll/X86/mmx.ll +=================================================================== +--- test/Transforms/LoopUnroll/X86/mmx.ll ++++ test/Transforms/LoopUnroll/X86/mmx.ll +@@ -0,0 +1,21 @@ ++; RUN: opt < %s -S -loop-unroll | FileCheck %s ++target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" ++target triple = "x86_64-unknown-linux-gnu" ++ ++define x86_mmx @f() #0 { ++entry: ++ br label %for.body ++ ++for.body: ; preds = %for.body, %entry ++ %phi = phi i32 [ 1, %entry ], [ %add, %for.body ] ++ %add = add i32 %phi, 1 ++ %cmp = icmp eq i32 %phi, 0 ++ br i1 %cmp, label %exit, label %for.body ++ ++exit: ; preds = %for.body ++ %ret = phi x86_mmx [ undef, %for.body ] ++ ; CHECK: ret x86_mmx %ret ++ ret x86_mmx %ret ++} ++ ++attributes #0 = { "target-cpu"="x86-64" } +Index: test/Transforms/SCCP/crash.ll +=================================================================== +--- test/Transforms/SCCP/crash.ll ++++ test/Transforms/SCCP/crash.ll +@@ -27,3 +27,8 @@ + %B = extractvalue [4 x i32] %A, 1 + ret i32 %B + } ++ ++define x86_mmx @test3() { ++ %load = load x86_mmx* null ++ ret x86_mmx %load ++} Modified: projects/clang-trunk/contrib/pf/pflogd/pflogd.8 ============================================================================== --- projects/clang-trunk/contrib/pf/pflogd/pflogd.8 Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/contrib/pf/pflogd/pflogd.8 Sat Jul 4 21:50:39 2015 (r285153) @@ -125,9 +125,11 @@ By default, .Nm will use .Ar pflog0 . +.It Fl p Ar pidfile Writes a file containing the process ID of the program to .Pa /var/run . The file name has the form +.Ao Ar pidfile Ac Ns .pid . The default is .Ar pflogd . .It Fl s Ar snaplen Modified: projects/clang-trunk/contrib/tcpdump/tcpdump.c ============================================================================== --- projects/clang-trunk/contrib/tcpdump/tcpdump.c Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/contrib/tcpdump/tcpdump.c Sat Jul 4 21:50:39 2015 (r285153) @@ -82,7 +82,7 @@ extern int SIZE_BUF; #include <libcapsicum.h> #include <libcapsicum_dns.h> #include <libcapsicum_service.h> -#include <nv.h> +#include <sys/nv.h> #include <sys/capability.h> #include <sys/ioccom.h> #include <net/bpf.h> Modified: projects/clang-trunk/etc/defaults/rc.conf ============================================================================== --- projects/clang-trunk/etc/defaults/rc.conf Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/etc/defaults/rc.conf Sat Jul 4 21:50:39 2015 (r285153) @@ -630,15 +630,16 @@ kern_securelevel="-1" # range: -1..3 ; ` # in the system booting with securelevel set to 1, as # init(8) will raise the level when rc(8) completes. update_motd="YES" # update version info in /etc/motd (or NO) -entropy_file="/entropy" # Set to NO to disable caching entropy through reboots. +entropy_boot_file="/boot/entropy" # Set to NO to disable very early + # (used at early boot time) entropy caching through reboots. +entropy_file="/entropy" # Set to NO to disable late (used when going multi-user) + # entropy through reboots. # /var/db/entropy-file is preferred if / is not avail. entropy_dir="/var/db/entropy" # Set to NO to disable caching entropy via cron. entropy_save_sz="4096" # Size of the entropy cache files. entropy_save_num="8" # Number of entropy cache files to save. -harvest_interrupt="YES" # Entropy device harvests interrupt randomness -harvest_ethernet="YES" # Entropy device harvests ethernet randomness -harvest_p_to_p="YES" # Entropy device harvests point-to-point randomness -harvest_swi="YES" # Entropy device harvests internal SWI randomness +harvest_mask="511" # Entropy device harvests all but the very invasive sources. + # (See 'sysctl kern.random.harvest' and random(4)) dmesg_enable="YES" # Save dmesg(8) to /var/run/dmesg.boot watchdogd_enable="NO" # Start the software watchdog daemon watchdogd_flags="" # Flags to watchdogd (if enabled) Modified: projects/clang-trunk/etc/rc.d/iovctl ============================================================================== --- projects/clang-trunk/etc/rc.d/iovctl Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/etc/rc.d/iovctl Sat Jul 4 21:50:39 2015 (r285153) @@ -27,7 +27,7 @@ run_iovctl() iovctl_start() { - run_iovctl -E + run_iovctl -C } iovctl_stop() Modified: projects/clang-trunk/etc/rc.d/random ============================================================================== --- projects/clang-trunk/etc/rc.d/random Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/etc/rc.d/random Sat Jul 4 21:50:39 2015 (r285153) @@ -41,6 +41,13 @@ feed_dev_random() random_start() { + + if [ ${harvest_mask} -gt 0 ]; then + echo -n 'Setting up harvesting:' + ${SYSCTL} kern.random.harvest.mask=${harvest_mask} > /dev/null + ${SYSCTL_N} kern.random.harvest.mask_symbolic + fi + echo -n 'Feeding entropy:' if [ ! -w /dev/random ] ; then @@ -68,6 +75,14 @@ random_start() ;; esac + case ${entropy_boot_file:=/boot/entropy} in + [Nn][Oo] | '') + ;; + *) + save_dev_random "${entropy_boot_file}" + ;; + esac + echo '.' } @@ -100,7 +115,33 @@ random_stop() ;; *) dd if=/dev/random of=${entropy_file_confirmed} \ - bs=4096 count=1 2> /dev/null + bs=4096 count=1 2> /dev/null || + warn 'write failed (unwriteable file or full fs?)' + echo '.' + ;; + esac + umask ${oumask} + ;; + esac + case ${entropy_boot_file:=/boot/entropy} in + [Nn][Oo] | '') + ;; + *) + echo -n 'Writing early boot entropy file:' + rm -f ${entropy_boot_file} 2> /dev/null + oumask=`umask` + umask 077 + if touch ${entropy_boot_file} 2> /dev/null; then + entropy_boot_file_confirmed="${entropy_boot_file}" + fi + case ${entropy_boot_file_confirmed} in + '') + warn 'write failed (read-only fs?)' + ;; + *) + dd if=/dev/random of=${entropy_boot_file_confirmed} \ + bs=4096 count=1 2> /dev/null || + warn 'write failed (unwriteable file or full fs?)' echo '.' ;; esac Modified: projects/clang-trunk/etc/rc.firewall ============================================================================== --- projects/clang-trunk/etc/rc.firewall Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/etc/rc.firewall Sat Jul 4 21:50:39 2015 (r285153) @@ -291,14 +291,14 @@ case ${firewall_type} in fi fi - # define stuff we should never send out or receive in + # Define stuff we should never send out or receive in. # Stop RFC1918 nets on the outside interface ${fwcmd} table ${BAD_ADDR_TBL} flush ${fwcmd} table ${BAD_ADDR_TBL} add 10.0.0.0/8 ${fwcmd} table ${BAD_ADDR_TBL} add 172.16.0.0/12 ${fwcmd} table ${BAD_ADDR_TBL} add 192.168.0.0/16 - # Stop draft-manning-dsua-03.txt (1 May 2000) nets (includes RESERVED-1, + # And stop draft-manning-dsua-03.txt (1 May 2000) nets (includes RESERVED-1, # DHCP auto-configuration, NET-TEST, MULTICAST (class D), and class E) # on the outside interface ${fwcmd} table ${BAD_ADDR_TBL} add 0.0.0.0/8 Modified: projects/clang-trunk/etc/services ============================================================================== --- projects/clang-trunk/etc/services Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/etc/services Sat Jul 4 21:50:39 2015 (r285153) @@ -2365,6 +2365,8 @@ prosharerequest 5716/tcp #proshare con prosharerequest 5716/udp #proshare conf request prosharenotify 5717/tcp #proshare conf notify prosharenotify 5717/udp #proshare conf notify +couchdb 5984/tcp #CouchDB database server +couchdb 5984/udp #CouchDB database server cvsup 5999/tcp #CVSup file transfer/John Polstra/FreeBSD x11 6000/tcp #6000-6063 are assigned to X Window System x11 6000/udp Modified: projects/clang-trunk/games/fortune/datfiles/fortunes ============================================================================== --- projects/clang-trunk/games/fortune/datfiles/fortunes Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/games/fortune/datfiles/fortunes Sat Jul 4 21:50:39 2015 (r285153) @@ -6727,7 +6727,7 @@ K is for Kate who was struck with an axe M is for Maud who was swept out to sea, N is for Neville who died of ennui. O is for Olive, run through with an awl, P is for Prue, trampled flat in a brawl Q is for Quentin who sank in a mire, R is for Rhoda, consumed by a fire. -S is for Susan who parished of fits, T is for Titus who flew into bits. +S is for Susan who perished of fits, T is for Titus who flew into bits. U is for Una who slipped down a drain, V is for Victor, squashed under a train. W is for Winnie, embedded in ice, X is for Xerxes, devoured by mice. Y is for Yorick whose head was bashed in, Z is for Zillah who drank too much gin. Modified: projects/clang-trunk/gnu/usr.bin/gdb/kgdb/trgt.c ============================================================================== --- projects/clang-trunk/gnu/usr.bin/gdb/kgdb/trgt.c Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/gnu/usr.bin/gdb/kgdb/trgt.c Sat Jul 4 21:50:39 2015 (r285153) @@ -76,7 +76,7 @@ kvm_t *kvm; static char kvm_err[_POSIX2_LINE_MAX]; #define KERNOFF (kgdb_kernbase ()) -#define INKERNEL(x) ((x) >= KERNOFF) +#define PINKERNEL(x) ((x) >= KERNOFF) static CORE_ADDR kgdb_kernbase (void) @@ -296,7 +296,7 @@ kgdb_set_proc_cmd (char *arg, int from_t addr = (CORE_ADDR) parse_and_eval_address (arg); - if (!INKERNEL (addr)) { + if (!PINKERNEL (addr)) { thr = kgdb_thr_lookup_pid((int)addr); if (thr == NULL) error ("invalid pid"); @@ -319,7 +319,7 @@ kgdb_set_tid_cmd (char *arg, int from_tt addr = (CORE_ADDR) parse_and_eval_address (arg); - if (kvm != NULL && INKERNEL (addr)) { + if (kvm != NULL && PINKERNEL (addr)) { thr = kgdb_thr_lookup_taddr(addr); if (thr == NULL) error("invalid thread address"); Modified: projects/clang-trunk/include/stdio.h ============================================================================== --- projects/clang-trunk/include/stdio.h Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/include/stdio.h Sat Jul 4 21:50:39 2015 (r285153) @@ -396,6 +396,7 @@ int (dprintf)(int, const char * __restr int asprintf(char **, const char *, ...) __printflike(2, 3); char *ctermid_r(char *); void fcloseall(void); +int fdclose(FILE *, int *); char *fgetln(FILE *, size_t *); const char *fmtcheck(const char *, const char *) __format_arg(2); int fpurge(FILE *); Modified: projects/clang-trunk/lib/Makefile ============================================================================== --- projects/clang-trunk/lib/Makefile Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/lib/Makefile Sat Jul 4 21:50:39 2015 (r285153) @@ -215,8 +215,9 @@ _libldns= libldns # sense to build when clang is enabled at all. Furthermore, they can only be # built for certain architectures. .if ${MK_CLANG} != "no" && ${COMPILER_TYPE} == "clang" && \ - (${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \ - (${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb")) + (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ + (${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb") || \ + (${MACHINE_CPUARCH} == "i386")) _libclang_rt= libclang_rt .endif @@ -273,7 +274,7 @@ _libsmb= libsmb _libsmb= libsmb .endif -.if ${MACHINE_CPUARCH} == "arm" +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" _libsmb= libsmb _libproc= libproc _librtld_db= librtld_db Modified: projects/clang-trunk/lib/csu/aarch64/crt1.c ============================================================================== --- projects/clang-trunk/lib/csu/aarch64/crt1.c Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/lib/csu/aarch64/crt1.c Sat Jul 4 21:50:39 2015 (r285153) @@ -51,6 +51,8 @@ extern int eprol; extern int etext; #endif +extern long * _end; + void __start(int, char **, char **, void (*)(void)); /* The entry function. */ @@ -79,8 +81,17 @@ __start(int argc, char *argv[], char *en if (&_DYNAMIC != NULL) atexit(cleanup); - else + else { + /* + * Hack to resolve _end so we read the correct symbol. + * Without this it will resolve to the copy in the library + * that firsts requests it. We should fix the toolchain, + * however this is is needed until this can take place. + */ + *(volatile long *)&_end; + _init_tls(); + } #ifdef GCRT atexit(_mcleanup); Modified: projects/clang-trunk/lib/libc/aarch64/Symbol.map ============================================================================== --- projects/clang-trunk/lib/libc/aarch64/Symbol.map Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/lib/libc/aarch64/Symbol.map Sat Jul 4 21:50:39 2015 (r285153) @@ -14,6 +14,9 @@ FBSD_1.0 { _setjmp; _longjmp; fabs; + __flt_rounds; + fpgetmask; + fpsetmask; setjmp; longjmp; sigsetjmp; @@ -25,6 +28,7 @@ FBSD_1.0 { FBSDprivate_1.0 { _set_tp; + _end; curbrk; minbrk; }; Modified: projects/clang-trunk/lib/libc/aarch64/gen/Makefile.inc ============================================================================== --- projects/clang-trunk/lib/libc/aarch64/gen/Makefile.inc Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/lib/libc/aarch64/gen/Makefile.inc Sat Jul 4 21:50:39 2015 (r285153) @@ -2,6 +2,8 @@ SRCS+= fabs.S \ flt_rounds.c \ + fpgetmask.c \ + fpsetmask.c \ ldexp.c \ _setjmp.S \ _set_tp.c \ Modified: projects/clang-trunk/lib/libc/aarch64/gen/_setjmp.S ============================================================================== --- projects/clang-trunk/lib/libc/aarch64/gen/_setjmp.S Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/lib/libc/aarch64/gen/_setjmp.S Sat Jul 4 21:50:39 2015 (r285153) @@ -59,8 +59,8 @@ ENTRY(_setjmp) /* Return value */ mov x0, #0 ret -.Lmagic: .align 3 +.Lmagic: .quad _JB_MAGIC__SETJMP END(_setjmp) Copied: projects/clang-trunk/lib/libc/aarch64/gen/fpgetmask.c (from r285152, head/lib/libc/aarch64/gen/fpgetmask.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang-trunk/lib/libc/aarch64/gen/fpgetmask.c Sat Jul 4 21:50:39 2015 (r285153, copy of r285152, head/lib/libc/aarch64/gen/fpgetmask.c) @@ -0,0 +1,47 @@ +/*- + * Copyright (c) 2015 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Andrew Turner under + * sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/types.h> +#include <ieeefp.h> + +#define FP_X_MASK (FP_X_INV | FP_X_DZ | FP_X_OFL | FP_X_UFL | FP_X_IMP) + +fp_except_t +fpgetmask(void) +{ + uint64_t mask; + + /* Read the current mask */ + __asm __volatile("mrs %0, fpcr" : "=&r"(mask)); + + return (mask & FP_X_MASK); +} Copied: projects/clang-trunk/lib/libc/aarch64/gen/fpsetmask.c (from r285152, head/lib/libc/aarch64/gen/fpsetmask.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang-trunk/lib/libc/aarch64/gen/fpsetmask.c Sat Jul 4 21:50:39 2015 (r285153, copy of r285152, head/lib/libc/aarch64/gen/fpsetmask.c) @@ -0,0 +1,52 @@ +/*- + * Copyright (c) 2015 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Andrew Turner under + * sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/types.h> +#include <ieeefp.h> + +#define FP_X_MASK (FP_X_INV | FP_X_DZ | FP_X_OFL | FP_X_UFL | FP_X_IMP) + +fp_except_t +fpsetmask(fp_except_t mask) +{ + uint64_t old, new; + + mask &= FP_X_MASK; + + /* Read the current mask */ + __asm __volatile("mrs %0, fpcr" : "=&r"(old)); + new = old & ~FP_X_MASK; + new |= mask; + __asm __volatile("msr fpcr, %0" :: "r"(new)); + + return ((fp_except_t)old); +} Modified: projects/clang-trunk/lib/libc/aarch64/gen/setjmp.S ============================================================================== --- projects/clang-trunk/lib/libc/aarch64/gen/setjmp.S Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/lib/libc/aarch64/gen/setjmp.S Sat Jul 4 21:50:39 2015 (r285153) @@ -69,8 +69,8 @@ ENTRY(setjmp) /* Return value */ mov x0, #0 ret -.Lmagic: .align 3 +.Lmagic: .quad _JB_MAGIC_SETJMP END(setjmp) Modified: projects/clang-trunk/lib/libc/aarch64/gen/sigsetjmp.S ============================================================================== --- projects/clang-trunk/lib/libc/aarch64/gen/sigsetjmp.S Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/lib/libc/aarch64/gen/sigsetjmp.S Sat Jul 4 21:50:39 2015 (r285153) @@ -47,7 +47,7 @@ ENTRY(siglongjmp) cmp x2, x3 b.eq _C_LABEL(_longjmp) b _C_LABEL(longjmp) -.Lmagic: .align 3 +.Lmagic: .quad _JB_MAGIC__SETJMP END(siglongjmp) Modified: projects/clang-trunk/lib/libc/aarch64/sys/brk.S ============================================================================== --- projects/clang-trunk/lib/libc/aarch64/sys/brk.S Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/lib/libc/aarch64/sys/brk.S Sat Jul 4 21:50:39 2015 (r285153) @@ -32,6 +32,8 @@ __FBSDID("$FreeBSD$"); #include "SYS.h" + .globl _C_LABEL(_end) + .data .align 3 .globl _C_LABEL(minbrk) @@ -47,15 +49,8 @@ ENTRY(_brk) WEAK_REFERENCE(_brk, brk) /* Load the address of minbrk */ -#ifdef __PIC__ - adrp x2, :got:minbrk - ldr x3, [x2, #:got_lo12:minbrk] -#else - ldr x3, .Lminbrk -#endif - - /* Get the minimum allowable brk address */ - ldr x2, [x3] + adrp x3, minbrk + ldr x2, [x3, :lo12:minbrk] /* Validate the address */ cmp x0, x2 @@ -70,24 +65,12 @@ ENTRY(_brk) _SYSCALL(break) b.cs cerror -#ifdef __PIC__ - adrp x2, :got:curbrk - ldr x3, [x2, #:got_lo12:curbrk] -#else - ldr x3, .Lcurbrk -#endif - /* Store the new curbrk value */ - str x4, [x3] + adrp x2, curbrk + str x4, [x2, :lo12:curbrk] /* Return success */ mov x0, #0 ret -#ifndef __PIC__ -.Lcurbrk: - .quad _C_LABEL(curbrk) -.Lminbrk: - .quad _C_LABEL(minbrk) -#endif END(_brk) Modified: projects/clang-trunk/lib/libc/aarch64/sys/sbrk.S ============================================================================== --- projects/clang-trunk/lib/libc/aarch64/sys/sbrk.S Sat Jul 4 21:32:44 2015 (r285152) +++ projects/clang-trunk/lib/libc/aarch64/sys/sbrk.S Sat Jul 4 21:50:39 2015 (r285153) @@ -32,6 +32,8 @@ __FBSDID("$FreeBSD$"); #include "SYS.h" + .globl _C_LABEL(_end) + .data .align 3 .global _C_LABEL(curbrk) @@ -47,15 +49,10 @@ ENTRY(_sbrk) WEAK_REFERENCE(_sbrk, sbrk) /* Load the address of curbrk */ -#ifdef __PIC__ - adrp x2, :got:curbrk - ldr x3, [x2, #:got_lo12:curbrk] -#else *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507042150.t64Lof7B051248>