svn commit: r246527 - in user/sbruno/pxe_http_head: . bin/ps bin/sh contrib/binutils/include/elf contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests contrib/gcc/config/arm contrib/gdb/gdb contr...

Fri Feb 8 01:30:12 UTC 2013

Author: sbruno
Date: Fri Feb  8 01:30:08 2013
New Revision: 246527
URL: http://svnweb.freebsd.org/changeset/base/246527

Log:
  Merge from HEAD

Added:
  user/sbruno/pxe_http_head/contrib/bmake/Makefile
     - copied unchanged from r246526, head/contrib/bmake/Makefile
  user/sbruno/pxe_http_head/contrib/bmake/Makefile.config.in
     - copied unchanged from r246526, head/contrib/bmake/Makefile.config.in
  user/sbruno/pxe_http_head/contrib/bmake/makefile.in
     - copied unchanged from r246526, head/contrib/bmake/makefile.in
  user/sbruno/pxe_http_head/contrib/bmake/mk/
     - copied from r246526, head/contrib/bmake/mk/
  user/sbruno/pxe_http_head/sys/arm/allwinner/a10_gpio.c
     - copied unchanged from r246526, head/sys/arm/allwinner/a10_gpio.c
  user/sbruno/pxe_http_head/tools/build/options/WITHOUT_CLANG_FULL
     - copied unchanged from r246526, head/tools/build/options/WITHOUT_CLANG_FULL
  user/sbruno/pxe_http_head/tools/build/options/WITHOUT_LIBCPLUSPLUS
     - copied unchanged from r246526, head/tools/build/options/WITHOUT_LIBCPLUSPLUS
  user/sbruno/pxe_http_head/tools/build/options/WITH_CLANG_FULL
     - copied unchanged from r246526, head/tools/build/options/WITH_CLANG_FULL
  user/sbruno/pxe_http_head/tools/build/options/WITH_GPL_DTC
     - copied unchanged from r246526, head/tools/build/options/WITH_GPL_DTC
  user/sbruno/pxe_http_head/usr.bin/bmake/Makefile.config
     - copied unchanged from r246526, head/usr.bin/bmake/Makefile.config
Deleted:
  user/sbruno/pxe_http_head/contrib/bmake/Makefile.in
