svn commit: r297053 - in projects/powerpcspe: . bin/sh cddl/contrib/opensolaris/lib/libdtrace/common contrib/bmake contrib/bmake/mk contrib/bsnmp/snmp_mibII contrib/elftoolchain/libelf contrib/libc...

Justin Hibbits jhibbits at FreeBSD.org
Sat Mar 19 16:17:01 UTC 2016 

Author: jhibbits
Date: Sat Mar 19 16:16:56 2016
New Revision: 297053
URL: https://svnweb.freebsd.org/changeset/base/297053

Log:
  IFC at r297052

Added:
  projects/powerpcspe/Makefile.libcompat
     - copied unchanged from r297052, head/Makefile.libcompat
     - copied unchanged from r297052, head/contrib/libxo/libxo/xo_config.h.in
  projects/powerpcspe/etc/defaults/Makefile.depend
     - copied unchanged from r297052, head/etc/defaults/Makefile.depend
  projects/powerpcspe/lib/libxo/xo_config.h
     - copied unchanged from r297052, head/lib/libxo/xo_config.h
  projects/powerpcspe/share/examples/Makefile.depend
     - copied unchanged from r297052, head/share/examples/Makefile.depend
  projects/powerpcspe/sys/arm/conf/JETSON-TK1
     - copied unchanged from r297052, head/sys/arm/conf/JETSON-TK1
  projects/powerpcspe/sys/arm/conf/TEGRA124
     - copied unchanged from r297052, head/sys/arm/conf/TEGRA124
  projects/powerpcspe/sys/arm/nvidia/
     - copied from r297052, head/sys/arm/nvidia/
  projects/powerpcspe/sys/boot/fdt/dts/arm/tegra124-jetson-tk1-fbsd.dts
     - copied unchanged from r297052, head/sys/boot/fdt/dts/arm/tegra124-jetson-tk1-fbsd.dts
  projects/powerpcspe/sys/boot/geli/
     - copied from r297052, head/sys/boot/geli/
  projects/powerpcspe/sys/dev/extres/clk/clk_bus.c
     - copied unchanged from r297052, head/sys/dev/extres/clk/clk_bus.c
  projects/powerpcspe/sys/dev/extres/phy/
     - copied from r297052, head/sys/dev/extres/phy/
  projects/powerpcspe/sys/dev/extres/regulator/
     - copied from r297052, head/sys/dev/extres/regulator/
  projects/powerpcspe/sys/dev/usb/controller/xhci_mv.c
     - copied unchanged from r297052, head/sys/dev/usb/controller/xhci_mv.c
Directory Properties:
  projects/powerpcspe/contrib/libxo/libxo/xo_config.h.in   (props changed)
Deleted:
  projects/powerpcspe/Makefile.lib32
  projects/powerpcspe/contrib/libxo/bin/
  projects/powerpcspe/contrib/libxo/build/
  projects/powerpcspe/contrib/libxo/libxo/xo_config.h
