Date: Tue, 16 May 2017 19:54:48 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r318381 - in projects/clang500-import: . bin/dd bin/sh bin/sh/tests/builtins contrib/atf/atf-c/detail contrib/binutils/gas/config contrib/bmake contrib/bmake/mk contrib/bmake/mk/sys con... Message-ID: <201705161954.v4GJsmJD001653@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Tue May 16 19:54:47 2017 New Revision: 318381 URL: https://svnweb.freebsd.org/changeset/base/318381 Log: Merge ^/head r317971 through r318379. Added: projects/clang500-import/bin/sh/tests/builtins/case21.0 - copied unchanged from r318379, head/bin/sh/tests/builtins/case21.0 projects/clang500-import/bin/sh/tests/builtins/case22.0 - copied unchanged from r318379, head/bin/sh/tests/builtins/case22.0 projects/clang500-import/contrib/bmake/mk/files.mk - copied unchanged from r318379, head/contrib/bmake/mk/files.mk projects/clang500-import/contrib/libxo/libxo/xo_options.7 - copied unchanged from r318379, head/contrib/libxo/libxo/xo_options.7 projects/clang500-import/etc/newsyslog.conf.d/amd.conf - copied unchanged from r318379, head/etc/newsyslog.conf.d/amd.conf projects/clang500-import/etc/newsyslog.conf.d/ftp.conf - copied unchanged from r318379, head/etc/newsyslog.conf.d/ftp.conf projects/clang500-import/etc/newsyslog.conf.d/lpr.conf - copied unchanged from r318379, head/etc/newsyslog.conf.d/lpr.conf projects/clang500-import/etc/newsyslog.conf.d/pf.conf - copied unchanged from r318379, head/etc/newsyslog.conf.d/pf.conf projects/clang500-import/etc/newsyslog.conf.d/ppp.conf - copied unchanged from r318379, head/etc/newsyslog.conf.d/ppp.conf projects/clang500-import/etc/newsyslog.conf.d/sendmail.conf - copied unchanged from r318379, head/etc/newsyslog.conf.d/sendmail.conf projects/clang500-import/etc/syslog.d/ - copied from r318379, head/etc/syslog.d/ projects/clang500-import/lib/libstand/ip.c - copied unchanged from r318379, head/lib/libstand/ip.c projects/clang500-import/lib/libzstd/Makefile.depend - copied unchanged from r318379, head/lib/libzstd/Makefile.depend projects/clang500-import/sbin/decryptcore/Makefile.depend - copied unchanged from r318379, head/sbin/decryptcore/Makefile.depend projects/clang500-import/share/doc/pjdfstest/Makefile.depend - copied unchanged from r318379, head/share/doc/pjdfstest/Makefile.depend projects/clang500-import/sys/dev/acpica/acpi_container.c - copied unchanged from r318379, head/sys/dev/acpica/acpi_container.c projects/clang500-import/sys/dev/hyperv/vmbus/vmbus_res.c - copied unchanged from r318379, head/sys/dev/hyperv/vmbus/vmbus_res.c projects/clang500-import/sys/dev/iwm/if_iwm_constants.h - copied unchanged from r318379, head/sys/dev/iwm/if_iwm_constants.h projects/clang500-import/sys/dev/iwm/if_iwm_sta.c - copied unchanged from r318379, head/sys/dev/iwm/if_iwm_sta.c projects/clang500-import/sys/dev/iwm/if_iwm_sta.h - copied unchanged from r318379, head/sys/dev/iwm/if_iwm_sta.h projects/clang500-import/sys/modules/dtb/mv/ - copied from r318379, head/sys/modules/dtb/mv/ projects/clang500-import/sys/modules/tests/Makefile - copied unchanged from r318379, head/sys/modules/tests/Makefile projects/clang500-import/usr.bin/getaddrinfo/Makefile.depend - copied unchanged from r318379, head/usr.bin/getaddrinfo/Makefile.depend projects/clang500-import/usr.bin/procstat/tests/ - copied from r318379, head/usr.bin/procstat/tests/ projects/clang500-import/usr.bin/zstd/Makefile.depend - copied unchanged from r318379, head/usr.bin/zstd/Makefile.depend projects/clang500-import/usr.sbin/prometheus_sysctl_exporter/Makefile.depend - copied unchanged from r318379, head/usr.sbin/prometheus_sysctl_exporter/Makefile.depend Modified: projects/clang500-import/Makefile.inc1 projects/clang500-import/Makefile.libcompat projects/clang500-import/README projects/clang500-import/bin/dd/Makefile.depend projects/clang500-import/bin/sh/expand.c projects/clang500-import/bin/sh/tests/builtins/Makefile projects/clang500-import/contrib/atf/atf-c/detail/process_test.c projects/clang500-import/contrib/binutils/gas/config/tc-arm.c projects/clang500-import/contrib/bmake/ChangeLog projects/clang500-import/contrib/bmake/Makefile projects/clang500-import/contrib/bmake/main.c projects/clang500-import/contrib/bmake/mk/ChangeLog projects/clang500-import/contrib/bmake/mk/FILES projects/clang500-import/contrib/bmake/mk/dirdeps.mk projects/clang500-import/contrib/bmake/mk/doc.mk projects/clang500-import/contrib/bmake/mk/final.mk projects/clang500-import/contrib/bmake/mk/inc.mk projects/clang500-import/contrib/bmake/mk/init.mk projects/clang500-import/contrib/bmake/mk/install-mk projects/clang500-import/contrib/bmake/mk/lib.mk projects/clang500-import/contrib/bmake/mk/meta2deps.py projects/clang500-import/contrib/bmake/mk/own.mk projects/clang500-import/contrib/bmake/mk/prog.mk projects/clang500-import/contrib/bmake/mk/scripts.mk projects/clang500-import/contrib/bmake/mk/sys/AIX.mk projects/clang500-import/contrib/bmake/mk/sys/Darwin.mk projects/clang500-import/contrib/bmake/mk/sys/Generic.mk projects/clang500-import/contrib/bmake/mk/sys/HP-UX.mk projects/clang500-import/contrib/bmake/mk/sys/IRIX.mk projects/clang500-import/contrib/bmake/mk/sys/Linux.mk projects/clang500-import/contrib/bmake/mk/sys/NetBSD.mk projects/clang500-import/contrib/bmake/mk/sys/OSF1.mk projects/clang500-import/contrib/bmake/mk/sys/OpenBSD.mk projects/clang500-import/contrib/bmake/mk/sys/SunOS.mk projects/clang500-import/contrib/bmake/mk/sys/UnixWare.mk projects/clang500-import/contrib/bmake/parse.c projects/clang500-import/contrib/bmake/str.c projects/clang500-import/contrib/gcc/config/arm/libgcc-bpabi.ver projects/clang500-import/contrib/gcc/config/arm/libunwind-arm.S projects/clang500-import/contrib/gcc/libgcc-std.ver projects/clang500-import/contrib/ipfilter/lib/ipf_perror.c projects/clang500-import/contrib/ipfilter/lib/printhash_live.c projects/clang500-import/contrib/ipfilter/lib/printhashnode.c projects/clang500-import/contrib/ipfilter/lib/printpoolnode.c projects/clang500-import/contrib/ipfilter/tools/ippool.c projects/clang500-import/contrib/libarchive/cpio/test/test_option_lz4.c projects/clang500-import/contrib/libxo/configure.ac projects/clang500-import/contrib/libxo/doc/Makefile.am projects/clang500-import/contrib/libxo/doc/libxo-manual.html projects/clang500-import/contrib/libxo/doc/libxo.txt projects/clang500-import/contrib/libxo/libxo/Makefile.am projects/clang500-import/contrib/libxo/libxo/libxo.c projects/clang500-import/contrib/libxo/libxo/xo.h projects/clang500-import/contrib/libxo/libxo/xo_buf.h projects/clang500-import/contrib/libxo/libxo/xo_encoder.c projects/clang500-import/contrib/libxo/libxo/xo_format.5 projects/clang500-import/contrib/libxo/libxo/xo_syslog.c projects/clang500-import/contrib/libxo/tests/core/saved/test_01.E.out projects/clang500-import/contrib/libxo/tests/core/saved/test_01.J.out projects/clang500-import/contrib/libxo/tests/core/saved/test_01.JP.out projects/clang500-import/contrib/libxo/tests/core/saved/test_01.X.out projects/clang500-import/contrib/libxo/tests/core/saved/test_01.XP.out projects/clang500-import/contrib/libxo/tests/core/saved/test_10.X.out projects/clang500-import/contrib/libxo/tests/core/saved/test_10.XP.out projects/clang500-import/contrib/libxo/tests/core/saved/test_11.X.out projects/clang500-import/contrib/libxo/tests/core/saved/test_11.XP.out projects/clang500-import/contrib/libxo/tests/core/test_01.c projects/clang500-import/contrib/libxo/tests/gettext/saved/gt_01.J.out projects/clang500-import/contrib/libxo/tests/gettext/saved/gt_01.JP.out projects/clang500-import/contrib/libxo/xo/xo.c projects/clang500-import/contrib/netbsd-tests/lib/libc/gen/t_realpath.c projects/clang500-import/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh projects/clang500-import/contrib/netbsd-tests/lib/libc/sys/t_wait.c projects/clang500-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh projects/clang500-import/crypto/openssh/auth-pam.c projects/clang500-import/crypto/openssh/auth.c projects/clang500-import/crypto/openssh/auth1.c projects/clang500-import/crypto/openssh/auth2.c projects/clang500-import/crypto/openssh/blacklist.c projects/clang500-import/crypto/openssh/blacklist_client.h projects/clang500-import/crypto/openssh/packet.c projects/clang500-import/crypto/openssh/sshd.c projects/clang500-import/etc/Makefile projects/clang500-import/etc/mtree/BSD.tests.dist projects/clang500-import/etc/newsyslog.conf projects/clang500-import/etc/newsyslog.conf.d/Makefile projects/clang500-import/etc/syslog.conf projects/clang500-import/lib/libbsnmp/libbsnmp/Makefile.depend projects/clang500-import/lib/libc/gen/getusershell.c projects/clang500-import/lib/libc/stdlib/realpath.c projects/clang500-import/lib/libc/sys/open.2 projects/clang500-import/lib/libmt/mtlib.c projects/clang500-import/lib/libstand/Makefile projects/clang500-import/lib/libstand/net.h projects/clang500-import/lib/libstand/nfs.c projects/clang500-import/lib/libstand/rarp.c projects/clang500-import/lib/libstand/udp.c projects/clang500-import/lib/libsysdecode/Makefile.depend projects/clang500-import/lib/libthr/thread/thr_mutex.c projects/clang500-import/lib/libxo/Makefile projects/clang500-import/lib/libxo/add.man projects/clang500-import/lib/libxo/xo_config.h projects/clang500-import/lib/msun/src/catrig.c projects/clang500-import/lib/msun/src/catrigf.c projects/clang500-import/lib/msun/src/catrigl.c projects/clang500-import/libexec/dma/dma-mbox-create/Makefile.depend projects/clang500-import/libexec/rtld-elf/map_object.c projects/clang500-import/libexec/rtld-elf/rtld.c projects/clang500-import/release/scripts/atlas-upload.sh projects/clang500-import/rescue/rescue/Makefile.depend projects/clang500-import/sbin/dumpon/Makefile.depend projects/clang500-import/sbin/hastctl/Makefile.depend projects/clang500-import/sbin/hastd/Makefile.depend projects/clang500-import/sbin/ifconfig/af_link.c projects/clang500-import/sbin/newfs_msdos/mkfs_msdos.c projects/clang500-import/sbin/newfs_msdos/mkfs_msdos.h projects/clang500-import/sbin/newfs_msdos/newfs_msdos.8 projects/clang500-import/sbin/newfs_msdos/newfs_msdos.c projects/clang500-import/secure/lib/libssh/Makefile projects/clang500-import/share/man/man4/Makefile projects/clang500-import/share/man/man4/bnxt.4 projects/clang500-import/share/man/man4/bytgpio.4 projects/clang500-import/share/man/man4/cxgbev.4 projects/clang500-import/share/man/man4/jedec_ts.4 projects/clang500-import/share/man/man4/qlnxe.4 projects/clang500-import/share/man/man4/u3g.4 projects/clang500-import/share/man/man4/uark.4 projects/clang500-import/share/man/man4/uart.4 projects/clang500-import/share/man/man4/ubsa.4 projects/clang500-import/share/man/man4/ubser.4 projects/clang500-import/share/man/man4/uchcom.4 projects/clang500-import/share/man/man4/ucom.4 projects/clang500-import/share/man/man4/ucycom.4 projects/clang500-import/share/man/man4/uftdi.4 projects/clang500-import/share/man/man4/uipaq.4 projects/clang500-import/share/man/man4/umcs.4 projects/clang500-import/share/man/man4/umct.4 projects/clang500-import/share/man/man4/umodem.4 projects/clang500-import/share/man/man4/umoscom.4 projects/clang500-import/share/man/man4/uplcom.4 projects/clang500-import/share/man/man4/uslcom.4 projects/clang500-import/share/man/man4/uvisor.4 projects/clang500-import/share/man/man4/uvscom.4 projects/clang500-import/share/man/man7/build.7 projects/clang500-import/share/mk/bsd.progs.mk projects/clang500-import/share/mk/local.meta.sys.mk projects/clang500-import/share/mk/meta2deps.py projects/clang500-import/sys/amd64/acpica/acpi_wakecode.S projects/clang500-import/sys/amd64/amd64/cpu_switch.S projects/clang500-import/sys/amd64/amd64/pmap.c projects/clang500-import/sys/arm/arm/busdma_machdep-v4.c projects/clang500-import/sys/arm/arm/busdma_machdep-v6.c projects/clang500-import/sys/arm/arm/pmap-v6.c projects/clang500-import/sys/arm/conf/ARMADA38X projects/clang500-import/sys/arm/include/pmap-v6.h projects/clang500-import/sys/arm/mv/armada38x/files.armada38x projects/clang500-import/sys/arm/mv/mv_common.c projects/clang500-import/sys/arm/mv/mvwin.h projects/clang500-import/sys/arm64/arm64/busdma_bounce.c projects/clang500-import/sys/arm64/include/armreg.h projects/clang500-import/sys/arm64/include/vm.h projects/clang500-import/sys/boot/efi/loader/main.c projects/clang500-import/sys/boot/i386/loader/Makefile.depend projects/clang500-import/sys/boot/i386/pxeldr/pxeboot.8 projects/clang500-import/sys/boot/i386/zfsloader/Makefile.depend projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/clang500-import/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c projects/clang500-import/sys/cddl/dev/fbt/powerpc/fbt_isa.c projects/clang500-import/sys/cddl/dev/profile/profile.c projects/clang500-import/sys/compat/linuxkpi/common/src/linux_rcu.c projects/clang500-import/sys/conf/files projects/clang500-import/sys/conf/files.amd64 projects/clang500-import/sys/conf/files.i386 projects/clang500-import/sys/conf/kern.opts.mk projects/clang500-import/sys/conf/kern.post.mk projects/clang500-import/sys/conf/kern.pre.mk projects/clang500-import/sys/dev/acpica/acpi_pcib_acpi.c projects/clang500-import/sys/dev/bnxt/if_bnxt.c projects/clang500-import/sys/dev/cxgbe/adapter.h projects/clang500-import/sys/dev/cxgbe/t4_main.c projects/clang500-import/sys/dev/cxgbe/t4_sge.c projects/clang500-import/sys/dev/dpaa/if_dtsec_rm.c projects/clang500-import/sys/dev/e1000/e1000_ich8lan.c projects/clang500-import/sys/dev/hyperv/vmbus/vmbus.c projects/clang500-import/sys/dev/iwm/if_iwm.c projects/clang500-import/sys/dev/iwm/if_iwm_7000.c projects/clang500-import/sys/dev/iwm/if_iwm_8000.c projects/clang500-import/sys/dev/iwm/if_iwm_binding.c projects/clang500-import/sys/dev/iwm/if_iwm_binding.h projects/clang500-import/sys/dev/iwm/if_iwm_fw.c projects/clang500-import/sys/dev/iwm/if_iwm_led.c projects/clang500-import/sys/dev/iwm/if_iwm_mac_ctxt.c projects/clang500-import/sys/dev/iwm/if_iwm_mac_ctxt.h projects/clang500-import/sys/dev/iwm/if_iwm_notif_wait.c projects/clang500-import/sys/dev/iwm/if_iwm_pcie_trans.c projects/clang500-import/sys/dev/iwm/if_iwm_phy_ctxt.c projects/clang500-import/sys/dev/iwm/if_iwm_phy_db.c projects/clang500-import/sys/dev/iwm/if_iwm_power.c projects/clang500-import/sys/dev/iwm/if_iwm_power.h projects/clang500-import/sys/dev/iwm/if_iwm_scan.c projects/clang500-import/sys/dev/iwm/if_iwm_time_event.c projects/clang500-import/sys/dev/iwm/if_iwm_time_event.h projects/clang500-import/sys/dev/iwm/if_iwm_util.c projects/clang500-import/sys/dev/iwm/if_iwm_util.h projects/clang500-import/sys/dev/iwm/if_iwmreg.h projects/clang500-import/sys/dev/iwm/if_iwmvar.h projects/clang500-import/sys/dev/mpr/mpr_sas.c projects/clang500-import/sys/dev/mps/mps_sas.c projects/clang500-import/sys/dev/qlnx/qlnxe/ecore_dev.c projects/clang500-import/sys/dev/qlxgbe/ql_isr.c projects/clang500-import/sys/dev/qlxgbe/ql_os.c projects/clang500-import/sys/dev/sdhci/sdhci.c projects/clang500-import/sys/dev/sdhci/sdhci.h projects/clang500-import/sys/dev/sdhci/sdhci_acpi.c projects/clang500-import/sys/dev/sdhci/sdhci_fdt.c projects/clang500-import/sys/dev/sdhci/sdhci_pci.c projects/clang500-import/sys/dev/usb/controller/xhci_pci.c projects/clang500-import/sys/dev/vt/vt_core.c projects/clang500-import/sys/fs/nfsclient/nfs_clcomsubs.c projects/clang500-import/sys/kern/kern_sig.c projects/clang500-import/sys/kern/subr_kobj.c projects/clang500-import/sys/kern/vfs_subr.c projects/clang500-import/sys/mips/include/cpuinfo.h projects/clang500-import/sys/mips/include/frame.h projects/clang500-import/sys/mips/include/md_var.h projects/clang500-import/sys/mips/include/regnum.h projects/clang500-import/sys/mips/mips/busdma_machdep.c projects/clang500-import/sys/mips/mips/cpu.c projects/clang500-import/sys/mips/mips/pm_machdep.c projects/clang500-import/sys/mips/mips/swtch.S projects/clang500-import/sys/modules/Makefile projects/clang500-import/sys/modules/hyperv/vmbus/Makefile projects/clang500-import/sys/modules/iwm/Makefile projects/clang500-import/sys/modules/mmcsd/Makefile projects/clang500-import/sys/net/ieee8023ad_lacp.c projects/clang500-import/sys/net/if.c projects/clang500-import/sys/net/if_ethersubr.c projects/clang500-import/sys/net/if_media.h projects/clang500-import/sys/net/if_var.h projects/clang500-import/sys/net/iflib.c projects/clang500-import/sys/netinet/in_mcast.c projects/clang500-import/sys/netinet/in_pcb.c projects/clang500-import/sys/netinet/in_pcb.h projects/clang500-import/sys/netinet/ip_divert.c projects/clang500-import/sys/netinet/libalias/alias.c projects/clang500-import/sys/netinet/raw_ip.c projects/clang500-import/sys/netinet/tcp_reass.c projects/clang500-import/sys/netinet/tcp_subr.c projects/clang500-import/sys/netinet/udp_usrreq.c projects/clang500-import/sys/netinet6/in6_mcast.c projects/clang500-import/sys/netinet6/ip6_output.c projects/clang500-import/sys/opencrypto/criov.c projects/clang500-import/sys/opencrypto/cryptodev.h projects/clang500-import/sys/powerpc/booke/trap_subr.S projects/clang500-import/sys/powerpc/include/pmap.h projects/clang500-import/sys/powerpc/powerpc/bus_machdep.c projects/clang500-import/sys/powerpc/powerpc/pmap_dispatch.c projects/clang500-import/sys/sys/kobj.h projects/clang500-import/sys/sys/proc.h projects/clang500-import/sys/sys/sockio.h projects/clang500-import/sys/tests/callout_test/callout_test.c projects/clang500-import/sys/tests/framework/kern_testfrwk.c projects/clang500-import/sys/x86/acpica/acpi_wakeup.c projects/clang500-import/sys/x86/x86/busdma_bounce.c projects/clang500-import/targets/pseudo/clang/Makefile.depend projects/clang500-import/targets/pseudo/userland/Makefile.depend projects/clang500-import/targets/pseudo/userland/share/Makefile.depend projects/clang500-import/tests/sys/aio/aio_test.c projects/clang500-import/tests/sys/aio/local.h projects/clang500-import/tests/sys/kern/ptrace_test.c projects/clang500-import/tools/build/mk/OptionalObsoleteFiles.inc projects/clang500-import/tools/build/options/makeman projects/clang500-import/usr.bin/bmake/Makefile projects/clang500-import/usr.bin/fold/Makefile.depend projects/clang500-import/usr.bin/getconf/fake-gperf.awk projects/clang500-import/usr.bin/grep/Makefile.depend projects/clang500-import/usr.bin/grep/grep.c projects/clang500-import/usr.bin/grep/grep.h projects/clang500-import/usr.bin/grep/queue.c projects/clang500-import/usr.bin/grep/util.c projects/clang500-import/usr.bin/hexdump/Makefile.depend projects/clang500-import/usr.bin/iconv/Makefile.depend projects/clang500-import/usr.bin/ident/Makefile.depend projects/clang500-import/usr.bin/ktrdump/Makefile.depend projects/clang500-import/usr.bin/lam/Makefile.depend projects/clang500-import/usr.bin/last/Makefile.depend projects/clang500-import/usr.bin/localedef/localedef.c projects/clang500-import/usr.bin/localedef/localedef.h projects/clang500-import/usr.bin/localedef/wide.c projects/clang500-import/usr.bin/ministat/Makefile.depend projects/clang500-import/usr.bin/mkimg/mkimg.1 projects/clang500-import/usr.bin/mkimg/mkimg.c projects/clang500-import/usr.bin/mkuzip/mkuzip.c projects/clang500-import/usr.bin/mt/mt.1 projects/clang500-import/usr.bin/pom/Makefile.depend projects/clang500-import/usr.bin/procstat/Makefile projects/clang500-import/usr.bin/procstat/procstat.1 projects/clang500-import/usr.bin/resizewin/resizewin.1 projects/clang500-import/usr.bin/uniq/uniq.1 projects/clang500-import/usr.bin/uniq/uniq.c projects/clang500-import/usr.bin/xo/Makefile projects/clang500-import/usr.sbin/amd/amq/Makefile.depend projects/clang500-import/usr.sbin/amd/fixmount/Makefile.depend projects/clang500-import/usr.sbin/amd/fsinfo/Makefile.depend projects/clang500-import/usr.sbin/amd/hlfsd/Makefile.depend projects/clang500-import/usr.sbin/amd/libamu/Makefile.depend projects/clang500-import/usr.sbin/amd/mk-amd-map/Makefile.depend projects/clang500-import/usr.sbin/amd/pawd/Makefile.depend projects/clang500-import/usr.sbin/amd/wire-test/Makefile.depend projects/clang500-import/usr.sbin/arp/Makefile.depend projects/clang500-import/usr.sbin/bhyve/Makefile.depend projects/clang500-import/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend projects/clang500-import/usr.sbin/mountd/mountd.c projects/clang500-import/usr.sbin/pw/pw_user.c projects/clang500-import/usr.sbin/rpc.statd/Makefile.depend projects/clang500-import/usr.sbin/traceroute/Makefile.depend Directory Properties: projects/clang500-import/ (props changed) projects/clang500-import/contrib/atf/ (props changed) projects/clang500-import/contrib/binutils/ (props changed) projects/clang500-import/contrib/bmake/ (props changed) projects/clang500-import/contrib/gcc/ (props changed) projects/clang500-import/contrib/ipfilter/ (props changed) projects/clang500-import/contrib/libarchive/ (props changed) projects/clang500-import/contrib/libxo/ (props changed) projects/clang500-import/contrib/netbsd-tests/ (props changed) projects/clang500-import/crypto/openssh/ (props changed) projects/clang500-import/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/clang500-import/Makefile.inc1 ============================================================================== --- projects/clang500-import/Makefile.inc1 Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/Makefile.inc1 Tue May 16 19:54:47 2017 (r318381) @@ -302,6 +302,11 @@ CLEANDIR= clean cleandepend CLEANDIR= cleandir .endif +.if defined(WORLDFAST) +NO_CLEAN= t +NO_OBJ= t +.endif + .if ${MK_META_MODE} == "yes" # If filemon is used then we can rely on the build being incremental-safe. # The .meta files will also track the build command and rebuild should @@ -310,6 +315,13 @@ CLEANDIR= cleandir NO_CLEAN= t .endif .endif +.if defined(NO_OBJ) || ${MK_AUTO_OBJ} == "yes" +NO_OBJ= t +NO_KERNELOBJ= t +.endif +.if !defined(NO_OBJ) +_obj= obj +.endif LOCAL_TOOL_DIRS?= PACKAGEDIR?= ${DESTDIR}/${DISTDIR} @@ -824,13 +836,22 @@ everything: .PHONY ${_+_}cd ${.CURDIR}; _PARALLEL_SUBDIR_OK=1 ${WMAKE} all WMAKE_TGTS= +.if !defined(WORLDFAST) WMAKE_TGTS+= _worldtmp _legacy .if empty(SUBDIR_OVERRIDE) WMAKE_TGTS+= _bootstrap-tools .endif -WMAKE_TGTS+= _cleanobj _obj _build-tools _cross-tools +WMAKE_TGTS+= _cleanobj +.if !defined(NO_OBJ) +WMAKE_TGTS+= _obj +.endif +WMAKE_TGTS+= _build-tools _cross-tools WMAKE_TGTS+= _compiler-metadata -WMAKE_TGTS+= _includes _libraries +WMAKE_TGTS+= _includes +.endif +.if !defined(NO_LIBS) +WMAKE_TGTS+= _libraries +.endif WMAKE_TGTS+= everything .if defined(LIBCOMPAT) && empty(SUBDIR_OVERRIDE) WMAKE_TGTS+= build${libcompat} @@ -1610,7 +1631,7 @@ legacy: .PHONY .for _tool in tools/build ${_elftoolchain_libs} ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,all,install)"; \ cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ + if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \ ${MAKE} DIRPRFX=${_tool}/ MK_INCLUDES=no all; \ ${MAKE} DIRPRFX=${_tool}/ MK_INCLUDES=no \ @@ -1766,7 +1787,7 @@ bootstrap-tools: .PHONY ${_bt}-${_tool}: .PHONY .MAKE ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ + if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install @@ -1805,7 +1826,7 @@ _rescue=rescue/rescue build-tools_${_tool}: .PHONY ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \ cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ + if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ ${MAKE} DIRPRFX=${_tool}/ build-tools build-tools: build-tools_${_tool} .endfor @@ -1814,7 +1835,7 @@ build-tools: build-tools_${_tool} build-tools_${_tool}: .PHONY ${_+_}@${ECHODIR} "===> ${_tool} (obj,all)"; \ cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ + if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ ${MAKE} DIRPRFX=${_tool}/ all build-tools: build-tools_${_tool} .endfor @@ -1899,7 +1920,7 @@ cross-tools: .MAKE .PHONY ${_usb_tools} ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ + if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install .endfor @@ -1931,7 +1952,7 @@ native-xtools: .PHONY mkdir -p ${OBJTREE}/gperf_for_gcc/usr/bin ${_+_}@${ECHODIR} "===> ${_gperf} (obj,all,install)"; \ cd ${.CURDIR}/${_gperf}; \ - ${NXBMAKE} DIRPRFX=${_gperf}/ obj; \ + if [ -z "${NO_OBJ}" ]; then ${NXBMAKE} DIRPRFX=${_gperf}/ obj; fi; \ ${NXBMAKE} DIRPRFX=${_gperf}/ all; \ ${NXBMAKE} DIRPRFX=${_gperf}/ DESTDIR=${OBJTREE}/gperf_for_gcc install .endif @@ -2007,7 +2028,7 @@ native-xtools: .PHONY usr.sbin/chown ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ - ${NXBMAKE} DIRPRFX=${_tool}/ obj; \ + if [ -z "${NO_OBJ}" ]; then ${NXBMAKE} DIRPRFX=${_tool}/ obj; fi; \ ${NXBMAKE} DIRPRFX=${_tool}/ all; \ ${NXBMAKE} DIRPRFX=${_tool}/ DESTDIR=${NXBDESTDIR} install .endfor @@ -2269,7 +2290,7 @@ ${_lib}__PL: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,all,install)"; \ cd ${.CURDIR}/${_lib}; \ - ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; \ + if [ -z "${NO_OBJ}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \ ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ DIRPRFX=${_lib}/ all; \ ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ @@ -2282,7 +2303,7 @@ ${_lib}__L: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,all,install)"; \ cd ${.CURDIR}/${_lib}; \ - ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; \ + if [ -z "${NO_OBJ}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all; \ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ install .endif @@ -2609,7 +2630,7 @@ _xb-bootstrap-tools: .PHONY ${_yacc} ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ - ${CDMAKE} DIRPRFX=${_tool}/ obj; \ + if [ -z "${NO_OBJ}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ obj; fi; \ ${CDMAKE} DIRPRFX=${_tool}/ all; \ ${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install .endfor @@ -2628,7 +2649,7 @@ _xb-cross-tools: .PHONY ${_gcc} ${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,all)"; \ cd ${.CURDIR}/${_tool}; \ - ${CDMAKE} DIRPRFX=${_tool}/ obj; \ + if [ -z "${NO_OBJ}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ obj; fi; \ ${CDMAKE} DIRPRFX=${_tool}/ all .endfor Modified: projects/clang500-import/Makefile.libcompat ============================================================================== --- projects/clang500-import/Makefile.libcompat Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/Makefile.libcompat Tue May 16 19:54:47 2017 (r318381) @@ -163,7 +163,7 @@ build${libcompat}: .PHONY .endif mkdir -p ${WORLDTMP} ln -sf ${.CURDIR}/sys ${WORLDTMP} -.for _t in obj includes +.for _t in ${_obj} includes .for _dir in ${_LC_INCDIRS} ${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATWMAKE} MK_INCLUDES=yes \ DIRPRFX=${_dir}/ ${_t} @@ -180,7 +180,7 @@ build${libcompat}: .PHONY ${_+_}cd ${.CURDIR}; \ ${LIBCOMPATWMAKE} -f Makefile.inc1 -DNO_FSCHG libraries .if ${libcompat} == "32" -.for _t in obj all +.for _t in ${_obj} all ${_+_}cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIBCOMPATWMAKE} \ -DNO_FSCHG DIRPRFX=libexec/rtld-elf/ ${_t} ${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIBCOMPATWMAKE} \ Modified: projects/clang500-import/README ============================================================================== --- projects/clang500-import/README Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/README Tue May 16 19:54:47 2017 (r318381) @@ -81,4 +81,4 @@ usr.sbin System administration commands. For information on synchronizing your source tree with one or more of the FreeBSD Project's development branches, please see: - http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/synching.html + https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/updating-src.html Modified: projects/clang500-import/bin/dd/Makefile.depend ============================================================================== --- projects/clang500-import/bin/dd/Makefile.depend Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/bin/dd/Makefile.depend Tue May 16 19:54:47 2017 (r318381) @@ -8,6 +8,7 @@ DIRDEPS = \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ lib/libcompiler_rt \ Modified: projects/clang500-import/bin/sh/expand.c ============================================================================== --- projects/clang500-import/bin/sh/expand.c Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/bin/sh/expand.c Tue May 16 19:54:47 2017 (r318381) @@ -440,8 +440,15 @@ expari(const char *p, struct nodelist ** fmtstr(expdest, DIGITS(result), ARITH_FORMAT_STR, result); adj = strlen(expdest); STADJUST(adj, expdest); - if (!quoted) - reprocess(expdest - adj - stackblock(), flag, VSNORMAL, 0, dst); + /* + * If this is quoted, a '-' must not indicate a range in [...]. + * If this is not quoted, splitting may occur. + */ + if (quoted ? + result < 0 && begoff > 1 && flag & (EXP_GLOB | EXP_CASE) : + flag & EXP_SPLIT) + reprocess(expdest - adj - stackblock(), flag, VSNORMAL, quoted, + dst); return p; } Modified: projects/clang500-import/bin/sh/tests/builtins/Makefile ============================================================================== --- projects/clang500-import/bin/sh/tests/builtins/Makefile Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/bin/sh/tests/builtins/Makefile Tue May 16 19:54:47 2017 (r318381) @@ -40,6 +40,8 @@ ${PACKAGE}FILES+= case17.0 ${PACKAGE}FILES+= case18.0 ${PACKAGE}FILES+= case19.0 ${PACKAGE}FILES+= case20.0 +${PACKAGE}FILES+= case21.0 +${PACKAGE}FILES+= case22.0 ${PACKAGE}FILES+= cd1.0 ${PACKAGE}FILES+= cd2.0 ${PACKAGE}FILES+= cd3.0 Copied: projects/clang500-import/bin/sh/tests/builtins/case21.0 (from r318379, head/bin/sh/tests/builtins/case21.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang500-import/bin/sh/tests/builtins/case21.0 Tue May 16 19:54:47 2017 (r318381, copy of r318379, head/bin/sh/tests/builtins/case21.0) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +case 5 in +[0$((-9))]) ;; +*) echo bad1 ;; +esac + +case - in +[0$((-9))]) echo bad2 ;; +esac Copied: projects/clang500-import/bin/sh/tests/builtins/case22.0 (from r318379, head/bin/sh/tests/builtins/case22.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang500-import/bin/sh/tests/builtins/case22.0 Tue May 16 19:54:47 2017 (r318381, copy of r318379, head/bin/sh/tests/builtins/case22.0) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +case 5 in +[0"$((-9))"]) echo bad1 ;; +esac + +case - in +[0"$((-9))"]) ;; +*) echo bad2 ;; +esac Modified: projects/clang500-import/contrib/atf/atf-c/detail/process_test.c ============================================================================== --- projects/clang500-import/contrib/atf/atf-c/detail/process_test.c Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/atf/atf-c/detail/process_test.c Tue May 16 19:54:47 2017 (r318381) @@ -26,6 +26,9 @@ #include "atf-c/detail/process.h" #include <sys/types.h> +#ifdef __FreeBSD__ +#include <sys/sysctl.h> +#endif #include <sys/time.h> #include <sys/resource.h> #include <sys/wait.h> @@ -667,6 +670,14 @@ ATF_TC_BODY(status_coredump, tc) atf_tc_skip("Cannot unlimit the core file size; check limits " "manually"); +#ifdef __FreeBSD__ + int coredump_enabled; + size_t ce_len = sizeof(coredump_enabled); + if (sysctlbyname("kern.coredump", &coredump_enabled, &ce_len, NULL, + 0) == 0 && !coredump_enabled) + atf_tc_skip("Coredumps disabled"); +#endif + const int rawstatus = fork_and_wait_child(child_sigquit); atf_process_status_t s; RE(atf_process_status_init(&s, rawstatus)); Modified: projects/clang500-import/contrib/binutils/gas/config/tc-arm.c ============================================================================== --- projects/clang500-import/contrib/binutils/gas/config/tc-arm.c Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/binutils/gas/config/tc-arm.c Tue May 16 19:54:47 2017 (r318381) @@ -5211,12 +5211,6 @@ parse_neon_mov (char **str, int *which_o inst.operands[i].present = 1; } } - else if (parse_qfloat_immediate (&ptr, &inst.operands[i].imm) == SUCCESS) - /* Case 2: VMOV<c><q>.<dt> <Qd>, #<float-imm> - Case 3: VMOV<c><q>.<dt> <Dd>, #<float-imm> - Case 10: VMOV.F32 <Sd>, #<imm> - Case 11: VMOV.F64 <Dd>, #<imm> */ - inst.operands[i].immisfloat = 1; else if ((val = arm_typed_reg_parse (&ptr, REG_TYPE_NSDQ, &rtype, &optype)) != FAIL) { @@ -5253,9 +5247,15 @@ parse_neon_mov (char **str, int *which_o inst.operands[i].reg = val; inst.operands[i].isreg = 1; - inst.operands[i++].present = 1; + inst.operands[i].present = 1; } } + else if (parse_qfloat_immediate (&ptr, &inst.operands[i].imm) == SUCCESS) + /* Case 2: VMOV<c><q>.<dt> <Qd>, #<float-imm> + Case 3: VMOV<c><q>.<dt> <Dd>, #<float-imm> + Case 10: VMOV.F32 <Sd>, #<imm> + Case 11: VMOV.F64 <Dd>, #<imm> */ + inst.operands[i].immisfloat = 1; else if (parse_big_immediate (&ptr, i) == SUCCESS) /* Case 2: VMOV<c><q>.<dt> <Qd>, #<imm> Case 3: VMOV<c><q>.<dt> <Dd>, #<imm> */ @@ -5337,7 +5337,7 @@ parse_neon_mov (char **str, int *which_o inst.operands[i].isvec = 1; inst.operands[i].issingle = 1; inst.operands[i].vectype = optype; - inst.operands[i++].present = 1; + inst.operands[i].present = 1; } } else Modified: projects/clang500-import/contrib/bmake/ChangeLog ============================================================================== --- projects/clang500-import/contrib/bmake/ChangeLog Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/bmake/ChangeLog Tue May 16 19:54:47 2017 (r318381) @@ -1,3 +1,29 @@ +2017-05-10 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (_MAKE_VERSION): 20170510 + Merge with NetBSD make, pick up + o main.c: Main_SetObjdir: ensure buf2 is in scope + +2017-05-08 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (_MAKE_VERSION): 20170505 + see mk/ChangeLog + +2017-05-05 Simon J. Gerraty <sjg@bad.crufty.net> + + * parse.c: not everyone has stdint.h + +2017-05-01 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (_MAKE_VERSION): 20170501 + see mk/ChangeLog + +2017-04-21 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (_MAKE_VERSION): 20170421 + Merge with NetBSD make, pick up + o str.c: Str_Match: fix closure tests for [^] and add unit-test. + 2017-04-20 Simon J. Gerraty <sjg@bad.crufty.net> * Makefile (_MAKE_VERSION): 20170420 Modified: projects/clang500-import/contrib/bmake/Makefile ============================================================================== --- projects/clang500-import/contrib/bmake/Makefile Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/bmake/Makefile Tue May 16 19:54:47 2017 (r318381) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.88 2017/04/20 14:51:14 sjg Exp $ +# $Id: Makefile,v 1.92 2017/05/10 22:29:04 sjg Exp $ # Base version on src date -_MAKE_VERSION= 20170420 +_MAKE_VERSION= 20170510 PROG= bmake Modified: projects/clang500-import/contrib/bmake/main.c ============================================================================== --- projects/clang500-import/contrib/bmake/main.c Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/bmake/main.c Tue May 16 19:54:47 2017 (r318381) @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.264 2017/04/20 03:57:27 sjg Exp $ */ +/* $NetBSD: main.c,v 1.265 2017/05/10 22:26:14 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.264 2017/04/20 03:57:27 sjg Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.265 2017/05/10 22:26:14 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19 #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.264 2017/04/20 03:57:27 sjg Exp $"); +__RCSID("$NetBSD: main.c,v 1.265 2017/05/10 22:26:14 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -751,6 +751,7 @@ Main_SetObjdir(const char *fmt, ...) struct stat sb; char *path; char buf[MAXPATHLEN + 1]; + char buf2[MAXPATHLEN + 1]; Boolean rc = FALSE; va_list ap; @@ -759,8 +760,6 @@ Main_SetObjdir(const char *fmt, ...) va_end(ap); if (path[0] != '/') { - char buf2[MAXPATHLEN + 1]; - snprintf(buf2, MAXPATHLEN, "%s/%s", curdir, path); path = buf2; } Modified: projects/clang500-import/contrib/bmake/mk/ChangeLog ============================================================================== --- projects/clang500-import/contrib/bmake/mk/ChangeLog Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/bmake/mk/ChangeLog Tue May 16 19:54:47 2017 (r318381) @@ -1,3 +1,37 @@ +2017-05-08 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): 20170505 + + * meta2deps.py: fix botched indenation. + +2017-05-05 Simon J. Gerraty <sjg@bad.crufty.net> + + * sys/*.mk: Remove setting of MAKE it is unnecessary and + in many cases wrong (basname rather than full path) + + * scripts.mk (SCRIPTSGROUPS): make this more like files.mk and inc.mk + + * init.mk: define realbuild to simplify logic in {lib,prog}.mk etc + +2017-05-01 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): 20170501 + + * doc.mk: fix typo in DOC_INSTALL_OWN + + * inc.mk: handle INCGROUPS similar to freebsd + + * files.mk: add something for files too + + * add staging logic to lib.mk prog.mk etc. + +2017-04-24 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): 20170424 + + * dirdeps.mk: set NO_DIRDEPS when bootstrapping. + also target of bootstrap-this when sed is needed should be ${_want:T} + 2017-04-18 Simon J. Gerraty <sjg@bad.crufty.net> * install-mk (MK_VERSION): 20170418 Modified: projects/clang500-import/contrib/bmake/mk/FILES ============================================================================== --- projects/clang500-import/contrib/bmake/mk/FILES Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/bmake/mk/FILES Tue May 16 19:54:47 2017 (r318381) @@ -9,6 +9,7 @@ cython.mk dep.mk doc.mk dpadd.mk +files.mk final.mk host-target.mk host.libnames.mk Modified: projects/clang500-import/contrib/bmake/mk/dirdeps.mk ============================================================================== --- projects/clang500-import/contrib/bmake/mk/dirdeps.mk Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/bmake/mk/dirdeps.mk Tue May 16 19:54:47 2017 (r318381) @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.87 2017/03/07 01:49:03 sjg Exp $ +# $Id: dirdeps.mk,v 1.88 2017/04/24 20:34:59 sjg Exp $ # Copyright (c) 2010-2013, Juniper Networks, Inc. # All rights reserved. @@ -137,6 +137,14 @@ # built for. # +.if !target(bootstrap) && (make(bootstrap) || \ + make(bootstrap-this) || \ + make(bootstrap-recurse) || \ + make(bootstrap-empty)) +# disable most of below +.MAKE.LEVEL = 1 +.endif + # touch this at your peril _DIRDEP_USE_LEVEL?= 0 .if ${.MAKE.LEVEL} == ${_DIRDEP_USE_LEVEL} @@ -757,7 +765,7 @@ bootstrap-this: .NOTMAIN @echo Bootstrapping ${RELDIR}/${_want:T} from ${_src:T}; \ echo You need to build ${RELDIR} to correctly populate it. .if ${_src:T} != ${.MAKE.DEPENDFILE_PREFIX:T} - (cd ${.CURDIR} && sed ${.MAKE.DEPENDFILE_BOOTSTRAP_SED} ${_src} > ${_want}) + (cd ${.CURDIR} && sed ${.MAKE.DEPENDFILE_BOOTSTRAP_SED} ${_src} > ${_want:T}) .else cp ${.CURDIR}/${_src:T} ${_want} .endif Modified: projects/clang500-import/contrib/bmake/mk/doc.mk ============================================================================== --- projects/clang500-import/contrib/bmake/mk/doc.mk Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/bmake/mk/doc.mk Tue May 16 19:54:47 2017 (r318381) @@ -1,4 +1,4 @@ -# $Id: doc.mk,v 1.5 2015/09/08 06:15:31 sjg Exp $ +# $Id: doc.mk,v 1.6 2017/05/01 21:24:10 sjg Exp $ .if !target(__${.PARSEFILE}__) __${.PARSEFILE}__: @@ -59,7 +59,7 @@ spell: ${SRCS} .include <own.mk> .if !empty(DOCOWN) -DOC_INSTALL_OWN?= -o ${DOCOWN} -g ${DOGGRP} +DOC_INSTALL_OWN?= -o ${DOCOWN} -g ${DOCGRP} .endif .endif Copied: projects/clang500-import/contrib/bmake/mk/files.mk (from r318379, head/contrib/bmake/mk/files.mk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang500-import/contrib/bmake/mk/files.mk Tue May 16 19:54:47 2017 (r318381, copy of r318379, head/contrib/bmake/mk/files.mk) @@ -0,0 +1,83 @@ +# $Id: files.mk,v 1.6 2017/05/07 02:21:02 sjg Exp $ +# +# @(#) Copyright (c) 2017, Simon J. Gerraty +# +# This file is provided in the hope that it will +# be of use. There is absolutely NO WARRANTY. +# Permission to copy, redistribute or otherwise +# use this file is hereby granted provided that +# the above copyright notice and this notice are +# left intact. +# +# Please send copies of changes and bug-fixes to: +# sjg@crufty.net +# + +.include <init.mk> + +FILES_INSTALL_OWN ?= -o ${SHAREOWN} -g ${SHAREGRP} +FILESMODE ?= ${SHAREMODE} +FILES_COPY ?= -C + +FILESGROUPS ?= FILES +FILESGROUPS := ${FILESGROUPS:O:u} + +.if !target(buildfiles) +.for group in ${FILESGROUPS} +buildfiles: ${${group}} +.endfor +.endif +buildfiles: +realbuild: buildfiles + +# there is no default FILESDIR so +# ignore group if ${group}DIR is not defined +.for group in ${FILESGROUPS} +.if !empty(${group}) && defined(${group}DIR) +.if ${group} != "FILES" +${group}_INSTALL_OWN ?= ${FILES_INSTALL_OWN} +.endif +# incase we are staging +STAGE_DIR.${group} ?= ${STAGE_OBJTOP}${${group}DIR} + +.for file in ${${group}:O:u} +${group}_INSTALL_OWN.${file:T} ?= ${${group}_INSTALL_OWN} +${group}DIR.${file:T} ?= ${${group}DIR} +file_mkdir_list += ${${group}DIR.${file:T}} + +.if defined(${group}NAME.${file:T}) +STAGE_AS_SETS += ${group} +STAGE_AS_${file} = ${${group}NAME.${file:T}} +stage_as.${group}: ${file} + +installfiles: installfiles.${group}.${file:T} +installfiles.${group}.${file:T}: ${file} file_mkdirs + ${INSTALL} ${FILES_COPY} ${${group}_INSTALL_OWN.${file:T}} \ + -m ${FILESMODE} ${.ALLSRC:Nfile_mkdirs} ${DESTDIR}${${group}DIR}/${${group}NAME.${file:T}} + +.else +STAGE_SETS += ${group} +stage_files.${group}: ${file} +installfiles.${group}: ${file} +installfiles: installfiles.${group} +.endif + +.endfor # file + +installfiles.${group}: file_mkdirs + ${INSTALL} ${FILES_COPY} ${${group}_INSTALL_OWN} -m ${FILESMODE} \ + ${.ALLSRC:Nfile_mkdirs:O:u} ${DESTDIR}${${group}DIR} + +.endif # !empty +.endfor # group + +file_mkdirs: + @for d in ${file_mkdir_list:O:u}; do \ + test -d ${DESTDIR}$$d || \ + ${INSTALL} -d ${FILES_INSTALL_OWN} -m 775 ${DESTDIR}$$d; \ + done + +beforeinstall: +installfiles: +realinstall: installfiles +.ORDER: beforeinstall installfiles Modified: projects/clang500-import/contrib/bmake/mk/final.mk ============================================================================== --- projects/clang500-import/contrib/bmake/mk/final.mk Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/bmake/mk/final.mk Tue May 16 19:54:47 2017 (r318381) @@ -1,4 +1,4 @@ -# $Id: final.mk,v 1.6 2016/04/05 15:58:37 sjg Exp $ +# $Id: final.mk,v 1.8 2017/05/07 20:30:08 sjg Exp $ .if !target(__${.PARSEFILE}__) __${.PARSEFILE}__: @@ -6,9 +6,17 @@ __${.PARSEFILE}__: # provide a hook for folk who want to do scary stuff .-include <${.CURDIR:H}/Makefile-final.inc> -.if !empty(STAGE) +.if ${MK_STAGING} == "yes" +.include <meta.stage.mk> +.elif !empty(STAGE) .-include <stage.mk> .endif .-include <local.final.mk> + +.if empty(_SKIP_BUILD) +install: realinstall +.endif +realinstall: + .endif Modified: projects/clang500-import/contrib/bmake/mk/inc.mk ============================================================================== --- projects/clang500-import/contrib/bmake/mk/inc.mk Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/bmake/mk/inc.mk Tue May 16 19:54:47 2017 (r318381) @@ -1,4 +1,4 @@ -# $Id: inc.mk,v 1.3 2011/03/11 05:23:05 sjg Exp $ +# $Id: inc.mk,v 1.7 2017/05/06 17:29:45 sjg Exp $ # # @(#) Copyright (c) 2008, Simon J. Gerraty # @@ -15,8 +15,6 @@ .include <init.mk> -includes: ${INCS} - .if !empty(LIBOWN) INC_INSTALL_OWN ?= -o ${LIBOWN} -g ${LIBGRP} .endif @@ -24,12 +22,68 @@ INCMODE ?= 444 INC_COPY ?= -C INCSDIR ?= ${INCDIR} -realinstall: incinstall +STAGE_INCSDIR?= ${STAGE_OBJTOP}${INCSDIR} + +# accommodate folk used to freebsd +INCGROUPS ?= ${INCSGROUPS:UINCS} +INCGROUPS := ${INCGROUPS:O:u} + +.if !target(buildincludes) +.for group in ${INCGROUPS} +buildincludes: ${${group}} +.endfor +.endif +buildincludes: +includes: buildincludes + .if !target(incinstall) -incinstall: -.if !empty(INCS) - [ -d ${DESTDIR}${INCSDIR} ] || \ - ${INSTALL} -d ${INC_INSTALL_OWN} -m 775 ${DESTDIR}${INCSDIR} - ${INSTALL} ${INC_COPY} ${INC_INSTALL_OWN} -m ${INCMODE} ${INCS} ${DESTDIR}${INCSDIR} +.for group in ${INCGROUPS} +.if !empty(${group}) +.if ${group} != "INC" +${group}_INSTALL_OWN ?= ${INC_INSTALL_OWN} +${group}DIR ?= ${INCDIR} .endif +# incase we are staging +STAGE_DIR.${group} ?= ${STAGE_OBJTOP}${${group}DIR} + +.for header in ${${group}:O:u} +${group}_INSTALL_OWN.${header:T} ?= ${${group}_INSTALL_OWN} +${group}DIR.${header:T} ?= ${${group}DIR} +inc_mkdir_list += ${${group}DIR.${header:T}} + +.if defined(${group}NAME.${header:T}) +STAGE_AS_SETS += ${group} +STAGE_AS_${header} = ${${group}NAME.${header:T}} +stage_as.${group}: ${header} + +incinstall: incinstall.${group}.${header:T} +incinstall.${group}.${header:T}: ${header} inc_mkdirs + ${INSTALL} ${INC_COPY} ${${group}_INSTALL_OWN.${header:T}} -m ${INCMODE} ${.ALLSRC:Ninc_mkdirs} ${DESTDIR}${${group}DIR}/${${group}NAME.${header:T}} + +.else +STAGE_SETS += ${group} +stage_files.${group}: ${header} +incinstall.${group}: ${header} +incinstall: incinstall.${group} .endif + +.endfor # header + +incinstall.${group}: inc_mkdirs + ${INSTALL} ${INC_COPY} ${${group}_INSTALL_OWN} -m ${INCMODE} \ + ${.ALLSRC:Ninc_mkdirs:O:u} ${DESTDIR}${${group}DIR} + +.endif # !empty +.endfor # group + +inc_mkdirs: + @for d in ${inc_mkdir_list:O:u}; do \ + test -d ${DESTDIR}$$d || \ + ${INSTALL} -d ${INC_INSTALL_OWN} -m 775 ${DESTDIR}$$d; \ + done + +.endif # !target(incinstall) + +beforeinstall: +realinstall: incinstall +.ORDER: beforeinstall incinstall Modified: projects/clang500-import/contrib/bmake/mk/init.mk ============================================================================== --- projects/clang500-import/contrib/bmake/mk/init.mk Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/bmake/mk/init.mk Tue May 16 19:54:47 2017 (r318381) @@ -1,4 +1,4 @@ -# $Id: init.mk,v 1.12 2016/04/05 15:58:37 sjg Exp $ +# $Id: init.mk,v 1.15 2017/05/07 20:27:54 sjg Exp $ # # @(#) Copyright (c) 2002, Simon J. Gerraty # @@ -50,8 +50,20 @@ PROFFLAGS?= -DGPROF -DPROF _SKIP_BUILD = not building at level 0 .endif -.if !empty(_SKIP_BUILD) +.if !defined(.PARSEDIR) +# no-op is the best we can do if not bmake. +.WAIT: +.endif + +# define this once for consistency +.if empty(_SKIP_BUILD) +# beforebuild is a hook for things that must be done early +all: beforebuild .WAIT realbuild +.else all: .PHONY .warning ${_SKIP_BUILD} .endif +beforebuild: +realbuild: + .endif Modified: projects/clang500-import/contrib/bmake/mk/install-mk ============================================================================== --- projects/clang500-import/contrib/bmake/mk/install-mk Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/bmake/mk/install-mk Tue May 16 19:54:47 2017 (r318381) @@ -55,7 +55,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: install-mk,v 1.141 2017/04/18 23:53:18 sjg Exp $ +# $Id: install-mk,v 1.145 2017/05/09 04:05:32 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -70,7 +70,7 @@ # sjg@crufty.net # -MK_VERSION=20170418 +MK_VERSION=20170505 OWNER= GROUP= MODE=444 @@ -176,7 +176,7 @@ $SKIP_MKFILES Do chmod $BINMODE $mk_scri [ "$OWNER" ] && $SKIP_MKFILES Do chown $OWNER $mk_files $sys_mk_files # if this is a BSD system the bsd.*.mk should exist and be used. if [ -z "$SKIP_BSD_MK" ]; then - for f in dep doc init lib links man nls obj own prog subdir + for f in dep doc files inc init lib links man nls obj own prog subdir do b=bsd.$f.mk [ -s $b ] || Do ln -s $f.mk $b Modified: projects/clang500-import/contrib/bmake/mk/lib.mk ============================================================================== --- projects/clang500-import/contrib/bmake/mk/lib.mk Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/bmake/mk/lib.mk Tue May 16 19:54:47 2017 (r318381) @@ -1,4 +1,4 @@ -# $Id: lib.mk,v 1.55 2016/09/23 23:04:51 sjg Exp $ +# $Id: lib.mk,v 1.61 2017/05/06 17:30:09 sjg Exp $ .if !target(__${.PARSEFILE}__) __${.PARSEFILE}__: @@ -37,7 +37,7 @@ PICO?= .pico CFLAGS+= ${COPTS} -# Derrived from NetBSD-1.6 +# Originally derrived from NetBSD-1.6 # Set PICFLAGS to cc flags for producing position-independent code, # if not already set. Includes -DPIC, if required. @@ -375,15 +375,14 @@ _LIBS+=llib-l${LIB}.ln .include <dpadd.mk> .endif -.if !defined(_SKIP_BUILD) -all: prebuild .WAIT ${_LIBS} -# a hook for things that must be done early -prebuild: -.if !defined(.PARSEDIR) -# no-op is the best we can do if not bmake. -.WAIT: +.if empty(LIB) +_LIBS= .endif + +.if !defined(_SKIP_BUILD) +realbuild: ${_LIBS} .endif + all: _SUBDIRUSE .for s in ${SRCS:N*.h:M*/*} @@ -509,7 +508,7 @@ LIB_INSTALL_OWN ?= -o ${LIBOWN} -g ${LIB .include <links.mk> -.if !target(realinstall) +.if !target(realinstall) && !empty(LIB) realinstall: libinstall .endif .if !target(libinstall) @@ -552,13 +551,19 @@ libinstall: .endif .endif +.if ${MK_MAN} != "no" install: maninstall _SUBDIRUSE maninstall: afterinstall +.endif afterinstall: realinstall libinstall: beforeinstall realinstall: beforeinstall .endif +.if defined(FILES) || defined(FILESGROUPS) +.include <files.mk> +.endif + .if ${MK_MAN} != "no" .include <man.mk> .endif @@ -591,5 +596,10 @@ realinstall: beforeinstall .endfor @touch ${.TARGET} +.if !empty(LIB) +STAGE_LIBDIR?= ${STAGE_OBJTOP}${LIBDIR} +stage_libs: ${_LIBS} +.endif + .include <final.mk> .endif Modified: projects/clang500-import/contrib/bmake/mk/meta2deps.py ============================================================================== --- projects/clang500-import/contrib/bmake/mk/meta2deps.py Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/bmake/mk/meta2deps.py Tue May 16 19:54:47 2017 (r318381) @@ -37,7 +37,7 @@ We only pay attention to a subset of the """ RCSid: - $Id: meta2deps.py,v 1.25 2017/04/03 21:04:09 sjg Exp $ + $Id: meta2deps.py,v 1.26 2017/05/09 04:04:16 sjg Exp $ Copyright (c) 2011-2013, Juniper Networks, Inc. All rights reserved. @@ -142,7 +142,7 @@ def sort_unique(list, cmp=None, key=None for e in list: if e == le: continue - le = e + le = e nl.append(e) return nl @@ -534,7 +534,7 @@ class MetaFile: # to the src dir, we may need to add dependencies for each rdir = dir dir = abspath(dir, cwd, self.last_dir, self.debug, self.debug_out) - rdir = os.path.realpath(dir) + rdir = os.path.realpath(dir) if rdir == dir: rdir = None # now put path back together Modified: projects/clang500-import/contrib/bmake/mk/own.mk ============================================================================== --- projects/clang500-import/contrib/bmake/mk/own.mk Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/bmake/mk/own.mk Tue May 16 19:54:47 2017 (r318381) @@ -1,4 +1,4 @@ -# $Id: own.mk,v 1.32 2016/05/18 20:54:29 sjg Exp $ +# $Id: own.mk,v 1.35 2017/05/03 18:09:44 sjg Exp $ .if !target(__${.PARSEFILE}__) __${.PARSEFILE}__: @@ -117,6 +117,7 @@ OPTIONS_DEFAULT_DEPENDENT+= \ PICINSTALL/LINKLIB \ PICLIB/PIC \ PROFILE/LINKLIB \ + STAGING_PROG/STAGING \ .include <options.mk> @@ -128,7 +129,7 @@ _uid!= id -u USERGRP!= id -g .export USERGRP .endif -.for x in BIN CONF DOC INFO KMOD LIB MAN NLS SHARE +.for x in BIN CONF DOC INC INFO FILES KMOD LIB MAN NLS SHARE $xOWN= ${USER} $xGRP= ${USERGRP} $x_INSTALL_OWN= @@ -145,6 +146,9 @@ BINMODE?= 555 NONBINMODE?= 444 DIRMODE?= 755 +INCLUDEDIR?= ${prefix}/include +INCDIR?= ${INCLUDEDIR} + # Define MANZ to have the man pages compressed (gzip) #MANZ= 1 @@ -184,6 +188,10 @@ KMODGRP?= ${BINGRP} KMODOWN?= ${BINOWN} KMODMODE?= ${NONBINMODE} +SHAREGRP?= ${BINGRP} +SHAREOWN?= ${BINOWN} +SHAREMODE?= ${NONBINMODE} + COPY?= -c STRIP_FLAG?= -s @@ -244,4 +252,19 @@ MK_MAN= no MK_NLS= no .endif +# :U incase not using our sys.mk +.if ${MK_META_MODE:Uno} == "yes" +# should all be set by sys.mk if not default +TARGET_SPEC_VARS ?= MACHINE +.if ${TARGET_SPEC_VARS:[#]} > 1 +TARGET_SPEC_VARS_REV := ${TARGET_SPEC_VARS:[-1..1]} +.else +TARGET_SPEC_VARS_REV = ${TARGET_SPEC_VARS} +.endif +.if ${MK_STAGING} == "yes" +STAGE_ROOT?= ${OBJROOT}/stage +STAGE_OBJTOP?= ${STAGE_ROOT}/${TARGET_SPEC_VARS_REV:ts/} +.endif +.endif + .endif Modified: projects/clang500-import/contrib/bmake/mk/prog.mk ============================================================================== --- projects/clang500-import/contrib/bmake/mk/prog.mk Tue May 16 19:53:38 2017 (r318380) +++ projects/clang500-import/contrib/bmake/mk/prog.mk Tue May 16 19:54:47 2017 (r318381) @@ -1,4 +1,4 @@ -# $Id: prog.mk,v 1.28 2017/02/14 21:26:13 sjg Exp $ +# $Id: prog.mk,v 1.32 2017/05/06 17:30:09 sjg Exp $ .if !target(__${.PARSEFILE}__) __${.PARSEFILE}__: @@ -75,6 +75,8 @@ ${CXX_SUFFIXES:%=%.o}: .if defined(PROG) +BINDIR ?= ${prefix}/bin + SRCS?= ${PROG}.c .for s in ${SRCS:N*.h:N*.sh:M*/*} ${.o .po .lo:L:@o@${s:T:R}$o@}: $s @@ -126,8 +128,9 @@ MAN= ${PROG}.1 .endif # defined(PROG) .if !defined(_SKIP_BUILD) -all: ${PROG} +realbuild: ${PROG} .endif + all: _SUBDIRUSE .if !target(clean) @@ -208,6 +211,10 @@ lint: ${LOBJS} .NOPATH: ${OBJS} .endif +.if defined(FILES) || defined(FILESGROUPS) +.include <files.mk> +.endif + .if ${MK_MAN} != "no" .include <man.mk> .endif @@ -219,6 +226,20 @@ lint: ${LOBJS} .include <obj.mk> .include <dep.mk> .include <subdir.mk> + +.if !empty(PROG) && ${MK_STAGING_PROG} == "yes" +STAGE_BINDIR ?= ${STAGE_OBJTOP}${BINDIR} +STAGE_DIR.prog ?= ${STAGE_BINDIR} +.if ${PROG_NAME:U${PROG}} != ${PROG} +STAGE_AS_SETS += prog +STAGE_AS_${PROG} = ${PROG_NAME} +stage_as.prog: ${PROG} +.else +STAGE_SETS += prog +stage_files.prog: ${PROG} +.endif +.endif + .include <final.mk> .endif Modified: projects/clang500-import/contrib/bmake/mk/scripts.mk ============================================================================== --- projects/clang500-import/contrib/bmake/mk/scripts.mk Tue May 16 19:53:38 2017 (r318380) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705161954.v4GJsmJD001653>