Modified:
  user/sbruno/pxe_http_head/Makefile.inc1
  user/sbruno/pxe_http_head/bin/ps/ps.1
  user/sbruno/pxe_http_head/bin/sh/eval.c
  user/sbruno/pxe_http_head/bin/sh/expand.c
  user/sbruno/pxe_http_head/bin/sh/expand.h
  user/sbruno/pxe_http_head/bin/sh/jobs.c
  user/sbruno/pxe_http_head/bin/sh/mksyntax.c
  user/sbruno/pxe_http_head/bin/sh/nodetypes
  user/sbruno/pxe_http_head/bin/sh/parser.h
  user/sbruno/pxe_http_head/bin/sh/redir.c
  user/sbruno/pxe_http_head/contrib/binutils/include/elf/common.h
  user/sbruno/pxe_http_head/contrib/bmake/ChangeLog
  user/sbruno/pxe_http_head/contrib/bmake/FILES
  user/sbruno/pxe_http_head/contrib/bmake/bmake.1
  user/sbruno/pxe_http_head/contrib/bmake/bmake.cat1
  user/sbruno/pxe_http_head/contrib/bmake/boot-strap
  user/sbruno/pxe_http_head/contrib/bmake/bsd.after-import.mk
  user/sbruno/pxe_http_head/contrib/bmake/compat.c
  user/sbruno/pxe_http_head/contrib/bmake/configure
  user/sbruno/pxe_http_head/contrib/bmake/configure.in
  user/sbruno/pxe_http_head/contrib/bmake/job.c
  user/sbruno/pxe_http_head/contrib/bmake/main.c
  user/sbruno/pxe_http_head/contrib/bmake/make-bootstrap.sh.in
  user/sbruno/pxe_http_head/contrib/bmake/make.1
  user/sbruno/pxe_http_head/contrib/bmake/meta.c
  user/sbruno/pxe_http_head/contrib/bmake/realpath.c
  user/sbruno/pxe_http_head/contrib/bmake/unit-tests/Makefile.in
  user/sbruno/pxe_http_head/contrib/bmake/var.c
  user/sbruno/pxe_http_head/contrib/gcc/config/arm/freebsd.h
  user/sbruno/pxe_http_head/contrib/gcc/config/arm/unwind-arm.h
  user/sbruno/pxe_http_head/contrib/gdb/gdb/osabi.c
  user/sbruno/pxe_http_head/contrib/libarchive/libarchive/archive_getdate.c
  user/sbruno/pxe_http_head/contrib/libarchive/libarchive/test/test_archive_getdate.c
  user/sbruno/pxe_http_head/contrib/libc++/include/__config
  user/sbruno/pxe_http_head/contrib/libc++/include/algorithm
  user/sbruno/pxe_http_head/contrib/libc++/include/array
  user/sbruno/pxe_http_head/contrib/libc++/include/atomic
  user/sbruno/pxe_http_head/contrib/libc++/include/cmath
  user/sbruno/pxe_http_head/contrib/libc++/include/functional
  user/sbruno/pxe_http_head/contrib/libc++/include/future
  user/sbruno/pxe_http_head/contrib/libc++/include/istream
  user/sbruno/pxe_http_head/contrib/libc++/include/iterator
  user/sbruno/pxe_http_head/contrib/libc++/include/limits
  user/sbruno/pxe_http_head/contrib/libc++/include/locale
  user/sbruno/pxe_http_head/contrib/libc++/include/memory
  user/sbruno/pxe_http_head/contrib/libc++/include/ostream
  user/sbruno/pxe_http_head/contrib/libc++/include/random
  user/sbruno/pxe_http_head/contrib/libc++/include/regex
  user/sbruno/pxe_http_head/contrib/libc++/include/string
  user/sbruno/pxe_http_head/contrib/libc++/include/type_traits
  user/sbruno/pxe_http_head/contrib/libc++/include/vector
  user/sbruno/pxe_http_head/contrib/libc++/src/chrono.cpp
  user/sbruno/pxe_http_head/contrib/libc++/src/debug.cpp
  user/sbruno/pxe_http_head/contrib/libc++/src/exception.cpp
  user/sbruno/pxe_http_head/contrib/libc++/src/future.cpp
  user/sbruno/pxe_http_head/contrib/libc++/src/hash.cpp
  user/sbruno/pxe_http_head/contrib/libc++/src/locale.cpp
  user/sbruno/pxe_http_head/contrib/libc++/src/string.cpp
  user/sbruno/pxe_http_head/contrib/libc++/src/thread.cpp
  user/sbruno/pxe_http_head/contrib/libcxxrt/exception.cc
  user/sbruno/pxe_http_head/contrib/libstdc++/libsupc++/unwind-cxx.h
  user/sbruno/pxe_http_head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.td
  user/sbruno/pxe_http_head/contrib/llvm/tools/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
  user/sbruno/pxe_http_head/etc/mtree/BSD.include.dist
  user/sbruno/pxe_http_head/etc/rc.d/ip6addrctl
  user/sbruno/pxe_http_head/etc/rc.d/pfsync
  user/sbruno/pxe_http_head/games/fortune/datfiles/fortunes-o.real
  user/sbruno/pxe_http_head/include/Makefile
  user/sbruno/pxe_http_head/lib/Makefile
  user/sbruno/pxe_http_head/lib/clang/Makefile
  user/sbruno/pxe_http_head/lib/clang/clang.build.mk
  user/sbruno/pxe_http_head/lib/clang/libclanganalysis/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangarcmigrate/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangast/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangbasic/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangcodegen/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangdriver/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangedit/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangfrontend/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangfrontendtool/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclanglex/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangparse/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangrewritecore/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangrewritefrontend/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangsema/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangserialization/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangstaticanalyzercheckers/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangstaticanalyzercore/Makefile
  user/sbruno/pxe_http_head/lib/clang/libclangstaticanalyzerfrontend/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmarchive/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmarmasmparser/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmarmcodegen/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmarmdesc/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmarmdisassembler/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmarminfo/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmarminstprinter/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmasmparser/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmasmprinter/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmbitreader/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmbitwriter/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmcodegen/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmcore/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmdebuginfo/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmexecutionengine/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvminstcombine/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvminstrumentation/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvminterpreter/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmjit/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmlinker/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmmcdisassembler/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmmcparser/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmmipsasmparser/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmmipscodegen/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmmipsdesc/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmmipsdisassembler/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmmipsinfo/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmmipsinstprinter/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmobject/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmpowerpccodegen/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmpowerpcdesc/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmpowerpcinfo/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmpowerpcinstprinter/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmruntimedyld/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmselectiondag/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmtablegen/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmtarget/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmvectorize/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmx86asmparser/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmx86codegen/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmx86desc/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmx86info/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmx86instprinter/Makefile
  user/sbruno/pxe_http_head/lib/clang/libllvmx86utils/Makefile
  user/sbruno/pxe_http_head/lib/libc/sys/open.2
  user/sbruno/pxe_http_head/lib/libc/sys/ptrace.2
  user/sbruno/pxe_http_head/lib/libcompiler_rt/Makefile
  user/sbruno/pxe_http_head/lib/libcxxrt/Version.map
  user/sbruno/pxe_http_head/lib/libstand/Makefile
  user/sbruno/pxe_http_head/release/Makefile
  user/sbruno/pxe_http_head/release/amd64/mkisoimages.sh
  user/sbruno/pxe_http_head/release/generate-release.sh
  user/sbruno/pxe_http_head/release/i386/mkisoimages.sh
  user/sbruno/pxe_http_head/release/ia64/mkisoimages.sh
  user/sbruno/pxe_http_head/release/pc98/mkisoimages.sh
  user/sbruno/pxe_http_head/release/powerpc/mkisoimages.sh
  user/sbruno/pxe_http_head/release/sparc64/mkisoimages.sh
  user/sbruno/pxe_http_head/sbin/devd/devd.8
  user/sbruno/pxe_http_head/sbin/ifconfig/ifieee80211.c
  user/sbruno/pxe_http_head/sbin/recoverdisk/recoverdisk.c
  user/sbruno/pxe_http_head/share/man/man5/src.conf.5
  user/sbruno/pxe_http_head/share/man/man7/release.7
  user/sbruno/pxe_http_head/share/misc/committers-src.dot
  user/sbruno/pxe_http_head/share/mk/bsd.own.mk
  user/sbruno/pxe_http_head/sys/amd64/amd64/minidump_machdep.c
  user/sbruno/pxe_http_head/sys/amd64/amd64/mp_machdep.c
  user/sbruno/pxe_http_head/sys/amd64/amd64/pmap.c
  user/sbruno/pxe_http_head/sys/amd64/conf/GENERIC
  user/sbruno/pxe_http_head/sys/amd64/include/intr_machdep.h
  user/sbruno/pxe_http_head/sys/amd64/include/pmap.h
  user/sbruno/pxe_http_head/sys/arm/allwinner/a10_clk.c
  user/sbruno/pxe_http_head/sys/arm/allwinner/a10_ehci.c
  user/sbruno/pxe_http_head/sys/arm/allwinner/files.a10
  user/sbruno/pxe_http_head/sys/arm/arm/vm_machdep.c
  user/sbruno/pxe_http_head/sys/arm/conf/BEAGLEBONE
  user/sbruno/pxe_http_head/sys/arm/conf/CUBIEBOARD
  user/sbruno/pxe_http_head/sys/arm/ti/cpsw/if_cpsw.c
  user/sbruno/pxe_http_head/sys/arm/ti/cpsw/if_cpswreg.h
  user/sbruno/pxe_http_head/sys/arm/ti/cpsw/if_cpswvar.h
  user/sbruno/pxe_http_head/sys/boot/arm/uboot/Makefile
  user/sbruno/pxe_http_head/sys/boot/fdt/dts/cubieboard.dts
  user/sbruno/pxe_http_head/sys/boot/usb/Makefile
  user/sbruno/pxe_http_head/sys/boot/usb/bsd_global.h
  user/sbruno/pxe_http_head/sys/boot/usb/bsd_kernel.c
  user/sbruno/pxe_http_head/sys/boot/usb/bsd_kernel.h
  user/sbruno/pxe_http_head/sys/cddl/compat/opensolaris/sys/kmem.h
  user/sbruno/pxe_http_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  user/sbruno/pxe_http_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  user/sbruno/pxe_http_head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S
  user/sbruno/pxe_http_head/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
  user/sbruno/pxe_http_head/sys/conf/NOTES
  user/sbruno/pxe_http_head/sys/conf/newvers.sh
  user/sbruno/pxe_http_head/sys/conf/options
  user/sbruno/pxe_http_head/sys/dev/acpica/acpi.c
  user/sbruno/pxe_http_head/sys/dev/age/if_age.c
  user/sbruno/pxe_http_head/sys/dev/age/if_agevar.h
  user/sbruno/pxe_http_head/sys/dev/ata/ata-all.h
  user/sbruno/pxe_http_head/sys/dev/ata/ata-lowlevel.c
  user/sbruno/pxe_http_head/sys/dev/ath/if_ath.c
  user/sbruno/pxe_http_head/sys/dev/ath/if_ath_ahb.c
  user/sbruno/pxe_http_head/sys/dev/ath/if_ath_misc.h
  user/sbruno/pxe_http_head/sys/dev/ath/if_ath_pci.c
  user/sbruno/pxe_http_head/sys/dev/ath/if_ath_tx.c
  user/sbruno/pxe_http_head/sys/dev/ath/if_ath_tx_edma.c
  user/sbruno/pxe_http_head/sys/dev/ath/if_athvar.h
  user/sbruno/pxe_http_head/sys/dev/bxe/if_bxe.c
  user/sbruno/pxe_http_head/sys/dev/cxgbe/common/t4_hw.c
  user/sbruno/pxe_http_head/sys/dev/e1000/if_em.c
  user/sbruno/pxe_http_head/sys/dev/e1000/if_igb.c
  user/sbruno/pxe_http_head/sys/dev/ixgbe/ixgbe.c
  user/sbruno/pxe_http_head/sys/dev/ixgbe/ixv.c
  user/sbruno/pxe_http_head/sys/dev/oce/oce_if.c
  user/sbruno/pxe_http_head/sys/dev/sound/pcm/mixer.c
  user/sbruno/pxe_http_head/sys/dev/sound/pcm/mixer.h
  user/sbruno/pxe_http_head/sys/dev/sound/usb/uaudio.c
  user/sbruno/pxe_http_head/sys/dev/syscons/syscons.c
  user/sbruno/pxe_http_head/sys/dev/uart/uart_bus.h
  user/sbruno/pxe_http_head/sys/dev/uart/uart_bus_acpi.c
  user/sbruno/pxe_http_head/sys/dev/uart/uart_bus_isa.c
  user/sbruno/pxe_http_head/sys/dev/uart/uart_bus_pci.c
  user/sbruno/pxe_http_head/sys/dev/uart/uart_core.c
  user/sbruno/pxe_http_head/sys/dev/usb/controller/usb_controller.c
  user/sbruno/pxe_http_head/sys/dev/usb/controller/xhci.c
  user/sbruno/pxe_http_head/sys/dev/usb/controller/xhci.h
  user/sbruno/pxe_http_head/sys/dev/usb/usb_bus.h
  user/sbruno/pxe_http_head/sys/dev/usb/usb_device.c
  user/sbruno/pxe_http_head/sys/dev/usb/usb_dynamic.c
  user/sbruno/pxe_http_head/sys/dev/usb/usb_freebsd.h
  user/sbruno/pxe_http_head/sys/dev/usb/usb_freebsd_loader.h
  user/sbruno/pxe_http_head/sys/dev/usb/usb_hub.c
  user/sbruno/pxe_http_head/sys/dev/usb/usb_msctest.c
  user/sbruno/pxe_http_head/sys/dev/usb/usb_process.c
  user/sbruno/pxe_http_head/sys/dev/usb/usb_request.c
  user/sbruno/pxe_http_head/sys/dev/usb/usb_transfer.c
  user/sbruno/pxe_http_head/sys/fs/devfs/devfs_vnops.c
  user/sbruno/pxe_http_head/sys/fs/ext2fs/ext2_alloc.c
  user/sbruno/pxe_http_head/sys/fs/ext2fs/ext2_dir.h
  user/sbruno/pxe_http_head/sys/fs/ext2fs/ext2_inode.c
  user/sbruno/pxe_http_head/sys/fs/ext2fs/ext2_lookup.c
  user/sbruno/pxe_http_head/sys/fs/ext2fs/ext2_mount.h
  user/sbruno/pxe_http_head/sys/fs/ext2fs/ext2_vfsops.c
  user/sbruno/pxe_http_head/sys/fs/ext2fs/ext2_vnops.c
  user/sbruno/pxe_http_head/sys/fs/ext2fs/ext2fs.h
  user/sbruno/pxe_http_head/sys/fs/ext2fs/fs.h
  user/sbruno/pxe_http_head/sys/fs/nfs/nfs_commonkrpc.c
  user/sbruno/pxe_http_head/sys/i386/conf/GENERIC
  user/sbruno/pxe_http_head/sys/i386/i386/mp_machdep.c
  user/sbruno/pxe_http_head/sys/i386/include/intr_machdep.h
  user/sbruno/pxe_http_head/sys/kern/init_main.c
  user/sbruno/pxe_http_head/sys/kern/kern_exec.c
  user/sbruno/pxe_http_head/sys/kern/kern_exit.c
  user/sbruno/pxe_http_head/sys/kern/kern_intr.c
  user/sbruno/pxe_http_head/sys/kern/kern_ktr.c
  user/sbruno/pxe_http_head/sys/kern/kern_malloc.c
  user/sbruno/pxe_http_head/sys/kern/kern_mib.c
  user/sbruno/pxe_http_head/sys/kern/kern_sig.c
  user/sbruno/pxe_http_head/sys/kern/subr_blist.c
  user/sbruno/pxe_http_head/sys/kern/subr_sleepqueue.c
  user/sbruno/pxe_http_head/sys/kern/sys_process.c
  user/sbruno/pxe_http_head/sys/kern/uipc_syscalls.c
  user/sbruno/pxe_http_head/sys/kern/vfs_acl.c
  user/sbruno/pxe_http_head/sys/kern/vfs_syscalls.c
  user/sbruno/pxe_http_head/sys/modules/wlan/Makefile
  user/sbruno/pxe_http_head/sys/net/if_var.h
  user/sbruno/pxe_http_head/sys/net80211/ieee80211_action.c
  user/sbruno/pxe_http_head/sys/net80211/ieee80211_ddb.c
  user/sbruno/pxe_http_head/sys/net80211/ieee80211_hwmp.c
  user/sbruno/pxe_http_head/sys/net80211/ieee80211_input.c
  user/sbruno/pxe_http_head/sys/net80211/ieee80211_ioctl.h
  user/sbruno/pxe_http_head/sys/net80211/ieee80211_mesh.c
  user/sbruno/pxe_http_head/sys/net80211/ieee80211_mesh.h
  user/sbruno/pxe_http_head/sys/net80211/ieee80211_node.h
  user/sbruno/pxe_http_head/sys/net80211/ieee80211_output.c
  user/sbruno/pxe_http_head/sys/net80211/ieee80211_superg.c
  user/sbruno/pxe_http_head/sys/netgraph/ng_ether.c
  user/sbruno/pxe_http_head/sys/nfsclient/nfs_krpc.c
  user/sbruno/pxe_http_head/sys/ofed/drivers/net/mlx4/en_tx.c
  user/sbruno/pxe_http_head/sys/pc98/conf/GENERIC
  user/sbruno/pxe_http_head/sys/security/audit/audit.h
  user/sbruno/pxe_http_head/sys/sparc64/conf/GENERIC
  user/sbruno/pxe_http_head/sys/sys/buf_ring.h
  user/sbruno/pxe_http_head/sys/sys/proc.h
  user/sbruno/pxe_http_head/sys/sys/queue.h
  user/sbruno/pxe_http_head/sys/sys/signalvar.h
  user/sbruno/pxe_http_head/sys/sys/systm.h
  user/sbruno/pxe_http_head/sys/ufs/ffs/ffs_inode.c
  user/sbruno/pxe_http_head/sys/ufs/ufs/ufs_lookup.c
  user/sbruno/pxe_http_head/sys/vm/vm_kern.c
  user/sbruno/pxe_http_head/sys/x86/x86/intr_machdep.c
  user/sbruno/pxe_http_head/sys/x86/x86/local_apic.c
  user/sbruno/pxe_http_head/usr.bin/bmake/Makefile
  user/sbruno/pxe_http_head/usr.bin/bmake/config.h
  user/sbruno/pxe_http_head/usr.bin/bmake/unit-tests/Makefile
  user/sbruno/pxe_http_head/usr.bin/clang/clang/Makefile
  user/sbruno/pxe_http_head/usr.bin/join/join.c
  user/sbruno/pxe_http_head/usr.sbin/bhyve/Makefile
  user/sbruno/pxe_http_head/usr.sbin/crunch/crunchgen/crunchgen.c
  user/sbruno/pxe_http_head/usr.sbin/crunch/crunchide/exec_elf32.c
  user/sbruno/pxe_http_head/usr.sbin/crunch/examples/really-big.conf
  user/sbruno/pxe_http_head/usr.sbin/pciconf/Makefile
  user/sbruno/pxe_http_head/usr.sbin/pciconf/cap.c