Modified:
  projects/powerpcspe/MAINTAINERS   (contents, props changed)
  projects/powerpcspe/Makefile
  projects/powerpcspe/Makefile.inc1
  projects/powerpcspe/ObsoleteFiles.inc
  projects/powerpcspe/UPDATING
  projects/powerpcspe/bin/sh/exec.c
  projects/powerpcspe/bin/sh/miscbltin.c
  projects/powerpcspe/bin/sh/sh.1
  projects/powerpcspe/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
  projects/powerpcspe/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c
  projects/powerpcspe/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c
  projects/powerpcspe/contrib/bmake/ChangeLog
  projects/powerpcspe/contrib/bmake/Makefile
  projects/powerpcspe/contrib/bmake/bmake.1
  projects/powerpcspe/contrib/bmake/bmake.cat1
  projects/powerpcspe/contrib/bmake/make.1
  projects/powerpcspe/contrib/bmake/meta.c
  projects/powerpcspe/contrib/bmake/mk/ChangeLog
  projects/powerpcspe/contrib/bmake/mk/dirdeps.mk
  projects/powerpcspe/contrib/bmake/mk/install-mk
  projects/powerpcspe/contrib/bmake/mk/meta.autodep.mk
  projects/powerpcspe/contrib/bmake/mk/meta.stage.mk
  projects/powerpcspe/contrib/bmake/mk/sys.dependfile.mk
  projects/powerpcspe/contrib/bmake/parse.c
  projects/powerpcspe/contrib/bmake/suff.c
  projects/powerpcspe/contrib/bmake/var.c
  projects/powerpcspe/contrib/bsnmp/snmp_mibII/mibII_tcp.c
  projects/powerpcspe/contrib/elftoolchain/libelf/libelf_convert.m4
  projects/powerpcspe/contrib/libc++/include/__config
  projects/powerpcspe/contrib/libc++/include/atomic
  projects/powerpcspe/contrib/libxo/install-sh
  projects/powerpcspe/contrib/pjdfstest/tests/ftruncate/11.t
  projects/powerpcspe/contrib/pjdfstest/tests/misc.sh
  projects/powerpcspe/contrib/pjdfstest/tests/open/20.t
  projects/powerpcspe/contrib/pjdfstest/tests/truncate/11.t
  projects/powerpcspe/etc/Makefile
  projects/powerpcspe/etc/autofs/special_media
  projects/powerpcspe/etc/defaults/Makefile
  projects/powerpcspe/etc/login.conf
  projects/powerpcspe/etc/mtree/BSD.usr.dist
  projects/powerpcspe/etc/rc.d/netwait
  projects/powerpcspe/include/Makefile
  projects/powerpcspe/lib/Makefile
  projects/powerpcspe/lib/atf/Makefile
  projects/powerpcspe/lib/libc++/Makefile
  projects/powerpcspe/lib/libc/db/mpool/Makefile.inc
  projects/powerpcspe/lib/libc/gen/Makefile.inc
  projects/powerpcspe/lib/libc/iconv/Makefile.inc
  projects/powerpcspe/lib/libc/posix1e/Makefile.inc
  projects/powerpcspe/lib/libc/secure/Makefile.inc
  projects/powerpcspe/lib/libc/sys/Symbol.map
  projects/powerpcspe/lib/libc/sys/modfind.2
  projects/powerpcspe/lib/libdevinfo/Makefile
  projects/powerpcspe/lib/libfetch/fetch.3
  projects/powerpcspe/lib/libpam/modules/pam_ssh/Makefile.depend
  projects/powerpcspe/lib/libutil/login.conf.5
  projects/powerpcspe/lib/libutil/login_class.3
  projects/powerpcspe/lib/libutil/login_class.c
  projects/powerpcspe/lib/libxo/Makefile
  projects/powerpcspe/lib/libxo/tests/Makefile
  projects/powerpcspe/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/powerpcspe/sbin/ifconfig/ifieee80211.c
  projects/powerpcspe/sbin/ifconfig/sfp.c
  projects/powerpcspe/sbin/kldstat/kldstat.8
  projects/powerpcspe/sbin/kldstat/kldstat.c
  projects/powerpcspe/sbin/ping/ping.c
  projects/powerpcspe/share/examples/Makefile
  projects/powerpcspe/share/i18n/esdb/BIG5/Makefile
  projects/powerpcspe/share/i18n/esdb/Makefile.part
  projects/powerpcspe/share/i18n/esdb/UTF/Makefile
  projects/powerpcspe/share/man/man7/hier.7
  projects/powerpcspe/share/man/man9/Makefile
  projects/powerpcspe/share/man/man9/SYSCALL_MODULE.9
  projects/powerpcspe/share/man/man9/counter.9
  projects/powerpcspe/share/man/man9/fail.9
  projects/powerpcspe/share/man/man9/sx.9
  projects/powerpcspe/share/mk/bsd.files.mk
  projects/powerpcspe/share/mk/bsd.lib.mk
  projects/powerpcspe/share/mk/bsd.subdir.mk
  projects/powerpcspe/share/mk/bsd.sys.mk
  projects/powerpcspe/share/mk/dirdeps.mk
  projects/powerpcspe/share/mk/local.meta.sys.mk
  projects/powerpcspe/share/mk/local.sys.mk
  projects/powerpcspe/share/mk/meta.stage.mk
  projects/powerpcspe/share/sendmail/Makefile
  projects/powerpcspe/share/sendmail/Makefile.depend
  projects/powerpcspe/share/zoneinfo/Makefile
  projects/powerpcspe/share/zoneinfo/Makefile.depend
  projects/powerpcspe/sys/amd64/amd64/sys_machdep.c
  projects/powerpcspe/sys/amd64/amd64/vm_machdep.c
  projects/powerpcspe/sys/arm/allwinner/a10_gpio.c
  projects/powerpcspe/sys/arm/allwinner/a10_hdmi.c
  projects/powerpcspe/sys/arm/arm/gic.c
  projects/powerpcspe/sys/arm/arm/machdep.c
  projects/powerpcspe/sys/arm/arm/vm_machdep.c
  projects/powerpcspe/sys/arm/conf/ARMADA38X
  projects/powerpcspe/sys/arm/conf/ATMEL
  projects/powerpcspe/sys/arm/conf/CNS11XXNAS
  projects/powerpcspe/sys/arm/conf/EFIKA_MX
  projects/powerpcspe/sys/arm/conf/ETHERNUT5
  projects/powerpcspe/sys/arm/conf/IMX53
  projects/powerpcspe/sys/arm/conf/NOTES
  projects/powerpcspe/sys/arm/conf/SAM9260EK
  projects/powerpcspe/sys/arm/conf/std.arm
  projects/powerpcspe/sys/arm/conf/std.armv6
  projects/powerpcspe/sys/arm/mv/armada38x/files.armada38x
  projects/powerpcspe/sys/arm/mv/files.mv
  projects/powerpcspe/sys/arm/mv/mpic.c
  projects/powerpcspe/sys/arm/mv/mv_common.c
  projects/powerpcspe/sys/arm/mv/mvreg.h
  projects/powerpcspe/sys/arm/mv/mvwin.h
  projects/powerpcspe/sys/arm/ti/cpsw/if_cpsw.c
  projects/powerpcspe/sys/arm/ti/cpsw/if_cpswreg.h
  projects/powerpcspe/sys/arm/ti/cpsw/if_cpswvar.h
  projects/powerpcspe/sys/arm/xscale/ixp425/avila_ata.c
  projects/powerpcspe/sys/arm/xscale/ixp425/ixp425.c
  projects/powerpcspe/sys/arm/xscale/pxa/pxa_obio.c
  projects/powerpcspe/sys/arm64/arm64/exception.S
  projects/powerpcspe/sys/arm64/arm64/intr_machdep.c
  projects/powerpcspe/sys/arm64/arm64/mp_machdep.c
  projects/powerpcspe/sys/arm64/arm64/nexus.c
  projects/powerpcspe/sys/arm64/arm64/pmap.c
  projects/powerpcspe/sys/arm64/include/intr.h
  projects/powerpcspe/sys/arm64/include/pte.h
  projects/powerpcspe/sys/arm64/include/smp.h
  projects/powerpcspe/sys/boot/Makefile.amd64
  projects/powerpcspe/sys/boot/Makefile.i386
  projects/powerpcspe/sys/boot/common/disk.c
  projects/powerpcspe/sys/boot/common/disk.h
  projects/powerpcspe/sys/boot/common/gpt.c
  projects/powerpcspe/sys/boot/common/gpt.h
  projects/powerpcspe/sys/boot/efi/Makefile
  projects/powerpcspe/sys/boot/efi/boot1/Makefile
  projects/powerpcspe/sys/boot/efi/boot1/boot1.c
  projects/powerpcspe/sys/boot/efi/fdt/Makefile
  projects/powerpcspe/sys/boot/efi/loader/Makefile
  projects/powerpcspe/sys/boot/fdt/dts/arm/bananapi.dts
  projects/powerpcspe/sys/boot/fdt/dts/arm/db78460.dts
  projects/powerpcspe/sys/boot/ficl/Makefile
  projects/powerpcspe/sys/boot/i386/common/bootargs.h
  projects/powerpcspe/sys/boot/i386/common/cons.c
  projects/powerpcspe/sys/boot/i386/common/drv.c
  projects/powerpcspe/sys/boot/i386/common/drv.h
  projects/powerpcspe/sys/boot/i386/gptboot/Makefile
  projects/powerpcspe/sys/boot/i386/gptboot/gptboot.c
  projects/powerpcspe/sys/boot/i386/gptzfsboot/Makefile
  projects/powerpcspe/sys/boot/i386/libfirewire/Makefile
  projects/powerpcspe/sys/boot/i386/libi386/Makefile
  projects/powerpcspe/sys/boot/i386/libi386/biosdisk.c
  projects/powerpcspe/sys/boot/i386/loader/Makefile
  projects/powerpcspe/sys/boot/i386/loader/main.c
  projects/powerpcspe/sys/boot/i386/zfsboot/Makefile
  projects/powerpcspe/sys/boot/i386/zfsboot/zfsboot.c
  projects/powerpcspe/sys/boot/libstand32/Makefile
  projects/powerpcspe/sys/boot/ofw/libofw/Makefile
  projects/powerpcspe/sys/boot/uboot/fdt/Makefile
  projects/powerpcspe/sys/boot/uboot/lib/Makefile
  projects/powerpcspe/sys/boot/userboot/ficl/Makefile
  projects/powerpcspe/sys/boot/zfs/Makefile
  projects/powerpcspe/sys/boot/zfs/libzfs.h
  projects/powerpcspe/sys/cam/cam_ccb.h
  projects/powerpcspe/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c
  projects/powerpcspe/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/powerpcspe/sys/cddl/dev/dtrace/aarch64/dtrace_subr.c
  projects/powerpcspe/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
  projects/powerpcspe/sys/cddl/dev/dtrace/arm/dtrace_subr.c
  projects/powerpcspe/sys/cddl/dev/dtrace/i386/dtrace_subr.c
  projects/powerpcspe/sys/cddl/dev/dtrace/mips/dtrace_subr.c
  projects/powerpcspe/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
  projects/powerpcspe/sys/compat/freebsd32/freebsd32_syscall.h
  projects/powerpcspe/sys/compat/ndis/kern_ndis.c
  projects/powerpcspe/sys/conf/config.mk
  projects/powerpcspe/sys/conf/files
  projects/powerpcspe/sys/conf/files.amd64
  projects/powerpcspe/sys/conf/files.arm
  projects/powerpcspe/sys/conf/files.i386
  projects/powerpcspe/sys/conf/files.pc98
  projects/powerpcspe/sys/conf/files.sparc64
  projects/powerpcspe/sys/conf/kern.mk
  projects/powerpcspe/sys/conf/kern.opts.mk
  projects/powerpcspe/sys/conf/kmod.mk
  projects/powerpcspe/sys/contrib/rdma/krping/krping.c
  projects/powerpcspe/sys/dev/acpica/acpi.c
  projects/powerpcspe/sys/dev/acpica/acpi_hpet.c
  projects/powerpcspe/sys/dev/acpica/acpi_timer.c
  projects/powerpcspe/sys/dev/advansys/adv_isa.c
  projects/powerpcspe/sys/dev/agp/agp_i810.c
  projects/powerpcspe/sys/dev/agp/agpreg.h
  projects/powerpcspe/sys/dev/arcmsr/arcmsr.c
  projects/powerpcspe/sys/dev/atkbdc/atkbdc_subr.c
  projects/powerpcspe/sys/dev/bxe/bxe.c
  projects/powerpcspe/sys/dev/cardbus/cardbus_cis.c
  projects/powerpcspe/sys/dev/ctau/if_ct.c
  projects/powerpcspe/sys/dev/cxgbe/adapter.h
  projects/powerpcspe/sys/dev/cxgbe/common/t4_hw.c
  projects/powerpcspe/sys/dev/cxgbe/firmware/t4fw_cfg.txt
  projects/powerpcspe/sys/dev/cxgbe/firmware/t5fw_cfg.txt
  projects/powerpcspe/sys/dev/cxgbe/t4_main.c
  projects/powerpcspe/sys/dev/drm2/i915/i915_dma.c
  projects/powerpcspe/sys/dev/drm2/i915/i915_gem.c
  projects/powerpcspe/sys/dev/drm2/i915/i915_gem_context.c
  projects/powerpcspe/sys/dev/drm2/i915/i915_gem_gtt.c
  projects/powerpcspe/sys/dev/ed/if_ed_3c503.c
  projects/powerpcspe/sys/dev/ed/if_ed_cbus.c
  projects/powerpcspe/sys/dev/extres/clk/clk.c
  projects/powerpcspe/sys/dev/extres/clk/clk.h
  projects/powerpcspe/sys/dev/extres/clk/clk_div.c
  projects/powerpcspe/sys/dev/extres/clk/clk_fixed.c
  projects/powerpcspe/sys/dev/extres/clk/clk_fixed.h
  projects/powerpcspe/sys/dev/extres/clk/clk_gate.c
  projects/powerpcspe/sys/dev/extres/clk/clk_mux.c
  projects/powerpcspe/sys/dev/extres/clk/clkdev_if.m
  projects/powerpcspe/sys/dev/fdt/simplebus.c
  projects/powerpcspe/sys/dev/gpio/ofw_gpiobus.c
  projects/powerpcspe/sys/dev/iir/iir.c
  projects/powerpcspe/sys/dev/iir/iir_pci.c
  projects/powerpcspe/sys/dev/isci/isci_controller.c
  projects/powerpcspe/sys/dev/isci/isci_io_request.c
  projects/powerpcspe/sys/dev/iscsi/iscsi.c
  projects/powerpcspe/sys/dev/ixgbe/if_ix.c
  projects/powerpcspe/sys/dev/mca/mca_bus.c
  projects/powerpcspe/sys/dev/mfi/mfi.c
  projects/powerpcspe/sys/dev/mxge/if_mxge.c
  projects/powerpcspe/sys/dev/ncr/ncr.c
  projects/powerpcspe/sys/dev/ofw/ofw_iicbus.c
  projects/powerpcspe/sys/dev/ofw/ofwbus.c
  projects/powerpcspe/sys/dev/pccard/pccard.c
  projects/powerpcspe/sys/dev/pccard/pccard_cis.c
  projects/powerpcspe/sys/dev/pccbb/pccbb.c
  projects/powerpcspe/sys/dev/pccbb/pccbb_pci.c
  projects/powerpcspe/sys/dev/pci/pci.c
  projects/powerpcspe/sys/dev/pci/pci_host_generic.c
  projects/powerpcspe/sys/dev/pci/pci_iov.c
  projects/powerpcspe/sys/dev/pci/pci_iov_private.h
  projects/powerpcspe/sys/dev/pci/pci_iov_schema.c
  projects/powerpcspe/sys/dev/pci/pci_pci.c
  projects/powerpcspe/sys/dev/pci/pci_subr.c
  projects/powerpcspe/sys/dev/pci/schema_private.h
  projects/powerpcspe/sys/dev/ppbus/vpo.c
  projects/powerpcspe/sys/dev/ppc/ppc.c
  projects/powerpcspe/sys/dev/proto/proto_bus_isa.c
  projects/powerpcspe/sys/dev/sound/isa/ad1816.c
  projects/powerpcspe/sys/dev/sound/isa/ess.c
  projects/powerpcspe/sys/dev/sound/isa/mss.c
  projects/powerpcspe/sys/dev/sound/isa/sb16.c
  projects/powerpcspe/sys/dev/sound/isa/sb8.c
  projects/powerpcspe/sys/dev/sound/pci/als4000.c
  projects/powerpcspe/sys/dev/sound/pci/atiixp.c
  projects/powerpcspe/sys/dev/sound/pci/aureal.c
  projects/powerpcspe/sys/dev/sound/pci/cmi.c
  projects/powerpcspe/sys/dev/sound/pci/cs4281.c
  projects/powerpcspe/sys/dev/sound/pci/csapcm.c
  projects/powerpcspe/sys/dev/sound/pci/ds1.c
  projects/powerpcspe/sys/dev/sound/pci/emu10k1.c
  projects/powerpcspe/sys/dev/sound/pci/emu10kx.c
  projects/powerpcspe/sys/dev/sound/pci/envy24.c
  projects/powerpcspe/sys/dev/sound/pci/envy24ht.c
  projects/powerpcspe/sys/dev/sound/pci/es137x.c
  projects/powerpcspe/sys/dev/sound/pci/fm801.c
  projects/powerpcspe/sys/dev/sound/pci/hdspe-pcm.c
  projects/powerpcspe/sys/dev/sound/pci/ich.c
  projects/powerpcspe/sys/dev/sound/pci/maestro.c
  projects/powerpcspe/sys/dev/sound/pci/maestro3.c
  projects/powerpcspe/sys/dev/sound/pci/neomagic.c
  projects/powerpcspe/sys/dev/sound/pci/solo.c
  projects/powerpcspe/sys/dev/sound/pci/t4dwave.c
  projects/powerpcspe/sys/dev/sound/pci/via8233.c
  projects/powerpcspe/sys/dev/sound/pci/via82c686.c
  projects/powerpcspe/sys/dev/sound/pci/vibes.c
  projects/powerpcspe/sys/dev/usb/controller/ehci_pci.c
  projects/powerpcspe/sys/dev/usb/controller/xhci_pci.c
  projects/powerpcspe/sys/dev/wl/if_wl.c
  projects/powerpcspe/sys/dev/xe/if_xe.c
  projects/powerpcspe/sys/dev/xe/if_xe_pccard.c
  projects/powerpcspe/sys/fs/autofs/autofs.h
  projects/powerpcspe/sys/fs/autofs/autofs_vfsops.c
  projects/powerpcspe/sys/fs/autofs/autofs_vnops.c
  projects/powerpcspe/sys/fs/unionfs/union_subr.c
  projects/powerpcspe/sys/i386/i386/vm_machdep.c
  projects/powerpcspe/sys/kern/kern_alq.c
  projects/powerpcspe/sys/kern/kern_event.c
  projects/powerpcspe/sys/kern/kern_fail.c
  projects/powerpcspe/sys/kern/makesyscalls.sh
  projects/powerpcspe/sys/kern/subr_counter.c
  projects/powerpcspe/sys/kern/subr_rman.c
  projects/powerpcspe/sys/kern/subr_sleepqueue.c
  projects/powerpcspe/sys/kern/vfs_aio.c
  projects/powerpcspe/sys/kern/vfs_lookup.c
  projects/powerpcspe/sys/mips/atheros/apb.c
  projects/powerpcspe/sys/mips/mips/mips_pic.c
  projects/powerpcspe/sys/mips/mips/nexus.c
  projects/powerpcspe/sys/mips/nlm/xlp_pci.c
  projects/powerpcspe/sys/mips/nlm/xlp_simplebus.c
  projects/powerpcspe/sys/mips/rmi/iodi.c
  projects/powerpcspe/sys/mips/rmi/xlr_pci.c
  projects/powerpcspe/sys/modules/Makefile
  projects/powerpcspe/sys/net80211/ieee80211.h
  projects/powerpcspe/sys/net80211/ieee80211_amrr.c
  projects/powerpcspe/sys/net80211/ieee80211_input.c
  projects/powerpcspe/sys/net80211/ieee80211_ratectl.c
  projects/powerpcspe/sys/net80211/ieee80211_ratectl.h
  projects/powerpcspe/sys/netinet/siftr.c
  projects/powerpcspe/sys/netinet/tcp_input.c
  projects/powerpcspe/sys/netinet/tcp_stacks/fastpath.c
  projects/powerpcspe/sys/netinet/tcp_subr.c
  projects/powerpcspe/sys/netinet/tcp_syncache.c
  projects/powerpcspe/sys/netinet/tcp_timewait.c
  projects/powerpcspe/sys/netinet/tcp_usrreq.c
  projects/powerpcspe/sys/netinet/tcp_var.h
  projects/powerpcspe/sys/netinet6/in6_src.c
  projects/powerpcspe/sys/netinet6/nd6.h
  projects/powerpcspe/sys/netinet6/nd6_nbr.c
  projects/powerpcspe/sys/netinet6/nd6_rtr.c
  projects/powerpcspe/sys/netipsec/ipsec_output.c
  projects/powerpcspe/sys/netipsec/key.c
  projects/powerpcspe/sys/netpfil/pf/pf.c
  projects/powerpcspe/sys/ofed/drivers/infiniband/core/device.c
  projects/powerpcspe/sys/ofed/drivers/infiniband/hw/mlx4/main.c
  projects/powerpcspe/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h
  projects/powerpcspe/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
  projects/powerpcspe/sys/ofed/drivers/net/mlx4/en_port.c
  projects/powerpcspe/sys/ofed/drivers/net/mlx4/en_rx.c
  projects/powerpcspe/sys/ofed/drivers/net/mlx4/en_tx.c
  projects/powerpcspe/sys/powerpc/include/bus.h
  projects/powerpcspe/sys/powerpc/mpc85xx/lbc.c
  projects/powerpcspe/sys/powerpc/ofw/ofw_pci.c
  projects/powerpcspe/sys/powerpc/powermac/uninorth.c
  projects/powerpcspe/sys/powerpc/powerpc/exec_machdep.c
  projects/powerpcspe/sys/powerpc/powerpc/nexus.c
  projects/powerpcspe/sys/rpc/svc.c
  projects/powerpcspe/sys/sparc64/pci/apb.c
  projects/powerpcspe/sys/sys/_types.h
  projects/powerpcspe/sys/sys/errno.h
  projects/powerpcspe/sys/sys/fail.h
  projects/powerpcspe/sys/sys/iov.h
  projects/powerpcspe/sys/sys/iov_schema.h
  projects/powerpcspe/sys/sys/libkern.h
  projects/powerpcspe/sys/sys/namei.h
  projects/powerpcspe/sys/sys/param.h
  projects/powerpcspe/sys/sys/sleepqueue.h
  projects/powerpcspe/sys/sys/syscall.h
  projects/powerpcspe/sys/sys/syscall.mk
  projects/powerpcspe/sys/sys/sysctl.h
  projects/powerpcspe/sys/x86/x86/io_apic.c
  projects/powerpcspe/sys/x86/x86/local_apic.c
  projects/powerpcspe/targets/pseudo/bootstrap-tools/Makefile
  projects/powerpcspe/targets/pseudo/kernel/Makefile
  projects/powerpcspe/targets/pseudo/stage/Makefile
  projects/powerpcspe/targets/pseudo/userland/share/Makefile.depend
  projects/powerpcspe/tools/build/mk/OptionalObsoleteFiles.inc
  projects/powerpcspe/usr.bin/bmake/Makefile
  projects/powerpcspe/usr.bin/fetch/fetch.1
  projects/powerpcspe/usr.bin/finger/sprint.c
  projects/powerpcspe/usr.bin/grep/regex/glue.h
  projects/powerpcspe/usr.bin/limits/limits.1
  projects/powerpcspe/usr.bin/limits/limits.c
  projects/powerpcspe/usr.bin/mkuzip/mkuz_blockcache.c
  projects/powerpcspe/usr.bin/mkuzip/mkuzip.c
  projects/powerpcspe/usr.bin/netstat/inet.c
  projects/powerpcspe/usr.bin/netstat/main.c
  projects/powerpcspe/usr.bin/netstat/netstat.h
  projects/powerpcspe/usr.bin/netstat/nlist_symbols
  projects/powerpcspe/usr.bin/vtfontcvt/vtfontcvt.c
  projects/powerpcspe/usr.bin/xo/Makefile
  projects/powerpcspe/usr.sbin/Makefile
  projects/powerpcspe/usr.sbin/autofs/log.c
  projects/powerpcspe/usr.sbin/bhyve/pci_virtio_net.c
  projects/powerpcspe/usr.sbin/bsdinstall/scripts/zfsboot
  projects/powerpcspe/usr.sbin/ctld/log.c
  projects/powerpcspe/usr.sbin/ctld/uclparse.c
  projects/powerpcspe/usr.sbin/devinfo/devinfo.c
  projects/powerpcspe/usr.sbin/gpioctl/gpioctl.8
  projects/powerpcspe/usr.sbin/gpioctl/gpioctl.c
  projects/powerpcspe/usr.sbin/iovctl/iovctl.c
  projects/powerpcspe/usr.sbin/iovctl/iovctl.h
  projects/powerpcspe/usr.sbin/iovctl/parse.c
  projects/powerpcspe/usr.sbin/iovctl/validate.c
  projects/powerpcspe/usr.sbin/iscsid/iscsid.c
  projects/powerpcspe/usr.sbin/iscsid/log.c
  projects/powerpcspe/usr.sbin/kbdcontrol/kbdcontrol.1
  projects/powerpcspe/usr.sbin/kbdcontrol/kbdcontrol.c
  projects/powerpcspe/usr.sbin/pc-sysinstall/backend/functions-disk.sh
  projects/powerpcspe/usr.sbin/uathload/Makefile
  projects/powerpcspe/usr.sbin/uathload/uathload.c
