Date: Fri, 6 Sep 2013 17:42:13 +0000 (UTC) From: Mark Murray <markm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r255317 - in projects/random_number_generator: . bin/sh contrib/binutils/gas/config contrib/binutils/opcodes contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests contrib/gcc contrib/... Message-ID: <201309061742.r86HgDtT060640@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markm Date: Fri Sep 6 17:42:12 2013 New Revision: 255317 URL: http://svnweb.freebsd.org/changeset/base/255317 Log: MFC Added: projects/random_number_generator/contrib/bmake/unit-tests/sunshcmd - copied unchanged from r255316, head/contrib/bmake/unit-tests/sunshcmd projects/random_number_generator/gnu/usr.bin/cc/include/__wmmintrin_aes.h - copied unchanged from r255316, head/gnu/usr.bin/cc/include/__wmmintrin_aes.h projects/random_number_generator/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h - copied unchanged from r255316, head/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h projects/random_number_generator/lib/libc/capability/ - copied from r255316, head/lib/libc/capability/ projects/random_number_generator/lib/msun/src/imprecise.c - copied unchanged from r255316, head/lib/msun/src/imprecise.c projects/random_number_generator/sys/arm/conf/DIGI-CCWMX53 - copied unchanged from r255316, head/sys/arm/conf/DIGI-CCWMX53 projects/random_number_generator/sys/arm/freescale/imx/files.imx53 - copied unchanged from r255316, head/sys/arm/freescale/imx/files.imx53 projects/random_number_generator/sys/arm/freescale/imx/imx53_machdep.c - copied unchanged from r255316, head/sys/arm/freescale/imx/imx53_machdep.c projects/random_number_generator/sys/arm/freescale/imx/std.imx53 - copied unchanged from r255316, head/sys/arm/freescale/imx/std.imx53 projects/random_number_generator/sys/boot/fdt/dts/digi-ccwmx53.dts - copied unchanged from r255316, head/sys/boot/fdt/dts/digi-ccwmx53.dts projects/random_number_generator/sys/boot/fdt/dts/imx53x.dtsi - copied unchanged from r255316, head/sys/boot/fdt/dts/imx53x.dtsi projects/random_number_generator/sys/crypto/aesni/aesencdec.h - copied unchanged from r255316, head/sys/crypto/aesni/aesencdec.h projects/random_number_generator/sys/dev/hwpmc/hwpmc_mpc7xxx.c - copied unchanged from r255316, head/sys/dev/hwpmc/hwpmc_mpc7xxx.c projects/random_number_generator/sys/dev/hwpmc/hwpmc_powerpc.h - copied unchanged from r255316, head/sys/dev/hwpmc/hwpmc_powerpc.h projects/random_number_generator/sys/kern/subr_capability.c - copied unchanged from r255316, head/sys/kern/subr_capability.c projects/random_number_generator/sys/mips/conf/GXEMUL32 - copied unchanged from r255316, head/sys/mips/conf/GXEMUL32 projects/random_number_generator/sys/sys/caprights.h - copied unchanged from r255316, head/sys/sys/caprights.h projects/random_number_generator/tools/regression/bin/sh/builtins/return8.0 - copied unchanged from r255316, head/tools/regression/bin/sh/builtins/return8.0 projects/random_number_generator/tools/regression/lib/libc/stdio/test-fopen.c - copied unchanged from r255316, head/tools/regression/lib/libc/stdio/test-fopen.c projects/random_number_generator/tools/regression/lib/libc/stdio/test-fopen.t - copied unchanged from r255316, head/tools/regression/lib/libc/stdio/test-fopen.t projects/random_number_generator/tools/regression/lib/libc/stdio/test-mkostemp.t - copied unchanged from r255316, head/tools/regression/lib/libc/stdio/test-mkostemp.t Deleted: projects/random_number_generator/gnu/usr.bin/patch/ projects/random_number_generator/sys/crypto/aesni/aesencdec_amd64.S projects/random_number_generator/sys/crypto/aesni/aesencdec_i386.S Modified: projects/random_number_generator/Makefile projects/random_number_generator/ObsoleteFiles.inc projects/random_number_generator/UPDATING projects/random_number_generator/bin/sh/eval.c projects/random_number_generator/bin/sh/eval.h projects/random_number_generator/bin/sh/jobs.c projects/random_number_generator/bin/sh/jobs.h projects/random_number_generator/bin/sh/main.c projects/random_number_generator/bin/sh/sh.1 projects/random_number_generator/bin/sh/trap.c projects/random_number_generator/bin/sh/trap.h projects/random_number_generator/contrib/binutils/gas/config/tc-i386.c projects/random_number_generator/contrib/binutils/opcodes/i386-dis.c projects/random_number_generator/contrib/binutils/opcodes/i386-opc.tbl projects/random_number_generator/contrib/binutils/opcodes/i386-tbl.h projects/random_number_generator/contrib/bmake/ChangeLog projects/random_number_generator/contrib/bmake/FILES projects/random_number_generator/contrib/bmake/Makefile projects/random_number_generator/contrib/bmake/bmake.1 projects/random_number_generator/contrib/bmake/bmake.cat1 projects/random_number_generator/contrib/bmake/compat.c projects/random_number_generator/contrib/bmake/job.c projects/random_number_generator/contrib/bmake/main.c projects/random_number_generator/contrib/bmake/make.1 projects/random_number_generator/contrib/bmake/make.h projects/random_number_generator/contrib/bmake/mk/ChangeLog projects/random_number_generator/contrib/bmake/mk/gendirdeps.mk projects/random_number_generator/contrib/bmake/mk/install-mk projects/random_number_generator/contrib/bmake/mk/libs.mk projects/random_number_generator/contrib/bmake/mk/progs.mk projects/random_number_generator/contrib/bmake/parse.c projects/random_number_generator/contrib/bmake/unit-tests/Makefile.in projects/random_number_generator/contrib/bmake/unit-tests/test.exp projects/random_number_generator/contrib/bmake/var.c projects/random_number_generator/contrib/gcc/config/i386/i386.c projects/random_number_generator/contrib/gcc/config/i386/i386.h projects/random_number_generator/contrib/gcc/config/i386/i386.opt projects/random_number_generator/contrib/gcc/doc/invoke.texi projects/random_number_generator/contrib/gcc/opth-gen.awk projects/random_number_generator/contrib/libexecinfo/execinfo.h (contents, props changed) projects/random_number_generator/contrib/tcpdump/tcpdump.c projects/random_number_generator/etc/defaults/periodic.conf projects/random_number_generator/etc/devd/usb.conf projects/random_number_generator/etc/mtree/BSD.include.dist projects/random_number_generator/etc/mtree/BSD.var.dist projects/random_number_generator/etc/rc.d/routing projects/random_number_generator/gnu/usr.bin/Makefile projects/random_number_generator/gnu/usr.bin/cc/include/Makefile projects/random_number_generator/include/iconv.h projects/random_number_generator/lib/Makefile projects/random_number_generator/lib/libc++/Makefile projects/random_number_generator/lib/libc/Makefile projects/random_number_generator/lib/libc/gen/signal.3 projects/random_number_generator/lib/libc/iconv/citrus_iconv_local.h projects/random_number_generator/lib/libc/include/compat.h projects/random_number_generator/lib/libc/stdio/flags.c projects/random_number_generator/lib/libc/stdlib/system.c projects/random_number_generator/lib/libc/sys/Symbol.map projects/random_number_generator/lib/libc/sys/sigaction.2 projects/random_number_generator/lib/libc/sys/sigpending.2 projects/random_number_generator/lib/libc/sys/sigreturn.2 projects/random_number_generator/lib/libc/sys/sigwait.2 projects/random_number_generator/lib/libexecinfo/Makefile projects/random_number_generator/lib/libiconv_modules/Makefile.inc projects/random_number_generator/lib/libprocstat/libprocstat.c projects/random_number_generator/lib/libprocstat/libprocstat.h projects/random_number_generator/lib/libusb/libusb20_ugen20.c projects/random_number_generator/lib/msun/Makefile projects/random_number_generator/lib/msun/Symbol.map projects/random_number_generator/release/picobsd/build/picobsd projects/random_number_generator/sbin/camcontrol/camcontrol.8 projects/random_number_generator/sbin/camcontrol/camcontrol.c projects/random_number_generator/sbin/camcontrol/fwdownload.c projects/random_number_generator/sbin/dhclient/bpf.c projects/random_number_generator/sbin/dhclient/dhclient.c projects/random_number_generator/sbin/hastd/subr.c projects/random_number_generator/sbin/swapon/swapon.c projects/random_number_generator/share/man/man4/capsicum.4 projects/random_number_generator/share/man/man4/netgraph.4 projects/random_number_generator/share/man/man4/ntb.4 projects/random_number_generator/share/man/man4/procdesc.4 projects/random_number_generator/share/man/man5/periodic.conf.5 projects/random_number_generator/share/man/man9/Makefile projects/random_number_generator/share/misc/committers-ports.dot projects/random_number_generator/share/misc/committers-src.dot projects/random_number_generator/share/mk/bsd.libnames.mk projects/random_number_generator/sys/amd64/amd64/apic_vector.S projects/random_number_generator/sys/amd64/amd64/db_disasm.c projects/random_number_generator/sys/amd64/amd64/genassym.c projects/random_number_generator/sys/amd64/amd64/mp_machdep.c projects/random_number_generator/sys/amd64/amd64/pmap.c projects/random_number_generator/sys/amd64/amd64/vm_machdep.c projects/random_number_generator/sys/amd64/include/pcpu.h projects/random_number_generator/sys/amd64/include/pmap.h projects/random_number_generator/sys/amd64/include/sf_buf.h projects/random_number_generator/sys/amd64/include/smp.h projects/random_number_generator/sys/amd64/linux32/linux32_machdep.c projects/random_number_generator/sys/amd64/vmm/vmm_msr.c projects/random_number_generator/sys/amd64/vmm/x86.c projects/random_number_generator/sys/amd64/vmm/x86.h projects/random_number_generator/sys/arm/freescale/imx/imx51_ccm.c projects/random_number_generator/sys/arm/freescale/imx/imx51_gpio.c projects/random_number_generator/sys/arm/freescale/imx/imx51_iomux.c projects/random_number_generator/sys/arm/freescale/imx/imx_gpt.c projects/random_number_generator/sys/arm/freescale/imx/imx_wdog.c projects/random_number_generator/sys/bsm/audit_kevents.h projects/random_number_generator/sys/bsm/audit_record.h projects/random_number_generator/sys/cam/cam_debug.h projects/random_number_generator/sys/cam/cam_periph.c projects/random_number_generator/sys/cam/cam_xpt.c projects/random_number_generator/sys/cam/cam_xpt.h projects/random_number_generator/sys/cam/scsi/scsi_da.c projects/random_number_generator/sys/cam/scsi/scsi_da.h projects/random_number_generator/sys/cam/scsi/scsi_enc_ses.c projects/random_number_generator/sys/cddl/compat/opensolaris/sys/file.h projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c projects/random_number_generator/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c projects/random_number_generator/sys/compat/freebsd32/freebsd32_capability.c projects/random_number_generator/sys/compat/freebsd32/freebsd32_ioctl.c projects/random_number_generator/sys/compat/freebsd32/freebsd32_misc.c projects/random_number_generator/sys/compat/freebsd32/freebsd32_proto.h projects/random_number_generator/sys/compat/freebsd32/freebsd32_syscall.h projects/random_number_generator/sys/compat/freebsd32/freebsd32_syscalls.c projects/random_number_generator/sys/compat/freebsd32/freebsd32_sysent.c projects/random_number_generator/sys/compat/freebsd32/freebsd32_systrace_args.c projects/random_number_generator/sys/compat/freebsd32/syscalls.master projects/random_number_generator/sys/compat/linux/linux_file.c projects/random_number_generator/sys/compat/linux/linux_ioctl.c projects/random_number_generator/sys/compat/linux/linux_socket.c projects/random_number_generator/sys/compat/svr4/svr4_fcntl.c projects/random_number_generator/sys/compat/svr4/svr4_filio.c projects/random_number_generator/sys/compat/svr4/svr4_ioctl.c projects/random_number_generator/sys/compat/svr4/svr4_misc.c projects/random_number_generator/sys/compat/svr4/svr4_stream.c projects/random_number_generator/sys/conf/files projects/random_number_generator/sys/conf/files.amd64 projects/random_number_generator/sys/conf/files.i386 projects/random_number_generator/sys/conf/files.mips projects/random_number_generator/sys/conf/files.powerpc projects/random_number_generator/sys/crypto/aesni/aeskeys_amd64.S projects/random_number_generator/sys/crypto/aesni/aesni.c projects/random_number_generator/sys/crypto/aesni/aesni.h projects/random_number_generator/sys/crypto/aesni/aesni_wrap.c projects/random_number_generator/sys/dev/aac/aac_linux.c projects/random_number_generator/sys/dev/aacraid/aacraid_linux.c projects/random_number_generator/sys/dev/amr/amr_linux.c projects/random_number_generator/sys/dev/atkbdc/psm.c projects/random_number_generator/sys/dev/cfi/cfi_bus_nexus.c projects/random_number_generator/sys/dev/cfi/cfi_core.c projects/random_number_generator/sys/dev/cfi/cfi_dev.c projects/random_number_generator/sys/dev/cfi/cfi_disk.c projects/random_number_generator/sys/dev/cfi/cfi_reg.h projects/random_number_generator/sys/dev/cfi/cfi_var.h projects/random_number_generator/sys/dev/cxgbe/tom/t4_listen.c projects/random_number_generator/sys/dev/filemon/filemon.c projects/random_number_generator/sys/dev/gpio/gpiobus.c projects/random_number_generator/sys/dev/gxemul/cons/gxemul_cons.c projects/random_number_generator/sys/dev/gxemul/disk/gxemul_disk.c projects/random_number_generator/sys/dev/gxemul/disk/gxemul_diskreg.h projects/random_number_generator/sys/dev/gxemul/ether/gxreg.h projects/random_number_generator/sys/dev/hwpmc/hwpmc_logging.c projects/random_number_generator/sys/dev/hwpmc/hwpmc_mod.c projects/random_number_generator/sys/dev/hwpmc/hwpmc_powerpc.c projects/random_number_generator/sys/dev/ipmi/ipmi_linux.c projects/random_number_generator/sys/dev/iscsi_initiator/iscsi.c projects/random_number_generator/sys/dev/mfi/mfi_linux.c projects/random_number_generator/sys/dev/ntb/if_ntb/if_ntb.c projects/random_number_generator/sys/dev/ntb/ntb_hw/ntb_hw.c projects/random_number_generator/sys/dev/ntb/ntb_hw/ntb_hw.h projects/random_number_generator/sys/dev/ntb/ntb_hw/ntb_regs.h projects/random_number_generator/sys/dev/tdfx/tdfx_linux.c projects/random_number_generator/sys/dev/usb/serial/uftdi.c projects/random_number_generator/sys/dev/usb/usbdevs projects/random_number_generator/sys/dev/usb/wlan/if_run.c projects/random_number_generator/sys/dev/virtio/network/if_vtnet.c projects/random_number_generator/sys/dev/virtio/network/if_vtnetvar.h projects/random_number_generator/sys/dev/virtio/virtqueue.c projects/random_number_generator/sys/dev/xen/blkback/blkback.c projects/random_number_generator/sys/fs/fdescfs/fdesc_vnops.c projects/random_number_generator/sys/fs/fuse/fuse_vfsops.c projects/random_number_generator/sys/fs/nfsclient/nfs_clkrpc.c projects/random_number_generator/sys/fs/nfsclient/nfs_clport.c projects/random_number_generator/sys/fs/nfsclient/nfs_clvfsops.c projects/random_number_generator/sys/fs/nfsserver/nfs_nfsdport.c projects/random_number_generator/sys/geom/eli/g_eli.c projects/random_number_generator/sys/geom/part/g_part_ldm.c projects/random_number_generator/sys/i386/ibcs2/ibcs2_fcntl.c projects/random_number_generator/sys/i386/ibcs2/ibcs2_ioctl.c projects/random_number_generator/sys/i386/ibcs2/ibcs2_misc.c projects/random_number_generator/sys/i386/linux/linux_machdep.c projects/random_number_generator/sys/i386/xen/mp_machdep.c projects/random_number_generator/sys/ia64/ia64/vm_machdep.c projects/random_number_generator/sys/ia64/include/sf_buf.h projects/random_number_generator/sys/kern/capabilities.conf projects/random_number_generator/sys/kern/init_sysent.c projects/random_number_generator/sys/kern/kern_descrip.c projects/random_number_generator/sys/kern/kern_event.c projects/random_number_generator/sys/kern/kern_exec.c projects/random_number_generator/sys/kern/kern_jail.c projects/random_number_generator/sys/kern/kern_ktrace.c projects/random_number_generator/sys/kern/kern_mbuf.c projects/random_number_generator/sys/kern/kern_sig.c projects/random_number_generator/sys/kern/subr_witness.c projects/random_number_generator/sys/kern/sys_capability.c projects/random_number_generator/sys/kern/sys_generic.c projects/random_number_generator/sys/kern/sys_procdesc.c projects/random_number_generator/sys/kern/syscalls.c projects/random_number_generator/sys/kern/syscalls.master projects/random_number_generator/sys/kern/systrace_args.c projects/random_number_generator/sys/kern/tty.c projects/random_number_generator/sys/kern/uipc_debug.c projects/random_number_generator/sys/kern/uipc_mqueue.c projects/random_number_generator/sys/kern/uipc_sem.c projects/random_number_generator/sys/kern/uipc_sockbuf.c projects/random_number_generator/sys/kern/uipc_socket.c projects/random_number_generator/sys/kern/uipc_syscalls.c projects/random_number_generator/sys/kern/uipc_usrreq.c projects/random_number_generator/sys/kern/vfs_acl.c projects/random_number_generator/sys/kern/vfs_aio.c projects/random_number_generator/sys/kern/vfs_bio.c projects/random_number_generator/sys/kern/vfs_extattr.c projects/random_number_generator/sys/kern/vfs_lookup.c projects/random_number_generator/sys/kern/vfs_mount.c projects/random_number_generator/sys/kern/vfs_syscalls.c projects/random_number_generator/sys/mips/atheros/if_arge.c projects/random_number_generator/sys/mips/conf/DIR-825 projects/random_number_generator/sys/mips/gxemul/mpreg.h projects/random_number_generator/sys/mips/include/_stdint.h projects/random_number_generator/sys/mips/include/sf_buf.h projects/random_number_generator/sys/mips/mips/pmap.c projects/random_number_generator/sys/mips/mips/vm_machdep.c projects/random_number_generator/sys/modules/aesni/Makefile projects/random_number_generator/sys/modules/cam/Makefile projects/random_number_generator/sys/modules/hwpmc/Makefile projects/random_number_generator/sys/modules/send/Makefile projects/random_number_generator/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c projects/random_number_generator/sys/netgraph/netflow/ng_netflow.h projects/random_number_generator/sys/netinet/ip_mroute.c projects/random_number_generator/sys/netinet/sctp_auth.c projects/random_number_generator/sys/netinet/sctp_auth.h projects/random_number_generator/sys/netinet/sctp_indata.c projects/random_number_generator/sys/netinet/sctp_os_bsd.h projects/random_number_generator/sys/netinet/sctp_output.c projects/random_number_generator/sys/netinet/sctp_structs.h projects/random_number_generator/sys/netinet/sctp_timer.c projects/random_number_generator/sys/netinet/sctp_uio.h projects/random_number_generator/sys/netinet/sctputil.c projects/random_number_generator/sys/netinet6/ip6_mroute.c projects/random_number_generator/sys/netpfil/pf/pf_lb.c projects/random_number_generator/sys/netsmb/smb_dev.c projects/random_number_generator/sys/nfsserver/nfs_srvkrpc.c projects/random_number_generator/sys/ofed/include/linux/file.h projects/random_number_generator/sys/powerpc/aim/trap.c projects/random_number_generator/sys/powerpc/aim/vm_machdep.c projects/random_number_generator/sys/powerpc/include/_stdint.h projects/random_number_generator/sys/powerpc/include/frame.h projects/random_number_generator/sys/powerpc/include/pmc_mdep.h projects/random_number_generator/sys/rpc/clnt_dg.c projects/random_number_generator/sys/security/audit/audit.h projects/random_number_generator/sys/security/audit/audit_arg.c projects/random_number_generator/sys/security/audit/audit_bsm.c projects/random_number_generator/sys/security/audit/audit_bsm_klib.c projects/random_number_generator/sys/security/audit/audit_private.h projects/random_number_generator/sys/security/audit/bsm_token.c projects/random_number_generator/sys/security/mac/mac_syscalls.c projects/random_number_generator/sys/sys/_types.h projects/random_number_generator/sys/sys/capability.h projects/random_number_generator/sys/sys/file.h projects/random_number_generator/sys/sys/filedesc.h projects/random_number_generator/sys/sys/ktrace.h projects/random_number_generator/sys/sys/mount.h projects/random_number_generator/sys/sys/mouse.h projects/random_number_generator/sys/sys/namei.h projects/random_number_generator/sys/sys/param.h projects/random_number_generator/sys/sys/procdesc.h projects/random_number_generator/sys/sys/sf_buf.h projects/random_number_generator/sys/sys/sockbuf.h projects/random_number_generator/sys/sys/syscall.h projects/random_number_generator/sys/sys/syscall.mk projects/random_number_generator/sys/sys/sysproto.h projects/random_number_generator/sys/sys/time.h projects/random_number_generator/sys/sys/types.h projects/random_number_generator/sys/sys/user.h projects/random_number_generator/sys/ufs/ffs/ffs_alloc.c projects/random_number_generator/sys/vm/vm_mmap.c projects/random_number_generator/sys/vm/vm_page.c projects/random_number_generator/sys/x86/xen/hvm.c projects/random_number_generator/tools/regression/lib/libc/stdio/test-fmemopen.t projects/random_number_generator/tools/regression/lib/libc/stdio/test-open_memstream.t projects/random_number_generator/tools/regression/lib/libc/stdio/test-open_wmemstream.t projects/random_number_generator/tools/tools/bus_autoconf/bus_load_file.c projects/random_number_generator/usr.bin/bmake/Makefile projects/random_number_generator/usr.bin/bmake/unit-tests/Makefile projects/random_number_generator/usr.bin/kdump/kdump.c projects/random_number_generator/usr.bin/kdump/mksubr projects/random_number_generator/usr.bin/patch/pch.c projects/random_number_generator/usr.bin/patch/util.c projects/random_number_generator/usr.bin/procstat/procstat_files.c projects/random_number_generator/usr.bin/rwho/rwho.c projects/random_number_generator/usr.bin/uniq/uniq.c projects/random_number_generator/usr.sbin/bhyve/ioapic.c projects/random_number_generator/usr.sbin/periodic/periodic.sh projects/random_number_generator/usr.sbin/rtadvd/if.c projects/random_number_generator/usr.sbin/rwhod/rwhod.c projects/random_number_generator/usr.sbin/watch/watch.c Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/contrib/binutils/ (props changed) projects/random_number_generator/contrib/bmake/ (props changed) projects/random_number_generator/contrib/gcc/ (props changed) projects/random_number_generator/contrib/libexecinfo/ (props changed) projects/random_number_generator/contrib/tcpdump/ (props changed) projects/random_number_generator/lib/libc/ (props changed) projects/random_number_generator/sbin/ (props changed) projects/random_number_generator/share/man/man4/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/sys/amd64/vmm/ (props changed) projects/random_number_generator/sys/boot/ (props changed) projects/random_number_generator/sys/cddl/contrib/opensolaris/ (props changed) projects/random_number_generator/sys/conf/ (props changed) projects/random_number_generator/usr.bin/procstat/ (props changed) projects/random_number_generator/usr.sbin/bhyve/ (props changed) projects/random_number_generator/usr.sbin/rtadvd/ (props changed) Modified: projects/random_number_generator/Makefile ============================================================================== --- projects/random_number_generator/Makefile Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/Makefile Fri Sep 6 17:42:12 2013 (r255317) @@ -498,3 +498,11 @@ universe_epilogue: buildLINT: ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT + +.if defined(.PARSEDIR) +.if make(universe) +# we do not want a failure of one branch abort all. +MAKE_JOB_ERROR_TOKEN= no +.export MAKE_JOB_ERROR_TOKEN +.endif +.endif Modified: projects/random_number_generator/ObsoleteFiles.inc ============================================================================== --- projects/random_number_generator/ObsoleteFiles.inc Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/ObsoleteFiles.inc Fri Sep 6 17:42:12 2013 (r255317) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20130903: gnupatch is no more +OLD_FILES+=usr/bin/gnupatch +OLD_FILES+=usr/share/man/man1/gnupatch.1.gz # 20130829: bsdpatch is patch unconditionally OLD_FILES+=usr/bin/bsdpatch OLD_FILES+=usr/share/man/man1/bsdpatch.1.gz Modified: projects/random_number_generator/UPDATING ============================================================================== --- projects/random_number_generator/UPDATING Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/UPDATING Fri Sep 6 17:42:12 2013 (r255317) @@ -31,6 +31,20 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130905: + The PROCDESC kernel option is now part of the GENERIC kernel + configuration and is required for the rwhod(8) to work. + If you are using custom kernel configuration, you should include + 'options PROCDESC'. + +20130905: + The API and ABI related to the Capsicum framework was modified + in backward incompatible way. The userland libraries and programs + have to be recompiled to work with the new kernel. This includes the + following libraries and programs, but the whole buildworld is + advised: libc, libprocstat, dhclient, tcpdump, hastd, hastctl, + kdump, procstat, rwho, rwhod, uniq. + 20130827: Thomas Dickey (vendor author thereof) reports that dialog(1) since 2011/10/18 has a bug in handling --hline. Testers and I noticed the Modified: projects/random_number_generator/bin/sh/eval.c ============================================================================== --- projects/random_number_generator/bin/sh/eval.c Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/bin/sh/eval.c Fri Sep 6 17:42:12 2013 (r255317) @@ -324,7 +324,7 @@ skipping: if (evalskip == SKIPCONT && } if (evalskip == SKIPBREAK && --skipcount <= 0) evalskip = 0; - if (evalskip == SKIPFUNC || evalskip == SKIPFILE) + if (evalskip == SKIPRETURN) status = exitstatus; break; } @@ -1068,7 +1068,7 @@ evalcommand(union node *cmd, int flags, funcnest--; popredir(); INTON; - if (evalskip == SKIPFUNC) { + if (evalskip == SKIPRETURN) { evalskip = 0; skipcount = 0; } @@ -1305,14 +1305,8 @@ returncmd(int argc, char **argv) { int ret = argc > 1 ? number(argv[1]) : oexitstatus; - if (funcnest) { - evalskip = SKIPFUNC; - skipcount = 1; - } else { - /* skip the rest of the file */ - evalskip = SKIPFILE; - skipcount = 1; - } + evalskip = SKIPRETURN; + skipcount = 1; return ret; } Modified: projects/random_number_generator/bin/sh/eval.h ============================================================================== --- projects/random_number_generator/bin/sh/eval.h Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/bin/sh/eval.h Fri Sep 6 17:42:12 2013 (r255317) @@ -67,5 +67,4 @@ extern int skipcount; /* reasons for skipping commands (see comment on breakcmd routine) */ #define SKIPBREAK 1 #define SKIPCONT 2 -#define SKIPFUNC 3 -#define SKIPFILE 4 +#define SKIPRETURN 3 Modified: projects/random_number_generator/bin/sh/jobs.c ============================================================================== --- projects/random_number_generator/bin/sh/jobs.c Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/bin/sh/jobs.c Fri Sep 6 17:42:12 2013 (r255317) @@ -83,13 +83,12 @@ static struct job *bgjob = NULL; /* last static struct job *jobmru; /* most recently used job list */ static pid_t initialpgrp; /* pgrp of shell on invocation */ #endif -int in_waitcmd = 0; /* are we in waitcmd()? */ -volatile sig_atomic_t breakwaitcmd = 0; /* should wait be terminated? */ static int ttyfd = -1; /* mode flags for dowait */ #define DOWAIT_BLOCK 0x1 /* wait until a child exits */ -#define DOWAIT_SIG 0x2 /* if DOWAIT_BLOCK, abort on signals */ +#define DOWAIT_SIG 0x2 /* if DOWAIT_BLOCK, abort on SIGINT/SIGQUIT */ +#define DOWAIT_SIG_ANY 0x4 /* if DOWAIT_SIG, abort on any signal */ #if JOBS static void restartjob(struct job *); @@ -484,7 +483,7 @@ waitcmd(int argc __unused, char **argv _ static int waitcmdloop(struct job *job) { - int status, retval; + int status, retval, sig; struct job *jp; /* @@ -492,7 +491,6 @@ waitcmdloop(struct job *job) * received. */ - in_waitcmd++; do { if (job != NULL) { if (job->state == JOBDONE) { @@ -508,7 +506,6 @@ waitcmdloop(struct job *job) if (job == bgjob) bgjob = NULL; } - in_waitcmd--; return retval; } } else { @@ -524,7 +521,6 @@ waitcmdloop(struct job *job) } for (jp = jobtab ; ; jp++) { if (jp >= jobtab + njobs) { /* no running procs */ - in_waitcmd--; return 0; } if (jp->used && jp->state == 0) @@ -532,9 +528,10 @@ waitcmdloop(struct job *job) } } } while (dowait(DOWAIT_BLOCK | DOWAIT_SIG, (struct job *)NULL) != -1); - in_waitcmd--; - return pendingsig + 128; + sig = pendingsig_waitcmd; + pendingsig_waitcmd = 0; + return sig + 128; } @@ -990,7 +987,8 @@ waitforjob(struct job *jp, int *origstat INTOFF; TRACE(("waitforjob(%%%td) called\n", jp - jobtab + 1)); while (jp->state == 0) - if (dowait(DOWAIT_BLOCK | (Tflag ? DOWAIT_SIG : 0), jp) == -1) + if (dowait(DOWAIT_BLOCK | (Tflag ? DOWAIT_SIG | + DOWAIT_SIG_ANY : 0), jp) == -1) dotrap(); #if JOBS if (jp->jobctl) { @@ -1081,12 +1079,17 @@ dowait(int mode, struct job *job) pid = wait3(&status, wflags, (struct rusage *)NULL); TRACE(("wait returns %d, status=%d\n", (int)pid, status)); if (pid == 0 && (mode & DOWAIT_SIG) != 0) { - sigsuspend(&omask); pid = -1; + if (((mode & DOWAIT_SIG_ANY) != 0 ? + pendingsig : pendingsig_waitcmd) != 0) { + errno = EINTR; + break; + } + sigsuspend(&omask); if (int_pending()) break; } - } while (pid == -1 && errno == EINTR && breakwaitcmd == 0); + } while (pid == -1 && errno == EINTR); if (pid == -1 && errno == ECHILD && job != NULL) job->state = JOBDONE; if ((mode & DOWAIT_SIG) != 0) { @@ -1095,11 +1098,6 @@ dowait(int mode, struct job *job) sigprocmask(SIG_SETMASK, &omask, NULL); INTON; } - if (breakwaitcmd != 0) { - breakwaitcmd = 0; - if (pid <= 0) - return -1; - } if (pid <= 0) return pid; INTOFF; Modified: projects/random_number_generator/bin/sh/jobs.h ============================================================================== --- projects/random_number_generator/bin/sh/jobs.h Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/bin/sh/jobs.h Fri Sep 6 17:42:12 2013 (r255317) @@ -83,8 +83,6 @@ enum { }; extern int job_warning; /* user was warned about stopped jobs */ -extern int in_waitcmd; /* are we in waitcmd()? */ -extern volatile sig_atomic_t breakwaitcmd; /* break wait to process traps? */ void setjobctl(int); void showjobs(int, int); Modified: projects/random_number_generator/bin/sh/main.c ============================================================================== --- projects/random_number_generator/bin/sh/main.c Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/bin/sh/main.c Fri Sep 6 17:42:12 2013 (r255317) @@ -231,7 +231,7 @@ cmdloop(int top) popstackmark(&smark); setstackmark(&smark); if (evalskip != 0) { - if (evalskip == SKIPFILE) + if (evalskip == SKIPRETURN) evalskip = 0; break; } Modified: projects/random_number_generator/bin/sh/sh.1 ============================================================================== --- projects/random_number_generator/bin/sh/sh.1 Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/bin/sh/sh.1 Fri Sep 6 17:42:12 2013 (r255317) @@ -1145,8 +1145,10 @@ command is .Pp .D1 Ic return Op Ar exitstatus .Pp -It terminates the current executional scope, returning from the previous -nested function, sourced script, or shell instance, in that order. +It terminates the current executional scope, returning from the closest +nested function or sourced script; +if no function or sourced script is being executed, +it exits the shell instance. The .Ic return command is implemented as a special built-in command. Modified: projects/random_number_generator/bin/sh/trap.c ============================================================================== --- projects/random_number_generator/bin/sh/trap.c Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/bin/sh/trap.c Fri Sep 6 17:42:12 2013 (r255317) @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); static char sigmode[NSIG]; /* current value of signal */ volatile sig_atomic_t pendingsig; /* indicates some signal received */ +volatile sig_atomic_t pendingsig_waitcmd; /* indicates SIGINT/SIGQUIT received */ int in_dotrap; /* do we execute in a trap handler? */ static char *volatile trap[NSIG]; /* trap handler commands */ static volatile sig_atomic_t gotsig[NSIG]; @@ -389,23 +390,13 @@ onsig(int signo) } /* If we are currently in a wait builtin, prepare to break it */ - if ((signo == SIGINT || signo == SIGQUIT) && in_waitcmd != 0) { - breakwaitcmd = 1; - pendingsig = signo; - } + if (signo == SIGINT || signo == SIGQUIT) + pendingsig_waitcmd = signo; if (trap[signo] != NULL && trap[signo][0] != '\0' && (signo != SIGCHLD || !ignore_sigchld)) { gotsig[signo] = 1; pendingsig = signo; - - /* - * If a trap is set, not ignored and not the null command, we - * need to make sure traps are executed even when a child - * blocks signals. - */ - if (Tflag && !(trap[signo][0] == ':' && trap[signo][1] == '\0')) - breakwaitcmd = 1; } #ifndef NO_HISTORY @@ -428,6 +419,7 @@ dotrap(void) in_dotrap++; for (;;) { pendingsig = 0; + pendingsig_waitcmd = 0; for (i = 1; i < NSIG; i++) { if (gotsig[i]) { gotsig[i] = 0; Modified: projects/random_number_generator/bin/sh/trap.h ============================================================================== --- projects/random_number_generator/bin/sh/trap.h Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/bin/sh/trap.h Fri Sep 6 17:42:12 2013 (r255317) @@ -34,6 +34,7 @@ */ extern volatile sig_atomic_t pendingsig; +extern volatile sig_atomic_t pendingsig_waitcmd; extern int in_dotrap; extern volatile sig_atomic_t gotwinch; Modified: projects/random_number_generator/contrib/binutils/gas/config/tc-i386.c ============================================================================== --- projects/random_number_generator/contrib/binutils/gas/config/tc-i386.c Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/binutils/gas/config/tc-i386.c Fri Sep 6 17:42:12 2013 (r255317) @@ -3990,7 +3990,8 @@ output_insn (void) goto check_prefix; } } - else if (i.tm.base_opcode == 0x660f3880 || i.tm.base_opcode == 0x660f3881) + else if (i.tm.base_opcode == 0x660f3880 || i.tm.base_opcode == 0x660f3881 + || i.tm.base_opcode == 0x660f3882) { /* invept and invvpid are 3 byte instructions with a mandatory prefix. */ @@ -4040,7 +4041,8 @@ output_insn (void) *p++ = (i.tm.base_opcode >> 16) & 0xff; } else if (i.tm.base_opcode == 0x660f3880 || - i.tm.base_opcode == 0x660f3881) + i.tm.base_opcode == 0x660f3881 || + i.tm.base_opcode == 0x660f3882) { p = frag_more (3); *p++ = (i.tm.base_opcode >> 16) & 0xff; Modified: projects/random_number_generator/contrib/binutils/opcodes/i386-dis.c ============================================================================== --- projects/random_number_generator/contrib/binutils/opcodes/i386-dis.c Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/binutils/opcodes/i386-dis.c Fri Sep 6 17:42:12 2013 (r255317) @@ -550,6 +550,7 @@ fetch_data (struct disassemble_info *inf #define PREGRP104 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 104 } } #define PREGRP105 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 105 } } #define PREGRP106 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 106 } } +#define PREGRP107 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 107 } } #define X86_64_0 NULL, { { NULL, X86_64_SPECIAL }, { NULL, 0 } } @@ -2668,6 +2669,14 @@ static const struct dis386 prefix_user_t { "pclmulqdq", { XM, EXx, Ib } }, { "(bad)", { XX } }, }, + + /* PREGRP107 */ + { + { "(bad)", { XX } }, + { "(bad)", { XX } }, + { "invpcid",{ Gm, Mo } }, + { "(bad)", { XX } }, + }, }; static const struct dis386 x86_64_table[][2] = { @@ -2839,7 +2848,7 @@ static const struct dis386 three_byte_ta /* 80 */ { PREGRP98 }, { PREGRP99 }, - { "(bad)", { XX } }, + { PREGRP107 }, { "(bad)", { XX } }, { "(bad)", { XX } }, { "(bad)", { XX } }, Modified: projects/random_number_generator/contrib/binutils/opcodes/i386-opc.tbl ============================================================================== --- projects/random_number_generator/contrib/binutils/opcodes/i386-opc.tbl Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/binutils/opcodes/i386-opc.tbl Fri Sep 6 17:42:12 2013 (r255317) @@ -1498,3 +1498,7 @@ xsetbv, 0, 0xf01, 0xd1, CpuXSAVE, No_bSu xsave, 1, 0xfae, 0x4, CpuXSAVE, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_xSuf, { BaseIndex|Disp8|Disp16|Disp32|Disp32S } xsaveopt, 1, 0xfae, 0x6, CpuXSAVE, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_xSuf, { BaseIndex|Disp8|Disp16|Disp32|Disp32S } xrstor, 1, 0xfae, 0x5, CpuXSAVE, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_xSuf, { BaseIndex|Disp8|Disp16|Disp32|Disp32S } + +// INVPCID +invpcid, 2, 0x660f3882, None, CpuNo64, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, { BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg32 } +invpcid, 2, 0x660f3882, None, Cpu64, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, { BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg64 } Modified: projects/random_number_generator/contrib/binutils/opcodes/i386-tbl.h ============================================================================== --- projects/random_number_generator/contrib/binutils/opcodes/i386-tbl.h Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/binutils/opcodes/i386-tbl.h Fri Sep 6 17:42:12 2013 (r255317) @@ -3641,6 +3641,14 @@ const template i386_optab[] = Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, { BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg64 } }, + { "invpcid", 2, 0x660f3882, None, CpuNo64, + Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, + { BaseIndex|Disp8|Disp16|Disp32|Disp32S, + Reg32 } }, + { "invpcid", 2, 0x660f3882, None, Cpu64, + Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, + { BaseIndex|Disp8|Disp16|Disp32|Disp32S, + Reg64 } }, { "vmcall", 0, 0xf01, 0xc1, CpuVMX, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf|ImmExt, { 0 } }, Modified: projects/random_number_generator/contrib/bmake/ChangeLog ============================================================================== --- projects/random_number_generator/contrib/bmake/ChangeLog Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/ChangeLog Fri Sep 6 17:42:12 2013 (r255317) @@ -1,3 +1,24 @@ +2013-09-04 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20130904 + Merge with NetBSD make, pick up + o Add VAR_INTERNAL context, so that internal setting of + MAKEFILE does not override value set by makefiles. + +2013-09-02 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20130902 + Merge with NetBSD make, pick up + o CompatRunCommand: only apply shellErrFlag when errCheck is true + +2013-08-28 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20130828 + Merge with NetBSD make, pick up + o Fix VAR :sh = syntax from Will Andrews at freebsd.org + o Call Job_SetPrefix() from Job_Init() so makefiles have + opportunity to set .MAKE.JOB.PREFIX + 2013-07-30 Simon J. Gerraty <sjg@bad.crufty.net> * Makefile (MAKE_VERSION): 20130730 Modified: projects/random_number_generator/contrib/bmake/FILES ============================================================================== --- projects/random_number_generator/contrib/bmake/FILES Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/FILES Fri Sep 6 17:42:12 2013 (r255317) @@ -114,6 +114,7 @@ unit-tests/order unit-tests/phony-end unit-tests/posix unit-tests/qequals +unit-tests/sunshcmd unit-tests/sysv unit-tests/ternary unit-tests/test.exp Modified: projects/random_number_generator/contrib/bmake/Makefile ============================================================================== --- projects/random_number_generator/contrib/bmake/Makefile Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/Makefile Fri Sep 6 17:42:12 2013 (r255317) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.17 2013/07/30 19:13:53 sjg Exp $ +# $Id: Makefile,v 1.20 2013/09/04 15:42:03 sjg Exp $ # Base version on src date -MAKE_VERSION= 20130730 +MAKE_VERSION= 20130904 PROG= bmake Modified: projects/random_number_generator/contrib/bmake/bmake.1 ============================================================================== --- projects/random_number_generator/contrib/bmake/bmake.1 Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/bmake.1 Fri Sep 6 17:42:12 2013 (r255317) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.220 2013/07/30 19:09:57 sjg Exp $ +.\" $NetBSD: make.1,v 1.222 2013/08/11 09:53:49 apb 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 July 30, 2013 +.Dd August 11, 2013 .Dt MAKE 1 .Os .Sh NAME @@ -1971,6 +1971,12 @@ If the source is the special .Ic .DOTLAST target, then the current working directory is searched last. +.It Ic .PATH. Ns Va suffix +Like +.Ic .PATH +but applies only to files with a particular suffix. +The suffix must have been previously declared with +.Ic .SUFFIXES . .It Ic .PHONY Apply the .Ic .PHONY Modified: projects/random_number_generator/contrib/bmake/bmake.cat1 ============================================================================== --- projects/random_number_generator/contrib/bmake/bmake.cat1 Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/bmake.cat1 Fri Sep 6 17:42:12 2013 (r255317) @@ -1257,6 +1257,10 @@ SSPPEECCIIAALL TTAARRGGEETT source is the special ..DDOOTTLLAASSTT target, then the current working directory is searched last. + ..PPAATTHH.._s_u_f_f_i_x + Like ..PPAATTHH but applies only to files with a particular suffix. + The suffix must have been previously declared with ..SSUUFFFFIIXXEESS. + ..PPHHOONNYY Apply the ..PPHHOONNYY attribute to any specified sources. ..PPRREECCIIOOUUSS @@ -1374,4 +1378,4 @@ BBUUGGSS There is no way of escaping a space character in a filename. -NetBSD 5.1 July 30, 2013 NetBSD 5.1 +NetBSD 5.1 August 11, 2013 NetBSD 5.1 Modified: projects/random_number_generator/contrib/bmake/compat.c ============================================================================== --- projects/random_number_generator/contrib/bmake/compat.c Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/compat.c Fri Sep 6 17:42:12 2013 (r255317) @@ -1,4 +1,4 @@ -/* $NetBSD: compat.c,v 1.92 2013/07/05 22:14:56 sjg Exp $ */ +/* $NetBSD: compat.c,v 1.93 2013/09/02 19:26:42 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: compat.c,v 1.92 2013/07/05 22:14:56 sjg Exp $"; +static char rcsid[] = "$NetBSD: compat.c,v 1.93 2013/09/02 19:26:42 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: compat.c,v 1.92 2013/07/05 22:14:56 sjg Exp $"); +__RCSID("$NetBSD: compat.c,v 1.93 2013/09/02 19:26:42 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -340,7 +340,7 @@ again: /* * The following work for any of the builtin shell specs. */ - if (shellErrFlag) { + if (errCheck && shellErrFlag) { shargv[shargc++] = shellErrFlag; } if (DEBUG(SHELL)) Modified: projects/random_number_generator/contrib/bmake/job.c ============================================================================== --- projects/random_number_generator/contrib/bmake/job.c Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/job.c Fri Sep 6 17:42:12 2013 (r255317) @@ -1,4 +1,4 @@ -/* $NetBSD: job.c,v 1.175 2013/07/30 19:09:57 sjg Exp $ */ +/* $NetBSD: job.c,v 1.176 2013/08/04 16:48:15 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: job.c,v 1.175 2013/07/30 19:09:57 sjg Exp $"; +static char rcsid[] = "$NetBSD: job.c,v 1.176 2013/08/04 16:48:15 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: job.c,v 1.175 2013/07/30 19:09:57 sjg Exp $"); +__RCSID("$NetBSD: job.c,v 1.176 2013/08/04 16:48:15 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -178,6 +178,14 @@ __RCSID("$NetBSD: job.c,v 1.175 2013/07/ */ #define MAKE_ALWAYS_PASS_JOB_QUEUE ".MAKE.ALWAYS_PASS_JOB_QUEUE" static int Always_pass_job_queue = TRUE; +/* + * FreeBSD: aborting entire parallel make isn't always + * desired. When doing tinderbox for example, failure of + * one architecture should not stop all. + * We still want to bail on interrupt though. + */ +#define MAKE_JOB_ERROR_TOKEN "MAKE_JOB_ERROR_TOKEN" +static int Job_error_token = TRUE; /* * error handling variables @@ -2237,6 +2245,9 @@ Job_Init(void) Always_pass_job_queue = getBoolean(MAKE_ALWAYS_PASS_JOB_QUEUE, Always_pass_job_queue); + Job_error_token = getBoolean(MAKE_JOB_ERROR_TOKEN, Job_error_token); + + /* * There is a non-zero chance that we already have children. * eg after 'make -f- <<EOF' @@ -2832,13 +2843,19 @@ JobTokenAdd(void) { char tok = JOB_TOKENS[aborting], tok1; + if (!Job_error_token && aborting == ABORT_ERROR) { + if (jobTokensRunning == 0) + return; + tok = '+'; /* no error token */ + } + /* If we are depositing an error token flush everything else */ while (tok != '+' && read(tokenWaitJob.inPipe, &tok1, 1) == 1) continue; if (DEBUG(JOB)) fprintf(debug_file, "(%d) aborting %d, deposit token %c\n", - getpid(), aborting, JOB_TOKENS[aborting]); + getpid(), aborting, tok); while (write(tokenWaitJob.outPipe, &tok, 1) == -1 && errno == EAGAIN) continue; } Modified: projects/random_number_generator/contrib/bmake/main.c ============================================================================== --- projects/random_number_generator/contrib/bmake/main.c Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/main.c Fri Sep 6 17:42:12 2013 (r255317) @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.222 2013/07/18 15:31:49 sjg Exp $ */ +/* $NetBSD: main.c,v 1.224 2013/09/04 15:38:26 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.222 2013/07/18 15:31:49 sjg Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.224 2013/09/04 15:38:26 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19 #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.222 2013/07/18 15:31:49 sjg Exp $"); +__RCSID("$NetBSD: main.c,v 1.224 2013/09/04 15:38:26 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -1414,7 +1414,7 @@ ReadMakefile(const void *p, const void * if (!strcmp(fname, "-")) { Parse_File(NULL /*stdin*/, -1); - Var_Set("MAKEFILE", "", VAR_GLOBAL, 0); + Var_Set("MAKEFILE", "", VAR_INTERNAL, 0); } else { /* if we've chdir'd, rebuild the path name */ if (strcmp(curdir, objdir) && *fname != '/') { @@ -1463,7 +1463,7 @@ ReadMakefile(const void *p, const void * */ found: if (!doing_depend) - Var_Set("MAKEFILE", fname, VAR_GLOBAL, 0); + Var_Set("MAKEFILE", fname, VAR_INTERNAL, 0); Parse_File(fname, fd); } free(path); Modified: projects/random_number_generator/contrib/bmake/make.1 ============================================================================== --- projects/random_number_generator/contrib/bmake/make.1 Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/make.1 Fri Sep 6 17:42:12 2013 (r255317) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.220 2013/07/30 19:09:57 sjg Exp $ +.\" $NetBSD: make.1,v 1.222 2013/08/11 09:53:49 apb 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 July 30, 2013 +.Dd August 11, 2013 .Dt MAKE 1 .Os .Sh NAME @@ -1982,6 +1982,12 @@ If the source is the special .Ic .DOTLAST target, then the current working directory is searched last. +.It Ic .PATH. Ns Va suffix +Like +.Ic .PATH +but applies only to files with a particular suffix. +The suffix must have been previously declared with +.Ic .SUFFIXES . .It Ic .PHONY Apply the .Ic .PHONY Modified: projects/random_number_generator/contrib/bmake/make.h ============================================================================== --- projects/random_number_generator/contrib/bmake/make.h Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/make.h Fri Sep 6 17:42:12 2013 (r255317) @@ -1,4 +1,4 @@ -/* $NetBSD: make.h,v 1.91 2013/06/18 20:06:09 sjg Exp $ */ +/* $NetBSD: make.h,v 1.92 2013/09/04 15:38:26 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -404,6 +404,10 @@ extern Boolean varNoExportEnv; /* TRUE i extern GNode *DEFAULT; /* .DEFAULT rule */ +extern GNode *VAR_INTERNAL; /* Variables defined internally by make + * which should not override those set by + * makefiles. + */ extern GNode *VAR_GLOBAL; /* Variables defined in a global context, e.g * in the Makefile itself */ extern GNode *VAR_CMD; /* Variables defined on the command line */ Modified: projects/random_number_generator/contrib/bmake/mk/ChangeLog ============================================================================== --- projects/random_number_generator/contrib/bmake/mk/ChangeLog Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/mk/ChangeLog Fri Sep 6 17:42:12 2013 (r255317) @@ -1,3 +1,14 @@ +2013-09-04 Simon J. Gerraty <sjg@bad.crufty.net> + + * gendirdeps.mk (_objtops): fix typo also + while processing M2D_OBJROOTS to gather qualdir_list + qualify $ql with loop iterator to ensure correct results. + +2013-08-01 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): 20130801 + * libs.mk: update to match progs.mk + 2013-07-26 Simon J. Gerraty <sjg@bad.crufty.net> * install-mk (MK_VERSION): 20130726 Modified: projects/random_number_generator/contrib/bmake/mk/gendirdeps.mk ============================================================================== --- projects/random_number_generator/contrib/bmake/mk/gendirdeps.mk Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/mk/gendirdeps.mk Fri Sep 6 17:42:12 2013 (r255317) @@ -1,4 +1,4 @@ -# $Id: gendirdeps.mk,v 1.22 2013/05/11 05:16:26 sjg Exp $ +# $Id: gendirdeps.mk,v 1.23 2013/09/04 17:49:20 sjg Exp $ # Copyright (c) 2010-2013, Juniper Networks, Inc. # All rights reserved. @@ -162,7 +162,7 @@ dir_list != cd ${_OBJDIR} && \ .warning Skipping ${_DEPENDFILE:S,${SRCTOP}/,,} # we are not going to update anything .else - +dpadd_dir_list= .if !empty(DPADD) _nonlibs := ${DPADD:T:Nlib*:N*include} .if !empty(_nonlibs) @@ -174,6 +174,7 @@ ddep_list += $f.dirdep ddep_list += ${f:H}.dirdep .else dir_list += ${f:H:tA} +dpadd_dir_list += ${f:H:tA} .endif .endfor .if !empty(ddep_list) @@ -197,7 +198,7 @@ dir_list += ${ddeps} # so we add # ${"${dir_list:M*bsd/sys/${MACHINE_ARCH}/include}":?bsd/include:} # to GENDIRDEPS_DIR_LIST_XTRAS -_objtops = ${OBJTOP} ${_OBJTOP} ${_obtop} +_objtops = ${OBJTOP} ${_OBJTOP} ${_objtop} _objtops := ${_objtops:O:u} dirdep_list = \ ${_objtops:@o@${dir_list:M$o*/*:C,$o[^/]*/,,}@} \ @@ -212,8 +213,11 @@ M2D_OBJROOTS := ${M2D_OBJROOTS:O:u:[-1.. skip_ql= ${SRCTOP}* ${_objtops:@o@$o*@} .for o in ${M2D_OBJROOTS:${skip_ql:${M_ListToSkip}}} # we need := so only skip_ql to this point applies -ql := ${dir_list:${skip_ql:${M_ListToSkip}}:M$o*/*/*:C,$o([^/]+)/(.*),\2.\1,:S,.${HOST_TARGET},.host,} -qualdir_list += ${ql} +ql.$o := ${dir_list:${skip_ql:${M_ListToSkip}}:M$o*/*/*:C,$o([^/]+)/(.*),\2.\1,:S,.${HOST_TARGET},.host,} +qualdir_list += ${ql.$o} +.if ${DEBUG_GENDIRDEPS:Uno:@x@${RELDIR:M$x}@} != "" +.info ${RELDIR}: o=$o ${ql.$o qualdir_list:L:@v@$v=${$v}@} +.endif skip_ql+= $o* .endfor @@ -241,6 +245,7 @@ DIRDEPS := ${DIRDEPS:${GENDIRDEPS_FILTER .if ${DEBUG_GENDIRDEPS:Uno:@x@${RELDIR:M$x}@} != "" .info ${RELDIR}: M2D_OBJROOTS=${M2D_OBJROOTS} .info ${RELDIR}: dir_list='${dir_list}' +.info ${RELDIR}: dpadd_dir_list='${dpadd_dir_list}' .info ${RELDIR}: dirdep_list='${dirdep_list}' .info ${RELDIR}: qualdir_list='${qualdir_list}' .info ${RELDIR}: SKIP_GENDIRDEPS='${SKIP_GENDIRDEPS}' Modified: projects/random_number_generator/contrib/bmake/mk/install-mk ============================================================================== --- projects/random_number_generator/contrib/bmake/mk/install-mk Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/mk/install-mk Fri Sep 6 17:42:12 2013 (r255317) @@ -55,7 +55,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: install-mk,v 1.92 2013/07/27 05:37:37 sjg Exp $ +# $Id: install-mk,v 1.93 2013/08/02 18:28:47 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -70,7 +70,7 @@ # sjg@crufty.net # -MK_VERSION=20130726 +MK_VERSION=20130801 OWNER= GROUP= MODE=444 Modified: projects/random_number_generator/contrib/bmake/mk/libs.mk ============================================================================== --- projects/random_number_generator/contrib/bmake/mk/libs.mk Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/mk/libs.mk Fri Sep 6 17:42:12 2013 (r255317) @@ -1,4 +1,4 @@ -# $Id: libs.mk,v 1.2 2007/04/30 17:39:27 sjg Exp $ +# $Id: libs.mk,v 1.3 2013/08/02 18:28:48 sjg Exp $ # # @(#) Copyright (c) 2006, Simon J. Gerraty # @@ -17,7 +17,15 @@ .if defined(LIBS) +# In meta mode, we can capture dependenices for _one_ of the progs. +# if makefile doesn't nominate one, we use the first. +.ifndef UPDATE_DEPENDFILE_LIB +UPDATE_DEPENDFILE_LIB = ${LIBS:[1]} +.export UPDATE_DEPENDFILE_LIB +.endif + .ifndef LIB +# They may have asked us to build just one .for t in ${LIBS:R:T:S,^lib,,} .if make(lib$t) LIB?= $t @@ -28,14 +36,41 @@ lib$t: all .if defined(LIB) # just one of many -.for v in DPADD SRCS CFLAGS ${LIB_VARS} -$v += ${${v}_lib${LIB}} +LIB_VARS += \ + LIBDIR \ + CFLAGS \ + COPTS \ + CPPFLAGS \ + CXXFLAGS \ + DPADD \ + DPLIBS \ + LDADD \ + LDFLAGS \ + MAN \ + SRCS + +.for v in ${LIB_VARS:O:u} +.if defined(${v}.${LIB}) || defined(${v}_${LIB}) +$v += ${${v}_${LIB}:U${${v}.${LIB}}} +.endif .endfor + +# for meta mode, there can be only one! +.if ${LIB} == ${UPDATE_DEPENDFILE_LIB:Uno} +UPDATE_DEPENDFILE ?= yes +.endif +UPDATE_DEPENDFILE ?= NO + # ensure that we don't clobber each other's dependencies DEPENDFILE?= .depend.${LIB} # lib.mk will do the rest .else all: ${LIBS:S,^lib,,:@t@lib$t.a@} .MAKE + +# We cannot capture dependencies for meta mode here +UPDATE_DEPENDFILE = NO +# nor can we safely run in parallel. +.NOTPARALLEL: .endif .endif @@ -43,12 +78,16 @@ all: ${LIBS:S,^lib,,:@t@lib$t.a@} .MAKE .include <${.PARSEFILE:S,libs,lib,}> .ifndef LIB -.for t in ${LIBS:R:T:S,^lib,,} -lib$t.a: ${SRCS} ${DPADD} ${SRCS_lib$t} ${DPADD_lib$t} - (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} LIB=$t) +# tell libs.mk we might want to install things +LIBS_TARGETS+= cleandepend cleandir cleanobj depend install -clean: $t.clean -$t.clean: - (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} LIB=$t ${@:E}) +.for b in ${LIBS:R:T:S,^lib,,} +lib$b.a: ${SRCS} ${DPADD} ${SRCS_lib$b} ${DPADD_lib$b} + (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} LIB=$b) + +.for t in ${LIBS_TARGETS:O:u} +$b.$t: .PHONY .MAKE + (cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} LIB=$b ${@:E}) +.endfor .endfor .endif Modified: projects/random_number_generator/contrib/bmake/mk/progs.mk ============================================================================== --- projects/random_number_generator/contrib/bmake/mk/progs.mk Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/mk/progs.mk Fri Sep 6 17:42:12 2013 (r255317) @@ -1,4 +1,4 @@ -# $Id: progs.mk,v 1.12 2013/04/22 18:10:04 sjg Exp $ +# $Id: progs.mk,v 1.13 2013/08/02 18:28:48 sjg Exp $ # # @(#) Copyright (c) 2006, Simon J. Gerraty # @@ -35,9 +35,21 @@ PROG ?= $t .if defined(PROG) # just one of many -PROG_VARS += BINDIR CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD MAN SRCS +PROG_VARS += \ + BINDIR \ + CFLAGS \ + COPTS \ + CPPFLAGS \ + CXXFLAGS \ + DPADD \ + DPLIBS \ + LDADD \ + LDFLAGS \ + MAN \ + SRCS + .for v in ${PROG_VARS:O:u} -.if defined(${v}.${PROG}) +.if defined(${v}.${PROG}) || defined(${v}_${PROG}) $v += ${${v}_${PROG}:U${${v}.${PROG}}} .endif .endfor Modified: projects/random_number_generator/contrib/bmake/parse.c ============================================================================== --- projects/random_number_generator/contrib/bmake/parse.c Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/parse.c Fri Sep 6 17:42:12 2013 (r255317) @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.189 2013/06/18 19:31:27 sjg Exp $ */ +/* $NetBSD: parse.c,v 1.191 2013/08/28 21:56:49 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: parse.c,v 1.189 2013/06/18 19:31:27 sjg Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.191 2013/08/28 21:56:49 sjg 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.189 2013/06/18 19:31:27 sjg Exp $"); +__RCSID("$NetBSD: parse.c,v 1.191 2013/08/28 21:56:49 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -1751,6 +1751,12 @@ Parse_IsVar(char *line) ch = *line++; wasSpace = TRUE; } +#ifdef SUNSHCMD + if (ch == ':' && strncmp(line, "sh", 2) == 0) { + line += 2; + continue; + } +#endif if (ch == '=') return TRUE; if (*line == '=' && ISEQOPERATOR(ch)) Modified: projects/random_number_generator/contrib/bmake/unit-tests/Makefile.in ============================================================================== --- projects/random_number_generator/contrib/bmake/unit-tests/Makefile.in Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/unit-tests/Makefile.in Fri Sep 6 17:42:12 2013 (r255317) @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.43 2013/07/16 21:14:30 sjg Exp $ +# $Id: Makefile.in,v 1.44 2013/08/28 22:09:29 sjg Exp $ # -# $NetBSD: Makefile,v 1.37 2013/07/16 19:59:28 sjg Exp $ +# $NetBSD: Makefile,v 1.38 2013/08/28 21:56:50 sjg Exp $ # # Unit tests for make(1) # The main targets are: @@ -45,6 +45,7 @@ SUBFILES= \ phony-end \ posix \ qequals \ + sunshcmd \ sysv \ ternary \ unexport \ Copied: projects/random_number_generator/contrib/bmake/unit-tests/sunshcmd (from r255316, head/contrib/bmake/unit-tests/sunshcmd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/random_number_generator/contrib/bmake/unit-tests/sunshcmd Fri Sep 6 17:42:12 2013 (r255317, copy of r255316, head/contrib/bmake/unit-tests/sunshcmd) @@ -0,0 +1,10 @@ +BYECMD = echo bye +LATERCMD = echo later +TEST1 :sh = echo hello +TEST2 :sh = ${BYECMD} +TEST3 = ${LATERCMD:sh} + +all: + @echo "TEST1=${TEST1}" + @echo "TEST2=${TEST2}" + @echo "TEST3=${TEST3}" Modified: projects/random_number_generator/contrib/bmake/unit-tests/test.exp ============================================================================== --- projects/random_number_generator/contrib/bmake/unit-tests/test.exp Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/unit-tests/test.exp Fri Sep 6 17:42:12 2013 (r255317) @@ -349,6 +349,9 @@ Now we expect an error... *** Error code 1 (continuing) `all' not remade because of errors. V.i386 ?= OK +TEST1=hello +TEST2=bye +TEST3=later FOOBAR = FOOBAR = foobar fubar fun Modified: projects/random_number_generator/contrib/bmake/var.c ============================================================================== --- projects/random_number_generator/contrib/bmake/var.c Fri Sep 6 17:32:29 2013 (r255316) +++ projects/random_number_generator/contrib/bmake/var.c Fri Sep 6 17:42:12 2013 (r255317) @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.183 2013/07/16 20:00:56 sjg Exp $ */ +/* $NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: var.c,v 1.183 2013/07/16 20:00:56 sjg Exp $"; +static char rcsid[] = "$NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg 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.183 2013/07/16 20:00:56 sjg Exp $"); +__RCSID("$NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -187,6 +187,7 @@ static char varNoError[] = ""; * The four contexts are searched in the reverse order from which they are * listed. */ +GNode *VAR_INTERNAL; /* variables from make itself */ GNode *VAR_GLOBAL; /* variables from the makefile */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309061742.r86HgDtT060640>