Date: Mon, 23 May 2016 05:15:06 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r300457 - in user/alc/PQ_LAUNDRY: . bin/ed bin/sh contrib/binutils/gas/config contrib/bmake contrib/bmake/mk contrib/bmake/mk/sys contrib/elftoolchain/addr2line contrib/elftoolchain/bra... Message-ID: <201605230515.u4N5F6eA084436@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Mon May 23 05:15:06 2016 New Revision: 300457 URL: https://svnweb.freebsd.org/changeset/base/300457 Log: MFH r300451 Added: user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelftc/elftc_reloc_type_str.3 - copied unchanged from r300451, head/contrib/elftoolchain/libelftc/elftc_reloc_type_str.3 user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c - copied unchanged from r300451, head/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c user/alc/PQ_LAUNDRY/contrib/top/commands.h - copied unchanged from r300451, head/contrib/top/commands.h user/alc/PQ_LAUNDRY/contrib/top/username.h - copied unchanged from r300451, head/contrib/top/username.h user/alc/PQ_LAUNDRY/share/man/man9/bus_map_resource.9 - copied unchanged from r300451, head/share/man/man9/bus_map_resource.9 user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhndb/bhnd_bhndb.c - copied unchanged from r300451, head/sys/dev/bhnd/bhndb/bhnd_bhndb.c user/alc/PQ_LAUNDRY/sys/modules/vnic/ - copied from r300451, head/sys/modules/vnic/ user/alc/PQ_LAUNDRY/tools/build/options/WITHOUT_SYSTEM_COMPILER - copied unchanged from r300451, head/tools/build/options/WITHOUT_SYSTEM_COMPILER user/alc/PQ_LAUNDRY/tools/build/options/WITH_LIBSOFT - copied unchanged from r300451, head/tools/build/options/WITH_LIBSOFT user/alc/PQ_LAUNDRY/tools/build/options/WITH_SYSTEM_COMPILER - copied unchanged from r300451, head/tools/build/options/WITH_SYSTEM_COMPILER Deleted: user/alc/PQ_LAUNDRY/lib/libc/aarch64/sys/brk.S user/alc/PQ_LAUNDRY/lib/libc/aarch64/sys/sbrk.S Modified: user/alc/PQ_LAUNDRY/Makefile.inc1 user/alc/PQ_LAUNDRY/ObsoleteFiles.inc user/alc/PQ_LAUNDRY/UPDATING user/alc/PQ_LAUNDRY/bin/ed/cbc.c user/alc/PQ_LAUNDRY/bin/sh/parser.c user/alc/PQ_LAUNDRY/contrib/binutils/gas/config/tc-arm.c user/alc/PQ_LAUNDRY/contrib/bmake/ChangeLog user/alc/PQ_LAUNDRY/contrib/bmake/Makefile user/alc/PQ_LAUNDRY/contrib/bmake/arch.c user/alc/PQ_LAUNDRY/contrib/bmake/bmake.1 user/alc/PQ_LAUNDRY/contrib/bmake/bmake.cat1 user/alc/PQ_LAUNDRY/contrib/bmake/compat.c user/alc/PQ_LAUNDRY/contrib/bmake/job.c user/alc/PQ_LAUNDRY/contrib/bmake/main.c user/alc/PQ_LAUNDRY/contrib/bmake/make.1 user/alc/PQ_LAUNDRY/contrib/bmake/meta.c user/alc/PQ_LAUNDRY/contrib/bmake/meta.h user/alc/PQ_LAUNDRY/contrib/bmake/mk/ChangeLog user/alc/PQ_LAUNDRY/contrib/bmake/mk/auto.dep.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/autodep.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/dirdeps.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/dpadd.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/final.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/gendirdeps.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/init.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/install-mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/lib.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/libnames.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.autodep.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta.sys.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/meta2deps.py user/alc/PQ_LAUNDRY/contrib/bmake/mk/nls.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/own.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/prog.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/subdir.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys/AIX.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys/Darwin.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys/Generic.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys/HP-UX.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys/IRIX.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys/Linux.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys/NetBSD.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys/OSF1.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys/OpenBSD.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys/SunOS.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/sys/UnixWare.mk user/alc/PQ_LAUNDRY/contrib/bmake/mk/warnings.mk user/alc/PQ_LAUNDRY/contrib/bmake/parse.c user/alc/PQ_LAUNDRY/contrib/bmake/str.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/addr2line/addr2line.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/brandelf/brandelf.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/common/_elftc.h user/alc/PQ_LAUNDRY/contrib/elftoolchain/common/elfdefinitions.h user/alc/PQ_LAUNDRY/contrib/elftoolchain/cxxfilt/cxxfilt.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/elfcopy/ascii.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/elfcopy/binary.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/elfcopy/elfcopy.1 user/alc/PQ_LAUNDRY/contrib/elftoolchain/elfcopy/elfcopy.h user/alc/PQ_LAUNDRY/contrib/elftoolchain/elfcopy/main.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/elfcopy/sections.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/elfcopy/segments.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/elfcopy/symbols.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/elfdump/elfdump.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/libdwarf/libdwarf_abbrev.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/libdwarf/libdwarf_reloc.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelf/_libelf_config.h user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelf/elf_data.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelf/libelf_ar.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelf/libelf_convert.m4 user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelftc/Makefile user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelftc/libelftc.h user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelftc/libelftc_dem_arm.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelftc/libelftc_dem_gnu2.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelftc/make-toolchain-version user/alc/PQ_LAUNDRY/contrib/elftoolchain/libpe/libpe_section.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/libpe/pe.h user/alc/PQ_LAUNDRY/contrib/elftoolchain/nm/nm.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/readelf/readelf.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/size/size.c user/alc/PQ_LAUNDRY/contrib/elftoolchain/strings/strings.c user/alc/PQ_LAUNDRY/contrib/gcc/c-typeck.c user/alc/PQ_LAUNDRY/contrib/llvm/tools/clang/lib/Basic/Targets.cpp user/alc/PQ_LAUNDRY/contrib/netbsd-tests/lib/libc/gen/t_dir.c user/alc/PQ_LAUNDRY/contrib/netbsd-tests/lib/libc/sys/t_mlock.c user/alc/PQ_LAUNDRY/contrib/top/commands.c user/alc/PQ_LAUNDRY/contrib/top/display.c user/alc/PQ_LAUNDRY/contrib/top/display.h user/alc/PQ_LAUNDRY/contrib/top/machine.h user/alc/PQ_LAUNDRY/contrib/top/screen.c user/alc/PQ_LAUNDRY/contrib/top/screen.h user/alc/PQ_LAUNDRY/contrib/top/top.c user/alc/PQ_LAUNDRY/contrib/top/top.h user/alc/PQ_LAUNDRY/contrib/top/username.c user/alc/PQ_LAUNDRY/contrib/top/utils.h user/alc/PQ_LAUNDRY/contrib/top/version.c user/alc/PQ_LAUNDRY/etc/defaults/periodic.conf user/alc/PQ_LAUNDRY/gnu/usr.bin/cc/cc_tools/Makefile user/alc/PQ_LAUNDRY/gnu/usr.bin/grep/config.h user/alc/PQ_LAUNDRY/include/Makefile user/alc/PQ_LAUNDRY/lib/clang/include/clang/Basic/Version.inc user/alc/PQ_LAUNDRY/lib/csu/aarch64/crt1.c user/alc/PQ_LAUNDRY/lib/libc/aarch64/Symbol.map user/alc/PQ_LAUNDRY/lib/libc/aarch64/sys/Makefile.inc user/alc/PQ_LAUNDRY/lib/libc/gen/fts-compat.c user/alc/PQ_LAUNDRY/lib/libc/gen/fts.c user/alc/PQ_LAUNDRY/lib/libc/regex/engine.c user/alc/PQ_LAUNDRY/lib/libc/rpc/getnetconfig.c user/alc/PQ_LAUNDRY/lib/libc/rpc/getrpcent.c user/alc/PQ_LAUNDRY/lib/libc/rpc/netnamer.c user/alc/PQ_LAUNDRY/lib/libc/rpc/rpcb_clnt.c user/alc/PQ_LAUNDRY/lib/libc/rpc/svc_generic.c user/alc/PQ_LAUNDRY/lib/libc/stdlib/random.c user/alc/PQ_LAUNDRY/lib/libc/sys/vfork.2 user/alc/PQ_LAUNDRY/lib/libelftc/Makefile user/alc/PQ_LAUNDRY/lib/libelftc/elftc_version.c user/alc/PQ_LAUNDRY/lib/libmt/mtlib.c user/alc/PQ_LAUNDRY/lib/libstand/uuid_from_string.c user/alc/PQ_LAUNDRY/share/man/man5/src.conf.5 user/alc/PQ_LAUNDRY/share/man/man9/Makefile user/alc/PQ_LAUNDRY/share/man/man9/bus_activate_resource.9 user/alc/PQ_LAUNDRY/share/man/man9/bus_alloc_resource.9 user/alc/PQ_LAUNDRY/share/man/man9/rman.9 user/alc/PQ_LAUNDRY/share/man/man9/sglist.9 user/alc/PQ_LAUNDRY/share/mk/bsd.compiler.mk user/alc/PQ_LAUNDRY/share/mk/bsd.dep.mk user/alc/PQ_LAUNDRY/share/mk/local.meta.sys.mk user/alc/PQ_LAUNDRY/share/mk/src.opts.mk user/alc/PQ_LAUNDRY/share/mk/src.sys.env.mk user/alc/PQ_LAUNDRY/share/mk/sys.mk user/alc/PQ_LAUNDRY/sys/amd64/amd64/sys_machdep.c user/alc/PQ_LAUNDRY/sys/amd64/amd64/vm_machdep.c user/alc/PQ_LAUNDRY/sys/amd64/linux/linux_proto.h user/alc/PQ_LAUNDRY/sys/amd64/linux/linux_syscall.h user/alc/PQ_LAUNDRY/sys/amd64/linux/linux_syscalls.c user/alc/PQ_LAUNDRY/sys/amd64/linux/linux_sysent.c user/alc/PQ_LAUNDRY/sys/amd64/linux/linux_systrace_args.c user/alc/PQ_LAUNDRY/sys/amd64/linux/syscalls.master user/alc/PQ_LAUNDRY/sys/amd64/linux32/linux32_proto.h user/alc/PQ_LAUNDRY/sys/amd64/linux32/linux32_syscall.h user/alc/PQ_LAUNDRY/sys/amd64/linux32/linux32_syscalls.c user/alc/PQ_LAUNDRY/sys/amd64/linux32/linux32_sysent.c user/alc/PQ_LAUNDRY/sys/amd64/linux32/linux32_systrace_args.c user/alc/PQ_LAUNDRY/sys/amd64/linux32/syscalls.master user/alc/PQ_LAUNDRY/sys/arm/allwinner/axp209.c user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c user/alc/PQ_LAUNDRY/sys/arm/freescale/imx/imx6_anatop.c user/alc/PQ_LAUNDRY/sys/arm/freescale/imx/imx_gpio.c user/alc/PQ_LAUNDRY/sys/arm/include/_align.h user/alc/PQ_LAUNDRY/sys/arm/include/param.h user/alc/PQ_LAUNDRY/sys/arm/mv/mpic.c user/alc/PQ_LAUNDRY/sys/arm/mv/mv_ts.c user/alc/PQ_LAUNDRY/sys/arm64/arm64/busdma_bounce.c user/alc/PQ_LAUNDRY/sys/arm64/arm64/gic_v3_reg.h user/alc/PQ_LAUNDRY/sys/arm64/cavium/thunder_pcie_pem.c user/alc/PQ_LAUNDRY/sys/arm64/conf/DEFAULTS user/alc/PQ_LAUNDRY/sys/boot/efi/loader/main.c user/alc/PQ_LAUNDRY/sys/cam/cam_ccb.h user/alc/PQ_LAUNDRY/sys/cam/ctl/scsi_ctl.c user/alc/PQ_LAUNDRY/sys/compat/linux/linux_file.c user/alc/PQ_LAUNDRY/sys/compat/linux/linux_futex.c user/alc/PQ_LAUNDRY/sys/compat/linux/linux_socket.c user/alc/PQ_LAUNDRY/sys/compat/ndis/subr_ntoskrnl.c user/alc/PQ_LAUNDRY/sys/conf/files user/alc/PQ_LAUNDRY/sys/conf/files.arm64 user/alc/PQ_LAUNDRY/sys/conf/kern.post.mk user/alc/PQ_LAUNDRY/sys/dev/acpi_support/acpi_asus_wmi.c user/alc/PQ_LAUNDRY/sys/dev/acpi_support/acpi_ibm.c user/alc/PQ_LAUNDRY/sys/dev/acpi_support/atk0110.c user/alc/PQ_LAUNDRY/sys/dev/acpica/acpi_thermal.c user/alc/PQ_LAUNDRY/sys/dev/amdtemp/amdtemp.c user/alc/PQ_LAUNDRY/sys/dev/ath/ath_hal/ah_regdomain.c user/alc/PQ_LAUNDRY/sys/dev/bhnd/bcma/bcma_bhndb.c user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhnd.h user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhnd_bus_if.m user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhnd_types.h user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhndb/bhndb.h user/alc/PQ_LAUNDRY/sys/dev/bhnd/siba/siba_bhndb.c user/alc/PQ_LAUNDRY/sys/dev/bhnd/soc/bhnd_soc.c user/alc/PQ_LAUNDRY/sys/dev/bwn/if_bwn.c user/alc/PQ_LAUNDRY/sys/dev/coretemp/coretemp.c user/alc/PQ_LAUNDRY/sys/dev/cpuctl/cpuctl.c user/alc/PQ_LAUNDRY/sys/dev/cxgbe/cxgbei/icl_cxgbei.c user/alc/PQ_LAUNDRY/sys/dev/cxgbe/tom/t4_ddp.c user/alc/PQ_LAUNDRY/sys/dev/gpio/gpioiic.c user/alc/PQ_LAUNDRY/sys/dev/gpio/gpioled.c user/alc/PQ_LAUNDRY/sys/dev/iicbus/ds3231reg.h user/alc/PQ_LAUNDRY/sys/dev/iicbus/iicbb_if.m user/alc/PQ_LAUNDRY/sys/dev/iicbus/iiconf.c user/alc/PQ_LAUNDRY/sys/dev/iicbus/lm75.c user/alc/PQ_LAUNDRY/sys/dev/iscsi/icl.h user/alc/PQ_LAUNDRY/sys/dev/iscsi/icl_soft.c user/alc/PQ_LAUNDRY/sys/dev/iscsi/iscsi.c user/alc/PQ_LAUNDRY/sys/dev/isp/isp_freebsd.c user/alc/PQ_LAUNDRY/sys/dev/ixl/if_ixl.c user/alc/PQ_LAUNDRY/sys/dev/mlx5/mlx5_en/en.h user/alc/PQ_LAUNDRY/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c user/alc/PQ_LAUNDRY/sys/dev/mlx5/mlx5_en/mlx5_en_main.c user/alc/PQ_LAUNDRY/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c user/alc/PQ_LAUNDRY/sys/dev/nvram2env/nvram2env.c user/alc/PQ_LAUNDRY/sys/dev/pci/pci_host_generic.c user/alc/PQ_LAUNDRY/sys/dev/urtwn/if_urtwn.c user/alc/PQ_LAUNDRY/sys/dev/urtwn/if_urtwnreg.h user/alc/PQ_LAUNDRY/sys/dev/vnic/mrml_bridge.c user/alc/PQ_LAUNDRY/sys/dev/vnic/nic_main.c user/alc/PQ_LAUNDRY/sys/dev/vnic/nicvf_main.c user/alc/PQ_LAUNDRY/sys/dev/vnic/thunder_bgx.c user/alc/PQ_LAUNDRY/sys/dev/vnic/thunder_mdio.c user/alc/PQ_LAUNDRY/sys/dev/wi/if_wi.c user/alc/PQ_LAUNDRY/sys/fs/cd9660/cd9660_vfsops.c user/alc/PQ_LAUNDRY/sys/fs/devfs/devfs_devs.c user/alc/PQ_LAUNDRY/sys/fs/ext2fs/ext2_alloc.c user/alc/PQ_LAUNDRY/sys/fs/ext2fs/ext2_vfsops.c user/alc/PQ_LAUNDRY/sys/fs/msdosfs/msdosfs_vfsops.c user/alc/PQ_LAUNDRY/sys/fs/udf/udf_vfsops.c user/alc/PQ_LAUNDRY/sys/geom/eli/g_eli.c user/alc/PQ_LAUNDRY/sys/geom/geom.h user/alc/PQ_LAUNDRY/sys/geom/geom_event.c user/alc/PQ_LAUNDRY/sys/geom/geom_kern.c user/alc/PQ_LAUNDRY/sys/geom/geom_mbr.c user/alc/PQ_LAUNDRY/sys/geom/geom_pc98.c user/alc/PQ_LAUNDRY/sys/geom/geom_subr.c user/alc/PQ_LAUNDRY/sys/geom/journal/g_journal.c user/alc/PQ_LAUNDRY/sys/geom/mirror/g_mirror.c user/alc/PQ_LAUNDRY/sys/geom/mountver/g_mountver.c user/alc/PQ_LAUNDRY/sys/geom/raid/g_raid.c user/alc/PQ_LAUNDRY/sys/geom/raid3/g_raid3.c user/alc/PQ_LAUNDRY/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c user/alc/PQ_LAUNDRY/sys/i386/i386/sys_machdep.c user/alc/PQ_LAUNDRY/sys/i386/i386/vm_machdep.c user/alc/PQ_LAUNDRY/sys/i386/linux/linux_proto.h user/alc/PQ_LAUNDRY/sys/i386/linux/linux_syscall.h user/alc/PQ_LAUNDRY/sys/i386/linux/linux_syscalls.c user/alc/PQ_LAUNDRY/sys/i386/linux/linux_sysent.c user/alc/PQ_LAUNDRY/sys/i386/linux/linux_systrace_args.c user/alc/PQ_LAUNDRY/sys/i386/linux/syscalls.master user/alc/PQ_LAUNDRY/sys/kern/bus_if.m user/alc/PQ_LAUNDRY/sys/kern/subr_bus.c user/alc/PQ_LAUNDRY/sys/kern/subr_rman.c user/alc/PQ_LAUNDRY/sys/kern/subr_sglist.c user/alc/PQ_LAUNDRY/sys/kern/subr_taskqueue.c user/alc/PQ_LAUNDRY/sys/kern/sys_socket.c user/alc/PQ_LAUNDRY/sys/kern/uipc_socket.c user/alc/PQ_LAUNDRY/sys/kern/vfs_aio.c user/alc/PQ_LAUNDRY/sys/mips/include/clock.h user/alc/PQ_LAUNDRY/sys/modules/bhnd/bhndb/Makefile user/alc/PQ_LAUNDRY/sys/net80211/ieee80211_scan_sw.c user/alc/PQ_LAUNDRY/sys/netinet6/ip6_output.c user/alc/PQ_LAUNDRY/sys/netpfil/ipfw/ip_fw_dynamic.c user/alc/PQ_LAUNDRY/sys/netpfil/pf/pf_norm.c user/alc/PQ_LAUNDRY/sys/powerpc/powermac/powermac_thermal.h user/alc/PQ_LAUNDRY/sys/powerpc/powermac/smu.c user/alc/PQ_LAUNDRY/sys/powerpc/powermac/smusat.c user/alc/PQ_LAUNDRY/sys/powerpc/powerpc/exec_machdep.c user/alc/PQ_LAUNDRY/sys/sparc64/include/vm.h user/alc/PQ_LAUNDRY/sys/sparc64/sparc64/vm_machdep.c user/alc/PQ_LAUNDRY/sys/sys/_task.h user/alc/PQ_LAUNDRY/sys/sys/bus.h user/alc/PQ_LAUNDRY/sys/sys/kobj.h user/alc/PQ_LAUNDRY/sys/sys/param.h user/alc/PQ_LAUNDRY/sys/sys/rman.h user/alc/PQ_LAUNDRY/sys/sys/sglist.h user/alc/PQ_LAUNDRY/sys/sys/sysent.h user/alc/PQ_LAUNDRY/sys/sys/taskqueue.h user/alc/PQ_LAUNDRY/sys/ufs/ffs/ffs_alloc.c user/alc/PQ_LAUNDRY/sys/ufs/ffs/ffs_vfsops.c user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c user/alc/PQ_LAUNDRY/sys/vm/vm.h user/alc/PQ_LAUNDRY/sys/vm/vm_fault.c user/alc/PQ_LAUNDRY/sys/vm/vm_glue.c user/alc/PQ_LAUNDRY/sys/x86/x86/nexus.c user/alc/PQ_LAUNDRY/usr.bin/bmake/Makefile user/alc/PQ_LAUNDRY/usr.bin/kdump/kdump.c user/alc/PQ_LAUNDRY/usr.bin/mt/mt.1 user/alc/PQ_LAUNDRY/usr.sbin/bsdinstall/scripts/zfsboot user/alc/PQ_LAUNDRY/usr.sbin/periodic/periodic.8 user/alc/PQ_LAUNDRY/usr.sbin/periodic/periodic.sh user/alc/PQ_LAUNDRY/usr.sbin/rpc.yppasswdd/yppasswdd_server.c Directory Properties: user/alc/PQ_LAUNDRY/ (props changed) user/alc/PQ_LAUNDRY/contrib/binutils/ (props changed) user/alc/PQ_LAUNDRY/contrib/bmake/ (props changed) user/alc/PQ_LAUNDRY/contrib/elftoolchain/ (props changed) user/alc/PQ_LAUNDRY/contrib/elftoolchain/brandelf/ (props changed) user/alc/PQ_LAUNDRY/contrib/elftoolchain/elfdump/ (props changed) user/alc/PQ_LAUNDRY/contrib/gcc/ (props changed) user/alc/PQ_LAUNDRY/contrib/llvm/ (props changed) user/alc/PQ_LAUNDRY/contrib/llvm/tools/clang/ (props changed) user/alc/PQ_LAUNDRY/contrib/top/ (props changed) user/alc/PQ_LAUNDRY/gnu/usr.bin/cc/cc_tools/ (props changed) Modified: user/alc/PQ_LAUNDRY/Makefile.inc1 ============================================================================== --- user/alc/PQ_LAUNDRY/Makefile.inc1 Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/Makefile.inc1 Mon May 23 05:15:06 2016 (r300457) @@ -48,6 +48,7 @@ .error "Both TARGET and TARGET_ARCH must be defined." .endif +SRCDIR?= ${.CURDIR} LOCALBASE?= /usr/local # Cross toolchain changes must be in effect before bsd.compiler.mk @@ -56,8 +57,100 @@ LOCALBASE?= /usr/local .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}" .endif -.include <bsd.compiler.mk> # don't depend on src.opts.mk doing it -.include "share/mk/src.opts.mk" +.if defined(CROSS_TOOLCHAIN_PREFIX) +CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} +CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} +.endif +# If we do not have a bootstrap binutils (because the in-tree one does not +# support the target architecture), provide a default cross-binutils prefix. +# This allows aarch64 builds, for example, to automatically use the +# aarch64-binutils port or package. +.if !make(showconfig) +.if !empty(BROKEN_OPTIONS:MBINUTILS_BOOTSTRAP) && \ + !defined(CROSS_BINUTILS_PREFIX) +CROSS_BINUTILS_PREFIX=/usr/local/${TARGET_ARCH}-freebsd/bin/ +.if !exists(${CROSS_BINUTILS_PREFIX}) +.error In-tree binutils does not support the ${TARGET_ARCH} architecture. Install the ${TARGET_ARCH}-binutils port or package or set CROSS_BINUTILS_PREFIX. +.endif +.endif +.endif + +XCOMPILERS= CC CXX CPP +.for COMPILER in ${XCOMPILERS} +.if defined(CROSS_COMPILER_PREFIX) +X${COMPILER}?= ${CROSS_COMPILER_PREFIX}${${COMPILER}} +.else +X${COMPILER}?= ${${COMPILER}} +.endif +.endfor +XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS +.for BINUTIL in ${XBINUTILS} +.if defined(CROSS_BINUTILS_PREFIX) && \ + exists(${CROSS_BINUTILS_PREFIX}${${BINUTIL}}) +X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}} +.else +X${BINUTIL}?= ${${BINUTIL}} +.endif +.endfor +# If a full path to an external cross compiler is given, don't build +# a cross compiler. +.if ${XCC:N${CCACHE_BIN}:M/*} +MK_CROSS_COMPILER= no +.endif + +# Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early. +.include <bsd.compiler.mk> +.include "share/mk/src.opts.mk" + +# Check if there is a local compiler that can satisfy as an external compiler. +.if ${MK_SYSTEM_COMPILER} == "yes" && ${MK_CROSS_COMPILER} == "yes" && \ + (${MK_CLANG_BOOTSTRAP} == "yes" || ${MK_GCC_BOOTSTRAP} == "yes") && \ + !make(showconfig) +# Which compiler is expected to be used? +.if ${MK_CLANG_BOOTSTRAP} == "yes" +_expected_compiler_type= clang +.elif ${MK_GCC_BOOTSTRAP} == "yes" +_expected_compiler_type= gcc +.endif +# If the expected vs CC is different then we can't skip. +# GCC cannot be used for cross-arch yet. For clang we pass -target later if +# TARGET_ARCH!=MACHINE_ARCH. +.if ${_expected_compiler_type} == ${COMPILER_TYPE} && \ + (${COMPILER_TYPE} == "clang" || ${TARGET_ARCH} == ${MACHINE_ARCH}) +# It needs to be the same revision as we would build for the bootstrap. +.if !defined(CROSS_COMPILER_FREEBSD_VERSION) +.if ${_expected_compiler_type} == "clang" +CROSS_COMPILER_FREEBSD_VERSION!= \ + awk '$$2 == "FREEBSD_CC_VERSION" {printf("%d\n", $$3)}' \ + ${SRCDIR}/lib/clang/include/clang/Basic/Version.inc || echo unknown +CROSS_COMPILER_VERSION!= \ + awk '$$2 == "CLANG_VERSION" {split($$3, a, "."); print a[1] * 10000 + a[2] * 100 + a[3]}' \ + ${SRCDIR}/lib/clang/include/clang/Basic/Version.inc || echo unknown +.elif ${_expected_compiler_type} == "gcc" +CROSS_COMPILER_FREEBSD_VERSION!= \ + awk '$$2 == "FBSD_CC_VER" {printf("%d\n", $$3)}' \ + ${SRCDIR}/gnu/usr.bin/cc/cc_tools/freebsd-native.h || echo unknown +CROSS_COMPILER_VERSION!= \ + awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3}' \ + ${SRCDIR}/contrib/gcc/BASE-VER || echo unknown +.endif +.export CROSS_COMPILER_FREEBSD_VERSION CROSS_COMPILER_VERSION +.endif # !defined(CROSS_COMPILER_FREEBSD_VERSION) +.if ${COMPILER_VERSION} == ${CROSS_COMPILER_VERSION} && \ + ${COMPILER_FREEBSD_VERSION} == ${CROSS_COMPILER_FREEBSD_VERSION} +# Everything matches, disable the bootstrap compiler. +MK_CLANG_BOOTSTRAP= no +MK_GCC_BOOTSTRAP= no +CROSSENV+= COMPILER_VERSION=${COMPILER_VERSION} \ + COMPILER_TYPE=${COMPILER_TYPE} \ + COMPILER_FREEBSD_VERSION=${COMPILER_FREEBSD_VERSION} +.if make(buildworld) +.info SYSTEM_COMPILER: Determined that CC=${CC} matches the source tree. Not bootstrapping a cross-compiler. +.endif +.endif # ${COMPILER_VERSION} == ${CROSS_COMPILER_VERSION} +.endif # ${_expected_compiler_type} == ${COMPILER_TYPE} +.endif # ${XCC:N${CCACHE_BIN}:M/*} + # We must do lib/ and libexec/ before bin/ in case of a mid-install error to # keep the users system reasonably usable. For static->dynamic root upgrades, @@ -67,7 +160,6 @@ CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLC # This ordering is not a guarantee though. The only guarantee of a working # system here would require fine-grained ordering of all components based # on their dependencies. -SRCDIR?= ${.CURDIR} .if !empty(SUBDIR_OVERRIDE) SUBDIR= ${SUBDIR_OVERRIDE} .else @@ -404,42 +496,6 @@ HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MT HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT .endif -.if defined(CROSS_TOOLCHAIN_PREFIX) -CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} -CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} -.endif - -# If we do not have a bootstrap binutils (because the in-tree one does not -# support the target architecture), provide a default cross-binutils prefix. -# This allows aarch64 builds, for example, to automatically use the -# aarch64-binutils port or package. -.if !make(showconfig) -.if !empty(BROKEN_OPTIONS:MBINUTILS_BOOTSTRAP) && \ - !defined(CROSS_BINUTILS_PREFIX) -CROSS_BINUTILS_PREFIX=/usr/local/${TARGET_ARCH}-freebsd/bin/ -.if !exists(${CROSS_BINUTILS_PREFIX}) -.error In-tree binutils does not support the ${TARGET_ARCH} architecture. Install the ${TARGET_ARCH}-binutils port or package or set CROSS_BINUTILS_PREFIX. -.endif -.endif -.endif - -XCOMPILERS= CC CXX CPP -.for COMPILER in ${XCOMPILERS} -.if defined(CROSS_COMPILER_PREFIX) -X${COMPILER}?= ${CROSS_COMPILER_PREFIX}${${COMPILER}} -.else -X${COMPILER}?= ${${COMPILER}} -.endif -.endfor -XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS -.for BINUTIL in ${XBINUTILS} -.if defined(CROSS_BINUTILS_PREFIX) && \ - exists(${CROSS_BINUTILS_PREFIX}${${BINUTIL}}) -X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}} -.else -X${BINUTIL}?= ${${BINUTIL}} -.endif -.endfor CROSSENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \ CPP="${XCPP} ${XCFLAGS}" \ AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \ @@ -455,7 +511,8 @@ BFLAGS+= -B${CROSS_BINUTILS_PREFIX} .endif # External compiler needs sysroot and target flags. -.if ${XCC:N${CCACHE_BIN}:M/*} || ${MK_CROSS_COMPILER} == "no" +.if ${MK_CROSS_COMPILER} == "no" || \ + (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no") .if !defined(CROSS_BINUTILS_PREFIX) || !exists(${CROSS_BINUTILS_PREFIX}) BFLAGS+= -B${WORLDTMP}/usr/bin .endif @@ -479,7 +536,7 @@ XCFLAGS+= -target ${TARGET_TRIPLE} .endif XCFLAGS+= --sysroot=${WORLDTMP} .else -.endif # ${XCC:M/*} || ${MK_CROSS_COMPILER} == "no" +.endif # ${MK_CROSS_COMPILER} == "no" .if !empty(BFLAGS) XCFLAGS+= ${BFLAGS} @@ -533,7 +590,7 @@ KMAKE= ${KMAKEENV} ${MAKE} ${.MAKEFLAGS .if ${MK_META_MODE} == "yes" # meta mode normally is disallowed when building from curdir==objdir, but we # want to allow it for the kernel build. -KMAKE+= .MAKE.MODE="${.MAKE.MODE} curdirOk=yes" +KMAKEENV+= META_MODE="${.MAKE.MODE} curdirOk=yes" .endif # @@ -1715,9 +1772,7 @@ _elftctools= lib/libelftc \ usr.bin/elfcopy .endif -# If an full path to an external cross compiler is given, don't build -# a cross compiler. -.if ${XCC:N${CCACHE_BIN}:M/*} == "" && ${MK_CROSS_COMPILER} != "no" +.if ${MK_CROSS_COMPILER} != "no" .if ${MK_CLANG_BOOTSTRAP} != "no" _clang= usr.bin/clang _clang_libs= lib/clang Modified: user/alc/PQ_LAUNDRY/ObsoleteFiles.inc ============================================================================== --- user/alc/PQ_LAUNDRY/ObsoleteFiles.inc Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/ObsoleteFiles.inc Mon May 23 05:15:06 2016 (r300457) @@ -39,11 +39,11 @@ # done # 20160519: remove DTrace Toolkit from base -OLD_FILES+=usr/share/dtrace/toolkit/execsnoop* -OLD_FILES+=usr/share/dtrace/toolkit/hotkernel* -OLD_FILES+=usr/share/dtrace/toolkit/hotuser* -OLD_FILES+=usr/share/dtrace/toolkit/opensnoop* -OLD_FILES+=usr/share/dtrace/toolkit/procsystime* +OLD_FILES+=usr/share/dtrace/toolkit/execsnoop +OLD_FILES+=usr/share/dtrace/toolkit/hotkernel +OLD_FILES+=usr/share/dtrace/toolkit/hotuser +OLD_FILES+=usr/share/dtrace/toolkit/opensnoop +OLD_FILES+=usr/share/dtrace/toolkit/procsystime OLD_DIRS+=usr/share/dtrace/toolkit # 20160519: stale MLINK removed OLD_FILES+=usr/share/man/man9/rman_await_resource.9.gz Modified: user/alc/PQ_LAUNDRY/UPDATING ============================================================================== --- user/alc/PQ_LAUNDRY/UPDATING Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/UPDATING Mon May 23 05:15:06 2016 (r300457) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20160520: + The brk and sbrk functions have been removed from libc on arm64. + Binutils from ports has been updated to not link to these + functions and should be updated to the latest version before + installing a new libc. + 20160517: The armv6 port now defaults to hard float ABI. Limited support for running both hardfloat and soft float on the same system @@ -39,6 +45,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 and packages may fail or need manual intervention to run. New packages will be needed. + To update an existing self-hosted armv6hf system, you must add + TARGET_ARCH=armv6 on the make command line for both the build + and the install steps. + 20160510: Kernel modules compiled outside of a kernel build now default to installing to /boot/modules instead of /boot/kernel. Many kernel Modified: user/alc/PQ_LAUNDRY/bin/ed/cbc.c ============================================================================== --- user/alc/PQ_LAUNDRY/bin/ed/cbc.c Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/bin/ed/cbc.c Mon May 23 05:15:06 2016 (r300457) @@ -90,16 +90,13 @@ void init_des_cipher(void) { #ifdef DES - int i; - des_ct = des_n = 0; /* initialize the initialization vector */ MEMZERO(ivec, 8); /* initialize the padding vector */ - for (i = 0; i < 8; i++) - pvec[i] = (char) (arc4random() % 256); + arc4random_buf(pvec, sizeof(pvec)); #endif } @@ -164,7 +161,7 @@ get_keyword(void) /* * get the key */ - if (*(p = getpass("Enter key: "))) { + if ((p = getpass("Enter key: ")) != NULL && *p != '\0') { /* * copy it, nul-padded, into the key area Modified: user/alc/PQ_LAUNDRY/bin/sh/parser.c ============================================================================== --- user/alc/PQ_LAUNDRY/bin/sh/parser.c Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/bin/sh/parser.c Mon May 23 05:15:06 2016 (r300457) @@ -1998,7 +1998,7 @@ getprompt(void *unused __unused) /* * Format prompt string. */ - for (i = 0; (i < 127) && (*fmt != '\0'); i++, fmt++) + for (i = 0; (i < PROMPTLEN - 1) && (*fmt != '\0'); i++, fmt++) if (*fmt == '\\') switch (*++fmt) { @@ -2011,7 +2011,8 @@ getprompt(void *unused __unused) case 'h': case 'H': ps[i] = '\0'; - gethostname(&ps[i], PROMPTLEN - i); + gethostname(&ps[i], PROMPTLEN - i - 1); + ps[PROMPTLEN - 1] = '\0'; /* Skip to end of hostname. */ trim = (*fmt == 'h') ? '.' : '\0'; while ((ps[i] != '\0') && (ps[i] != trim)) @@ -2061,8 +2062,9 @@ getprompt(void *unused __unused) * Emit unrecognized formats verbatim. */ default: - ps[i++] = '\\'; - ps[i] = *fmt; + ps[i] = '\\'; + if (i < PROMPTLEN - 1) + ps[++i] = *fmt; break; } else Modified: user/alc/PQ_LAUNDRY/contrib/binutils/gas/config/tc-arm.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/binutils/gas/config/tc-arm.c Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/contrib/binutils/gas/config/tc-arm.c Mon May 23 05:15:06 2016 (r300457) @@ -2284,6 +2284,37 @@ s_unreq (int a ATTRIBUTE_UNUSED) demand_empty_rest_of_line (); } +static void +s_inst(int unused ATTRIBUTE_UNUSED) +{ + expressionS exp; + + if (thumb_mode) { + as_bad(".inst not implemented for Thumb mode"); + ignore_rest_of_line(); + return; + } + + if (is_it_end_of_statement()) { + demand_empty_rest_of_line(); + return; + } + + do { + expression(&exp); + + if (exp.X_op != O_constant) + as_bad("constant expression required"); + else + emit_expr(&exp, 4); + + } while (*input_line_pointer++ == ','); + + /* Put terminator back into stream. */ + input_line_pointer--; + demand_empty_rest_of_line(); +} + /* Directives: Instruction set selection. */ #ifdef OBJ_ELF @@ -3837,10 +3868,10 @@ s_arm_eabi_attribute (int ignored ATTRIB #endif /* OBJ_ELF */ static void s_arm_arch (int); -static void s_arm_arch_extension (int); static void s_arm_object_arch (int); static void s_arm_cpu (int); static void s_arm_fpu (int); +static void s_arm_arch_extension (int); #ifdef TE_PE @@ -3892,9 +3923,10 @@ const pseudo_typeS md_pseudo_table[] = { "syntax", s_syntax, 0 }, { "cpu", s_arm_cpu, 0 }, { "arch", s_arm_arch, 0 }, - { "arch_extension", s_arm_arch_extension, 0 }, { "object_arch", s_arm_object_arch, 0 }, { "fpu", s_arm_fpu, 0 }, + { "arch_extension", s_arm_arch_extension, 0 }, + { "inst", s_inst, 0 }, #ifdef OBJ_ELF { "word", s_arm_elf_cons, 4 }, { "long", s_arm_elf_cons, 4 }, Modified: user/alc/PQ_LAUNDRY/contrib/bmake/ChangeLog ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/ChangeLog Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/contrib/bmake/ChangeLog Mon May 23 05:15:06 2016 (r300457) @@ -1,3 +1,26 @@ +2016-05-12 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (_MAKE_VERSION): 20160512 + Merge with NetBSD make, pick up + o meta.c: ignore paths that match .MAKE.META.IGNORE_PATTERNS + this is useful for gcov builds. + o propagate errors from filemon(4). + +2016-05-09 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (_MAKE_VERSION): 20160509 + Merge with NetBSD make, pick up + o remove use of non-standard types u_int etc. + o meta.c: apply realpath() before matching against metaIgnorePaths + +2016-04-04 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (_MAKE_VERSION): 20160404 + Merge with NetBSD make, pick up + o allow makefile to set .MAKE.JOBS + + * Makefile (PROG_NAME): use ${_MAKE_VERSION} + 2016-03-15 Simon J. Gerraty <sjg@bad.crufty.net> * Makefile (_MAKE_VERSION): 20160315 Modified: user/alc/PQ_LAUNDRY/contrib/bmake/Makefile ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/Makefile Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/contrib/bmake/Makefile Mon May 23 05:15:06 2016 (r300457) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.58 2016/03/15 23:39:12 sjg Exp $ +# $Id: Makefile,v 1.63 2016/05/12 20:34:46 sjg Exp $ # Base version on src date -_MAKE_VERSION= 20160315 +_MAKE_VERSION= 20160512 PROG= bmake @@ -131,9 +131,9 @@ OPTIONS_DEFAULT_NO+= \ .include <own.mk> .if ${MK_PROG_VERSION} == "yes" -PROG_NAME= ${PROG}-${MAKE_VERSION} +PROG_NAME= ${PROG}-${_MAKE_VERSION} .if ${MK_PROG_LINK} == "yes" -SYMLINKS+= ${PROG}-${MAKE_VERSION} ${BINDIR}/${PROG} +SYMLINKS+= ${PROG_NAME} ${BINDIR}/${PROG} .endif .endif Modified: user/alc/PQ_LAUNDRY/contrib/bmake/arch.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/arch.c Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/contrib/bmake/arch.c Mon May 23 05:15:06 2016 (r300457) @@ -1,4 +1,4 @@ -/* $NetBSD: arch.c,v 1.68 2016/02/18 18:29:14 christos Exp $ */ +/* $NetBSD: arch.c,v 1.69 2016/04/06 09:57:00 gson Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: arch.c,v 1.68 2016/02/18 18:29:14 christos Exp $"; +static char rcsid[] = "$NetBSD: arch.c,v 1.69 2016/04/06 09:57:00 gson Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94"; #else -__RCSID("$NetBSD: arch.c,v 1.68 2016/02/18 18:29:14 christos Exp $"); +__RCSID("$NetBSD: arch.c,v 1.69 2016/04/06 09:57:00 gson Exp $"); #endif #endif /* not lint */ #endif @@ -832,7 +832,7 @@ ArchSVR4Entry(Arch *ar, char *name, size } if (DEBUG(ARCH)) { fprintf(debug_file, "Found svr4 archive name table with %lu entries\n", - (u_long)entry); + (unsigned long)entry); } return 0; } @@ -850,7 +850,7 @@ ArchSVR4Entry(Arch *ar, char *name, size if (entry >= ar->fnamesize) { if (DEBUG(ARCH)) { fprintf(debug_file, "SVR4 entry offset %s is greater than %lu\n", - name, (u_long)ar->fnamesize); + name, (unsigned long)ar->fnamesize); } return 2; } Modified: user/alc/PQ_LAUNDRY/contrib/bmake/bmake.1 ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/bmake.1 Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/contrib/bmake/bmake.1 Mon May 23 05:15:06 2016 (r300457) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.255 2016/03/14 07:42:15 matthias Exp $ +.\" $NetBSD: make.1,v 1.257 2016/05/10 23:45:45 sjg Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd February 19, 2016 +.Dd May 10, 2016 .Dt MAKE 1 .Os .Sh NAME @@ -913,6 +913,9 @@ Provides a list of path prefixes that sh because the contents are expected to change over time. The default list includes: .Ql Pa /dev /etc /proc /tmp /var/run /var/tmp +.It Va .MAKE.META.IGNORE_PATTERNS +Provides a list of patterns to match against pathnames. +Ignore any that match. .It Va .MAKE.META.PREFIX Defines the message printed for each meta file updated in "meta verbose" mode. The default value is: Modified: user/alc/PQ_LAUNDRY/contrib/bmake/bmake.cat1 ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/bmake.cat1 Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/contrib/bmake/bmake.cat1 Mon May 23 05:15:06 2016 (r300457) @@ -586,6 +586,10 @@ VVAARRIIAABBLLEE AASSSSIIGG The default list includes: `_/_d_e_v _/_e_t_c _/_p_r_o_c _/_t_m_p _/_v_a_r_/_r_u_n _/_v_a_r_/_t_m_p' + _._M_A_K_E_._M_E_T_A_._I_G_N_O_R_E___P_A_T_T_E_R_N_S + Provides a list of patterns to match against pathnames. + Ignore any that match. + _._M_A_K_E_._M_E_T_A_._P_R_E_F_I_X Defines the message printed for each meta file updated in "meta verbose" mode. The default value is: @@ -1471,4 +1475,4 @@ BBUUGGSS There is no way of escaping a space character in a filename. -NetBSD 5.1 February 19, 2016 NetBSD 5.1 +NetBSD 5.1 May 10, 2016 NetBSD 5.1 Modified: user/alc/PQ_LAUNDRY/contrib/bmake/compat.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/compat.c Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/contrib/bmake/compat.c Mon May 23 05:15:06 2016 (r300457) @@ -1,4 +1,4 @@ -/* $NetBSD: compat.c,v 1.104 2016/02/18 18:29:14 christos Exp $ */ +/* $NetBSD: compat.c,v 1.105 2016/05/12 20:28:34 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: compat.c,v 1.104 2016/02/18 18:29:14 christos Exp $"; +static char rcsid[] = "$NetBSD: compat.c,v 1.105 2016/05/12 20:28:34 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: compat.c,v 1.104 2016/02/18 18:29:14 christos Exp $"); +__RCSID("$NetBSD: compat.c,v 1.105 2016/05/12 20:28:34 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -586,7 +586,8 @@ Compat_Make(void *gnp, void *pgnp) } #ifdef USE_META if (useMeta && !NoExecute(gn)) { - meta_job_finish(NULL); + if (meta_job_finish(NULL) != 0) + gn->made = ERROR; } #endif Modified: user/alc/PQ_LAUNDRY/contrib/bmake/job.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/job.c Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/contrib/bmake/job.c Mon May 23 05:15:06 2016 (r300457) @@ -1,4 +1,4 @@ -/* $NetBSD: job.c,v 1.186 2016/02/18 18:29:14 christos Exp $ */ +/* $NetBSD: job.c,v 1.187 2016/05/12 20:28:34 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: job.c,v 1.186 2016/02/18 18:29:14 christos Exp $"; +static char rcsid[] = "$NetBSD: job.c,v 1.187 2016/05/12 20:28:34 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: job.c,v 1.186 2016/02/18 18:29:14 christos Exp $"); +__RCSID("$NetBSD: job.c,v 1.187 2016/05/12 20:28:34 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -1072,7 +1072,11 @@ JobFinish (Job *job, WAIT_T status) #ifdef USE_META if (useMeta) { - meta_job_finish(job); + int x; + + if ((x = meta_job_finish(job)) != 0 && status == 0) { + status = x; + } } #endif Modified: user/alc/PQ_LAUNDRY/contrib/bmake/main.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/main.c Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/contrib/bmake/main.c Mon May 23 05:15:06 2016 (r300457) @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.242 2016/03/07 21:45:43 christos Exp $ */ +/* $NetBSD: main.c,v 1.244 2016/04/05 04:25:43 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.242 2016/03/07 21:45:43 christos Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.244 2016/04/05 04:25:43 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.242 2016/03/07 21:45:43 christos Exp $"); +__RCSID("$NetBSD: main.c,v 1.244 2016/04/05 04:25:43 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -1152,14 +1152,6 @@ main(int argc, char **argv) } /* - * Be compatible if user did not specify -j and did not explicitly - * turned compatibility on - */ - if (!compatMake && !forceJobs) { - compatMake = TRUE; - } - - /* * Initialize archive, target and suffix modules in preparation for * parsing the makefile(s) */ @@ -1275,6 +1267,36 @@ main(int argc, char **argv) Var_Append("MFLAGS", Var_Value(MAKEFLAGS, VAR_GLOBAL, &p1), VAR_GLOBAL); free(p1); + if (!forceJobs && !compatMake && + Var_Exists(".MAKE.JOBS", VAR_GLOBAL)) { + char *value; + int n; + + value = Var_Subst(NULL, "${.MAKE.JOBS}", VAR_GLOBAL, VARF_WANTRES); + n = strtol(value, NULL, 0); + if (n < 1) { + (void)fprintf(stderr, "%s: illegal value for .MAKE.JOBS -- must be positive integer!\n", + progname); + exit(1); + } + if (n != maxJobs) { + Var_Append(MAKEFLAGS, "-j", VAR_GLOBAL); + Var_Append(MAKEFLAGS, value, VAR_GLOBAL); + } + maxJobs = n; + maxJobTokens = maxJobs; + forceJobs = TRUE; + free(value); + } + + /* + * Be compatible if user did not specify -j and did not explicitly + * turned compatibility on + */ + if (!compatMake && !forceJobs) { + compatMake = TRUE; + } + if (!compatMake) Job_ServerStart(maxJobTokens, jp_0, jp_1); if (DEBUG(JOB)) Modified: user/alc/PQ_LAUNDRY/contrib/bmake/make.1 ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/make.1 Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/contrib/bmake/make.1 Mon May 23 05:15:06 2016 (r300457) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.255 2016/03/14 07:42:15 matthias Exp $ +.\" $NetBSD: make.1,v 1.257 2016/05/10 23:45:45 sjg Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd February 19, 2016 +.Dd May 10, 2016 .Dt MAKE 1 .Os .Sh NAME @@ -924,6 +924,9 @@ Provides a list of path prefixes that sh because the contents are expected to change over time. The default list includes: .Ql Pa /dev /etc /proc /tmp /var/run /var/tmp +.It Va .MAKE.META.IGNORE_PATTERNS +Provides a list of patterns to match against pathnames. +Ignore any that match. .It Va .MAKE.META.PREFIX Defines the message printed for each meta file updated in "meta verbose" mode. The default value is: Modified: user/alc/PQ_LAUNDRY/contrib/bmake/meta.c ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/meta.c Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/contrib/bmake/meta.c Mon May 23 05:15:06 2016 (r300457) @@ -1,4 +1,4 @@ -/* $NetBSD: meta.c,v 1.54 2016/03/11 07:01:21 sjg Exp $ */ +/* $NetBSD: meta.c,v 1.57 2016/05/12 20:28:34 sjg Exp $ */ /* * Implement 'meta' mode. @@ -66,6 +66,9 @@ static char *metaIgnorePathsStr; /* stri #ifndef MAKE_META_IGNORE_PATHS #define MAKE_META_IGNORE_PATHS ".MAKE.META.IGNORE_PATHS" #endif +#ifndef MAKE_META_IGNORE_PATTERNS +#define MAKE_META_IGNORE_PATTERNS ".MAKE.META.IGNORE_PATTERNS" +#endif Boolean useMeta = FALSE; static Boolean useFilemon = FALSE; @@ -73,6 +76,7 @@ static Boolean writeMeta = FALSE; static Boolean metaEnv = FALSE; /* don't save env unless asked */ static Boolean metaVerbose = FALSE; static Boolean metaIgnoreCMDs = FALSE; /* ignore CMDs in .meta files */ +static Boolean metaIgnorePatterns = FALSE; /* do we need to do pattern matches */ static Boolean metaCurdirOk = FALSE; /* write .meta in .CURDIR Ok? */ static Boolean metaSilent = FALSE; /* if we have a .meta be SILENT */ @@ -157,28 +161,33 @@ filemon_open(BuildMon *pbm) * Read the build monitor output file and write records to the target's * metadata file. */ -static void +static int filemon_read(FILE *mfp, int fd) { char buf[BUFSIZ]; int n; + int error; /* Check if we're not writing to a meta data file.*/ if (mfp == NULL) { if (fd >= 0) close(fd); /* not interested */ - return; + return 0; } /* rewind */ (void)lseek(fd, (off_t)0, SEEK_SET); + error = 0; fprintf(mfp, "\n-- filemon acquired metadata --\n"); while ((n = read(fd, buf, sizeof(buf))) > 0) { - fwrite(buf, 1, n, mfp); + if ((int)fwrite(buf, 1, n, mfp) < n) + error = EIO; } fflush(mfp); - close(fd); + if (close(fd) < 0) + error = errno; + return error; } #endif @@ -620,6 +629,15 @@ meta_mode_init(const char *make_mode) if (metaIgnorePathsStr) { str2Lst_Append(metaIgnorePaths, metaIgnorePathsStr, NULL); } + + /* + * We ignore any paths that match ${.MAKE.META.IGNORE_PATTERNS} + */ + cp = NULL; + if (Var_Value(MAKE_META_IGNORE_PATTERNS, VAR_GLOBAL, &cp)) { + metaIgnorePatterns = TRUE; + free(cp); + } } /* @@ -744,27 +762,35 @@ meta_job_output(Job *job, char *cp, cons } } -void +int meta_cmd_finish(void *pbmp) { + int error = 0; #ifdef USE_FILEMON BuildMon *pbm = pbmp; + int x; if (!pbm) pbm = &Mybm; if (pbm->filemon_fd >= 0) { - close(pbm->filemon_fd); - filemon_read(pbm->mfp, pbm->mon_fd); + if (close(pbm->filemon_fd) < 0) + error = errno; + x = filemon_read(pbm->mfp, pbm->mon_fd); + if (error == 0 && x != 0) + error = x; pbm->filemon_fd = pbm->mon_fd = -1; } #endif + return error; } -void +int meta_job_finish(Job *job) { BuildMon *pbm; + int error = 0; + int x; if (job != NULL) { pbm = &job->bm; @@ -772,11 +798,14 @@ meta_job_finish(Job *job) pbm = &Mybm; } if (pbm->mfp != NULL) { - meta_cmd_finish(pbm); - fclose(pbm->mfp); + error = meta_cmd_finish(pbm); + x = fclose(pbm->mfp); + if (error == 0 && x != 0) + error = errno; pbm->mfp = NULL; pbm->meta_fname[0] = '\0'; } + return error; } void @@ -1209,14 +1238,35 @@ meta_oodate(GNode *gn, Boolean oodate) * be part of the dependencies because * they are _expected_ to change. */ - if (*p == '/' && - Lst_ForEach(metaIgnorePaths, prefix_match, p)) { + if (*p == '/') { + realpath(p, fname1); /* clean it up */ + if (Lst_ForEach(metaIgnorePaths, prefix_match, fname1)) { #ifdef DEBUG_META_MODE - if (DEBUG(META)) - fprintf(debug_file, "meta_oodate: ignoring: %s\n", - p); + if (DEBUG(META)) + fprintf(debug_file, "meta_oodate: ignoring path: %s\n", + p); #endif - break; + break; + } + } + + if (metaIgnorePatterns) { + char *pm; + + snprintf(fname1, sizeof(fname1), + "${%s:@m@${%s:L:M$m}@}", + MAKE_META_IGNORE_PATTERNS, p); + pm = Var_Subst(NULL, fname1, gn, VARF_WANTRES); + if (*pm) { +#ifdef DEBUG_META_MODE + if (DEBUG(META)) + fprintf(debug_file, "meta_oodate: ignoring pattern: %s\n", + p); +#endif + free(pm); + break; + } + free(pm); } /* Modified: user/alc/PQ_LAUNDRY/contrib/bmake/meta.h ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/meta.h Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/contrib/bmake/meta.h Mon May 23 05:15:06 2016 (r300457) @@ -1,4 +1,4 @@ -/* $NetBSD: meta.h,v 1.4 2016/03/07 21:45:43 christos Exp $ */ +/* $NetBSD: meta.h,v 1.5 2016/05/12 20:28:34 sjg Exp $ */ /* * Things needed for 'meta' mode. @@ -48,8 +48,8 @@ void meta_job_start(struct Job *, GNode void meta_job_child(struct Job *); void meta_job_error(struct Job *, GNode *, int, int); void meta_job_output(struct Job *, char *, const char *); -void meta_cmd_finish(void *); -void meta_job_finish(struct Job *); +int meta_cmd_finish(void *); +int meta_job_finish(struct Job *); Boolean meta_oodate(GNode *, Boolean); void meta_compat_start(void); void meta_compat_child(void); Modified: user/alc/PQ_LAUNDRY/contrib/bmake/mk/ChangeLog ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/mk/ChangeLog Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/contrib/bmake/mk/ChangeLog Mon May 23 05:15:06 2016 (r300457) @@ -1,3 +1,57 @@ +2016-05-12 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): 20160512 + + * dpadd.mk: always include local.dpadd.mk if it exists + remove some things that better belong in local.dpadd.mk + skip INCLUDES_* for staged libs unless SRC_* defined. + + * own.mk: add INCLUDEDIR + +2016-04-18 Simon J. Gerraty <sjg@bad.crufty.net> + + * dirdeps.mk: when doing -f dirdeps.mk if target suppies no + TARGET_MACHINE - :E will be empty or match part of path, use + ${MACHINE} + +2016-04-07 Simon J. Gerraty <sjg@bad.crufty.net> + + * meta.autodep.mk: issue a warning if UPDATE_DEPENDFILE=NO due to + NO_FILEMON_COOKIE + + * dirdeps.mk: move the logic that allows for + make -f dirdeps.mk some/dir.${TARGET_SPEC} + inside the check for !target(_DIRDEP_USE) + +2016-04-04 Simon J. Gerraty <sjg@bad.crufty.net> + + * Use <> when including local*.mk and others which may exist + elsewhere so that user can better control what they get. + + * meta.autodep.mk (NO_FILEMON_COOKIE): + create a cookie if we ever build dir with nofilemon + so that UPDATE_DEPENDFILE will be forced to NO until cleaned. + +2016-04-01 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): 20160401 + + * meta2deps.py: fix old print statement when debugging. + + * gendirdeps.mk: META2DEPS_CMD append M2D_EXCLUDES with -X + patch from Bryan Drewery + +2016-03-22 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): 20160317 (St. Pats) + + * warnings.mk: g++ does not like -Wimplicit + + * sys.mk sys/*.mk lib.mk prog.mk: use CXX_SUFFIXES to handle the + pelthora of common suffixes for C++ + + * lib.mk: use .So for shared objects + 2016-03-15 Simon J. Gerraty <sjg@bad.crufty.net> * install-mk (MK_VERSION): 20160315 Modified: user/alc/PQ_LAUNDRY/contrib/bmake/mk/auto.dep.mk ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/mk/auto.dep.mk Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/contrib/bmake/mk/auto.dep.mk Mon May 23 05:15:06 2016 (r300457) @@ -1,6 +1,6 @@ # # RCSid: -# $Id: auto.dep.mk,v 1.4 2016/02/18 21:16:39 sjg Exp $ +# $Id: auto.dep.mk,v 1.5 2016/04/05 15:58:37 sjg Exp $ # # @(#) Copyright (c) 2010, Simon J. Gerraty # @@ -66,7 +66,7 @@ ${.MAKE.DEPENDFILE}: ${OBJS} ${POBJS} ${ .if empty(_SKIP_BUILD) _all_objs = ${OBJS} ${POBJS} ${SOBJS} .for d in ${_all_objs:M*o:T:O:u:%=%.d} -.dinclude "$d" +.dinclude <$d> .endfor .endif Modified: user/alc/PQ_LAUNDRY/contrib/bmake/mk/autodep.mk ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/bmake/mk/autodep.mk Mon May 23 05:14:26 2016 (r300456) +++ user/alc/PQ_LAUNDRY/contrib/bmake/mk/autodep.mk Mon May 23 05:15:06 2016 (r300457) @@ -1,6 +1,6 @@ # # RCSid: -# $Id: autodep.mk,v 1.34 2014/08/04 05:12:27 sjg Exp $ +# $Id: autodep.mk,v 1.36 2016/04/05 15:58:37 sjg Exp $ # # @(#) Copyright (c) 1999-2010, Simon J. Gerraty # @@ -25,7 +25,11 @@ __${.PARSEFILE}__: DEPENDFILE?= .depend .for d in ${DEPENDFILE:N.depend} # bmake only groks .depend -.-include "$d" +.if ${MAKE_VERSION} < 20160218 +.-include <$d> +.else +.dinclude <$d> +.endif .endfor # it does nothing if SRCS is not defined or is empty @@ -75,6 +79,9 @@ CXXFLAGS_MD=${CXXFLAGS:M-[IUD]*} ${CPPFL CC_MD?=${CC} CXX_MD?=${CXX} +# should have been set by sys.mk +CXX_SUFFIXES?= .cc .cpp .cxx .C *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605230515.u4N5F6eA084436>