Directory Properties:
  user/sbruno/pxe_http_head/   (props changed)
  user/sbruno/pxe_http_head/contrib/binutils/   (props changed)
  user/sbruno/pxe_http_head/contrib/bmake/   (props changed)
  user/sbruno/pxe_http_head/contrib/gcc/   (props changed)
  user/sbruno/pxe_http_head/contrib/gdb/   (props changed)
  user/sbruno/pxe_http_head/contrib/libarchive/   (props changed)
  user/sbruno/pxe_http_head/contrib/libarchive/libarchive/   (props changed)
  user/sbruno/pxe_http_head/contrib/libc++/   (props changed)
  user/sbruno/pxe_http_head/contrib/libcxxrt/   (props changed)
  user/sbruno/pxe_http_head/contrib/libstdc++/   (props changed)
  user/sbruno/pxe_http_head/contrib/llvm/   (props changed)
  user/sbruno/pxe_http_head/contrib/llvm/tools/clang/   (props changed)
  user/sbruno/pxe_http_head/lib/libc/   (props changed)
  user/sbruno/pxe_http_head/sbin/   (props changed)
  user/sbruno/pxe_http_head/sys/   (props changed)
  user/sbruno/pxe_http_head/sys/boot/   (props changed)
  user/sbruno/pxe_http_head/sys/cddl/contrib/opensolaris/   (props changed)
  user/sbruno/pxe_http_head/sys/conf/   (props changed)
  user/sbruno/pxe_http_head/usr.sbin/bhyve/   (props changed)