Directory Properties:
  projects/powerpcspe/   (props changed)
  projects/powerpcspe/cddl/   (props changed)
  projects/powerpcspe/cddl/contrib/opensolaris/   (props changed)
  projects/powerpcspe/contrib/bmake/   (props changed)
  projects/powerpcspe/contrib/elftoolchain/   (props changed)
  projects/powerpcspe/contrib/libc++/   (props changed)
  projects/powerpcspe/contrib/libxo/   (props changed)
  projects/powerpcspe/include/   (props changed)
  projects/powerpcspe/lib/libc/   (props changed)
  projects/powerpcspe/lib/libutil/   (props changed)
  projects/powerpcspe/sbin/   (props changed)
  projects/powerpcspe/share/   (props changed)
  projects/powerpcspe/share/zoneinfo/   (props changed)
  projects/powerpcspe/sys/   (props changed)
  projects/powerpcspe/sys/boot/   (props changed)
  projects/powerpcspe/sys/cddl/contrib/opensolaris/   (props changed)
  projects/powerpcspe/sys/conf/   (props changed)
  projects/powerpcspe/targets/   (props changed)
  projects/powerpcspe/usr.sbin/bhyve/   (props changed)

Modified: projects/powerpcspe/MAINTAINERS
==============================================================================
--- projects/powerpcspe/MAINTAINERS	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/MAINTAINERS	Sat Mar 19 16:16:56 2016	(r297053)
@@ -102,3 +102,6 @@ usr.sbin/dpv	dteske	Pre-commit review re
 usr.sbin/pkg	pkg@	Please coordinate behavior or flag changes with pkg team.
 usr.sbin/sysrc	dteske	Pre-commit phabricator review requested. Keep in sync with bsdconfig(8) sysrc.subr.
 vmm(4)		neel,grehan	Pre-commit review requested.
