Date: Thu, 10 Nov 2016 22:12:20 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r308491 - in projects/clang390-import: . bin/echo bin/freebsd-version bin/hostname bin/sh/tests/execution bin/sleep cddl/contrib/opensolaris/lib/libzfs_core/common contrib/bsnmp/lib con... Message-ID: <201611102212.uAAMCKeh068658@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Thu Nov 10 22:12:19 2016 New Revision: 308491 URL: https://svnweb.freebsd.org/changeset/base/308491 Log: Merge ^/head r308227 through r308490. Added: projects/clang390-import/bin/sh/tests/execution/set-C1.0 - copied unchanged from r308490, head/bin/sh/tests/execution/set-C1.0 projects/clang390-import/contrib/file/magic/Magdir/algol68 - copied unchanged from r308490, head/contrib/file/magic/Magdir/algol68 projects/clang390-import/contrib/file/magic/Magdir/application - copied unchanged from r308490, head/contrib/file/magic/Magdir/application projects/clang390-import/contrib/file/magic/Magdir/apt - copied unchanged from r308490, head/contrib/file/magic/Magdir/apt projects/clang390-import/contrib/file/magic/Magdir/psl - copied unchanged from r308490, head/contrib/file/magic/Magdir/psl projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/spin.h - copied unchanged from r308490, head/contrib/jemalloc/include/jemalloc/internal/spin.h projects/clang390-import/contrib/jemalloc/src/spin.c - copied unchanged from r308490, head/contrib/jemalloc/src/spin.c projects/clang390-import/contrib/tzdata/CONTRIBUTING - copied unchanged from r308490, head/contrib/tzdata/CONTRIBUTING projects/clang390-import/contrib/tzdata/LICENSE - copied unchanged from r308490, head/contrib/tzdata/LICENSE projects/clang390-import/contrib/tzdata/Makefile - copied unchanged from r308490, head/contrib/tzdata/Makefile projects/clang390-import/contrib/tzdata/NEWS - copied unchanged from r308490, head/contrib/tzdata/NEWS projects/clang390-import/contrib/tzdata/README - copied unchanged from r308490, head/contrib/tzdata/README projects/clang390-import/contrib/tzdata/Theory - copied unchanged from r308490, head/contrib/tzdata/Theory projects/clang390-import/contrib/tzdata/backzone - copied unchanged from r308490, head/contrib/tzdata/backzone projects/clang390-import/contrib/tzdata/checklinks.awk - copied unchanged from r308490, head/contrib/tzdata/checklinks.awk projects/clang390-import/contrib/tzdata/checktab.awk - copied unchanged from r308490, head/contrib/tzdata/checktab.awk projects/clang390-import/contrib/tzdata/leapseconds.awk - copied unchanged from r308490, head/contrib/tzdata/leapseconds.awk projects/clang390-import/contrib/tzdata/version - copied unchanged from r308490, head/contrib/tzdata/version projects/clang390-import/contrib/tzdata/zoneinfo2tdf.pl - copied unchanged from r308490, head/contrib/tzdata/zoneinfo2tdf.pl projects/clang390-import/lib/libc/gen/basename_compat.c - copied unchanged from r308490, head/lib/libc/gen/basename_compat.c projects/clang390-import/sys/arm/allwinner/a31_dmac.c - copied unchanged from r308490, head/sys/arm/allwinner/a31_dmac.c projects/clang390-import/sys/arm/nvidia/tegra_mc.c - copied unchanged from r308490, head/sys/arm/nvidia/tegra_mc.c projects/clang390-import/sys/arm/nvidia/tegra_xhci.c - copied unchanged from r308490, head/sys/arm/nvidia/tegra_xhci.c projects/clang390-import/sys/boot/fdt/dts/arm/ubmc.dtsi - copied unchanged from r308490, head/sys/boot/fdt/dts/arm/ubmc.dtsi projects/clang390-import/sys/boot/fdt/dts/arm/ufw.dts - copied unchanged from r308490, head/sys/boot/fdt/dts/arm/ufw.dts projects/clang390-import/sys/contrib/dev/nvidia/ - copied from r308490, head/sys/contrib/dev/nvidia/ projects/clang390-import/sys/dev/gpio/bytgpio.c - copied unchanged from r308490, head/sys/dev/gpio/bytgpio.c projects/clang390-import/sys/dev/gpio/gpioled_fdt.c - copied unchanged from r308490, head/sys/dev/gpio/gpioled_fdt.c Deleted: projects/clang390-import/sys/arm/allwinner/a10_common.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_common.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2836.h projects/clang390-import/sys/arm/qemu/virt_common.c projects/clang390-import/sys/arm/ti/ti_common.c Modified: projects/clang390-import/Makefile.inc1 projects/clang390-import/bin/echo/echo.c projects/clang390-import/bin/freebsd-version/freebsd-version.sh.in projects/clang390-import/bin/hostname/hostname.1 projects/clang390-import/bin/hostname/hostname.c projects/clang390-import/bin/sh/tests/execution/Makefile projects/clang390-import/bin/sleep/sleep.c projects/clang390-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c projects/clang390-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h projects/clang390-import/contrib/bsnmp/lib/snmpagent.c projects/clang390-import/contrib/elftoolchain/cxxfilt/cxxfilt.c projects/clang390-import/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 projects/clang390-import/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c projects/clang390-import/contrib/file/ChangeLog projects/clang390-import/contrib/file/TODO projects/clang390-import/contrib/file/config.guess projects/clang390-import/contrib/file/config.sub projects/clang390-import/contrib/file/configure projects/clang390-import/contrib/file/configure.ac projects/clang390-import/contrib/file/doc/file.man projects/clang390-import/contrib/file/doc/magic.man projects/clang390-import/contrib/file/ltmain.sh projects/clang390-import/contrib/file/magic/Magdir/animation projects/clang390-import/contrib/file/magic/Magdir/apple projects/clang390-import/contrib/file/magic/Magdir/bioinformatics projects/clang390-import/contrib/file/magic/Magdir/c-lang projects/clang390-import/contrib/file/magic/Magdir/claris projects/clang390-import/contrib/file/magic/Magdir/commands projects/clang390-import/contrib/file/magic/Magdir/compress projects/clang390-import/contrib/file/magic/Magdir/cups projects/clang390-import/contrib/file/magic/Magdir/editors projects/clang390-import/contrib/file/magic/Magdir/filesystems projects/clang390-import/contrib/file/magic/Magdir/fonts projects/clang390-import/contrib/file/magic/Magdir/gcc projects/clang390-import/contrib/file/magic/Magdir/gnu projects/clang390-import/contrib/file/magic/Magdir/images projects/clang390-import/contrib/file/magic/Magdir/jpeg projects/clang390-import/contrib/file/magic/Magdir/msdos projects/clang390-import/contrib/file/magic/Magdir/pgp projects/clang390-import/contrib/file/magic/Magdir/python projects/clang390-import/contrib/file/magic/Magdir/ruby projects/clang390-import/contrib/file/magic/Magdir/sgml projects/clang390-import/contrib/file/magic/Magdir/sql projects/clang390-import/contrib/file/magic/Makefile.am projects/clang390-import/contrib/file/magic/Makefile.in projects/clang390-import/contrib/file/python/magic.py projects/clang390-import/contrib/file/src/apprentice.c projects/clang390-import/contrib/file/src/ascmagic.c projects/clang390-import/contrib/file/src/cdf.c projects/clang390-import/contrib/file/src/cdf.h projects/clang390-import/contrib/file/src/compress.c projects/clang390-import/contrib/file/src/der.c projects/clang390-import/contrib/file/src/file.c projects/clang390-import/contrib/file/src/file.h projects/clang390-import/contrib/file/src/funcs.c projects/clang390-import/contrib/file/src/magic.c projects/clang390-import/contrib/file/src/readcdf.c projects/clang390-import/contrib/file/src/readelf.c projects/clang390-import/contrib/file/src/softmagic.c projects/clang390-import/contrib/jemalloc/ChangeLog projects/clang390-import/contrib/jemalloc/FREEBSD-Xlist projects/clang390-import/contrib/jemalloc/FREEBSD-diffs projects/clang390-import/contrib/jemalloc/VERSION projects/clang390-import/contrib/jemalloc/doc/jemalloc.3 projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/arena.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/chunk.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/chunk_dss.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/ckh.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/huge.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/mb.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/mutex.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/nstime.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/private_namespace.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/prng.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/prof.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/size_classes.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/tcache.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/tsd.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/util.h projects/clang390-import/contrib/jemalloc/include/jemalloc/internal/witness.h projects/clang390-import/contrib/jemalloc/include/jemalloc/jemalloc.h projects/clang390-import/contrib/jemalloc/src/arena.c projects/clang390-import/contrib/jemalloc/src/chunk.c projects/clang390-import/contrib/jemalloc/src/chunk_dss.c projects/clang390-import/contrib/jemalloc/src/ckh.c projects/clang390-import/contrib/jemalloc/src/ctl.c projects/clang390-import/contrib/jemalloc/src/huge.c projects/clang390-import/contrib/jemalloc/src/jemalloc.c projects/clang390-import/contrib/jemalloc/src/mutex.c projects/clang390-import/contrib/jemalloc/src/nstime.c projects/clang390-import/contrib/jemalloc/src/pages.c projects/clang390-import/contrib/jemalloc/src/prof.c projects/clang390-import/contrib/jemalloc/src/rtree.c projects/clang390-import/contrib/jemalloc/src/stats.c projects/clang390-import/contrib/jemalloc/src/tcache.c projects/clang390-import/contrib/jemalloc/src/tsd.c projects/clang390-import/contrib/jemalloc/src/util.c projects/clang390-import/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S projects/clang390-import/contrib/tzdata/antarctica projects/clang390-import/contrib/tzdata/asia projects/clang390-import/contrib/tzdata/australasia projects/clang390-import/contrib/tzdata/europe projects/clang390-import/contrib/tzdata/zone.tab projects/clang390-import/contrib/tzdata/zone1970.tab projects/clang390-import/etc/devd.conf projects/clang390-import/etc/rc.subr projects/clang390-import/gnu/lib/Makefile projects/clang390-import/gnu/lib/libgcc/Makefile projects/clang390-import/include/libgen.h projects/clang390-import/lib/Makefile projects/clang390-import/lib/libc/gen/Makefile.inc projects/clang390-import/lib/libc/gen/Symbol.map projects/clang390-import/lib/libc/gen/basename.3 projects/clang390-import/lib/libc/gen/basename.c projects/clang390-import/lib/libc/stdlib/jemalloc/Makefile.inc projects/clang390-import/lib/libc/sys/getfsstat.2 projects/clang390-import/lib/libcompiler_rt/Makefile.inc projects/clang390-import/lib/libgcc_s/Version.map projects/clang390-import/lib/libmagic/config.h projects/clang390-import/lib/libstand/stand.h projects/clang390-import/lib/msun/riscv/Makefile.inc projects/clang390-import/libexec/rtld-elf/rtld.c projects/clang390-import/libexec/rtld-elf/sparc64/reloc.c projects/clang390-import/sbin/pfctl/pfctl.c projects/clang390-import/sbin/pfctl/pfctl_optimize.c projects/clang390-import/share/man/man4/smb.4 projects/clang390-import/share/man/man7/arch.7 projects/clang390-import/share/mk/bsd.cpu.mk projects/clang390-import/share/mk/bsd.stand.mk projects/clang390-import/sys/amd64/vmm/io/vlapic.c projects/clang390-import/sys/arm/allwinner/a10/a10_intc.c projects/clang390-import/sys/arm/allwinner/a10_codec.c projects/clang390-import/sys/arm/allwinner/a10_dmac.c projects/clang390-import/sys/arm/allwinner/aw_cir.c projects/clang390-import/sys/arm/allwinner/axp209.c projects/clang390-import/sys/arm/allwinner/axp209reg.h projects/clang390-import/sys/arm/allwinner/clk/aw_ahbclk.c projects/clang390-import/sys/arm/allwinner/clk/aw_modclk.c projects/clang390-import/sys/arm/allwinner/clk/aw_pll.c projects/clang390-import/sys/arm/allwinner/files.allwinner projects/clang390-import/sys/arm/arm/cpufunc_asm_sheeva.S projects/clang390-import/sys/arm/arm/cpufunc_asm_xscale.S projects/clang390-import/sys/arm/arm/cpufunc_asm_xscale_c3.S projects/clang390-import/sys/arm/arm/fiq_subr.S projects/clang390-import/sys/arm/arm/machdep.c projects/clang390-import/sys/arm/arm/setstack.s projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_audio.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2835_intr.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2836.c projects/clang390-import/sys/arm/broadcom/bcm2835/bcm2836_mp.c projects/clang390-import/sys/arm/broadcom/bcm2835/files.bcm283x projects/clang390-import/sys/arm/conf/ALLWINNER projects/clang390-import/sys/arm/conf/GENERIC projects/clang390-import/sys/arm/conf/RPI2 projects/clang390-import/sys/arm/conf/TEGRA124 projects/clang390-import/sys/arm/include/armreg.h projects/clang390-import/sys/arm/include/profile.h projects/clang390-import/sys/arm/nvidia/tegra124/files.tegra124 projects/clang390-import/sys/arm/nvidia/tegra124/tegra124_car.c projects/clang390-import/sys/arm/nvidia/tegra124/tegra124_clk_per.c projects/clang390-import/sys/arm/nvidia/tegra124/tegra124_clk_pll.c projects/clang390-import/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c projects/clang390-import/sys/arm/qemu/files.qemu projects/clang390-import/sys/arm/ti/aintc.c projects/clang390-import/sys/arm/ti/files.ti projects/clang390-import/sys/arm/ti/omap4/omap4_prcm_clks.c projects/clang390-import/sys/arm/ti/ti_gpio.c projects/clang390-import/sys/arm/ti/ti_gpio.h projects/clang390-import/sys/arm/ti/ti_smc.S projects/clang390-import/sys/arm64/arm64/identcpu.c projects/clang390-import/sys/boot/common/dev_net.c projects/clang390-import/sys/boot/common/module.c projects/clang390-import/sys/boot/common/part.c projects/clang390-import/sys/boot/common/util.c projects/clang390-import/sys/boot/common/util.h projects/clang390-import/sys/boot/efi/libefi/efinet.c projects/clang390-import/sys/boot/efi/libefi/efipart.c projects/clang390-import/sys/boot/efi/loader/main.c projects/clang390-import/sys/boot/fdt/dts/arm/bananapim2.dts projects/clang390-import/sys/boot/fdt/dts/arm/tegra124-jetson-tk1-fbsd.dts projects/clang390-import/sys/boot/forth/support.4th projects/clang390-import/sys/boot/i386/libfirewire/firewire.c projects/clang390-import/sys/boot/i386/libi386/bioscd.c projects/clang390-import/sys/boot/i386/libi386/biosdisk.c projects/clang390-import/sys/boot/i386/libi386/pxe.c projects/clang390-import/sys/boot/mips/beri/loader/beri_disk_cfi.c projects/clang390-import/sys/boot/mips/beri/loader/beri_disk_sdcard.c projects/clang390-import/sys/boot/ofw/libofw/ofw_disk.c projects/clang390-import/sys/boot/pc98/libpc98/bioscd.c projects/clang390-import/sys/boot/pc98/libpc98/biosdisk.c projects/clang390-import/sys/boot/powerpc/kboot/hostdisk.c projects/clang390-import/sys/boot/powerpc/ps3/ps3cdrom.c projects/clang390-import/sys/boot/powerpc/ps3/ps3disk.c projects/clang390-import/sys/boot/uboot/lib/disk.c projects/clang390-import/sys/boot/usb/storage/umass_loader.c projects/clang390-import/sys/boot/userboot/userboot/host.c projects/clang390-import/sys/boot/userboot/userboot/userboot_disk.c projects/clang390-import/sys/boot/zfs/zfs.c projects/clang390-import/sys/boot/zfs/zfsimpl.c projects/clang390-import/sys/cam/cam.h projects/clang390-import/sys/cam/cam_xpt.c projects/clang390-import/sys/cam/ctl/ctl.c projects/clang390-import/sys/cam/ctl/ctl_ioctl.h projects/clang390-import/sys/cam/scsi/scsi_all.c projects/clang390-import/sys/cam/scsi/scsi_da.c projects/clang390-import/sys/cam/scsi/scsi_enc_ses.c projects/clang390-import/sys/cam/scsi/scsi_pass.c projects/clang390-import/sys/cam/scsi/scsi_ses.h projects/clang390-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/clang390-import/sys/cddl/dev/dtrace/aarch64/dtrace_subr.c projects/clang390-import/sys/cddl/dev/dtrace/arm/dtrace_asm.S projects/clang390-import/sys/cddl/dev/dtrace/arm/dtrace_subr.c projects/clang390-import/sys/cddl/dev/dtrace/riscv/dtrace_subr.c projects/clang390-import/sys/conf/files projects/clang390-import/sys/conf/files.amd64 projects/clang390-import/sys/conf/files.i386 projects/clang390-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c projects/clang390-import/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c projects/clang390-import/sys/dev/aic7xxx/aic7xxx.seq projects/clang390-import/sys/dev/ath/if_ath_rx.c projects/clang390-import/sys/dev/ath/if_ath_tdma.c projects/clang390-import/sys/dev/atkbdc/atkbd.c projects/clang390-import/sys/dev/atkbdc/atkbd_atkbdc.c projects/clang390-import/sys/dev/bxe/bxe.c projects/clang390-import/sys/dev/e1000/if_em.c projects/clang390-import/sys/dev/e1000/if_igb.c projects/clang390-import/sys/dev/extres/clk/clk.c projects/clang390-import/sys/dev/extres/clk/clk.h projects/clang390-import/sys/dev/gpio/gpioled.c projects/clang390-import/sys/dev/hwpmc/hwpmc_mod.c projects/clang390-import/sys/dev/hyperv/vmbus/vmbus.c projects/clang390-import/sys/dev/ichsmb/ichsmb_pci.c projects/clang390-import/sys/dev/ioat/ioat.c projects/clang390-import/sys/dev/isci/scil/sati_design.h projects/clang390-import/sys/dev/isci/scil/sci_base_controller.h projects/clang390-import/sys/dev/mlx5/device.h projects/clang390-import/sys/dev/mlx5/driver.h projects/clang390-import/sys/dev/mlx5/mlx5_core/mlx5_cmd.c projects/clang390-import/sys/dev/mlx5/mlx5_core/mlx5_fw.c projects/clang390-import/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c projects/clang390-import/sys/dev/mlx5/mlx5_core/mlx5_port.c projects/clang390-import/sys/dev/mlx5/mlx5_en/en.h projects/clang390-import/sys/dev/mlx5/mlx5_en/mlx5_en_main.c projects/clang390-import/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c projects/clang390-import/sys/dev/mlx5/mlx5_ifc.h projects/clang390-import/sys/dev/mlx5/qp.h projects/clang390-import/sys/dev/mpr/mpr_sas.c projects/clang390-import/sys/dev/mps/mps_sas.c projects/clang390-import/sys/dev/mpt/mpt.c projects/clang390-import/sys/dev/nvme/nvme_ctrlr.c projects/clang390-import/sys/dev/nvme/nvme_private.h projects/clang390-import/sys/dev/nvme/nvme_qpair.c projects/clang390-import/sys/dev/rtwn/if_rtwn.c projects/clang390-import/sys/dev/rtwn/if_rtwn_beacon.c projects/clang390-import/sys/dev/rtwn/if_rtwn_rx.c projects/clang390-import/sys/dev/rtwn/if_rtwn_rx.h projects/clang390-import/sys/dev/rtwn/if_rtwnvar.h projects/clang390-import/sys/dev/rtwn/pci/rtwn_pci_attach.c projects/clang390-import/sys/dev/rtwn/pci/rtwn_pci_rx.c projects/clang390-import/sys/dev/rtwn/pci/rtwn_pci_tx.c projects/clang390-import/sys/dev/rtwn/pci/rtwn_pci_var.h projects/clang390-import/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c projects/clang390-import/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c projects/clang390-import/sys/dev/rtwn/rtl8192c/r92c_beacon.c projects/clang390-import/sys/dev/rtwn/rtl8812a/r12a_caps.c projects/clang390-import/sys/dev/rtwn/usb/rtwn_usb_attach.c projects/clang390-import/sys/dev/sdhci/fsl_sdhci.c projects/clang390-import/sys/dev/sfxge/common/efx_mcdi.c projects/clang390-import/sys/dev/smbus/smb.c projects/clang390-import/sys/dev/smbus/smb.h projects/clang390-import/sys/dev/smbus/smbconf.h projects/clang390-import/sys/dev/smbus/smbus_if.m projects/clang390-import/sys/dev/sound/pci/hda/hdaa.c projects/clang390-import/sys/dev/sound/pci/hda/hdac.c projects/clang390-import/sys/dev/sound/pci/hda/hdac.h projects/clang390-import/sys/dev/sound/pci/hda/hdacc.c projects/clang390-import/sys/dev/sound/usb/uaudio.c projects/clang390-import/sys/dev/usb/controller/xhci_pci.c projects/clang390-import/sys/dev/usb/usbdevs projects/clang390-import/sys/fs/autofs/autofs.c projects/clang390-import/sys/fs/nullfs/null_vnops.c projects/clang390-import/sys/geom/raid/md_ddf.c projects/clang390-import/sys/geom/raid/md_intel.c projects/clang390-import/sys/geom/raid/md_jmicron.c projects/clang390-import/sys/geom/raid/md_nvidia.c projects/clang390-import/sys/geom/raid/md_promise.c projects/clang390-import/sys/geom/raid/md_sii.c projects/clang390-import/sys/i386/include/cserial.h projects/clang390-import/sys/kern/init_main.c projects/clang390-import/sys/kern/kern_ctf.c projects/clang390-import/sys/kern/kern_synch.c projects/clang390-import/sys/kern/subr_firmware.c projects/clang390-import/sys/kern/uipc_mbuf.c projects/clang390-import/sys/kern/vfs_bio.c projects/clang390-import/sys/kern/vfs_cache.c projects/clang390-import/sys/modules/dtb/am335x/Makefile projects/clang390-import/sys/modules/dtrace/dtrace/Makefile projects/clang390-import/sys/modules/gpio/gpioled/Makefile projects/clang390-import/sys/net80211/ieee80211_alq.c projects/clang390-import/sys/net80211/ieee80211_alq.h projects/clang390-import/sys/net80211/ieee80211_crypto.c projects/clang390-import/sys/net80211/ieee80211_crypto.h projects/clang390-import/sys/net80211/ieee80211_ht.c projects/clang390-import/sys/net80211/ieee80211_ht.h projects/clang390-import/sys/net80211/ieee80211_node.h projects/clang390-import/sys/netgraph/ng_base.c projects/clang390-import/sys/netinet/tcp_subr.c projects/clang390-import/sys/netpfil/ipfw/ip_fw_pfil.c projects/clang390-import/sys/powerpc/powerpc/mmu_if.m projects/clang390-import/sys/riscv/include/asm.h projects/clang390-import/sys/riscv/include/float.h projects/clang390-import/sys/riscv/riscv/locore.S projects/clang390-import/sys/security/mac/mac_inet.c projects/clang390-import/sys/sys/vmmeter.h projects/clang390-import/sys/vm/swap_pager.c projects/clang390-import/sys/vm/vm_fault.c projects/clang390-import/sys/vm/vm_meter.c projects/clang390-import/sys/vm/vm_object.c projects/clang390-import/sys/vm/vm_page.c projects/clang390-import/sys/vm/vm_page.h projects/clang390-import/sys/vm/vm_pageout.c projects/clang390-import/sys/x86/x86/busdma_machdep.c projects/clang390-import/sys/x86/xen/xen_intr.c projects/clang390-import/tools/tools/nanobsd/embedded/qemu-armv7.cfg projects/clang390-import/usr.bin/basename/basename.c projects/clang390-import/usr.bin/dc/dc.c projects/clang390-import/usr.bin/dirname/dirname.c projects/clang390-import/usr.bin/du/du.c projects/clang390-import/usr.bin/fold/fold.c projects/clang390-import/usr.bin/fortune/datfiles/fortunes projects/clang390-import/usr.bin/getopt/getopt.c projects/clang390-import/usr.bin/locate/bigram/locate.bigram.c projects/clang390-import/usr.bin/logname/logname.c projects/clang390-import/usr.bin/ministat/ministat.c projects/clang390-import/usr.bin/ncal/ncal.c projects/clang390-import/usr.bin/printenv/printenv.c projects/clang390-import/usr.bin/sed/compile.c projects/clang390-import/usr.bin/systat/systat.1 projects/clang390-import/usr.bin/systat/vmstat.c projects/clang390-import/usr.bin/top/machine.c projects/clang390-import/usr.bin/top/top.local.1 projects/clang390-import/usr.bin/vmstat/vmstat.c projects/clang390-import/usr.bin/xlint/lint2/read.c projects/clang390-import/usr.bin/yes/yes.c projects/clang390-import/usr.sbin/bhyve/bhyverun.c projects/clang390-import/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt projects/clang390-import/usr.sbin/gstat/gstat.8 projects/clang390-import/usr.sbin/gstat/gstat.c projects/clang390-import/usr.sbin/makefs/Makefile projects/clang390-import/usr.sbin/makefs/ffs.c projects/clang390-import/usr.sbin/newsyslog/newsyslog.c projects/clang390-import/usr.sbin/rtadvd/if.c projects/clang390-import/usr.sbin/traceroute6/traceroute6.c projects/clang390-import/usr.sbin/vidcontrol/vidcontrol.c projects/clang390-import/usr.sbin/watchdogd/watchdogd.c Directory Properties: projects/clang390-import/ (props changed) projects/clang390-import/cddl/ (props changed) projects/clang390-import/cddl/contrib/opensolaris/ (props changed) projects/clang390-import/contrib/elftoolchain/ (props changed) projects/clang390-import/contrib/file/ (props changed) projects/clang390-import/contrib/llvm/ (props changed) projects/clang390-import/contrib/llvm/projects/libunwind/ (props changed) projects/clang390-import/contrib/tzdata/ (props changed) projects/clang390-import/gnu/lib/ (props changed) projects/clang390-import/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/clang390-import/Makefile.inc1 ============================================================================== --- projects/clang390-import/Makefile.inc1 Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/Makefile.inc1 Thu Nov 10 22:12:19 2016 (r308491) @@ -1953,6 +1953,7 @@ native-xtools: .PHONY usr.bin/gzip \ usr.bin/id \ usr.bin/lex \ + usr.bin/limits \ usr.bin/lorder \ usr.bin/mktemp \ usr.bin/mt \ @@ -2000,7 +2001,7 @@ libraries: .MAKE .PHONY # # static libgcc.a prerequisite for shared libc # -_prereq_libs= gnu/lib/libgcc lib/libcompiler_rt +_prereq_libs= lib/libcompiler_rt .if ${MK_SSP} != "no" _prereq_libs+= gnu/lib/libssp/libssp_nonshared .endif @@ -2012,7 +2013,6 @@ _prereq_libs+= gnu/lib/libssp/libssp_non # _startup_libs= gnu/lib/csu _startup_libs+= lib/csu -_startup_libs+= gnu/lib/libgcc _startup_libs+= lib/libcompiler_rt _startup_libs+= lib/libc _startup_libs+= lib/libc_nonshared @@ -2020,11 +2020,27 @@ _startup_libs+= lib/libc_nonshared _startup_libs+= lib/libcxxrt .endif +.if ${MK_LLVM_LIBUNWIND} != "no" +_prereq_libs+= lib/libgcc_eh lib/libgcc_s +_startup_libs+= lib/libgcc_eh lib/libgcc_s + +lib/libgcc_s__L: lib/libc__L +lib/libgcc_s__L: lib/libc_nonshared__L +.if ${MK_LIBCPLUSPLUS} != "no" +lib/libcxxrt__L: lib/libgcc_s__L +.endif + +.else # MK_LLVM_LIBUNWIND == no + +_prereq_libs+= gnu/lib/libgcc +_startup_libs+= gnu/lib/libgcc + gnu/lib/libgcc__L: lib/libc__L gnu/lib/libgcc__L: lib/libc_nonshared__L .if ${MK_LIBCPLUSPLUS} != "no" lib/libcxxrt__L: gnu/lib/libgcc__L .endif +.endif _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_kerberos5_lib_libhdb} \ Modified: projects/clang390-import/bin/echo/echo.c ============================================================================== --- projects/clang390-import/bin/echo/echo.c Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/bin/echo/echo.c Thu Nov 10 22:12:19 2016 (r308491) @@ -45,6 +45,8 @@ __FBSDID("$FreeBSD$"); #include <sys/uio.h> #include <assert.h> +#include <capsicum_helpers.h> +#include <err.h> #include <errno.h> #include <limits.h> #include <stdlib.h> @@ -78,6 +80,9 @@ main(int argc, char *argv[]) char newline[] = "\n"; char *progname = argv[0]; + if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS)) + err(1, "capsicum"); + /* This utility may NOT do getopt(3) option parsing. */ if (*++argv && !strcmp(*argv, "-n")) { ++argv; Modified: projects/clang390-import/bin/freebsd-version/freebsd-version.sh.in ============================================================================== --- projects/clang390-import/bin/freebsd-version/freebsd-version.sh.in Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/bin/freebsd-version/freebsd-version.sh.in Thu Nov 10 22:12:19 2016 (r308491) @@ -36,7 +36,7 @@ USERLAND_VERSION="@@REVISION@@-@@BRANCH@ : ${LOADER_CONF_FILES:=$LOADER_DIR/defaults/loader.conf $LOADER_DIR/loader.conf $LOADER_DIR/loader.conf.local} LOADER_RE1='^\([A-Z_a-z][0-9A-Z_a-z]*=[-./0-9A-Z_a-z]\{1,\}\).*$' LOADER_RE2='^\([A-Z_a-z][0-9A-Z_a-z]*="[-./0-9A-Z_a-z]\{1,\}"\).*$' -KERNEL_RE='^@(#)@@TYPE@@ \([-.0-9A-Za-z]\{1,\}\) .*$' +KERNEL_RE='^@@TYPE@@ \([-.0-9A-Za-z]\{1,\}\) .*$' progname=$(basename $0) @@ -67,7 +67,7 @@ kernel_version() { if [ ! -f "$kernfile" -o ! -r "$kernfile" ] ; then error "unable to locate kernel" fi - strings "$kernfile" | sed -n "s/$KERNEL_RE/\\1/p" + what -qs "$kernfile" | sed -n "s/$KERNEL_RE/\\1/p" } # Modified: projects/clang390-import/bin/hostname/hostname.1 ============================================================================== --- projects/clang390-import/bin/hostname/hostname.1 Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/bin/hostname/hostname.1 Thu Nov 10 22:12:19 2016 (r308491) @@ -29,7 +29,7 @@ .\" @(#)hostname.1 8.2 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd December 7, 2006 +.Dd November 10, 2016 .Dt HOSTNAME 1 .Os .Sh NAME @@ -37,7 +37,8 @@ .Nd set or print name of current host system .Sh SYNOPSIS .Nm -.Op Fl fs +.Op Fl f +.Op Fl s | d .Op Ar name-of-host .Sh DESCRIPTION The @@ -62,6 +63,8 @@ This is the default behavior. .It Fl s Trim off any domain information from the printed name. +.It Fl d +Only print domain information. .El .Sh SEE ALSO .Xr gethostname 3 , Modified: projects/clang390-import/bin/hostname/hostname.c ============================================================================== --- projects/clang390-import/bin/hostname/hostname.c Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/bin/hostname/hostname.c Thu Nov 10 22:12:19 2016 (r308491) @@ -54,11 +54,12 @@ static void usage(void) __dead2; int main(int argc, char *argv[]) { - int ch, sflag; + int ch, sflag, dflag; char *p, hostname[MAXHOSTNAMELEN]; sflag = 0; - while ((ch = getopt(argc, argv, "fs")) != -1) + dflag = 0; + while ((ch = getopt(argc, argv, "fsd")) != -1) switch (ch) { case 'f': /* @@ -70,6 +71,9 @@ main(int argc, char *argv[]) case 's': sflag = 1; break; + case 'd': + dflag = 1; + break; case '?': default: usage(); @@ -77,7 +81,7 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - if (argc > 1) + if (argc > 1 || (sflag && dflag)) usage(); if (*argv) { @@ -90,6 +94,10 @@ main(int argc, char *argv[]) p = strchr(hostname, '.'); if (p != NULL) *p = '\0'; + } else if (dflag) { + p = strchr(hostname, '.'); + if (p != NULL) + strcpy(hostname, ++p); } (void)printf("%s\n", hostname); } @@ -100,6 +108,6 @@ static void usage(void) { - (void)fprintf(stderr, "usage: hostname [-fs] [name-of-host]\n"); + (void)fprintf(stderr, "usage: hostname [-f] [-s | -d] [name-of-host]\n"); exit(1); } Modified: projects/clang390-import/bin/sh/tests/execution/Makefile ============================================================================== --- projects/clang390-import/bin/sh/tests/execution/Makefile Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/bin/sh/tests/execution/Makefile Thu Nov 10 22:12:19 2016 (r308491) @@ -37,6 +37,7 @@ ${PACKAGE}FILES+= redir4.0 ${PACKAGE}FILES+= redir5.0 ${PACKAGE}FILES+= redir6.0 ${PACKAGE}FILES+= redir7.0 +${PACKAGE}FILES+= set-C1.0 ${PACKAGE}FILES+= set-n1.0 ${PACKAGE}FILES+= set-n2.0 ${PACKAGE}FILES+= set-n3.0 Copied: projects/clang390-import/bin/sh/tests/execution/set-C1.0 (from r308490, head/bin/sh/tests/execution/set-C1.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang390-import/bin/sh/tests/execution/set-C1.0 Thu Nov 10 22:12:19 2016 (r308491, copy of r308490, head/bin/sh/tests/execution/set-C1.0) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +T=$(mktemp -d "${TMPDIR:-/tmp}/sh-test.XXXXXXXX") || exit +trap 'rm -rf "$T"' 0 + +set -C +echo . >"$T/a" && +[ -s "$T/a" ] && +{ ! true >"$T/a"; } 2>/dev/null && +[ -s "$T/a" ] && +ln -s /dev/null "$T/b" && +true >"$T/b" Modified: projects/clang390-import/bin/sleep/sleep.c ============================================================================== --- projects/clang390-import/bin/sleep/sleep.c Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/bin/sleep/sleep.c Thu Nov 10 22:12:19 2016 (r308491) @@ -41,6 +41,7 @@ static char sccsid[] = "@(#)sleep.c 8.3 #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <capsicum_helpers.h> #include <ctype.h> #include <err.h> #include <errno.h> @@ -69,6 +70,9 @@ main(int argc, char *argv[]) time_t original; char buf[2]; + if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS)) + err(1, "capsicum"); + if (argc != 2) usage(); Modified: projects/clang390-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c ============================================================================== --- projects/clang390-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c Thu Nov 10 22:12:19 2016 (r308491) @@ -596,8 +596,9 @@ recv_read(int fd, void *buf, int ilen) } static int -lzc_receive_impl(const char *snapname, nvlist_t *props, const char *origin, - boolean_t force, boolean_t resumable, int fd) +recv_impl(const char *snapname, nvlist_t *props, const char *origin, + boolean_t force, boolean_t resumable, int fd, + const dmu_replay_record_t *begin_record) { /* * The receive ioctl is still legacy, so we need to construct our own @@ -642,9 +643,14 @@ lzc_receive_impl(const char *snapname, n (void) strlcpy(zc.zc_string, origin, sizeof (zc.zc_string)); /* zc_begin_record is non-byteswapped BEGIN record */ - error = recv_read(fd, &zc.zc_begin_record, sizeof (zc.zc_begin_record)); - if (error != 0) - goto out; + if (begin_record == NULL) { + error = recv_read(fd, &zc.zc_begin_record, + sizeof (zc.zc_begin_record)); + if (error != 0) + goto out; + } else { + zc.zc_begin_record = *begin_record; + } /* zc_cookie is fd to read from */ zc.zc_cookie = fd; @@ -685,7 +691,7 @@ int lzc_receive(const char *snapname, nvlist_t *props, const char *origin, boolean_t force, int fd) { - return (lzc_receive_impl(snapname, props, origin, force, B_FALSE, fd)); + return (recv_impl(snapname, props, origin, force, B_FALSE, fd, NULL)); } /* @@ -698,7 +704,29 @@ int lzc_receive_resumable(const char *snapname, nvlist_t *props, const char *origin, boolean_t force, int fd) { - return (lzc_receive_impl(snapname, props, origin, force, B_TRUE, fd)); + return (recv_impl(snapname, props, origin, force, B_TRUE, fd, NULL)); +} + +/* + * Like lzc_receive, but allows the caller to read the begin record and then to + * pass it in. That could be useful if the caller wants to derive, for example, + * the snapname or the origin parameters based on the information contained in + * the begin record. + * The begin record must be in its original form as read from the stream, + * in other words, it should not be byteswapped. + * + * The 'resumable' parameter allows to obtain the same behavior as with + * lzc_receive_resumable. + */ +int +lzc_receive_with_header(const char *snapname, nvlist_t *props, + const char *origin, boolean_t force, boolean_t resumable, int fd, + const dmu_replay_record_t *begin_record) +{ + if (begin_record == NULL) + return (EINVAL); + return (recv_impl(snapname, props, origin, force, resumable, fd, + begin_record)); } /* Modified: projects/clang390-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h ============================================================================== --- projects/clang390-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h Thu Nov 10 22:12:19 2016 (r308491) @@ -68,10 +68,15 @@ enum lzc_send_flags { int lzc_send(const char *, const char *, int, enum lzc_send_flags); int lzc_send_resume(const char *, const char *, int, enum lzc_send_flags, uint64_t, uint64_t); +int lzc_send_space(const char *, const char *, uint64_t *); + +struct dmu_replay_record; + int lzc_receive(const char *, nvlist_t *, const char *, boolean_t, int); int lzc_receive_resumable(const char *, nvlist_t *, const char *, boolean_t, int); -int lzc_send_space(const char *, const char *, uint64_t *); +int lzc_receive_with_header(const char *, nvlist_t *, const char *, boolean_t, + boolean_t, int, const struct dmu_replay_record *); boolean_t lzc_exists(const char *); Modified: projects/clang390-import/contrib/bsnmp/lib/snmpagent.c ============================================================================== --- projects/clang390-import/contrib/bsnmp/lib/snmpagent.c Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/contrib/bsnmp/lib/snmpagent.c Thu Nov 10 22:12:19 2016 (r308491) @@ -171,7 +171,10 @@ snmp_pdu_create_response(const struct sn memset(resp, 0, sizeof(*resp)); strcpy(resp->community, pdu->community); resp->version = pdu->version; - resp->type = SNMP_PDU_RESPONSE; + if (pdu->flags & SNMP_MSG_AUTODISCOVER) + resp->type = SNMP_PDU_REPORT; /* RFC 3414.4 */ + else + resp->type = SNMP_PDU_RESPONSE; resp->request_id = pdu->request_id; resp->version = pdu->version; Modified: projects/clang390-import/contrib/elftoolchain/cxxfilt/cxxfilt.c ============================================================================== --- projects/clang390-import/contrib/elftoolchain/cxxfilt/cxxfilt.c Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/contrib/elftoolchain/cxxfilt/cxxfilt.c Thu Nov 10 22:12:19 2016 (r308491) @@ -188,6 +188,8 @@ main(int argc, char **argv) if (c == EOF) break; putchar(c); + if (c == '\n') + fflush(stdout); } else { if ((size_t) p >= sizeof(buf) - 1) warnx("buffer overflowed"); Modified: projects/clang390-import/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 ============================================================================== --- projects/clang390-import/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 Thu Nov 10 22:12:19 2016 (r308491) @@ -82,6 +82,7 @@ Known descriptor names and their propert .It Li elf32-shbig-linux Ta ELF Ta MSB Ta 32 .It Li elf32-shl-linux Ta ELF Ta LSB Ta 32 .It Li elf32-sparc Ta ELF Ta MSB Ta 32 +.It Li elf32-tradbigmips Ta ELF Ta MSB Ta 32 .It Li elf64-alpha Ta ELF Ta LSB Ta 64 .It Li elf64-alpha-freebsd Ta ELF Ta LSB Ta 64 .It Li elf64-big Ta ELF Ta MSB Ta 64 @@ -101,6 +102,7 @@ Known descriptor names and their propert .It Li elf64-sh64-linux Ta ELF Ta LSB Ta 64 .It Li elf64-sparc Ta ELF Ta MSB Ta 64 .It Li elf64-sparc-freebsd Ta ELF Ta MSB Ta 64 +.It Li elf64-tradbigmips Ta ELF Ta MSB Ta 64 .It Li elf64-x86-64 Ta ELF Ta LSB Ta 64 .It Li elf64-x86-64-freebsd Ta ELF Ta LSB Ta 64 .It Li ihex Ta IHEX Ta - Ta - Modified: projects/clang390-import/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c ============================================================================== --- projects/clang390-import/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c Thu Nov 10 22:12:19 2016 (r308491) @@ -195,6 +195,14 @@ struct _Elftc_Bfd_Target _libelftc_targe }, { + .bt_name = "elf32-tradbigmips", + .bt_type = ETF_ELF, + .bt_byteorder = ELFDATA2MSB, + .bt_elfclass = ELFCLASS32, + .bt_machine = EM_MIPS, + }, + + { .bt_name = "elf64-alpha", .bt_type = ETF_ELF, .bt_byteorder = ELFDATA2LSB, @@ -351,6 +359,14 @@ struct _Elftc_Bfd_Target _libelftc_targe }, { + .bt_name = "elf64-tradbigmips", + .bt_type = ETF_ELF, + .bt_byteorder = ELFDATA2MSB, + .bt_elfclass = ELFCLASS64, + .bt_machine = EM_MIPS, + }, + + { .bt_name = "elf64-x86-64", .bt_type = ETF_ELF, .bt_byteorder = ELFDATA2LSB, Modified: projects/clang390-import/contrib/file/ChangeLog ============================================================================== --- projects/clang390-import/contrib/file/ChangeLog Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/contrib/file/ChangeLog Thu Nov 10 22:12:19 2016 (r308491) @@ -1,3 +1,32 @@ +2016-10-25 10:40 Christos Zoulas <christos@zoulas.com> + + * release 5.28 + +2016-10-24 11:20 Christos Zoulas <christos@zoulas.com> + + * der getlength overflow (Jonas Wagner) + * multiple magic file load failure (Christoph Biedl) + +2016-10-17 11:26 Christos Zoulas <christos@zoulas.com> + + * CDF parsing improvements (Guy Helmer) + +2016-07-20 7:26 Christos Zoulas <christos@zoulas.com> + + * Add support for signed indirect offsets + +2016-07-18 7:41 Christos Zoulas <christos@zoulas.com> + + * cat /dev/null | file - should print empty (Christoph Biedl) + +2016-07-05 15:20 Christos Zoulas <christos@zoulas.com> + + * Bump string size from 64 to 96. + +2016-06-13 20:20 Christos Zoulas <christos@zoulas.com> + + * PR/556: Fix separators on annotations. + 2016-06-13 19:40 Christos Zoulas <christos@zoulas.com> * release 5.28 Modified: projects/clang390-import/contrib/file/TODO ============================================================================== --- projects/clang390-import/contrib/file/TODO Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/contrib/file/TODO Thu Nov 10 22:12:19 2016 (r308491) @@ -6,7 +6,6 @@ file, not here. More speculative materia listed in the BUGS section of the man page had been fixed!) --- - It would be nice to simplify file considerably. For example, reimplement the apprentice and non-pattern magic methods in Python, and compile the magic patterns to a giant regex (or something similar; @@ -15,8 +14,23 @@ small amount of C is needed (because fas required for soft magic, not the more detailed information given by hard-wired routines). In this regard, note that hplip, which is BSD-licensed, has a magic reimplementation in Python. - +--- Read the kerberos magic entry for more ideas. - +--- Write a string merger to make magic entry sizes dynamic. Strings will be converted to offsets from the string table. +--- +Programming language support, we can introduce the concept of a group +of rules where n rules need to match before the rule is positive. This +could require structural changes to the matching code :-( + +0 group 2 # require 2 matches +# rule 1 +>0 .... +... +# rule 2 +>0 .... +... + +christos + Modified: projects/clang390-import/contrib/file/config.guess ============================================================================== --- projects/clang390-import/contrib/file/config.guess Thu Nov 10 20:51:26 2016 (r308490) +++ projects/clang390-import/contrib/file/config.guess Thu Nov 10 22:12:19 2016 (r308491) @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2015-03-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ timestamp='2012-02-10' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to <config-patches@gnu.org> and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches to <config-patches@gnu.org>. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include <features.h> + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -153,20 +168,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) + arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -182,6 +204,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -198,7 +227,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` @@ -302,7 +335,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -560,8 +593,9 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -801,10 +835,13 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -852,21 +889,21 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +916,57 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +985,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1245,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1274,31 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1256,7 +1315,7 @@ EOF NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,157 +1389,6 @@ EOF exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c <<EOF -#ifdef _SEQUENT_ -# include <sys/types.h> -# include <sys/utsname.h> -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include <sys/param.h> - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include <sys/param.h> -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611102212.uAAMCKeh068658>