Modified: user/sbruno/pxe_http_head/Makefile.inc1
==============================================================================

--- user/sbruno/pxe_http_head/Makefile.inc1	Fri Feb  8 01:28:30 2013	(r246526)
+++ user/sbruno/pxe_http_head/Makefile.inc1	Fri Feb  8 01:30:08 2013	(r246527)
@@ -27,6 +27,8 @@
 #	TARGET="machine" to crossbuild world for a different machine type
 #	TARGET_ARCH= may be required when a TARGET supports multiple endians
 #	BUILDENV_SHELL= shell to launch for the buildenv target (def:/bin/sh)
+#	WORLD_FLAGS= additional flags to pass to make(1) during buildworld
+#	KERNEL_FLAGS= additional flags to pass to make(1) during buildkernel
 
 #
 # The intended user-driven targets are:
@@ -245,7 +247,7 @@ BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/i
 		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
 		COMPILER_TYPE=${COMPILER_TYPE}
 BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
-		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
+		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
@@ -255,7 +257,7 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
-		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
+		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
@@ -288,7 +290,7 @@ WMAKE_COMPILER_TYPE=	gcc
 WMAKE_COMPILER_TYPE=	clang
 .endif
 WMAKEENV+=	COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
-WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
+WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 # 32 bit world
@@ -378,7 +380,7 @@ IMAKE_MTREE=	MTREE_CMD="nmtree ${MTREEFL
 
 # kernel stage
 KMAKEENV=	${WMAKEENV}
-KMAKE=		${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME}
+KMAKE=		${KMAKEENV} ${MAKE} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME}
 
 #
 # buildworld
@@ -1731,7 +1733,8 @@ NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOU
 
 XDDIR=${XDEV_ARCH}-freebsd
 XDTP=/usr/${XDDIR}
-CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR}
+CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
+	INSTALL="sh ${.CURDIR}/tools/install.sh"
 CDENV= ${CDBENV} \
 	_SHLIBDIRPREFIX=${XDTP} \
 	TOOLS_PREFIX=${XDTP}

Modified: user/sbruno/pxe_http_head/bin/ps/ps.1
==============================================================================
--- user/sbruno/pxe_http_head/bin/ps/ps.1	Fri Feb  8 01:28:30 2013	(r246526)
+++ user/sbruno/pxe_http_head/bin/ps/ps.1	Fri Feb  8 01:30:08 2013	(r246527)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd September 18, 2012
+.Dd February 7, 2013
 .Dt PS 1
 .Os
 .Sh NAME
@@ -323,6 +323,7 @@ the include file
 .It Dv "P_INMEM" Ta No "0x10000000" Ta "Loaded into memory"
 .It Dv "P_SWAPPINGOUT" Ta No "0x20000000" Ta "Process is being swapped out"
 .It Dv "P_SWAPPINGIN" Ta No "0x40000000" Ta "Process is being swapped in"
+.It Dv "P_PPTRACE" Ta No "0x80000000" Ta "Vforked child issued ptrace(PT_TRACEME)"
 .El
 .It Cm label
 The MAC label of the process.

Modified: user/sbruno/pxe_http_head/bin/sh/eval.c
==============================================================================
--- user/sbruno/pxe_http_head/bin/sh/eval.c	Fri Feb  8 01:28:30 2013	(r246526)
+++ user/sbruno/pxe_http_head/bin/sh/eval.c	Fri Feb  8 01:30:08 2013	(r246527)
@@ -92,6 +92,7 @@ static void evalfor(union node *, int);
 static union node *evalcase(union node *);
 static void evalsubshell(union node *, int);
 static void evalredir(union node *, int);
+static void exphere(union node *, struct arglist *);
 static void expredir(union node *);
 static void evalpipe(union node *);
 static int is_valid_fast_cmdsubst(union node *n);
@@ -488,6 +489,37 @@ evalredir(union node *n, int flags)
 }
 
 
+static void
+exphere(union node *redir, struct arglist *fn)
+{
+	struct jmploc jmploc;
+	struct jmploc *savehandler;
+	struct localvar *savelocalvars;
+	int need_longjmp = 0;
+
+	redir->nhere.expdoc = nullstr;
+	savelocalvars = localvars;
+	localvars = NULL;
+	forcelocal++;
+	savehandler = handler;
+	if (setjmp(jmploc.loc))
+		need_longjmp = exception != EXERROR && exception != EXEXEC;
+	else {
+		handler = &jmploc;
+		expandarg(redir->nhere.doc, fn, 0);
+		redir->nhere.expdoc = fn->list->text;
+		INTOFF;
+	}
+	handler = savehandler;
+	forcelocal--;
+	poplocalvars();
+	localvars = savelocalvars;
+	if (need_longjmp)
+		longjmp(handler->loc, 1);
+	INTON;
+}
+
+
 /*
  * Compute the names of the files in a redirection list.
  */
@@ -516,6 +548,9 @@ expredir(union node *n)
 				fixredir(redir, fn.list->text, 1);
 			}
 			break;
+		case NXHERE:
+			exphere(redir, &fn);
+			break;
 		}
 	}
 }

Modified: user/sbruno/pxe_http_head/bin/sh/expand.c
==============================================================================
--- user/sbruno/pxe_http_head/bin/sh/expand.c	Fri Feb  8 01:28:30 2013	(r246526)
+++ user/sbruno/pxe_http_head/bin/sh/expand.c	Fri Feb  8 01:30:08 2013	(r246527)
@@ -127,19 +127,6 @@ collate_range_cmp(wchar_t c1, wchar_t c2
 	return (wcscoll(s1, s2));
 }
 