+autofs(5)	trasz	Pre-commit review recommended.
+iscsi(4)	trasz	Pre-commit review recommended.
+rctl(8)		trasz	Pre-commit review recommended.

Modified: projects/powerpcspe/Makefile
==============================================================================
--- projects/powerpcspe/Makefile	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/Makefile	Sat Mar 19 16:16:56 2016	(r297053)
@@ -125,7 +125,8 @@ TGTS=	all all-man buildenv buildenvvars 
 	obj objlink rerelease showconfig tags toolchain update \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
 	_build-tools _cross-tools _includes _libraries _depend \
-	build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
+	build32 distribute32 install32 build32 distribute32 install32 \
+	builddtb xdev xdev-build xdev-install \
 	xdev-links native-xtools installconfig \
 
 TGTS+=	${SUBDIR_TARGETS}

Modified: projects/powerpcspe/Makefile.inc1
==============================================================================
--- projects/powerpcspe/Makefile.inc1	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/Makefile.inc1	Sat Mar 19 16:16:56 2016	(r297053)
@@ -455,8 +455,13 @@ XCXXFLAGS+=	${BFLAGS}
 .endif
 .endif # ${XCC:M/*}
 
-.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
-.include "Makefile.lib32"
+.if ${MK_LIB32} != "no" && (${TARGET_ARCH} == "amd64" || \
+    ${TARGET_ARCH} == "powerpc64")
+LIBCOMPAT= 32
+.include "Makefile.libcompat"
+.elif ${MK_LIBSOFT} != "no" && ${TARGET_ARCH} == "armv6"
+LIBCOMPAT= SOFT
+.include "Makefile.libcompat"
 .endif
 
 WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
@@ -514,8 +519,8 @@ _worldtmp: .PHONY
 	@echo "--------------------------------------------------------------"
 .if !defined(NO_CLEAN)
 	rm -rf ${WORLDTMP}
-.if defined(LIB32TMP)
-	rm -rf ${LIB32TMP}
+.if defined(LIBCOMPAT)
+	rm -rf ${LIBCOMPATTMP}
 .endif
 .else
 	rm -rf ${WORLDTMP}/legacy/usr/include
@@ -545,13 +550,13 @@ _worldtmp: .PHONY
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${WORLDTMP}/usr/lib >/dev/null
 .endif
-.if ${MK_LIB32} != "no"
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+.if defined(LIBCOMPAT)
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${WORLDTMP}/usr >/dev/null
 .if ${MK_DEBUG_FILES} != "no"
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${WORLDTMP}/legacy/usr/lib/debug/usr >/dev/null
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${WORLDTMP}/usr/lib/debug/usr >/dev/null
 .endif
 .endif
@@ -587,8 +592,8 @@ _cleanobj:
 	@echo ">>> stage 2.1: cleaning up the object tree"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR}
-.if defined(LIB32TMP)
-	${_+_}cd ${.CURDIR}; ${LIB32WMAKE} -f Makefile.inc1 ${CLEANDIR}
+.if defined(LIBCOMPAT)
+	${_+_}cd ${.CURDIR}; ${LIBCOMPATWMAKE} -f Makefile.inc1 ${CLEANDIR}
 .endif
 .endif
 _obj:
@@ -654,8 +659,8 @@ WMAKE_TGTS+=	_includes _libraries
 WMAKE_TGTS+=	_depend
 .endif
 WMAKE_TGTS+=	everything
-.if defined(LIB32TMP) && ${MK_LIB32} != "no" && empty(SUBDIR_OVERRIDE)
-WMAKE_TGTS+=	build32
+.if defined(LIBCOMPAT) && empty(SUBDIR_OVERRIDE)
+WMAKE_TGTS+=	build${libcompat}
 .endif
 
 buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
@@ -695,7 +700,7 @@ buildenv: .PHONY
 	@cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 ${BUILDENV_SHELL} \
 	    || true
 
-TOOLCHAIN_TGTS=	${WMAKE_TGTS:N_depend:Neverything:Nbuild32}
+TOOLCHAIN_TGTS=	${WMAKE_TGTS:N_depend:Neverything:Nbuild${libcompat}}
 toolchain: ${TOOLCHAIN_TGTS}
 kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries}
 
@@ -789,8 +794,8 @@ ITOOLS+=makewhatis
 
 # Non-base distributions produced by the base system
 EXTRA_DISTRIBUTIONS=	doc
-.if defined(LIB32TMP) && ${MK_LIB32} != "no"
-EXTRA_DISTRIBUTIONS+=	lib32
+.if defined(LIBCOMPAT)
+EXTRA_DISTRIBUTIONS+=	lib${libcompat}
 .endif
 .if ${MK_TESTS} != "no"
 EXTRA_DISTRIBUTIONS+=	tests
@@ -842,11 +847,11 @@ distributeworld installworld: _installch
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null
 .endif
-.if ${MK_LIB32} != "no"
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+.if defined(LIBCOMPAT)
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
 .if ${MK_DEBUG_FILES} != "no"
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/usr >/dev/null
 .endif
 .endif
@@ -866,8 +871,8 @@ distributeworld installworld: _installch
 	    sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG}
 	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.include.dist | \
 	    sed -e 's#^\./#./${dist}/usr/include/#' >> ${METALOG}
-.if ${MK_LIB32} != "no"
-	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.lib32.dist | \
+.if defined(LIBCOMPAT)
+	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist | \
 	    sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG}
 .endif
 .endif
@@ -952,8 +957,8 @@ reinstall: .MAKE .PHONY
 	@echo ">>> Installing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
-.if defined(LIB32TMP) && ${MK_LIB32} != "no"
-	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
+.if defined(LIBCOMPAT)
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install${libcompat}
 .endif
 
 redistribute: .MAKE .PHONY
@@ -961,9 +966,9 @@ redistribute: .MAKE .PHONY
 	@echo ">>> Distributing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
-.if defined(LIB32TMP) && ${MK_LIB32} != "no"
-	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 \
-	    DISTRIBUTION=lib32
+.if defined(LIBCOMPAT)
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute${libcompat} \
+	    DISTRIBUTION=lib${libcompat}
 .endif
 
 distrib-dirs distribution: .MAKE .PHONY
@@ -1026,7 +1031,7 @@ INSTALLKERNEL= ${_kernel}
 .endif
 .endfor
 
-${WMAKE_TGTS:N_worldtmp:Nbuild32} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY
+${WMAKE_TGTS:N_worldtmp:Nbuild${libcompat}} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY
 
 #
 # buildkernel
@@ -1271,7 +1276,8 @@ update:
 #
 
 # ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
-.if ${BOOTSTRAPPING} < 1100006
+# r296685 fix cross-endian objcopy
+.if ${BOOTSTRAPPING} < 1100102
 _elftoolchain_libs= lib/libelf lib/libdwarf
 .endif
 