-/*
- * Expand shell variables and backquotes inside a here document.
- *	union node *arg		the document
- *	int fd;			where to write the expanded version
- */
-
-void
-expandhere(union node *arg, int fd)
-{
-	expandarg(arg, (struct arglist *)NULL, 0);
-	xwrite(fd, stackblock(), expdest - stackblock());
-}
-
 static char *
 stputs_quotes(const char *data, const char *syntax, char *p)
 {

Modified: user/sbruno/pxe_http_head/bin/sh/expand.h
==============================================================================
--- user/sbruno/pxe_http_head/bin/sh/expand.h	Fri Feb  8 01:28:30 2013	(r246526)
+++ user/sbruno/pxe_http_head/bin/sh/expand.h	Fri Feb  8 01:30:08 2013	(r246527)
@@ -57,7 +57,6 @@ struct arglist {
 
 
 union node;
-void expandhere(union node *, int);
 void expandarg(union node *, struct arglist *, int);
 void expari(int);
 void rmescapes(char *);

Modified: user/sbruno/pxe_http_head/bin/sh/jobs.c
==============================================================================
--- user/sbruno/pxe_http_head/bin/sh/jobs.c	Fri Feb  8 01:28:30 2013	(r246526)
+++ user/sbruno/pxe_http_head/bin/sh/jobs.c	Fri Feb  8 01:30:08 2013	(r246527)
@@ -1030,7 +1030,7 @@ dowait(int mode, struct job *job)
 	int wflags;
 	int restore_sigchld;
 
-	TRACE(("dowait(%d) called\n", block));
+	TRACE(("dowait(%d, %p) called\n", mode, job));
 	restore_sigchld = 0;
 	if ((mode & DOWAIT_SIG) != 0) {
 		sigfillset(&mask);

Modified: user/sbruno/pxe_http_head/bin/sh/mksyntax.c
==============================================================================
--- user/sbruno/pxe_http_head/bin/sh/mksyntax.c	Fri Feb  8 01:28:30 2013	(r246526)
+++ user/sbruno/pxe_http_head/bin/sh/mksyntax.c	Fri Feb  8 01:30:08 2013	(r246527)
@@ -103,29 +103,19 @@ static char writer[] = "\
 
 static FILE *cfile;
 static FILE *hfile;
-static const char *syntax[513];
-static int base;
-static int size;	/* number of values which a char variable can have */
-static int nbits;	/* number of bits in a character */
-static int digit_contig;/* true if digits are contiguous */
 
-static void filltable(const char *);
-static void init(void);
+static void add_default(void);
+static void finish(void);
+static void init(const char *);
 static void add(const char *, const char *);
-static void print(const char *);
 static void output_type_macros(void);
-static void digit_convert(void);
 
 int
 main(int argc __unused, char **argv __unused)
 {
-	char c;
-	char d;
-	int sign;
 	int i;
 	char buf[80];
 	int pos;
-	static char digit[] = "0123456789";
 
 	/* Create output files */
 	if ((cfile = fopen("syntax.c", "w")) == NULL) {
@@ -139,32 +129,8 @@ main(int argc __unused, char **argv __un
 	fputs(writer, hfile);
 	fputs(writer, cfile);
 
-	/* Determine the characteristics of chars. */
-	c = -1;
-	sign = (c > 0) ? 0 : 1;
-	for (nbits = 1 ; ; nbits++) {
-		d = (1 << nbits) - 1;
-		if (d == c)
-			break;
-	}
-#if 0
-	printf("%s %d bit chars\n", sign? "signed" : "unsigned", nbits);
-#endif
-	if (nbits > 9) {
-		fputs("Characters can't have more than 9 bits\n", stderr);
-		exit(2);
-	}
-	size = (1 << nbits) + 1;
-	base = 1;
-	if (sign)
-		base += 1 << (nbits - 1);
-	digit_contig = 1;
-	for (i = 0 ; i < 10 ; i++) {
-		if (digit[i] != '0' + i)
-			digit_contig = 0;
-	}
-
 	fputs("#include <sys/cdefs.h>\n", hfile);
+	fputs("#include <limits.h>\n\n", hfile);
 
 	/* Generate the #define statements in the header file */
 	fputs("/* Syntax classes */\n", hfile);
@@ -185,8 +151,8 @@ main(int argc __unused, char **argv __un
 		fprintf(hfile, "/* %s */\n", is_entry[i].comment);
 	}
 	putc('\n', hfile);
-	fprintf(hfile, "#define SYNBASE %d\n", base);
-	fprintf(hfile, "#define PEOF %d\n\n", -base);
+	fputs("#define SYNBASE (1 - CHAR_MIN)\n", hfile);
+	fputs("#define PEOF -SYNBASE\n\n", hfile);
 	putc('\n', hfile);
 	fputs("#define BASESYNTAX (basesyntax + SYNBASE)\n", hfile);
 	fputs("#define DQSYNTAX (dqsyntax + SYNBASE)\n", hfile);
@@ -197,10 +163,13 @@ main(int argc __unused, char **argv __un
 	putc('\n', hfile);
 
 	/* Generate the syntax tables. */
+	fputs("#include \"parser.h\"\n", cfile);
 	fputs("#include \"shell.h\"\n", cfile);
 	fputs("#include \"syntax.h\"\n\n", cfile);
-	init();
+
 	fputs("/* syntax table used when not in quotes */\n", cfile);
+	init("basesyntax");
+	add_default();
 	add("\n", "CNL");
 	add("\\", "CBACK");
 	add("'", "CSQUOTE");
@@ -209,9 +178,11 @@ main(int argc __unused, char **argv __un
 	add("$", "CVAR");
 	add("}", "CENDVAR");
 	add("<>();&| \t", "CSPCL");
-	print("basesyntax");
-	init();
+	finish();
+
 	fputs("\n/* syntax table used when in double quotes */\n", cfile);
+	init("dqsyntax");
+	add_default();
 	add("\n", "CNL");
 	add("\\", "CBACK");
 	add("\"", "CENDQUOTE");
@@ -220,17 +191,21 @@ main(int argc __unused, char **argv __un
 	add("}", "CENDVAR");
 	/* ':/' for tilde expansion, '-^]' for [a\-x] pattern ranges */
 	add("!*?[]=~:/-^", "CCTL");
-	print("dqsyntax");
-	init();
+	finish();
+
 	fputs("\n/* syntax table used when in single quotes */\n", cfile);
+	init("sqsyntax");
+	add_default();
 	add("\n", "CNL");
 	add("\\", "CSBACK");
 	add("'", "CENDQUOTE");
 	/* ':/' for tilde expansion, '-^]' for [a\-x] pattern ranges */
 	add("!*?[]=~:/-^", "CCTL");
-	print("sqsyntax");
-	init();
+	finish();
+
 	fputs("\n/* syntax table used when in arithmetic */\n", cfile);
+	init("arisyntax");
+	add_default();
 	add("\n", "CNL");
 	add("\\", "CBACK");
 	add("`", "CBQUOTE");
@@ -239,114 +214,108 @@ main(int argc __unused, char **argv __un
 	add("}", "CENDVAR");
 	add("(", "CLP");
 	add(")", "CRP");
-	print("arisyntax");
-	filltable("0");
+	finish();
+
 	fputs("\n/* character classification table */\n", cfile);
+	init("is_type");
 	add("0123456789", "ISDIGIT");
 	add("abcdefghijklmnopqrstuvwxyz", "ISLOWER");
 	add("ABCDEFGHIJKLMNOPQRSTUVWXYZ", "ISUPPER");
 	add("_", "ISUNDER");
 	add("#?$!-*@", "ISSPECL");
-	print("is_type");
-	if (! digit_contig)
-		digit_convert();
+	finish();
+
 	exit(0);
 }
 
 
-
 /*
- * Clear the syntax table.
+ * Output the header and declaration of a syntax table.
  */
 
 static void
-filltable(const char *dftval)
+init(const char *name)
 {
-	int i;
+	fprintf(hfile, "extern const char %s[];\n", name);
+	fprintf(cfile, "const char %s[SYNBASE + CHAR_MAX + 1] = {\n", name);
+}
+
 
-	for (i = 0 ; i < size ; i++)
-		syntax[i] = dftval;
+static void
+add_one(const char *key, const char *type)
+{
+	fprintf(cfile, "\t[SYNBASE + %s] = %s,\n", key, type);
 }
 
 
 /*
- * Initialize the syntax table with default values.
+ * Add default values to the syntax table.
  */
 
 static void
-init(void)
+add_default(void)
 {
-	filltable("CWORD");
-	syntax[0] = "CEOF";
-	syntax[base + CTLESC] = "CCTL";
-	syntax[base + CTLVAR] = "CCTL";
-	syntax[base + CTLENDVAR] = "CCTL";
-	syntax[base + CTLBACKQ] = "CCTL";
-	syntax[base + CTLBACKQ + CTLQUOTE] = "CCTL";
-	syntax[base + CTLARI] = "CCTL";
-	syntax[base + CTLENDARI] = "CCTL";
-	syntax[base + CTLQUOTEMARK] = "CCTL";
-	syntax[base + CTLQUOTEEND] = "CCTL";
+	add_one("PEOF",                "CEOF");
+	add_one("CTLESC",              "CCTL");
+	add_one("CTLVAR",              "CCTL");
+	add_one("CTLENDVAR",           "CCTL");
+	add_one("CTLBACKQ",            "CCTL");
+	add_one("CTLBACKQ + CTLQUOTE", "CCTL");
+	add_one("CTLARI",              "CCTL");
+	add_one("CTLENDARI",           "CCTL");
+	add_one("CTLQUOTEMARK",        "CCTL");
+	add_one("CTLQUOTEEND",         "CCTL");
 }
 
 
 /*
- * Add entries to the syntax table.
+ * Output the footer of a syntax table.
  */
 
 static void
-add(const char *p, const char *type)
+finish(void)
 {
-	while (*p)
-		syntax[*p++ + base] = type;
+	fputs("};\n", cfile);
 }
 
 
-
 /*
- * Output the syntax table.
+ * Add entries to the syntax table.
  */
 
 static void
-print(const char *name)
+add(const char *p, const char *type)
 {
-	int i;
-	int col;
-
-	fprintf(hfile, "extern const char %s[];\n", name);
-	fprintf(cfile, "const char %s[%d] = {\n", name, size);
-	col = 0;
-	for (i = 0 ; i < size ; i++) {
-		if (i == 0) {
-			fputs("      ", cfile);
-		} else if ((i & 03) == 0) {
-			fputs(",\n      ", cfile);
-			col = 0;
-		} else {
-			putc(',', cfile);
-			while (++col < 9 * (i & 03))
-				putc(' ', cfile);
+	for (; *p; ++p) {
+		char c = *p;
+		switch (c) {
+		case '\t': c = 't';  break;
+		case '\n': c = 'n';  break;
+		case '\'': c = '\''; break;
+		case '\\': c = '\\'; break;
+
+		default:
+			fprintf(cfile, "\t[SYNBASE + '%c'] = %s,\n", c, type);
+			continue;
 		}
-		fputs(syntax[i], cfile);
-		col += strlen(syntax[i]);
+		fprintf(cfile, "\t[SYNBASE + '\\%c'] = %s,\n", c, type);
 	}
-	fputs("\n};\n", cfile);
 }
 
 
-
 /*
  * Output character classification macros (e.g. is_digit).  If digits are
  * contiguous, we can test for them quickly.
  */
 
 static const char *macro[] = {
-	"#define is_digit(c)\t((is_type+SYNBASE)[(int)c] & ISDIGIT)",
+	"#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)",
 	"#define is_eof(c)\t((c) == PEOF)",
 	"#define is_alpha(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER))",
 	"#define is_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER))",
 	"#define is_in_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT))",
 	"#define is_special(c)\t((is_type+SYNBASE)[(int)c] & (ISSPECL|ISDIGIT))",
+	"#define digit_val(c)\t((c) - '0')",
 	NULL
 };
 
@@ -355,41 +324,6 @@ output_type_macros(void)
 {
 	const char **pp;
 
-	if (digit_contig)
-		macro[0] = "#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)";
 	for (pp = macro ; *pp ; pp++)
 		fprintf(hfile, "%s\n", *pp);
-	if (digit_contig)
-		fputs("#define digit_val(c)\t((c) - '0')\n", hfile);
-	else
-		fputs("#define digit_val(c)\t(digit_value[c])\n", hfile);
-}
-
-
-
-/*
- * Output digit conversion table (if digits are not contiguous).
- */
-
-static void
-digit_convert(void)
-{
-	int maxdigit;
-	static char digit[] = "0123456789";
-	char *p;
-	int i;
-
-	maxdigit = 0;
-	for (p = digit ; *p ; p++)
-		if (*p > maxdigit)
-			maxdigit = *p;
-	fputs("extern const char digit_value[];\n", hfile);
-	fputs("\n\nconst char digit_value[] = {\n", cfile);
-	for (i = 0 ; i <= maxdigit ; i++) {
-		for (p = digit ; *p && *p != i ; p++);
-		if (*p == '\0')
-			p = digit;
-		fprintf(cfile, "      %d,\n", (int)(p - digit));
-	}
-	fputs("};\n", cfile);
 }

Modified: user/sbruno/pxe_http_head/bin/sh/nodetypes
==============================================================================
--- user/sbruno/pxe_http_head/bin/sh/nodetypes	Fri Feb  8 01:28:30 2013	(r246526)
+++ user/sbruno/pxe_http_head/bin/sh/nodetypes	Fri Feb  8 01:30:08 2013	(r246527)
@@ -138,6 +138,7 @@ NXHERE nhere			# fd<<!
 	next	  nodeptr		# next redirection in list
 	fd	  int			# file descriptor being redirected
 	doc	  nodeptr		# input to command (NARG node)
+	expdoc    temp	char *expdoc	# actual document (for NXHERE)
 
 NNOT nnot			# ! command  (actually pipeline)
 	type	int

Modified: user/sbruno/pxe_http_head/bin/sh/parser.h
==============================================================================
--- user/sbruno/pxe_http_head/bin/sh/parser.h	Fri Feb  8 01:28:30 2013	(r246526)
+++ user/sbruno/pxe_http_head/bin/sh/parser.h	Fri Feb  8 01:30:08 2013	(r246527)
@@ -39,7 +39,7 @@
 #define CTLENDVAR '\371'
 #define CTLBACKQ '\372'
 #define CTLQUOTE 01		/* ored with CTLBACKQ code if in quotes */
-/*	CTLBACKQ | CTLQUOTE == '\205' */
+/*	CTLBACKQ | CTLQUOTE == '\373' */
 #define	CTLARI	'\374'
 #define	CTLENDARI '\375'
 #define	CTLQUOTEMARK '\376'

Modified: user/sbruno/pxe_http_head/bin/sh/redir.c
==============================================================================
--- user/sbruno/pxe_http_head/bin/sh/redir.c	Fri Feb  8 01:28:30 2013	(r246526)
+++ user/sbruno/pxe_http_head/bin/sh/redir.c	Fri Feb  8 01:30:08 2013	(r246527)
@@ -251,18 +251,23 @@ movefd:
 static int
 openhere(union node *redir)
 {
+	char *p;
 	int pip[2];
 	int len = 0;
 
 	if (pipe(pip) < 0)
 		error("Pipe call failed: %s", strerror(errno));
-	if (redir->type == NHERE) {
-		len = strlen(redir->nhere.doc->narg.text);
-		if (len <= PIPESIZE) {
-			xwrite(pip[1], redir->nhere.doc->narg.text, len);
-			goto out;
-		}
+
+	if (redir->type == NXHERE)
+		p = redir->nhere.expdoc;
+	else
+		p = redir->nhere.doc->narg.text;
+	len = strlen(p);
+	if (len <= PIPESIZE) {
+		xwrite(pip[1], p, len);
+		goto out;
 	}
+
 	if (forkshell((struct job *)NULL, (union node *)NULL, FORK_NOJOB) == 0) {
 		close(pip[0]);
 		signal(SIGINT, SIG_IGN);
@@ -270,10 +275,7 @@ openhere(union node *redir)
 		signal(SIGHUP, SIG_IGN);
 		signal(SIGTSTP, SIG_IGN);
 		signal(SIGPIPE, SIG_DFL);
-		if (redir->type == NHERE)
-			xwrite(pip[1], redir->nhere.doc->narg.text, len);
-		else
-			expandhere(redir->nhere.doc, pip[1]);
+		xwrite(pip[1], p, len);
 		_exit(0);
 	}
 out:

Modified: user/sbruno/pxe_http_head/contrib/binutils/include/elf/common.h
==============================================================================
--- user/sbruno/pxe_http_head/contrib/binutils/include/elf/common.h	Fri Feb  8 01:28:30 2013	(r246526)
+++ user/sbruno/pxe_http_head/contrib/binutils/include/elf/common.h	Fri Feb  8 01:30:08 2013	(r246527)
@@ -435,6 +435,10 @@
 
 #define NT_FREEBSD_ABI_TAG	1
 
+/* Values for FreeBSD .note.tag notes.  Note name is "FreeBSD".  */
+
+#define NT_FREEBSD_TAG		2
+
 /* These three macros disassemble and assemble a symbol table st_info field,
    which contains the symbol binding and symbol type.  The STB_ and STT_
    defines identify the binding and type.  */

Modified: user/sbruno/pxe_http_head/contrib/bmake/ChangeLog
==============================================================================
--- user/sbruno/pxe_http_head/contrib/bmake/ChangeLog	Fri Feb  8 01:28:30 2013	(r246526)
+++ user/sbruno/pxe_http_head/contrib/bmake/ChangeLog	Fri Feb  8 01:30:08 2013	(r246527)
@@ -1,3 +1,35 @@
+2013-01-27  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Merge with NetBSD make, pick up
+	  o make.1: more info on how shell commands are handled.
+	  o job.c,main.c: detect write errors to job pipes.
+
+2013-01-25  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20130123
+	  Merge with NetBSD make, pick up
+	  o meta.c: if script uses .OODATE and meta_oodate() decides
+	    rebuild is needed, .OODATE will be empty - set it to .ALLSRC.
+	  o var.c: in debug output indicate which variabale modifiers
+	    apply to.
+	  o remove Check_Cwd logic the makefiles have been fixed.
+	
+2012-12-12  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* makefile.in: add a simple makefile for folk who insist on
+	  ./configure; make; make install
+	  it just runs boot-strap
+	* include mk/* to accommodate the above
+	* boot-strap:  re-work to accommodate the above
+	  mksrc defaults to $Mydir/mk
+	  allow op={configure,build,install,clean,all}
+	  add options to facilitate install
+	* Makefile.config.in: just the bits set by configure
+	* Makefile: bump version to 20121212
+	  abandon Makefile.in (NetBSD Makefile)
+	  leverage mk/* instead
+	* configure.in: ensure srcdir is absolute
+
 2012-11-11  Simon J. Gerraty  <sjg at bad.crufty.net>
 
 	* Makefile.in (MAKE_VERSION): 20121111

Modified: user/sbruno/pxe_http_head/contrib/bmake/FILES
==============================================================================
--- user/sbruno/pxe_http_head/contrib/bmake/FILES	Fri Feb  8 01:28:30 2013	(r246526)
+++ user/sbruno/pxe_http_head/contrib/bmake/FILES	Fri Feb  8 01:30:08 2013	(r246527)
@@ -4,7 +4,9 @@ bmake.cat1
 boot-strap
 bsd.after-import.mk
 os.sh
-Makefile.in
+makefile.in
+Makefile
+Makefile.config.in
 PSD.doc/Makefile
 PSD.doc/tutorial.ms
 README
@@ -120,3 +122,63 @@ unit-tests/test.exp
 unit-tests/unexport
 unit-tests/unexport-env
 unit-tests/varcmd
+mk/ChangeLog
+mk/FILES
+mk/README
+mk/auto.obj.mk
+mk/autoconf.mk
+mk/autodep.mk
+mk/auto.dep.mk
+mk/dep.mk
+mk/doc.mk
+mk/dpadd.mk
+mk/final.mk
+mk/host-target.mk
+mk/host.libnames.mk
+mk/inc.mk
+mk/init.mk
+mk/install-mk
+mk/java.mk
+mk/lib.mk
+mk/libnames.mk
+mk/libs.mk
+mk/links.mk
+mk/man.mk
+mk/mk-files.txt
+mk/nls.mk
+mk/obj.mk
+mk/options.mk
+mk/own.mk
+mk/prlist.mk
+mk/prog.mk
+mk/progs.mk
+mk/rst2htm.mk
+mk/scripts.mk
+mk/srctop.mk
+mk/subdir.mk
+mk/sys.mk
+mk/sys.clean-env.mk
+mk/sys.dependfile.mk
+mk/sys/AIX.mk
+mk/sys/Darwin.mk
+mk/sys/Generic.mk
+mk/sys/HP-UX.mk
+mk/sys/IRIX.mk
+mk/sys/Linux.mk
+mk/sys/NetBSD.mk
+mk/sys/OSF1.mk
+mk/sys/OpenBSD.mk
+mk/sys/SunOS.mk
+mk/sys/UnixWare.mk
+mk/target-flags.mk
+mk/warnings.mk
+mk/yacc.mk
+mk/dirdeps.mk
+mk/gendirdeps.mk
+mk/install-new.mk
+mk/meta2deps.py
+mk/meta2deps.sh
+mk/meta.sys.mk
+mk/meta.autodep.mk
+mk/meta.stage.mk
+mk/meta.subdir.mk

Copied: user/sbruno/pxe_http_head/contrib/bmake/Makefile (from r246526, head/contrib/bmake/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/sbruno/pxe_http_head/contrib/bmake/Makefile	Fri Feb  8 01:30:08 2013	(r246527, copy of r246526, head/contrib/bmake/Makefile)
@@ -0,0 +1,221 @@
+#	$Id: Makefile,v 1.5 2013/01/28 19:31:58 sjg Exp $
+
+# Base version on src date
+MAKE_VERSION= 20130123
+
+PROG=	bmake
+
+SRCS= \
+	arch.c \
+	buf.c \
+	compat.c \
+	cond.c \
+	dir.c \
+	for.c \
+	hash.c \
+	job.c \
+	main.c \
+	make.c \
+	make_malloc.c \
+	meta.c \
+	parse.c \
+	str.c \
+	strlist.c \
+	suff.c \
+	targ.c \
+	trace.c \
+	util.c \
+	var.c
+
+# from lst.lib/
+SRCS+= \
+	lstAppend.c \
+	lstAtEnd.c \
+	lstAtFront.c \
+	lstClose.c \
+	lstConcat.c \
+	lstDatum.c \
+	lstDeQueue.c \
+	lstDestroy.c \
+	lstDupl.c \
+	lstEnQueue.c \
+	lstFind.c \
+	lstFindFrom.c \
+	lstFirst.c \
+	lstForEach.c \
+	lstForEachFrom.c \
+	lstInit.c \
+	lstInsert.c \
+	lstIsAtEnd.c \
+	lstIsEmpty.c \
+	lstLast.c \
+	lstMember.c \
+	lstNext.c \
+	lstOpen.c \
+	lstPrev.c \
+	lstRemove.c \
+	lstReplace.c \
+	lstSucc.c
+
+# this file gets generated by configure
+.-include "Makefile.config"
+
+.if !empty(LIBOBJS)
+SRCS+= ${LIBOBJS:T:.o=.c}
+.endif
+
+# just in case
+prefix?= /usr
+srcdir?= ${.CURDIR}
+
+DEFAULT_SYS_PATH?= .../share/mk:${prefix}/share/mk
+
+CPPFLAGS+= -DUSE_META
+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}\""
+
+# meta mode can be useful even without filemon 
+FILEMON_H ?= /usr/include/dev/filemon/filemon.h
+.if exists(${FILEMON_H}) && ${FILEMON_H:T} == "filemon.h"
+COPTS.meta.c += -DHAVE_FILEMON_H -I${FILEMON_H:H}
+.endif
+
+.PATH:	${srcdir}
+.PATH:	${srcdir}/lst.lib
+
+.if make(obj) || make(clean)
+SUBDIR+= unit-tests
+.endif
+
+# start-delete1 for bsd.after-import.mk
+# we skip a lot of this when building as part of FreeBSD etc.
+
+# list of OS's which are derrived from BSD4.4
+BSD44_LIST= NetBSD FreeBSD OpenBSD DragonFly
+# we are...
+OS!= uname -s
+# are we 4.4BSD ?
+isBSD44:=${BSD44_LIST:M${OS}}
+
+.if ${isBSD44} == ""
+MANTARGET= cat
+INSTALL?=${srcdir}/install-sh
+.if (${MACHINE} == "sun386")
+# even I don't have one of these anymore :-)
+CFLAGS+= -DPORTAR
+.elif (${MACHINE} != "sunos")
+SRCS+= sigcompat.c
+CFLAGS+= -DSIGNAL_FLAGS=SA_RESTART
+.endif
+.else
+MANTARGET?= man
+.endif
+
+# turn this on by default - ignored if we are root
+WITH_INSTALL_AS_USER=
+
+# supress with -DWITHOUT_*
+OPTIONS_DEFAULT_YES+= \
+	AUTOCONF_MK \
+	INSTALL_MK \
+	PROG_LINK
+
+OPTIONS_DEFAULT_NO+= \
+	PROG_VERSION
+
+# process options now
+.include <own.mk>
+
+.if ${MK_PROG_VERSION} == "yes"
+PROG_NAME= ${PROG}-${MAKE_VERSION}
+.if ${MK_PROG_LINK} == "yes"
+SYMLINKS+= ${PROG}-${MAKE_VERSION} ${BINDIR}/${PROG}
+.endif
+.endif
+
+EXTRACT_MAN=no
+# end-delete1
+
+MAN= ${PROG}.1
+MAN1= ${MAN}
+
+.if (${PROG} != "make")
+CLEANFILES+= my.history
+.if make(${MAN}) || !exists(${srcdir}/${MAN})
+my.history: ${MAKEFILE}
+	@(echo ".Nm"; \
+	echo "is derived from NetBSD"; \
+	echo ".Xr make 1 ."; \
+	echo "It uses autoconf to facilitate portability to other platforms."; \
+	echo ".Pp") > $@
+
+.NOPATH: ${MAN}
+${MAN}:	make.1 my.history
+	@echo making $@
+	@sed -e 's/^.Nx/NetBSD/' -e '/^.Nm/s/make/${PROG}/' \
+	-e '/^.Sh HISTORY/rmy.history' \
+	-e '/^.Sh HISTORY/,$$s,^.Nm,make,' ${srcdir}/make.1 > $@
+
+all beforeinstall: ${MAN}
+_mfromdir=.
+.endif
+.endif
+
+MANTARGET?= cat
+MANDEST?= ${MANDIR}/${MANTARGET}1
+
+.if ${MANTARGET} == "cat"
+_mfromdir=${srcdir}
+.endif
+
+.include <prog.mk>
+
+CPPFLAGS+= -DMAKE_NATIVE -DHAVE_CONFIG_H
+COPTS.var.c += -Wno-cast-qual
+COPTS.job.c += -Wno-format-nonliteral
+COPTS.parse.c += -Wno-format-nonliteral
+COPTS.var.c += -Wno-format-nonliteral
+
+# Force these
+SHAREDIR= ${prefix}/share
+BINDIR= ${prefix}/bin
+MANDIR= ${SHAREDIR}/man
+
+.if !exists(.depend)
+${OBJS}: config.h
+.endif
+.if ${MK_AUTOCONF_MK} == "yes"
+.include <autoconf.mk>
+.endif
+
+# make sure that MAKE_VERSION gets updated.
+main.o: ${SRCS} ${MAKEFILE}
+
+# start-delete2 for bsd.after-import.mk
+SHARE_MK?=${SHAREDIR}/mk
+MKSRC=${srcdir}/mk
+INSTALL?=${srcdir}/install-sh
+
+.if ${MK_INSTALL_MK} == "yes"
+install: install-mk
+.endif
+
+beforeinstall:
+	test -d ${DESTDIR}${BINDIR} || ${INSTALL} -m 775 -d ${DESTDIR}${BINDIR}
+	test -d ${DESTDIR}${MANDEST} || ${INSTALL} -m 775 -d ${DESTDIR}${MANDEST}
+
+install-mk:
+.if exists(${MKSRC}/install-mk)
+	test -d ${DESTDIR}${SHARE_MK} || ${INSTALL} -m 775 -d ${DESTDIR}${SHARE_MK}
+	sh ${MKSRC}/install-mk -v -m 644 ${DESTDIR}${SHARE_MK}
+.else
+	@echo need to unpack mk.tar.gz under ${srcdir} or set MKSRC; false
+.endif
+# end-delete2
+
+# A simple unit-test driver to help catch regressions
+accept test:
+	cd ${.CURDIR}/unit-tests && MAKEFLAGS= ${.MAKE} -r -m / TEST_MAKE=${TEST_MAKE:U${.OBJDIR}/${PROG:T}} ${.TARGET}

Copied: user/sbruno/pxe_http_head/contrib/bmake/Makefile.config.in (from r246526, head/contrib/bmake/Makefile.config.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/sbruno/pxe_http_head/contrib/bmake/Makefile.config.in	Fri Feb  8 01:30:08 2013	(r246527, copy of r246526, head/contrib/bmake/Makefile.config.in)
@@ -0,0 +1,16 @@
+# things set by configure
+
+prefix= @prefix@
+srcdir= @srcdir@
+CC?= @CC@
+MACHINE= @machine@
+MACHINE_ARCH= @machine_arch@
+DEFAULT_SYS_PATH= @default_sys_path@
+
+CPPFLAGS+= @CPPFLAGS@
+CFLAGS+= ${CPPFLAGS} @DEFS@
+LDFLAGS= @LDFLAGS@
+LIBOBJS= @LIBOBJS@
+LDADD= @LIBS@
+USE_META= @use_meta@
+FILEMON_H= @filemon_h@

Modified: user/sbruno/pxe_http_head/contrib/bmake/bmake.1
==============================================================================
--- user/sbruno/pxe_http_head/contrib/bmake/bmake.1	Fri Feb  8 01:28:30 2013	(r246526)
+++ user/sbruno/pxe_http_head/contrib/bmake/bmake.1	Fri Feb  8 01:30:08 2013	(r246527)
@@ -1,4 +1,4 @@
-.\"	$NetBSD: make.1,v 1.209 2012/10/08 15:09:48 christos Exp $
+.\"	$NetBSD: make.1,v 1.210 2013/01/27 18:52:01 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 October 8, 2012
+.Dd January 23, 2013
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -468,6 +468,50 @@ except that the effect can be limited to
 A
 .Ql Ic \-
 causes any non-zero exit status of the command line to be ignored.
+.Pp
+When
+.Nm
+is run in jobs mode with
+.Fl j Ar max_jobs ,
+the entire script for the target is fed to a
+single instance of the shell.
+.Pp
+In compatibility (non-jobs) mode, each command is run in a separate process.
+If the command contains any shell meta characters
+.Pq Ql #=|^(){};&<>*?[]:$`\e\en
+it will be passed to the shell, otherwise
+.Nm
+will attempt direct execution.
+.Pp
+Since
+.Nm
+will
+.Xr chdir 2
+to
+.Ql Va .OBJDIR
+before executing any targets, each child process
+starts with that as its current working directory.
+.Pp
+Makefiles should be written so that the mode of
+.Nm
+operation does not change their behavior.
+For example, any command which needs to use

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