@@ -2275,8 +2281,8 @@ _xi-mtree: .PHONY
 	    -p ${XDDESTDIR}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${XDDESTDIR}/usr/include >/dev/null
-.if ${MK_LIB32} != "no"
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+.if defined(LIBCOMPAT)
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${XDDESTDIR}/usr >/dev/null
 .endif
 .if ${MK_TESTS} != "no"

Copied: projects/powerpcspe/Makefile.libcompat (from r297052, head/Makefile.libcompat)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/powerpcspe/Makefile.libcompat	Sat Mar 19 16:16:56 2016	(r297053, copy of r297052, head/Makefile.libcompat)
@@ -0,0 +1,161 @@
+# $FreeBSD$
+
+.if !targets(__<${_this:T}>__)
+__<${_this:T}>__:
+
+# Makefile for the compatibility libraries.
+# - 32-bit compat libraries on PowerPC and AMD64.
+#   could also be for mips, but that doesn't work today.
+
+# -------------------------------------------------------------------
+# 32 bit world
+.if ${TARGET_ARCH} == "amd64"
+.if empty(TARGET_CPUTYPE)
+LIB32CPUFLAGS=	-march=i686 -mmmx -msse -msse2
+.else
+LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
+.endif
+LIB32WMAKEENV=	MACHINE=i386 MACHINE_ARCH=i386 \
+		MACHINE_CPU="i686 mmx sse sse2"
+LIB32WMAKEFLAGS=	\
+		AS="${XAS} --32" \
+		LD="${XLD} -m elf_i386_fbsd -Y P,${LIBCOMPATTMP}/usr/lib32" \
+		OBJCOPY="${XOBJCOPY}"
+
+.elif ${TARGET_ARCH} == "powerpc64"
+.if empty(TARGET_CPUTYPE)
+LIB32CPUFLAGS=	-mcpu=powerpc
+.else
+LIB32CPUFLAGS=	-mcpu=${TARGET_CPUTYPE}
+.endif
+LIB32WMAKEENV=	MACHINE=powerpc MACHINE_ARCH=powerpc
+LIB32WMAKEFLAGS=	\
+		LD="${XLD} -m elf32ppc_fbsd" \
+		OBJCOPY="${XOBJCOPY}"
+.endif
+
+
+LIB32CFLAGS=	-m32 -DCOMPAT_32BIT
+LIB32DTRACE=	${DTRACE} -32
+LIB32WMAKEFLAGS+=	-DCOMPAT_32BIT
+
+# -------------------------------------------------------------------
+# soft-fp world
+.if ${TARGET_ARCH} == "armv6"
+LIBSOFTCFLAGS=        -DCOMPAT_SOFTFP
+LIBSOFTCPUFLAGS= -mfloat-abi=softfp
+LIBSOFTWMAKEENV= CPUTYPE=soft MACHINE=arm MACHINE_ARCH=armv6
+LIBSOFTWMAKEFLAGS=        -DCOMPAT_SOFTFP
+.endif
+
+# -------------------------------------------------------------------
+# Generic code for each type.
+# Set defaults based on type.
+libcompat=	${LIBCOMPAT:tl}
+_LIBCOMPAT_MAKEVARS=	_OBJTREE TMP CPUFLAGS CFLAGS WMAKEENV WMAKEFLAGS WMAKE
+.for _var in ${_LIBCOMPAT_MAKEVARS}
+.if !empty(LIB${LIBCOMPAT}${_var})
+LIBCOMPAT${_var}?=	${LIB${LIBCOMPAT}${_var}}
+.endif
+.endfor
+
+# Shared flags
+LIBCOMPAT_OBJTREE?=	${OBJTREE}${.CURDIR}/world${libcompat}
+LIBCOMPATTMP?=		${OBJTREE}${.CURDIR}/lib${libcompat}
+
+LIBCOMPATCFLAGS+=	${LIBCOMPATCPUFLAGS} \
+			-isystem ${LIBCOMPATTMP}/usr/include/ \
+			-L${LIBCOMPATTMP}/usr/lib${libcompat} \
+			-B${LIBCOMPATTMP}/usr/lib${libcompat}
+
+# Yes, the flags are redundant.
+LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} \
+		_LDSCRIPTROOT=${LIBCOMPATTMP} \
+		INSTALL="sh ${.CURDIR}/tools/install.sh" \
+		PATH=${TMPPATH} \
+		LIBDIR=/usr/lib${libcompat} \
+		SHLIBDIR=/usr/lib${libcompat} \
+		DTRACE="${LIB$COMPATDTRACE:U${DTRACE}}"
+LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \
+		CXX="${XCXX} ${LIBCOMPATCFLAGS}" \
+		DESTDIR=${LIBCOMPATTMP} \
+		-DLIBRARIES_ONLY \
+		-DNO_CPU_CFLAGS \
+		MK_CTF=no \
+		-DNO_LINT \
+		MK_TESTS=no
+LIBCOMPATWMAKE+=	${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
+			MK_MAN=no MK_HTML=no
+LIBCOMPATIMAKE+=	${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} \
+			MK_TOOLCHAIN=no ${IMAKE_INSTALL}
+
+.if ${XCC:N${CCACHE_BIN}:M/*}
+LIBCOMPATCFLAGS+=	--sysroot=${WORLDTMP}
+.endif
+
+_LC_LIBDIRS.yes=		lib gnu/lib
+_LC_LIBDIRS.${MK_CDDL:tl}+=	cddl/lib
+_LC_LIBDIRS.${MK_CRYPT:tl}+=	secure/lib
+_LC_LIBDIRS.${MK_KERBEROS:tl}+=	kerberos5/lib
+
+# Shared logic
+build${libcompat}: .PHONY
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo ">>> stage 5.1: building lib${libcompat} shim libraries"
+	@echo "--------------------------------------------------------------"
+	mkdir -p ${LIBCOMPATTMP}/usr/include
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+	    -p ${LIBCOMPATTMP}/usr >/dev/null
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
+	    -p ${LIBCOMPATTMP}/usr/include >/dev/null
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
+	    -p ${LIBCOMPATTMP}/usr >/dev/null
+.if ${MK_DEBUG_FILES} != "no"
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
+	    -p ${LIBCOMPATTMP}/usr/lib >/dev/null
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
+	    -p ${LIBCOMPATTMP}/usr/lib/debug/usr >/dev/null
+.endif
+	mkdir -p ${WORLDTMP}
+	ln -sf ${.CURDIR}/sys ${WORLDTMP}
+.for _t in obj includes
+	${_+_}cd ${.CURDIR}/include; ${LIBCOMPATWMAKE} DIRPRFX=include/ ${_t}
+.for _dir in ${_LC_LIBDIRS.yes}
+	${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATWMAKE} DIRPRFX=${_dir}/ ${_t}
+.endfor
+.endfor
+.for _dir in usr.bin/lex/lib
+	${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATWMAKE} DIRPRFX=${_dir}/ obj
+.endfor
+.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
+	${_+_}cd ${.CURDIR}/${_dir}; \
+	    WORLDTMP=${WORLDTMP} \
+	    MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
+	    MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \
+	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
+	    build-tools
+.endfor
+	${_+_}cd ${.CURDIR}; \
+	    ${LIBCOMPATWMAKE} -f Makefile.inc1 -DNO_FSCHG libraries
+.if ${libcompat} == "32"
+.for _t in obj depend 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} \
+	    DIRPRFX=usr.bin/ldd ${_t}
+.endfor
+.endif
+
+distribute${libcompat} install${libcompat}: .PHONY
+.for _dir in ${_LC_LIBDIRS.yes}
+	${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATIMAKE} ${.TARGET:S/${libcompat}$//}
+.endfor
+.if ${libcompat} == "32"
+	${_+_}cd ${.CURDIR}/libexec/rtld-elf; \
+	    PROG=ld-elf32.so.1 ${LIBCOMPATIMAKE} ${.TARGET:S/32$//}
+	${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIBCOMPATIMAKE} \
+	    ${.TARGET:S/32$//}
+.endif
+
+.endif

Modified: projects/powerpcspe/ObsoleteFiles.inc
==============================================================================
--- projects/powerpcspe/ObsoleteFiles.inc	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/ObsoleteFiles.inc	Sat Mar 19 16:16:56 2016	(r297053)
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20160317: rman_res_t size bump to uintmax_t
+OLD_LIBS+=usr/lib/libdevinfo.so.5
+OLD_LIBS+=usr/lib32/libdevinfo.so.5
 # 20160305: new clang import which bumps version from 3.7.1 to 3.8.0.
 OLD_FILES+=usr/bin/macho-dump
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/allocator_interface.h
@@ -144,6 +147,12 @@ OLD_FILES+=libexec/casper/grp
 OLD_FILES+=libexec/casper/pwd
 OLD_FILES+=libexec/casper/random
 OLD_FILES+=libexec/casper/sysctl
+OLD_FILES+=libexec/casper/.debug/random.debug
+OLD_FILES+=libexec/casper/.debug/dns.debug
+OLD_FILES+=libexec/casper/.debug/sysctl.debug
+OLD_FILES+=libexec/casper/.debug/pwd.debug
+OLD_FILES+=libexec/casper/.debug/grp.debug
+OLD_DIRS+=libexec/casper/.debug
 OLD_DIRS+=libexec/casper
 OLD_FILES+=usr/lib/libcapsicum.a
 OLD_FILES+=usr/lib/libcapsicum.so

Modified: projects/powerpcspe/UPDATING
==============================================================================
--- projects/powerpcspe/UPDATING	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/UPDATING	Sat Mar 19 16:16:56 2016	(r297053)
@@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20160317:
+	Resource range types have grown from unsigned long to uintmax_t.  All
+	drivers, and anything using libdevinfo, need to be recompiled.
+
 20160311:
 	WITH_FAST_DEPEND is now enabled by default for in-tree and out-of-tree
 	builds.  It no longer runs mkdep(1) during 'make depend', and the

Modified: projects/powerpcspe/bin/sh/exec.c
==============================================================================
--- projects/powerpcspe/bin/sh/exec.c	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/bin/sh/exec.c	Sat Mar 19 16:16:56 2016	(r297053)
@@ -332,6 +332,7 @@ find_command(const char *name, struct cm
 	if (strchr(name, '/') != NULL) {
 		entry->cmdtype = CMDNORMAL;
 		entry->u.index = 0;
+		entry->special = 0;
 		return;
 	}
 
@@ -408,6 +409,7 @@ find_command(const char *name, struct cm
 			cmdp = &loc_cmd;
 		cmdp->cmdtype = CMDNORMAL;
 		cmdp->param.index = idx;
+		cmdp->special = 0;
 		INTON;
 		goto success;
 	}
@@ -420,6 +422,7 @@ find_command(const char *name, struct cm
 	}
 	entry->cmdtype = CMDUNKNOWN;
 	entry->u.index = 0;
+	entry->special = 0;
 	return;
 
 success:
@@ -588,6 +591,7 @@ addcmdentry(const char *name, struct cmd
 	}
 	cmdp->cmdtype = entry->cmdtype;
 	cmdp->param = entry->u;
+	cmdp->special = entry->special;
 	INTON;
 }
 
@@ -604,6 +608,7 @@ defun(const char *name, union node *func
 	INTOFF;
 	entry.cmdtype = CMDFUNCTION;
 	entry.u.func = copyfunc(func);
+	entry.special = 0;
 	addcmdentry(name, &entry);
 	INTON;
 }

Modified: projects/powerpcspe/bin/sh/miscbltin.c
==============================================================================
--- projects/powerpcspe/bin/sh/miscbltin.c	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/bin/sh/miscbltin.c	Sat Mar 19 16:16:56 2016	(r297053)
@@ -452,7 +452,7 @@ ulimitcmd(int argc __unused, char **argv
 	struct rlimit	limit;
 
 	what = 'f';
-	while ((optc = nextopt("HSatfdsmcnuvlbpwk")) != '\0')
+	while ((optc = nextopt("HSatfdsmcnuvlbpwko")) != '\0')
 		switch (optc) {
 		case 'H':
 			how = HARD;

Modified: projects/powerpcspe/bin/sh/sh.1
==============================================================================
--- projects/powerpcspe/bin/sh/sh.1	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/bin/sh/sh.1	Sat Mar 19 16:16:56 2016	(r297053)
@@ -2615,7 +2615,7 @@ and not found.
 For aliases the alias expansion is printed;
 for commands and tracked aliases
 the complete pathname of the command is printed.
-.It Ic ulimit Oo Fl HSabcdfklmnpstuvw Oc Op Ar limit
+.It Ic ulimit Oo Fl HSabcdfklmnopstuvw Oc Op Ar limit
 Set or display resource limits (see
 .Xr getrlimit 2 ) .
 If
@@ -2674,6 +2674,11 @@ kilobytes.
 The maximal resident set size of a process, in kilobytes.
 .It Fl n Ar nofiles
 The maximal number of descriptors that could be opened by a process.
+.It Fl o Ar umtxp
+The maximal number of process-shared locks
+(see
+.Xr pthread 3 )
+for this user ID.
 .It Fl p Ar pseudoterminals
 The maximal number of pseudo-terminals for this user ID.
 .It Fl s Ar stacksize

Modified: projects/powerpcspe/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
==============================================================================
--- projects/powerpcspe/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c	Sat Mar 19 16:16:56 2016	(r297053)
@@ -24,6 +24,7 @@
  */
 /*
  * Copyright (c) 2013, Joyent, Inc.  All rights reserved.
+ * Copyright (c) 2016, Pedro Giffuni.  All rights reserved.
  */
 
 #include <sys/types.h>
@@ -721,22 +722,20 @@ dt_module_load_proc(dtrace_hdl_t *dtp, d
 		return (dt_set_errno(dtp, EDT_CANTLOAD));
 	}
 
-	dmp->dm_libctfp = malloc(sizeof (ctf_file_t *) * arg.dpa_count);
+	dmp->dm_libctfp = calloc(arg.dpa_count, sizeof (ctf_file_t *));
 	if (dmp->dm_libctfp == NULL) {
 		dt_proc_unlock(dtp, p);
 		dt_proc_release(dtp, p);
 		return (dt_set_errno(dtp, EDT_NOMEM));
 	}
-	bzero(dmp->dm_libctfp, sizeof (ctf_file_t *) * arg.dpa_count);
 
-	dmp->dm_libctfn = malloc(sizeof (char *) * arg.dpa_count);
+	dmp->dm_libctfn = calloc(arg.dpa_count, sizeof (char *));
 	if (dmp->dm_libctfn == NULL) {
 		free(dmp->dm_libctfp);
 		dt_proc_unlock(dtp, p);
 		dt_proc_release(dtp, p);
 		return (dt_set_errno(dtp, EDT_NOMEM));
 	}
-	bzero(dmp->dm_libctfn, sizeof (char *) * arg.dpa_count);
 
 	dmp->dm_nctflibs = arg.dpa_count;
 
@@ -817,17 +816,14 @@ dt_module_load(dtrace_hdl_t *dtp, dt_mod
 	dmp->dm_nsymbuckets = _dtrace_strbuckets;
 	dmp->dm_symfree = 1;		/* first free element is index 1 */
 
-	dmp->dm_symbuckets = malloc(sizeof (uint_t) * dmp->dm_nsymbuckets);
-	dmp->dm_symchains = malloc(sizeof (dt_sym_t) * dmp->dm_nsymelems + 1);
+	dmp->dm_symbuckets = calloc(dmp->dm_nsymbuckets, sizeof (uint_t));
+	dmp->dm_symchains = calloc(dmp->dm_nsymelems + 1, sizeof (dt_sym_t));
 
 	if (dmp->dm_symbuckets == NULL || dmp->dm_symchains == NULL) {
 		dt_module_unload(dtp, dmp);
 		return (dt_set_errno(dtp, EDT_NOMEM));
 	}
 
-	bzero(dmp->dm_symbuckets, sizeof (uint_t) * dmp->dm_nsymbuckets);
-	bzero(dmp->dm_symchains, sizeof (dt_sym_t) * dmp->dm_nsymelems + 1);
-
 	/*
 	 * Iterate over the symbol table data buffer and insert each symbol
 	 * name into the name hash if the name and type are valid.  Then

Modified: projects/powerpcspe/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c
==============================================================================
--- projects/powerpcspe/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c	Sat Mar 19 16:16:56 2016	(r297053)
@@ -27,6 +27,7 @@
 
 /*
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2016 Pedro Giffuni.  All rights reserved.
  */
 
 #include <sys/types.h>
@@ -47,15 +48,15 @@ dt_regset_create(ulong_t nregs)
 	if (drp == NULL)
 		return (NULL);
 
-	drp->dr_bitmap = malloc(sizeof (ulong_t) * n);
-	drp->dr_size = nregs;
+	drp->dr_bitmap = calloc(n, sizeof (ulong_t));
 
 	if (drp->dr_bitmap == NULL) {
 		dt_regset_destroy(drp);
 		return (NULL);
 	}
 
-	bzero(drp->dr_bitmap, sizeof (ulong_t) * n);
+	drp->dr_size = nregs;
+
 	return (drp);
 }
 

Modified: projects/powerpcspe/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c
==============================================================================
--- projects/powerpcspe/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c	Sat Mar 19 16:16:56 2016	(r297053)
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Portions Copyright 2016 Pedro Giffuni.  All rights reserved.
+ */
+ 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/types.h>
@@ -70,12 +74,11 @@ dt_strtab_create(size_t bufsz)
 		return (NULL);
 
 	bzero(sp, sizeof (dt_strtab_t));
-	sp->str_hash = malloc(nbuckets * sizeof (dt_strhash_t *));
+	sp->str_hash = calloc(nbuckets, sizeof (dt_strhash_t *));
 
 	if (sp->str_hash == NULL)
 		goto err;
 
-	bzero(sp->str_hash, nbuckets * sizeof (dt_strhash_t *));
 	sp->str_hashsz = nbuckets;
 	sp->str_bufs = NULL;
 	sp->str_ptr = NULL;

Modified: projects/powerpcspe/contrib/bmake/ChangeLog
==============================================================================
--- projects/powerpcspe/contrib/bmake/ChangeLog	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bmake/ChangeLog	Sat Mar 19 16:16:56 2016	(r297053)
@@ -1,3 +1,20 @@
+2016-03-15  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (_MAKE_VERSION): 20160315
+	  Merge with NetBSD make, pick up
+	  o fix handling of archive members
+
+2016-03-13  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (_MAKE_VERSION): rename variable to avoid interference
+	  with checks for ${MAKE_VERSION}
+
+2016-03-10  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20160310
+	  Merge with NetBSD make, pick up
+	  o meta.c: treat missing Read file same as Write, incase we Delete it.
+
 2016-03-07  Simon J. Gerraty  <sjg at bad.crufty.net>
 
 	* Makefile (MAKE_VERSION): 20160307

Modified: projects/powerpcspe/contrib/bmake/Makefile
==============================================================================
--- projects/powerpcspe/contrib/bmake/Makefile	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bmake/Makefile	Sat Mar 19 16:16:56 2016	(r297053)
@@ -1,7 +1,7 @@
-#	$Id: Makefile,v 1.55 2016/03/07 22:02:47 sjg Exp $
+#	$Id: Makefile,v 1.58 2016/03/15 23:39:12 sjg Exp $
 
 # Base version on src date
-MAKE_VERSION= 20160307
+_MAKE_VERSION= 20160315
 
 PROG=	bmake
 
@@ -76,7 +76,7 @@ CFLAGS+= ${CPPFLAGS}
 CFLAGS+= -D_PATH_DEFSYSPATH=\"${DEFAULT_SYS_PATH}\"
 CFLAGS+= -I. -I${srcdir} ${XDEFS} -DMAKE_NATIVE
 CFLAGS+= ${COPTS.${.ALLSRC:M*.c:T:u}}
-COPTS.main.c+= "-DMAKE_VERSION=\"${MAKE_VERSION}\""
+COPTS.main.c+= "-DMAKE_VERSION=\"${_MAKE_VERSION}\""
 
 # meta mode can be useful even without filemon 
 FILEMON_H ?= /usr/include/dev/filemon/filemon.h

Modified: projects/powerpcspe/contrib/bmake/bmake.1
==============================================================================
--- projects/powerpcspe/contrib/bmake/bmake.1	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bmake/bmake.1	Sat Mar 19 16:16:56 2016	(r297053)
@@ -1,4 +1,4 @@
-.\"	$NetBSD: make.1,v 1.254 2016/02/20 01:43:28 wiz Exp $
+.\"	$NetBSD: make.1,v 1.255 2016/03/14 07:42:15 matthias Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -685,6 +685,9 @@ or it will not be recognized.
 .It Va .TARGET
 The name of the target; also known as
 .Ql Va @ .
+For compatibility with other makes this is an alias for
+.Ic .ARCHIVE
+in archive member rules.
 .El
 .Pp
 The shorter forms

Modified: projects/powerpcspe/contrib/bmake/bmake.cat1
==============================================================================
--- projects/powerpcspe/contrib/bmake/bmake.cat1	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bmake/bmake.cat1	Sat Mar 19 16:16:56 2016	(r297053)
@@ -438,7 +438,9 @@ VVAARRIIAABBLLEE AASSSSIIGG
                      suffixes declared with ..SSUUFFFFIIXXEESS or it will not be recog-
                      nized.
 
-           _._T_A_R_G_E_T   The name of the target; also known as `_@'.
+           _._T_A_R_G_E_T   The name of the target; also known as `_@'.  For compati-
+                     bility with other makes this is an alias for ..AARRCCHHIIVVEE in
+                     archive member rules.
 
      The shorter forms (`_>', `_!', `_<', `_%', `_?', `_*', and `_@') are permitted
      for backward compatibility with historical makefiles and legacy POSIX

Modified: projects/powerpcspe/contrib/bmake/make.1
==============================================================================
--- projects/powerpcspe/contrib/bmake/make.1	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bmake/make.1	Sat Mar 19 16:16:56 2016	(r297053)
@@ -1,4 +1,4 @@
-.\"	$NetBSD: make.1,v 1.254 2016/02/20 01:43:28 wiz Exp $
+.\"	$NetBSD: make.1,v 1.255 2016/03/14 07:42:15 matthias Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -685,6 +685,9 @@ or it will not be recognized.
 .It Va .TARGET
 The name of the target; also known as
 .Ql Va @ .
+For compatibility with other makes this is an alias for
+.Ic .ARCHIVE
+in archive member rules.
 .El
 .Pp
 The shorter forms

Modified: projects/powerpcspe/contrib/bmake/meta.c
==============================================================================
--- projects/powerpcspe/contrib/bmake/meta.c	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bmake/meta.c	Sat Mar 19 16:16:56 2016	(r297053)
@@ -1,4 +1,4 @@
-/*      $NetBSD: meta.c,v 1.53 2016/03/07 21:45:43 christos Exp $ */
+/*      $NetBSD: meta.c,v 1.54 2016/03/11 07:01:21 sjg Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -1190,7 +1190,8 @@ meta_oodate(GNode *gn, Boolean oodate)
 
 		    if ((link_src != NULL && lstat(p, &fs) < 0) ||
 			(link_src == NULL && stat(p, &fs) < 0)) {
-			Lst_AtEnd(missingFiles, bmake_strdup(p));
+			if (Lst_Find(missingFiles, p, string_match) == NULL)
+				Lst_AtEnd(missingFiles, bmake_strdup(p));
 		    }
 		    break;
 		check_link_src:
@@ -1281,9 +1282,8 @@ meta_oodate(GNode *gn, Boolean oodate)
 			     * A referenced file outside of CWD is missing.
 			     * We cannot catch every eventuality here...
 			     */
-			    if (DEBUG(META))
-				fprintf(debug_file, "%s: %d: file '%s' may have moved?...\n", fname, lineno, p);
-			    oodate = TRUE;
+			    if (Lst_Find(missingFiles, p, string_match) == NULL)
+				    Lst_AtEnd(missingFiles, bmake_strdup(p));
 			}
 		    }
 		    if (buf[0] == 'E') {

Modified: projects/powerpcspe/contrib/bmake/mk/ChangeLog
==============================================================================
--- projects/powerpcspe/contrib/bmake/mk/ChangeLog	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bmake/mk/ChangeLog	Sat Mar 19 16:16:56 2016	(r297053)
@@ -1,3 +1,26 @@
+2016-03-15  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* install-mk (MK_VERSION): 20160315
+
+	* meta.stage.mk (LN_CP_SCRIPT): do not ln(1) if we have to chmod(1)
+	  normally only applies to scripts.
+	
+	* dirdeps.mk: NO_DIRDEPS_BELOW to supress DIRDEPS below RELDIR as
+	  well as outside it. 
+
+2016-03-10  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* install-mk (MK_VERSION): 20160310
+
+	* dirdeps.mk: use targets rather than a list to track DIRDEPS that
+	  we have processed; the list gets very inefficient as number of
+	  DIRDEPS gets large.
+
+	* sys.dependfile.mk: fix comment wrt MACHINE
+
+	* meta.autodep.mk: ignore staged DPADDs when bootstrapping.
+	  patch from Bryan Drewery
+
 2016-03-02  Simon J. Gerraty  <sjg at bad.crufty.net>
 
 	* meta2deps.sh: don't ignore subdirs.

Modified: projects/powerpcspe/contrib/bmake/mk/dirdeps.mk
==============================================================================
--- projects/powerpcspe/contrib/bmake/mk/dirdeps.mk	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bmake/mk/dirdeps.mk	Sat Mar 19 16:16:56 2016	(r297053)
@@ -1,4 +1,4 @@
-# $Id: dirdeps.mk,v 1.59 2016/02/26 23:32:29 sjg Exp $
+# $Id: dirdeps.mk,v 1.62 2016/03/16 00:11:53 sjg Exp $
 
 # Copyright (c) 2010-2013, Juniper Networks, Inc.
 # All rights reserved.
@@ -135,7 +135,6 @@ start_utc := ${now_utc}
 
 # make sure these are empty to start with
 _DEP_TARGET_SPEC =
-_DIRDEP_CHECKED =
 
 # If TARGET_SPEC_VARS is other than just MACHINE
 # it should be set by sys.mk or similar by now.
@@ -225,7 +224,7 @@ _DEP_TARGET_SPEC = ${_last_dependfile:${
 .endif
 .if !empty(_last_dependfile)
 # record that we've read dependfile for this
-_DIRDEP_CHECKED += ${_CURDIR}.${TARGET_SPEC}
+_dirdeps_checked.${_CURDIR}.${TARGET_SPEC}:
 .endif
 .endif
 
@@ -306,8 +305,10 @@ DEP_SKIP_DIR = ${SKIP_DIR} \
 NSkipDir = ${DEP_SKIP_DIR:${M_ListToSkip}}
 
 .if defined(NO_DIRDEPS) || defined(NODIRDEPS) || defined(WITHOUT_DIRDEPS)
-# confine ourselves to the original dir
+# confine ourselves to the original dir and below.
 DIRDEPS_FILTER += M${_DEP_RELDIR}*
+.elif defined(NO_DIRDEPS_BELOW)
+DIRDEPS_FILTER += M${_DEP_RELDIR}
 .endif
 
 # this is what we run below
@@ -597,9 +598,9 @@ ${_this_dir}.$m: ${_build_dirs:M*.$m:N${
 
 # Now find more dependencies - and recurse.
 .for d in ${_build_all_dirs}
-.if ${_DIRDEP_CHECKED:M$d} == ""
+.if !target(_dirdeps_checked.$d)
 # once only
-_DIRDEP_CHECKED += $d
+_dirdeps_checked.$d:
 .if ${_debug_search}
 .info checking $d
 .endif

Modified: projects/powerpcspe/contrib/bmake/mk/install-mk
==============================================================================
--- projects/powerpcspe/contrib/bmake/mk/install-mk	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bmake/mk/install-mk	Sat Mar 19 16:16:56 2016	(r297053)
@@ -55,7 +55,7 @@
 #       Simon J. Gerraty <sjg at crufty.net>
 
 # RCSid:
-#	$Id: install-mk,v 1.121 2016/02/27 00:23:02 sjg Exp $
+#	$Id: install-mk,v 1.123 2016/03/16 00:13:16 sjg Exp $
 #
 #	@(#) Copyright (c) 1994 Simon J. Gerraty
 #
@@ -70,7 +70,7 @@
 #	sjg at crufty.net
 #
 
-MK_VERSION=20160226
+MK_VERSION=20160315
 OWNER=
 GROUP=
 MODE=444

Modified: projects/powerpcspe/contrib/bmake/mk/meta.autodep.mk
==============================================================================
--- projects/powerpcspe/contrib/bmake/mk/meta.autodep.mk	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bmake/mk/meta.autodep.mk	Sat Mar 19 16:16:56 2016	(r297053)
@@ -1,4 +1,4 @@
-# $Id: meta.autodep.mk,v 1.40 2016/02/22 22:44:58 sjg Exp $
+# $Id: meta.autodep.mk,v 1.41 2016/03/11 01:29:38 sjg Exp $
 
 #
 #	@(#) Copyright (c) 2010, Simon J. Gerraty
@@ -195,7 +195,7 @@ gendirdeps:	${_DEPENDFILE}
 # The pseudo machine "host" is used for HOST_TARGET
 DIRDEPS += \
 	${DPADD:M${_OBJTOP}*:H:C,${_OBJTOP}[^/]*/,,:N.:O:u} \
-	${DPADD:M${_OBJROOT}*:N${_OBJTOP}*:H:S,${_OBJROOT},,:C,^([^/]+)/(.*),\2.\1,:S,${HOST_TARGET}$,host,:N.*:O:u}
+	${DPADD:M${_OBJROOT}*:N${_OBJTOP}*:N${STAGE_ROOT:U${_OBJTOP}}/*:H:S,${_OBJROOT},,:C,^([^/]+)/(.*),\2.\1,:S,${HOST_TARGET}$,host,:N.*:O:u}
 
 .endif
 .endif

Modified: projects/powerpcspe/contrib/bmake/mk/meta.stage.mk
==============================================================================
--- projects/powerpcspe/contrib/bmake/mk/meta.stage.mk	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bmake/mk/meta.stage.mk	Sat Mar 19 16:16:56 2016	(r297053)
@@ -1,4 +1,4 @@
-# $Id: meta.stage.mk,v 1.43 2016/02/24 18:46:32 sjg Exp $
+# $Id: meta.stage.mk,v 1.44 2016/03/16 18:21:23 sjg Exp $
 #
 #	@(#) Copyright (c) 2011, Simon J. Gerraty
 #
@@ -58,7 +58,7 @@ GENDIRDEPS_FILTER += Nnot-empty-is-impor
 
 LN_CP_SCRIPT = LnCp() { \
   rm -f $$2 2> /dev/null; \
-  ln $$1 $$2 2> /dev/null || \
+  { [ -z "$$mode" ] && ln $$1 $$2 2> /dev/null; } || \
   cp -p $$1 $$2; }
 
 # a staging conflict should cause an error

Modified: projects/powerpcspe/contrib/bmake/mk/sys.dependfile.mk
==============================================================================
--- projects/powerpcspe/contrib/bmake/mk/sys.dependfile.mk	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bmake/mk/sys.dependfile.mk	Sat Mar 19 16:16:56 2016	(r297053)
@@ -1,4 +1,4 @@
-# $Id: sys.dependfile.mk,v 1.7 2016/02/20 01:57:39 sjg Exp $
+# $Id: sys.dependfile.mk,v 1.8 2016/03/11 01:34:13 sjg Exp $
 #
 #	@(#) Copyright (c) 2012, Simon J. Gerraty
 #
@@ -48,7 +48,7 @@ _e := ${.MAKE.DEPENDFILE_PREFERENCE:@m@$
 # MACHINE specific depend files are supported, but *not* default.
 # If any already exist, we should follow suit.
 _aml = ${ALL_MACHINE_LIST:Uarm amd64 i386 powerpc:N${MACHINE}} ${MACHINE}
-# MACHINE must be the last entry in _aml ;-)
+# make sure we restore MACHINE
 _m := ${MACHINE}
 _e := ${_aml:@MACHINE@${.MAKE.DEPENDFILE_PREFERENCE:@m@${exists($m):?$m:}@}@}
 MACHINE := ${_m}

Modified: projects/powerpcspe/contrib/bmake/parse.c
==============================================================================
--- projects/powerpcspe/contrib/bmake/parse.c	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bmake/parse.c	Sat Mar 19 16:16:56 2016	(r297053)
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.212 2016/02/19 06:19:06 sjg Exp $	*/
+/*	$NetBSD: parse.c,v 1.213 2016/03/11 13:54:47 matthias Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.212 2016/02/19 06:19:06 sjg Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.213 2016/03/11 13:54:47 matthias Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.212 2016/02/19 06:19:06 sjg Exp $");
+__RCSID("$NetBSD: parse.c,v 1.213 2016/03/11 13:54:47 matthias Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1261,6 +1261,7 @@ ParseDoDependency(char *line)
 		goto out;
 	    } else {
 		/* Done with this word; on to the next. */
+		cp = line;
 		continue;
 	    }
 	}

Modified: projects/powerpcspe/contrib/bmake/suff.c
==============================================================================
--- projects/powerpcspe/contrib/bmake/suff.c	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bmake/suff.c	Sat Mar 19 16:16:56 2016	(r297053)
@@ -1,4 +1,4 @@
-/*	$NetBSD: suff.c,v 1.78 2016/02/18 18:29:14 christos Exp $	*/
+/*	$NetBSD: suff.c,v 1.81 2016/03/15 18:30:14 matthias Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.78 2016/02/18 18:29:14 christos Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.81 2016/03/15 18:30:14 matthias Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.78 2016/02/18 18:29:14 christos Exp $");
+__RCSID("$NetBSD: suff.c,v 1.81 2016/03/15 18:30:14 matthias Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1894,6 +1894,7 @@ SuffFindArchiveDeps(GNode *gn, Lst slst)
 	TARGET,	    	    /* Must be first */
 	PREFIX,	    	    /* Must be second */
     };
+    LstNode 	ln, nln;    /* Next suffix node to check */
     int	    	i;  	    /* Index into copy and vals */
     Suff    	*ms;	    /* Suffix descriptor for member */
     char    	*name;	    /* Start of member's name */
@@ -1955,6 +1956,20 @@ SuffFindArchiveDeps(GNode *gn, Lst slst)
     Var_Set(MEMBER, name, gn, 0);
     Var_Set(ARCHIVE, gn->name, gn, 0);
 
+    /*
+     * Set $@ for compatibility with other makes
+     */
+    Var_Set(TARGET, gn->name, gn, 0);
+
+    /*
+     * Now we've got the important local variables set, expand any sources
+     * that still contain variables or wildcards in their names.
+     */
+    for (ln = Lst_First(gn->children); ln != NULL; ln = nln) {
+	nln = Lst_Succ(ln);
+	SuffExpandChildren(ln, gn);
+    }
+
     if (ms != NULL) {
 	/*
 	 * Member has a known suffix, so look for a transformation rule from
@@ -1962,7 +1977,6 @@ SuffFindArchiveDeps(GNode *gn, Lst slst)
 	 * through the entire list, we just look at suffixes to which the
 	 * member's suffix may be transformed...
 	 */
-	LstNode		ln;
 	SuffixCmpData	sd;		/* Search string data */
 
 	/*
@@ -2002,9 +2016,10 @@ SuffFindArchiveDeps(GNode *gn, Lst slst)
 
     /*
      * Flag the member as such so we remember to look in the archive for
-     * its modification time.
+     * its modification time. The OP_JOIN | OP_MADE is needed because this
+     * target should never get made.
      */
-    mem->type |= OP_MEMBER;
+    mem->type |= OP_MEMBER | OP_JOIN | OP_MADE;
 }
 
 /*-

Modified: projects/powerpcspe/contrib/bmake/var.c
==============================================================================
--- projects/powerpcspe/contrib/bmake/var.c	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bmake/var.c	Sat Mar 19 16:16:56 2016	(r297053)
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.206 2016/03/07 20:20:35 sjg Exp $	*/
+/*	$NetBSD: var.c,v 1.207 2016/03/11 15:12:39 matthias Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.206 2016/03/07 20:20:35 sjg Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.207 2016/03/11 15:12:39 matthias Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.206 2016/03/07 20:20:35 sjg Exp $");
+__RCSID("$NetBSD: var.c,v 1.207 2016/03/11 15:12:39 matthias Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -3699,11 +3699,11 @@ Var_Parse(const char *str, GNode *ctxt, 
 		    case '@':
 			return UNCONST("$(.TARGET)");
 		    case '%':
-			return UNCONST("$(.ARCHIVE)");
+			return UNCONST("$(.MEMBER)");
 		    case '*':
 			return UNCONST("$(.PREFIX)");
 		    case '!':
-			return UNCONST("$(.MEMBER)");
+			return UNCONST("$(.ARCHIVE)");
 		}
 	    }
 	    /*

Modified: projects/powerpcspe/contrib/bsnmp/snmp_mibII/mibII_tcp.c
==============================================================================
--- projects/powerpcspe/contrib/bsnmp/snmp_mibII/mibII_tcp.c	Sat Mar 19 11:55:21 2016	(r297052)
+++ projects/powerpcspe/contrib/bsnmp/snmp_mibII/mibII_tcp.c	Sat Mar 19 16:16:56 2016	(r297053)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-projects mailing list