Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Apr 2015 22:33:26 +0000 (UTC)
From:      Sean Bruno <sbruno@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r281753 - in projects/em_mq: . bin/ed bin/sh bin/sh/tests/builtins cddl/contrib/opensolaris/cmd/dtrace etc/defaults etc/mtree etc/rc.d include lib/libc lib/libc/amd64/sys lib/libc/arm/s...
Message-ID:  <201504192233.t3JMXQ68026453@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sbruno
Date: Sun Apr 19 22:33:24 2015
New Revision: 281753
URL: https://svnweb.freebsd.org/changeset/base/281753

Log:
  MFH @281750

Added:
  projects/em_mq/bin/sh/tests/builtins/trap15.0
     - copied unchanged from r281750, head/bin/sh/tests/builtins/trap15.0
  projects/em_mq/bin/sh/tests/builtins/trap16.0
     - copied unchanged from r281750, head/bin/sh/tests/builtins/trap16.0
  projects/em_mq/lib/libc/sys/ppoll.c
     - copied unchanged from r281750, head/lib/libc/sys/ppoll.c
  projects/em_mq/lib/libc/sys/wait6.c
     - copied unchanged from r281750, head/lib/libc/sys/wait6.c
  projects/em_mq/share/man/man4/dtrace-io.4
     - copied unchanged from r281750, head/share/man/man4/dtrace-io.4
  projects/em_mq/share/man/man4/dtrace-ip.4
     - copied unchanged from r281750, head/share/man/man4/dtrace-ip.4
  projects/em_mq/share/man/man4/dtrace-proc.4
     - copied unchanged from r281750, head/share/man/man4/dtrace-proc.4
  projects/em_mq/share/man/man4/dtrace-sched.4
     - copied unchanged from r281750, head/share/man/man4/dtrace-sched.4
  projects/em_mq/share/man/man4/dtrace-tcp.4
     - copied unchanged from r281750, head/share/man/man4/dtrace-tcp.4
  projects/em_mq/share/man/man4/dtrace-udp.4
     - copied unchanged from r281750, head/share/man/man4/dtrace-udp.4
  projects/em_mq/sys/arm/allwinner/files.allwinner
     - copied unchanged from r281750, head/sys/arm/allwinner/files.allwinner
  projects/em_mq/sys/dev/hwpmc/hwpmc_e500.c
     - copied unchanged from r281750, head/sys/dev/hwpmc/hwpmc_e500.c
  projects/em_mq/sys/net/altq/
     - copied from r281750, head/sys/net/altq/
  projects/em_mq/sys/pc98/pc98/genassym.c
     - copied unchanged from r281750, head/sys/pc98/pc98/genassym.c
  projects/em_mq/usr.sbin/bluetooth/hccontrol/le.c
     - copied unchanged from r281750, head/usr.sbin/bluetooth/hccontrol/le.c
Deleted:
  projects/em_mq/lib/libc/sys/ftruncate.c
  projects/em_mq/lib/libc/sys/lseek.c
  projects/em_mq/lib/libc/sys/mmap.c
  projects/em_mq/lib/libc/sys/pread.c
  projects/em_mq/lib/libc/sys/pwrite.c
  projects/em_mq/lib/libc/sys/truncate.c
  projects/em_mq/sys/contrib/altq/
  projects/em_mq/sys/fs/ext2fs/ext2_hash.c
  projects/em_mq/sys/fs/ext2fs/ext2_htree.c
  projects/em_mq/sys/netipsec/xform_ipip.c
  projects/em_mq/tools/build/options/WITHOUT_SYSCALL_COMPAT
  projects/em_mq/usr.sbin/crunch/crunchide/exec_aout.c
Modified:
  projects/em_mq/Makefile
  projects/em_mq/Makefile.inc1
  projects/em_mq/ObsoleteFiles.inc
  projects/em_mq/README
  projects/em_mq/bin/ed/glbl.c
  projects/em_mq/bin/sh/sh.1
  projects/em_mq/bin/sh/tests/builtins/Makefile
  projects/em_mq/bin/sh/trap.c
  projects/em_mq/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
  projects/em_mq/etc/defaults/rc.conf
  projects/em_mq/etc/mtree/BSD.include.dist
  projects/em_mq/etc/rc.d/mountd
  projects/em_mq/etc/rc.d/nfsd
  projects/em_mq/include/Makefile
  projects/em_mq/lib/libc/Makefile
  projects/em_mq/lib/libc/amd64/sys/Makefile.inc
  projects/em_mq/lib/libc/arm/sys/Makefile.inc
  projects/em_mq/lib/libc/gen/waitid.c
  projects/em_mq/lib/libc/i386/sys/Makefile.inc
  projects/em_mq/lib/libc/include/compat.h
  projects/em_mq/lib/libc/include/libc_private.h
  projects/em_mq/lib/libc/mips/sys/Makefile.inc
  projects/em_mq/lib/libc/powerpc/sys/Makefile.inc
  projects/em_mq/lib/libc/powerpc64/sys/Makefile.inc
  projects/em_mq/lib/libc/sparc64/sys/Makefile.inc
  projects/em_mq/lib/libc/sys/Makefile.inc
  projects/em_mq/lib/libc/sys/fcntl.c
  projects/em_mq/lib/libc/sys/interposing_table.c
  projects/em_mq/lib/libpmc/libpmc.c
  projects/em_mq/lib/libthr/Makefile
  projects/em_mq/lib/libthr/thread/thr_syscalls.c
  projects/em_mq/sbin/ipfw/nat.c
  projects/em_mq/sbin/mount/mount.8
  projects/em_mq/sbin/mount/mount.c
  projects/em_mq/sbin/mount_nfs/Makefile
  projects/em_mq/sbin/mount_nfs/mount_nfs.8
  projects/em_mq/sbin/pfctl/parse.y
  projects/em_mq/sbin/pfctl/pfctl.c
  projects/em_mq/sbin/pfctl/pfctl_altq.c
  projects/em_mq/sbin/pfctl/pfctl_qstats.c
  projects/em_mq/share/man/man3/pthread_testcancel.3
  projects/em_mq/share/man/man4/Makefile
  projects/em_mq/share/man/man4/run.4
  projects/em_mq/share/man/man5/rc.conf.5
  projects/em_mq/share/man/man5/src.conf.5
  projects/em_mq/share/man/man9/SDT.9
  projects/em_mq/share/mk/src.opts.mk
  projects/em_mq/sys/amd64/amd64/pmap.c
  projects/em_mq/sys/amd64/conf/GENERIC
  projects/em_mq/sys/amd64/vmm/amd/svm.c
  projects/em_mq/sys/amd64/vmm/vmm_lapic.c
  projects/em_mq/sys/arm/allwinner/a10_clk.h
  projects/em_mq/sys/arm/allwinner/a20/files.a20
  projects/em_mq/sys/arm/allwinner/a20/std.a20
  projects/em_mq/sys/arm/allwinner/files.a10
  projects/em_mq/sys/arm/allwinner/if_emac.c
  projects/em_mq/sys/arm/allwinner/if_emacreg.h
  projects/em_mq/sys/arm/allwinner/std.a10
  projects/em_mq/sys/arm/arm/trap-v6.c
  projects/em_mq/sys/arm/arm/vm_machdep.c
  projects/em_mq/sys/arm64/arm64/trap.c
  projects/em_mq/sys/arm64/conf/DEFAULTS
  projects/em_mq/sys/boot/forth/check-password.4th
  projects/em_mq/sys/boot/forth/check-password.4th.8
  projects/em_mq/sys/boot/forth/loader.conf
  projects/em_mq/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/em_mq/sys/compat/linux/linux_file.c
  projects/em_mq/sys/conf/Makefile.pc98
  projects/em_mq/sys/conf/files
  projects/em_mq/sys/conf/files.powerpc
  projects/em_mq/sys/conf/kern.pre.mk
  projects/em_mq/sys/conf/kmod.mk
  projects/em_mq/sys/dev/acpica/acpi.c
  projects/em_mq/sys/dev/acpica/acpivar.h
  projects/em_mq/sys/dev/atkbdc/psm.c
  projects/em_mq/sys/dev/cxgbe/tom/t4_listen.c
  projects/em_mq/sys/dev/etherswitch/miiproxy.c
  projects/em_mq/sys/dev/hwpmc/hwpmc_mpc7xxx.c
  projects/em_mq/sys/dev/hwpmc/hwpmc_powerpc.c
  projects/em_mq/sys/dev/hwpmc/hwpmc_powerpc.h
  projects/em_mq/sys/dev/hwpmc/hwpmc_ppc970.c
  projects/em_mq/sys/dev/hwpmc/pmc_events.h
  projects/em_mq/sys/dev/usb/usbdevs
  projects/em_mq/sys/dev/usb/video/udl.c
  projects/em_mq/sys/dev/usb/video/udl.h
  projects/em_mq/sys/dev/usb/wlan/if_run.c
  projects/em_mq/sys/dev/virtio/block/virtio_blk.c
  projects/em_mq/sys/fs/ext2fs/ext2_dir.h
  projects/em_mq/sys/fs/ext2fs/ext2_extern.h
  projects/em_mq/sys/fs/ext2fs/ext2_lookup.c
  projects/em_mq/sys/fs/ext2fs/ext2_vfsops.c
  projects/em_mq/sys/fs/ext2fs/ext2fs.h
  projects/em_mq/sys/fs/nfs/nfs.h
  projects/em_mq/sys/fs/nfs/nfs_commonport.c
  projects/em_mq/sys/fs/nfs/nfsproto.h
  projects/em_mq/sys/fs/nfsclient/nfs_clvfsops.c
  projects/em_mq/sys/fs/nfsserver/nfs_nfsdport.c
  projects/em_mq/sys/fs/nfsserver/nfs_nfsdserv.c
  projects/em_mq/sys/i386/i386/apic_vector.s
  projects/em_mq/sys/i386/i386/db_trace.c
  projects/em_mq/sys/i386/i386/mp_machdep.c
  projects/em_mq/sys/i386/i386/pmap.c
  projects/em_mq/sys/i386/i386/swtch.s
  projects/em_mq/sys/i386/include/smp.h
  projects/em_mq/sys/i386/xen/mp_machdep.c
  projects/em_mq/sys/i386/xen/pmap.c
  projects/em_mq/sys/kern/init_main.c
  projects/em_mq/sys/kern/init_sysent.c
  projects/em_mq/sys/kern/kern_synch.c
  projects/em_mq/sys/kern/kern_thread.c
  projects/em_mq/sys/kern/sys_generic.c
  projects/em_mq/sys/kern/syscalls.c
  projects/em_mq/sys/kern/syscalls.master
  projects/em_mq/sys/kern/systrace_args.c
  projects/em_mq/sys/kern/vfs_cache.c
  projects/em_mq/sys/kern/vfs_syscalls.c
  projects/em_mq/sys/modules/ext2fs/Makefile
  projects/em_mq/sys/modules/hwpmc/Makefile
  projects/em_mq/sys/modules/usb/Makefile
  projects/em_mq/sys/net/if_types.h
  projects/em_mq/sys/net/if_var.h
  projects/em_mq/sys/net/ifq.h
  projects/em_mq/sys/netgraph/bluetooth/include/ng_hci.h
  projects/em_mq/sys/netinet/in.c
  projects/em_mq/sys/netinet/in.h
  projects/em_mq/sys/netinet6/in6.c
  projects/em_mq/sys/netinet6/in6.h
  projects/em_mq/sys/netipsec/ipsec.c
  projects/em_mq/sys/netipsec/ipsec.h
  projects/em_mq/sys/netipsec/ipsec_input.c
  projects/em_mq/sys/netipsec/ipsec_output.c
  projects/em_mq/sys/netipsec/key.c
  projects/em_mq/sys/netipsec/xform.h
  projects/em_mq/sys/netipsec/xform_ah.c
  projects/em_mq/sys/netipsec/xform_esp.c
  projects/em_mq/sys/netipsec/xform_ipcomp.c
  projects/em_mq/sys/netpfil/pf/pf_ioctl.c
  projects/em_mq/sys/nfsclient/nfs.h
  projects/em_mq/sys/powerpc/booke/interrupt.c
  projects/em_mq/sys/powerpc/booke/locore.S
  projects/em_mq/sys/powerpc/booke/machdep.c
  projects/em_mq/sys/powerpc/booke/trap_subr.S
  projects/em_mq/sys/powerpc/include/pmc_mdep.h
  projects/em_mq/sys/sys/param.h
  projects/em_mq/sys/sys/pmc.h
  projects/em_mq/sys/sys/syscall.h
  projects/em_mq/sys/sys/syscall.mk
  projects/em_mq/sys/sys/sysproto.h
  projects/em_mq/sys/vm/device_pager.c
  projects/em_mq/sys/vm/vm_mmap.c
  projects/em_mq/sys/x86/xen/xen_apic.c
  projects/em_mq/tools/tools/netmap/pkt-gen.c
  projects/em_mq/usr.bin/calendar/io.c
  projects/em_mq/usr.bin/gzip/gzip.c
  projects/em_mq/usr.bin/nfsstat/nfsstat.c
  projects/em_mq/usr.bin/rpcgen/rpc_sample.c
  projects/em_mq/usr.bin/w/Makefile
  projects/em_mq/usr.bin/w/w.c
  projects/em_mq/usr.bin/wc/wc.c
  projects/em_mq/usr.sbin/bhyve/bhyverun.c
  projects/em_mq/usr.sbin/bhyve/block_if.c
  projects/em_mq/usr.sbin/bhyve/block_if.h
  projects/em_mq/usr.sbin/bhyve/pci_ahci.c
  projects/em_mq/usr.sbin/bhyve/pci_virtio_block.c
  projects/em_mq/usr.sbin/bluetooth/hccontrol/Makefile
  projects/em_mq/usr.sbin/bluetooth/hccontrol/hccontrol.c
  projects/em_mq/usr.sbin/bluetooth/hccontrol/hccontrol.h
  projects/em_mq/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
  projects/em_mq/usr.sbin/bsdinstall/scripts/zfsboot
  projects/em_mq/usr.sbin/config/main.c
  projects/em_mq/usr.sbin/crunch/crunchide/Makefile
  projects/em_mq/usr.sbin/crunch/crunchide/crunchide.c
  projects/em_mq/usr.sbin/crunch/crunchide/exec_elf32.c
  projects/em_mq/usr.sbin/crunch/crunchide/extern.h
  projects/em_mq/usr.sbin/inetd/inetd.c
  projects/em_mq/usr.sbin/mountd/mountd.c
  projects/em_mq/usr.sbin/nfsd/nfsd.8
  projects/em_mq/usr.sbin/tzsetup/tzsetup.c
Directory Properties:
  projects/em_mq/   (props changed)
  projects/em_mq/cddl/   (props changed)
  projects/em_mq/cddl/contrib/opensolaris/   (props changed)
  projects/em_mq/etc/   (props changed)
  projects/em_mq/include/   (props changed)
  projects/em_mq/lib/libc/   (props changed)
  projects/em_mq/sbin/   (props changed)
  projects/em_mq/sbin/ipfw/   (props changed)
  projects/em_mq/share/   (props changed)
  projects/em_mq/share/man/man4/   (props changed)
  projects/em_mq/sys/   (props changed)
  projects/em_mq/sys/amd64/vmm/   (props changed)
  projects/em_mq/sys/boot/   (props changed)
  projects/em_mq/sys/cddl/contrib/opensolaris/   (props changed)
  projects/em_mq/sys/conf/   (props changed)
  projects/em_mq/usr.bin/calendar/   (props changed)
  projects/em_mq/usr.sbin/bhyve/   (props changed)

Modified: projects/em_mq/Makefile
==============================================================================
--- projects/em_mq/Makefile	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/Makefile	Sun Apr 19 22:33:24 2015	(r281753)
@@ -374,6 +374,17 @@ kernel-toolchains:
 #
 .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets)
 TARGETS?=amd64 arm i386 mips pc98 powerpc sparc64
+# XXX Add arm64 to universe only if we have an external binutils installed.
+# It does not build with the in-tree linnker.
+.if exists(/usr/local/aarch64-freebsd/bin/ld)
+TARGETS+=arm64
+TARGET_ARCHES_arm64?=	aarch64
+.else
+universe: universe_arm64_skip
+universe_epilogue: universe_arm64_skip
+universe_arm64_skip: universe_prologue
+	@echo ">> arm64 skipped - install aarch64-binutils port or package to build"
+.endif
 TARGET_ARCHES_arm?=	arm armeb armv6 armv6hf
 TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipsn32
 TARGET_ARCHES_powerpc?=	powerpc powerpc64

Modified: projects/em_mq/Makefile.inc1
==============================================================================
--- projects/em_mq/Makefile.inc1	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/Makefile.inc1	Sun Apr 19 22:33:24 2015	(r281753)
@@ -1281,10 +1281,6 @@ _m4=		lib/libohash \
 ${_bt}-usr.bin/m4: ${_bt}-lib/libohash
 .endif
 
-.if ${BOOTSTRAPPING} < 1000014
-_crunch=	usr.sbin/crunch
-.endif
-
 .if ${BOOTSTRAPPING} < 1000026
 _nmtree=	lib/libnetbsd \
 		usr.sbin/nmtree
@@ -1300,16 +1296,18 @@ _cat=		bin/cat
 _lex=		usr.bin/lex
 .endif
 
+.if ${BOOTSTRAPPING} < 1001507
+_crunch=	usr.sbin/crunch
+.endif
+
 .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
 _awk=		usr.bin/awk
 .endif
 
-.if ${BOOTSTRAPPING} < 1001506
 _yacc=		lib/liby \
 		usr.bin/yacc
 
 ${_bt}-usr.bin/yacc: ${_bt}-lib/liby
-.endif
 
 .if ${MK_BSNMP} != "no"
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
@@ -1359,8 +1357,13 @@ _kerberos5_bootstrap_tools= \
 	kerberos5/tools/slc \
 	usr.bin/compile_et
 
-${_bt}-kerberos5/tools/slc: ${_bt}-kerberos5/lib/libroken
-${_bt}-kerberos5/tools/asn1_compile: ${_bt}-kerberos5/lib/libroken
+${_bt}-kerberos5/lib/libroken: ${_bt}-kerberos5/tools/make-roken
+${_bt}-kerberos5/tools/asn1_compile: \
+    ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers
+${_bt}-kerberos5/tools/slc: \
+    ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers
+${_bt}-usr.bin/compile_et: \
+    ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers
 .endif
 
 bootstrap-tools: .PHONY
@@ -1466,12 +1469,9 @@ _btxld=		usr.sbin/btxld
 .endif
 .endif
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
-.if ${MK_RESCUE} != "no" || defined(RELEASEDIR)
+.if ${MK_RESCUE} != "no"
 _crunchide=	usr.sbin/crunch/crunchide
 .endif
-.if ${TARGET_ARCH} == "i386" && defined(RELEASEDIR)
-_kgzip=		usr.sbin/kgzip
-.endif
 .endif
 
 # If we're given an XAS, don't build binutils.
@@ -1517,7 +1517,6 @@ cross-tools: .MAKE
     ${_cc} \
     ${_btxld} \
     ${_crunchide} \
-    ${_kgzip} \
     sys/boot/usb/tools
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool} && \

Modified: projects/em_mq/ObsoleteFiles.inc
==============================================================================
--- projects/em_mq/ObsoleteFiles.inc	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/ObsoleteFiles.inc	Sun Apr 19 22:33:24 2015	(r281753)
@@ -38,6 +38,24 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150418
+OLD_FILES+=sbin/mount_oldnfs
+OLD_FILES+=usr/share/man/man8/mount_oldnfs.8.gz
+# 20150416: ALTQ moved to net/altq
+OLD_FILES+=usr/include/altq/altq_rmclass_debug.h
+OLD_FILES+=usr/include/altq/altq.h
+OLD_FILES+=usr/include/altq/altq_cdnr.h
+OLD_FILES+=usr/include/altq/altq_hfsc.h
+OLD_FILES+=usr/include/altq/altq_priq.h
+OLD_FILES+=usr/include/altq/altqconf.h
+OLD_FILES+=usr/include/altq/altq_classq.h
+OLD_FILES+=usr/include/altq/altq_red.h
+OLD_FILES+=usr/include/altq/if_altq.h
+OLD_FILES+=usr/include/altq/altq_var.h
+OLD_FILES+=usr/include/altq/altq_rmclass.h
+OLD_FILES+=usr/include/altq/altq_cbq.h
+OLD_FILES+=usr/include/altq/altq_rio.h
+OLD_DIRS+=usr/include/altq
 # 20150410
 OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz

Modified: projects/em_mq/README
==============================================================================
--- projects/em_mq/README	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/README	Sun Apr 19 22:33:24 2015	(r281753)
@@ -8,37 +8,32 @@ sources in this tree - please see the sp
 more information).
 
 The Makefile in this directory supports a number of targets for
-building components (or all) of the FreeBSD source tree, the most
-commonly used one being ``world'', which rebuilds and installs
-everything in the FreeBSD system from the source tree except the
-kernel, the kernel-modules and the contents of /etc.  The ``world''
-target should only be used in cases where the source tree has not
-changed from the currently running version.  See:
-http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
+building components (or all) of the FreeBSD source tree.  See build(7)
+and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
 for more information, including setting make(1) variables.
 
-The ``buildkernel'' and ``installkernel'' targets build and install
+The `buildkernel` and `installkernel` targets build and install
 the kernel and the modules (see below).  Please see the top of
 the Makefile in this directory for more information on the
 standard build targets and compile-time flags.
 
-Building a kernel is a somewhat more involved process, documentation
-for which can be found at:
-   http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html
-And in the config(8) man page.
+Building a kernel is a somewhat more involved process.  See build(7), config(8),
+and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html
+for more information.
+
 Note: If you want to build and install the kernel with the
-``buildkernel'' and ``installkernel'' targets, you might need to build
+`buildkernel` and `installkernel` targets, you might need to build
 world before.  More information is available in the handbook.
 
-The sample kernel configuration files reside in the sys/<arch>/conf
-sub-directory (assuming that you've installed the kernel sources), the
-file named GENERIC being the one used to build your initial installation
-kernel.  The file NOTES contains entries and documentation for all possible
+The kernel configuration files reside in the sys/<arch>/conf
+sub-directory.  GENERIC is the default configuration used in release builds.
+NOTES contains entries and documentation for all possible
 devices, not just those commonly used.
 
 
 Source Roadmap:
 ---------------
+
 bin		System/user commands.
 
 cddl		Various commands and libraries under the Common Development

Modified: projects/em_mq/bin/ed/glbl.c
==============================================================================
--- projects/em_mq/bin/ed/glbl.c	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/bin/ed/glbl.c	Sun Apr 19 22:33:24 2015	(r281753)
@@ -153,7 +153,7 @@ set_active_node(line_t *lp)
 		if (active_list != NULL) {
 #endif
 			if ((ts = (line_t **) realloc(active_list,
-			    (ti += MINBUFSZ) * sizeof(line_t **))) == NULL) {
+			    (ti += MINBUFSZ) * sizeof(line_t *))) == NULL) {
 				fprintf(stderr, "%s\n", strerror(errno));
 				errmsg = "out of memory";
 				SPL0();

Modified: projects/em_mq/bin/sh/sh.1
==============================================================================
--- projects/em_mq/bin/sh/sh.1	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/bin/sh/sh.1	Sun Apr 19 22:33:24 2015	(r281753)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd February 22, 2015
+.Dd April 18, 2015
 .Dt SH 1
 .Os
 .Sh NAME
@@ -2574,8 +2574,7 @@ the former causes the specified signal t
 and the latter causes the default action to be taken.
 Omitting the
 .Ar action
-is another way to request the default action, for compatibility reasons this
-usage is not recommended though.
+and using only signal numbers is another way to request the default action.
 In a subshell or utility environment,
 the shell resets trapped (but not ignored) signals to the default action.
 The

Modified: projects/em_mq/bin/sh/tests/builtins/Makefile
==============================================================================
--- projects/em_mq/bin/sh/tests/builtins/Makefile	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/bin/sh/tests/builtins/Makefile	Sun Apr 19 22:33:24 2015	(r281753)
@@ -137,6 +137,8 @@ FILES+=		trap11.0
 FILES+=		trap12.0
 FILES+=		trap13.0
 FILES+=		trap14.0
+FILES+=		trap15.0
+FILES+=		trap16.0
 FILES+=		trap2.0
 FILES+=		trap3.0
 FILES+=		trap4.0

Copied: projects/em_mq/bin/sh/tests/builtins/trap15.0 (from r281750, head/bin/sh/tests/builtins/trap15.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/em_mq/bin/sh/tests/builtins/trap15.0	Sun Apr 19 22:33:24 2015	(r281753, copy of r281750, head/bin/sh/tests/builtins/trap15.0)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+(${SH} -c 'term(){ exit 5;}; trap term TERM; kill -TERM $$') &
+wait >/dev/null 2>&1 $!
+[ $? -eq 5 ]

Copied: projects/em_mq/bin/sh/tests/builtins/trap16.0 (from r281750, head/bin/sh/tests/builtins/trap16.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/em_mq/bin/sh/tests/builtins/trap16.0	Sun Apr 19 22:33:24 2015	(r281753, copy of r281750, head/bin/sh/tests/builtins/trap16.0)
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+traps=$(${SH} -c 'trap "echo bad" 0; trap - 0; trap')
+[ -z "$traps" ] || exit 1
+traps=$(${SH} -c 'trap "echo bad" 0; trap "" 0; trap')
+expected_traps=$(${SH} -c 'trap "" EXIT; trap')
+[ "$traps" = "$expected_traps" ] || exit 2
+traps=$(${SH} -c 'trap "echo bad" 0; trap 0; trap')
+[ -z "$traps" ] || exit 3
+traps=$(${SH} -c 'trap "echo bad" 0; trap -- 0; trap')
+[ -z "$traps" ] || exit 4
+traps=$(${SH} -c 'trap "echo bad" 0 1 2; trap - 0 1 2; trap')
+[ -z "$traps" ] || exit 5
+traps=$(${SH} -c 'trap "echo bad" 0 1 2; trap "" 0 1 2; trap')
+expected_traps=$(${SH} -c 'trap "" EXIT HUP INT; trap')
+[ "$traps" = "$expected_traps" ] || exit 6
+traps=$(${SH} -c 'trap "echo bad" 0 1 2; trap 0 1 2; trap')
+[ -z "$traps" ] || exit 7
+traps=$(${SH} -c 'trap "echo bad" 0 1 2; trap -- 0 1 2; trap')
+[ -z "$traps" ] || exit 8

Modified: projects/em_mq/bin/sh/trap.c
==============================================================================
--- projects/em_mq/bin/sh/trap.c	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/bin/sh/trap.c	Sun Apr 19 22:33:24 2015	(r281753)
@@ -183,7 +183,7 @@ trapcmd(int argc __unused, char **argv)
 		return 0;
 	}
 	action = NULL;
-	if (*argv && sigstring_to_signum(*argv) == -1) {
+	if (*argv && !is_number(*argv)) {
 		if (strcmp(*argv, "-") == 0)
 			argv++;
 		else {

Modified: projects/em_mq/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
==============================================================================
--- projects/em_mq/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1	Sun Apr 19 22:33:24 2015	(r281753)
@@ -21,7 +21,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 5, 2013
+.Dd April 18, 2015
 .Dt DTRACE 1
 .Os
 .Sh NAME
@@ -670,7 +670,8 @@ Invalid command line options or argument
 .Sh SEE ALSO
 .Xr cpp 1 ,
 .Xr dtruss 1 ,
-.Xr elf 5
+.Xr elf 5 ,
+.Xr SDT 9
 .Rs
 .%T Solaris Dynamic Tracing Guide
 .Re

Modified: projects/em_mq/etc/defaults/rc.conf
==============================================================================
--- projects/em_mq/etc/defaults/rc.conf	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/etc/defaults/rc.conf	Sun Apr 19 22:33:24 2015	(r281753)
@@ -88,7 +88,7 @@ fsck_y_enable="NO"	# Set to YES to do fs
 fsck_y_flags=""		# Additional flags for fsck -y
 background_fsck="YES"	# Attempt to run fsck in the background where possible.
 background_fsck_delay="60" # Time to wait (seconds) before starting the fsck.
-netfs_types="nfs:NFS oldnfs:OLDNFS smbfs:SMB" # Net filesystems.
+netfs_types="nfs:NFS smbfs:SMB" # Net filesystems.
 extra_netfs_types="NO"	# List of network extra filesystem types for delayed
 			# mount at startup (or NO).
 
@@ -324,7 +324,6 @@ autounmountd_flags=""		# Flags to autoun
 nfs_client_enable="NO"		# This host is an NFS client (or NO).
 nfs_access_cache="60"		# Client cache timeout in seconds
 nfs_server_enable="NO"		# This host is an NFS server (or NO).
-oldnfs_server_enable="NO"	# Run the old NFS server (YES/NO).
 nfs_server_flags="-u -t"	# Flags to nfsd (if enabled).
 mountd_enable="NO"		# Run mountd (or NO).
 mountd_flags="-r"		# Flags to mountd (if NFS server enabled).

Modified: projects/em_mq/etc/mtree/BSD.include.dist
==============================================================================
--- projects/em_mq/etc/mtree/BSD.include.dist	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/etc/mtree/BSD.include.dist	Sun Apr 19 22:33:24 2015	(r281753)
@@ -5,8 +5,6 @@
 
 /set type=dir uname=root gname=wheel mode=0755
 .
-    altq
-    ..
     arpa
     ..
     atf-c
@@ -254,6 +252,8 @@
         ..
     ..
     net
+        altq
+        ..
     ..
     net80211
     ..

Modified: projects/em_mq/etc/rc.d/mountd
==============================================================================
--- projects/em_mq/etc/rc.d/mountd	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/etc/rc.d/mountd	Sun Apr 19 22:33:24 2015	(r281753)
@@ -33,12 +33,6 @@ mountd_precmd()
 		fi
 	fi
 
-	# If oldnfs_server_enable is yes, force use of the old NFS server
-	#
-	if checkyesno oldnfs_server_enable; then
-		rc_flags="-o ${rc_flags}"
-	fi
-
 	if checkyesno zfs_enable; then
 		rc_flags="${rc_flags} /etc/exports /etc/zfs/exports"
 	fi

Modified: projects/em_mq/etc/rc.d/nfsd
==============================================================================
--- projects/em_mq/etc/rc.d/nfsd	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/etc/rc.d/nfsd	Sun Apr 19 22:33:24 2015	(r281753)
@@ -19,40 +19,25 @@ sig_stop="USR1"
 
 nfsd_precmd()
 {
-	if checkyesno oldnfs_server_enable; then
-		rc_flags="-o ${nfs_server_flags}"
+	rc_flags="${nfs_server_flags}"
 
-		# Load the module now, so that the vfs.nfsrv sysctl
-		# oids are available.
-		load_kld nfsserver
-
-		if checkyesno nfs_reserved_port_only; then
-			echo 'NFS on reserved port only=YES'
-			sysctl vfs.nfsrv.nfs_privport=1 > /dev/null
-		else
-			sysctl vfs.nfsrv.nfs_privport=0 > /dev/null
-		fi
+	# Load the modules now, so that the vfs.nfsd sysctl
+	# oids are available.
+	load_kld nfsd
+
+	if checkyesno nfs_reserved_port_only; then
+		echo 'NFS on reserved port only=YES'
+		sysctl vfs.nfsd.nfs_privport=1 > /dev/null
 	else
-		rc_flags="${nfs_server_flags}"
+		sysctl vfs.nfsd.nfs_privport=0 > /dev/null
+	fi
 
-		# Load the modules now, so that the vfs.nfsd sysctl
-		# oids are available.
-		load_kld nfsd
-
-		if checkyesno nfs_reserved_port_only; then
-			echo 'NFS on reserved port only=YES'
-			sysctl vfs.nfsd.nfs_privport=1 > /dev/null
-		else
-			sysctl vfs.nfsd.nfs_privport=0 > /dev/null
-		fi
-
-		if checkyesno nfsv4_server_enable; then
-			sysctl vfs.nfsd.server_max_nfsvers=4 > /dev/null
-			force_depend nfsuserd || err 1 "Cannot run nfsuserd"
-		else
-			echo 'NFSv4 is disabled'
-			sysctl vfs.nfsd.server_max_nfsvers=3 > /dev/null
-		fi
+	if checkyesno nfsv4_server_enable; then
+		sysctl vfs.nfsd.server_max_nfsvers=4 > /dev/null
+		force_depend nfsuserd || err 1 "Cannot run nfsuserd"
+	else
+		echo 'NFSv4 is disabled'
+		sysctl vfs.nfsd.server_max_nfsvers=3 > /dev/null
 	fi
 
 	force_depend rpcbind || return 1

Modified: projects/em_mq/include/Makefile
==============================================================================
--- projects/em_mq/include/Makefile	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/include/Makefile	Sun Apr 19 22:33:24 2015	(r281753)
@@ -50,6 +50,7 @@ LSUBDIRS=	cam/ata cam/scsi \
 	geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
 	geom/mirror geom/mountver geom/multipath geom/nop \
 	geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \
+	net/altq \
 	netgraph/atm netgraph/netflow \
 	security/audit \
 	security/mac_biba security/mac_bsdextended security/mac_lomac \
@@ -144,7 +145,7 @@ compat:
 	    -p ${DESTDIR}${INCLUDEDIR}
 
 copies:
-.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} altq crypto machine machine/pc \
+.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} crypto machine machine/pc \
 	${_MARCHS}
 .if exists(${DESTDIR}${INCLUDEDIR}/$i)
 	cd ${DESTDIR}${INCLUDEDIR}/$i; \
@@ -179,9 +180,6 @@ copies:
 	cd ${.CURDIR}/../sys/dev/pci; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 pcireg.h \
 	    ${DESTDIR}${INCLUDEDIR}/dev/pci
-	cd ${.CURDIR}/../sys/contrib/altq/altq; \
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
-	    ${DESTDIR}${INCLUDEDIR}/altq
 	cd ${.CURDIR}/../sys/fs/cd9660/; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
 	    ${DESTDIR}${INCLUDEDIR}/isofs/cd9660
@@ -279,11 +277,6 @@ symlinks:
 		ln -fs ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \
 	done
 .endfor
-	cd ${.CURDIR}/../sys/contrib/altq/altq; \
-	for h in *.h; do \
-		ln -fs ../../../sys/contrib/altq/altq/$$h \
-		    ${DESTDIR}${INCLUDEDIR}/altq; \
-	done
 .if ${MK_IPFILTER} != "no"
 	cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
 	for h in *.h; do \

Modified: projects/em_mq/lib/libc/Makefile
==============================================================================
--- projects/em_mq/lib/libc/Makefile	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libc/Makefile	Sun Apr 19 22:33:24 2015	(r281753)
@@ -157,10 +157,6 @@ libkern.${LIBC_ARCH}:: ${KMSRCS}
 	${CP} ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH}
 .endif
 
-.if ${MK_SYSCALL_COMPAT} != "no"
-CFLAGS+=-DSYSCALL_COMPAT
-.endif
-
 .include <bsd.arch.inc.mk>
 
 .include <bsd.lib.mk>

Modified: projects/em_mq/lib/libc/amd64/sys/Makefile.inc
==============================================================================
--- projects/em_mq/lib/libc/amd64/sys/Makefile.inc	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libc/amd64/sys/Makefile.inc	Sun Apr 19 22:33:24 2015	(r281753)
@@ -11,6 +11,3 @@ MDASM=	vfork.S brk.S cerror.S exect.S ge
 NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o
-.if ${MK_SYSCALL_COMPAT} != "no"
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif

Modified: projects/em_mq/lib/libc/arm/sys/Makefile.inc
==============================================================================
--- projects/em_mq/lib/libc/arm/sys/Makefile.inc	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libc/arm/sys/Makefile.inc	Sun Apr 19 22:33:24 2015	(r281753)
@@ -8,6 +8,3 @@ MDASM= Ovfork.S brk.S cerror.S pipe.S pt
 NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
 
 PSEUDO= _exit.o _getlogin.o
-.if ${MK_SYSCALL_COMPAT} != "no"
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif

Modified: projects/em_mq/lib/libc/gen/waitid.c
==============================================================================
--- projects/em_mq/lib/libc/gen/waitid.c	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libc/gen/waitid.c	Sun Apr 19 22:33:24 2015	(r281753)
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <signal.h>
 #include <errno.h>
 #include "un-namespace.h"
+#include "libc_private.h"
 
 int
 __waitid(idtype_t idtype, id_t id, siginfo_t *info, int flags)
@@ -44,7 +45,9 @@ __waitid(idtype_t idtype, id_t id, sigin
 	int status;
 	pid_t ret;
 
-	ret = _wait6(idtype, id, &status, flags, NULL, info);
+	ret = ((pid_t (*)(idtype_t, id_t, int *, int, struct __wrusage *,
+	    siginfo_t *))__libc_interposing[INTERPOS_wait6])(idtype, id,
+	    &status, flags, NULL, info);
 
 	/*
 	 * According to SUSv4, waitid() shall not return a PID when a

Modified: projects/em_mq/lib/libc/i386/sys/Makefile.inc
==============================================================================
--- projects/em_mq/lib/libc/i386/sys/Makefile.inc	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libc/i386/sys/Makefile.inc	Sun Apr 19 22:33:24 2015	(r281753)
@@ -15,9 +15,6 @@ MDASM=	Ovfork.S brk.S cerror.S exect.S g
 NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o
-.if ${MK_SYSCALL_COMPAT} != "no"
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif
 
 MAN+=	i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2
 MAN+=	i386_set_watch.3

Modified: projects/em_mq/lib/libc/include/compat.h
==============================================================================
--- projects/em_mq/lib/libc/include/compat.h	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libc/include/compat.h	Sun Apr 19 22:33:24 2015	(r281753)
@@ -47,9 +47,7 @@ __sym_compat(shmctl, freebsd7_shmctl, FB
 #define	__weak_reference(sym,alias)	\
 	.weak	alias;.equ	alias,sym
 
-#ifndef SYSCALL_COMPAT
 __weak_reference(__sys_fcntl,__fcntl_compat)
-#endif
 
 #undef __weak_reference
 

Modified: projects/em_mq/lib/libc/include/libc_private.h
==============================================================================
--- projects/em_mq/lib/libc/include/libc_private.h	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libc/include/libc_private.h	Sun Apr 19 22:33:24 2015	(r281753)
@@ -222,6 +222,8 @@ enum {
 	INTERPOS_spinlock,
 	INTERPOS_spinunlock,
 	INTERPOS_kevent,
+	INTERPOS_wait6,
+	INTERPOS_ppoll,
 	INTERPOS_MAX
 };
 
@@ -276,21 +278,12 @@ extern void (*__cleanup)(void) __hidden;
 
 /*
  * Get kern.osreldate to detect ABI revisions.  Explicitly
- * ignores value of $OSVERSION and caches result.  Prototypes
- * for the wrapped "new" pad-less syscalls are here for now.
+ * ignores value of $OSVERSION and caches result.
  */
 int __getosreldate(void);
 #include <sys/_types.h>
 #include <sys/_sigset.h>
 
-/* With pad */
-__off_t	__sys_freebsd6_lseek(int, int, __off_t, int);
-int	__sys_freebsd6_ftruncate(int, int, __off_t);
-int	__sys_freebsd6_truncate(const char *, int, __off_t);
-__ssize_t __sys_freebsd6_pread(int, void *, __size_t, int, __off_t);
-__ssize_t __sys_freebsd6_pwrite(int, const void *, __size_t, int, __off_t);
-void *	__sys_freebsd6_mmap(void *, __size_t, int, int, int, int, __off_t);
-
 struct aiocb;
 struct fd_set;
 struct iovec;
@@ -305,6 +298,8 @@ struct timeval;
 struct timezone;
 struct __siginfo;
 struct __ucontext;
+struct __wrusage;
+enum idtype;
 int		__sys_aio_suspend(const struct aiocb * const[], int,
 		    const struct timespec *);
 int		__sys_accept(int, struct sockaddr *, __socklen_t *);
@@ -329,6 +324,8 @@ int		__sys_pselect(int, struct fd_set *,
 		    struct fd_set *, const struct timespec *,
 		    const __sigset_t *);
 int		__sys_poll(struct pollfd *, unsigned, int);
+int		__sys_ppoll(struct pollfd *, unsigned, const struct timespec *,
+		    const __sigset_t *);
 __ssize_t	__sys_pread(int, void *, __size_t, __off_t);
 __ssize_t	__sys_pwrite(int, const void *, __size_t, __off_t);
 __ssize_t	__sys_read(int, void *, __size_t);
@@ -357,6 +354,8 @@ int		__sys_thr_kill(long, int);
 int		__sys_thr_self(long *);
 int		__sys_truncate(const char *, __off_t);
 __pid_t		__sys_wait4(__pid_t, int *, int, struct rusage *);
+__pid_t		__sys_wait6(enum idtype, __id_t, int *, int,
+		    struct __wrusage *, struct __siginfo *);
 __ssize_t	__sys_write(int, const void *, __size_t);
 __ssize_t	__sys_writev(int, const struct iovec *, int);
 

Modified: projects/em_mq/lib/libc/mips/sys/Makefile.inc
==============================================================================
--- projects/em_mq/lib/libc/mips/sys/Makefile.inc	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libc/mips/sys/Makefile.inc	Sun Apr 19 22:33:24 2015	(r281753)
@@ -6,10 +6,6 @@ MDASM=  Ovfork.S brk.S cerror.S exect.S 
 	fork.S pipe.S ptrace.S sbrk.S syscall.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o ftruncate.o getlogin.o lseek.o mmap.o \
-	openbsd_poll.o pread.o pwrite.o sstk.o truncate.o vfork.o yield.o
+NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
 
 PSEUDO= _exit.o _getlogin.o
-.if ${MK_SYSCALL_COMPAT} != "no"
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif

Modified: projects/em_mq/lib/libc/powerpc/sys/Makefile.inc
==============================================================================
--- projects/em_mq/lib/libc/powerpc/sys/Makefile.inc	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libc/powerpc/sys/Makefile.inc	Sun Apr 19 22:33:24 2015	(r281753)
@@ -6,6 +6,3 @@ MDASM+=	brk.S cerror.S exect.S pipe.S pt
 NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o
-.if ${MK_SYSCALL_COMPAT} != "no"
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif

Modified: projects/em_mq/lib/libc/powerpc64/sys/Makefile.inc
==============================================================================
--- projects/em_mq/lib/libc/powerpc64/sys/Makefile.inc	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libc/powerpc64/sys/Makefile.inc	Sun Apr 19 22:33:24 2015	(r281753)
@@ -6,6 +6,3 @@ MDASM+=	brk.S cerror.S exect.S pipe.S pt
 NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o
-.if ${MK_SYSCALL_COMPAT} != "no"
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif

Modified: projects/em_mq/lib/libc/sparc64/sys/Makefile.inc
==============================================================================
--- projects/em_mq/lib/libc/sparc64/sys/Makefile.inc	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libc/sparc64/sys/Makefile.inc	Sun Apr 19 22:33:24 2015	(r281753)
@@ -18,6 +18,3 @@ MDASM+=	brk.S cerror.S exect.S pipe.S pt
 NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o
-.if ${MK_SYSCALL_COMPAT} != "no"
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif

Modified: projects/em_mq/lib/libc/sys/Makefile.inc
==============================================================================
--- projects/em_mq/lib/libc/sys/Makefile.inc	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libc/sys/Makefile.inc	Sun Apr 19 22:33:24 2015	(r281753)
@@ -26,18 +26,6 @@ SRCS+=	\
 	__error.c \
 	interposing_table.c
 
-.if ${MK_SYSCALL_COMPAT} != "no"
-SYSCALL_COMPAT_SRCS= \
-	ftruncate.c \
-	lseek.c \
-	mmap.c \
-	pread.c \
-	pwrite.c \
-	truncate.c
-SRCS+=	${SYSCALL_COMPAT_SRCS}
-NOASM+=	${SYSCALL_COMPAT_SRCS:S/.c/.o/}
-.endif
-
 SRCS+= futimens.c utimensat.c
 NOASM+= futimens.o utimensat.o
 PSEUDO+= _futimens.o _utimensat.o
@@ -57,6 +45,7 @@ INTERPOSED = \
 	open \
 	openat \
 	poll \
+	ppoll \
 	pselect \
 	read \
 	readv \
@@ -73,6 +62,7 @@ INTERPOSED = \
 	sigwaitinfo \
 	swapcontext \
 	wait4 \
+	wait6 \
 	write \
 	writev
 

Modified: projects/em_mq/lib/libc/sys/fcntl.c
==============================================================================
--- projects/em_mq/lib/libc/sys/fcntl.c	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libc/sys/fcntl.c	Sun Apr 19 22:33:24 2015	(r281753)
@@ -3,6 +3,12 @@
  * Authors: Doug Rabson <dfr@rabson.org>
  * Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
  *
+ * Copyright (c) 2014-2015 The FreeBSD Foundation.
+ * All rights reserved.
+ *
+ * Portions of this software were developed by Konstantin Belousov
+ * under sponsorship from the FreeBSD Foundation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -48,59 +54,3 @@ fcntl(int fd, int cmd, ...)
 	return (((int (*)(int, int, ...))
 	    __libc_interposing[INTERPOS_fcntl])(fd, cmd, arg));
 }
-
-#ifdef SYSCALL_COMPAT
-__weak_reference(__fcntl_compat, __fcntl);
-
-int
-__fcntl_compat(int fd, int cmd, ...)
-{
-	va_list args;
-	long arg;
-	struct __oflock ofl;
-	struct flock *flp;
-	int res;
-
-	va_start(args, cmd);
-	arg = va_arg(args, long);
-	va_end(args);
-
-	if (__getosreldate() >= 800028) {
-		return (__sys_fcntl(fd, cmd, arg));
-	} else {
-		if (cmd == F_GETLK || cmd == F_SETLK || cmd == F_SETLKW) {
-			/*
-			 * Convert new-style struct flock (which
-			 * includes l_sysid) to old-style.
-			 */
-			flp = (struct flock *) (uintptr_t) arg;
-			ofl.l_start = flp->l_start;
-			ofl.l_len = flp->l_len;
-			ofl.l_pid = flp->l_pid;
-			ofl.l_type = flp->l_type;
-			ofl.l_whence = flp->l_whence;
-
-			switch (cmd) {
-			case F_GETLK:
-				res = __sys_fcntl(fd, F_OGETLK, &ofl);
-				if (res >= 0) {
-					flp->l_start = ofl.l_start;
-					flp->l_len = ofl.l_len;
-					flp->l_pid = ofl.l_pid;
-					flp->l_type = ofl.l_type;
-					flp->l_whence = ofl.l_whence;
-					flp->l_sysid = 0;
-				}
-				return (res);
-
-			case F_SETLK:
-				return (__sys_fcntl(fd, F_OSETLK, &ofl));
-
-			case F_SETLKW:
-				return (__sys_fcntl(fd, F_OSETLKW, &ofl));
-			}
-		}
-		return (__sys_fcntl(fd, cmd, arg));
-	}
-}
-#endif

Modified: projects/em_mq/lib/libc/sys/interposing_table.c
==============================================================================
--- projects/em_mq/lib/libc/sys/interposing_table.c	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libc/sys/interposing_table.c	Sun Apr 19 22:33:24 2015	(r281753)
@@ -44,7 +44,7 @@ interpos_func_t __libc_interposing[INTER
 	SLOT(aio_suspend, __sys_aio_suspend),
 	SLOT(close, __sys_close),
 	SLOT(connect, __sys_connect),
-	SLOT(fcntl, __fcntl_compat),
+	SLOT(fcntl, __sys_fcntl),
 	SLOT(fsync, __sys_fsync),
 	SLOT(fork, __sys_fork),
 	SLOT(msync, __sys_msync),
@@ -76,6 +76,8 @@ interpos_func_t __libc_interposing[INTER
 	SLOT(spinlock, __libc_spinlock_stub),
 	SLOT(spinunlock, __libc_spinunlock_stub),
 	SLOT(kevent, __sys_kevent),
+	SLOT(wait6, __sys_wait6),
+	SLOT(ppoll, __sys_ppoll),
 };
 #undef SLOT
 

Copied: projects/em_mq/lib/libc/sys/ppoll.c (from r281750, head/lib/libc/sys/ppoll.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/em_mq/lib/libc/sys/ppoll.c	Sun Apr 19 22:33:24 2015	(r281753, copy of r281750, head/lib/libc/sys/ppoll.c)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2015 The FreeBSD Foundation.
+ * All rights reserved.
+ *
+ * Portions of this software were developed by Konstantin Belousov
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice(s), this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified other than the possible
+ *    addition of one or more copyright notices.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice(s), this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/poll.h>
+#include "libc_private.h"
+
+__weak_reference(__sys_ppoll, __ppoll);
+
+#pragma weak ppoll
+int
+ppoll(struct pollfd pfd[], nfds_t nfds, const struct timespec *__restrict
+    timeout, const sigset_t *__restrict newsigmask)
+{
+
+	return (((int (*)(struct pollfd *, nfds_t, const struct timespec *,
+	    const sigset_t *)) __libc_interposing[INTERPOS_ppoll])(pfd, nfds,
+	    timeout, newsigmask));
+}

Copied: projects/em_mq/lib/libc/sys/wait6.c (from r281750, head/lib/libc/sys/wait6.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/em_mq/lib/libc/sys/wait6.c	Sun Apr 19 22:33:24 2015	(r281753, copy of r281750, head/lib/libc/sys/wait6.c)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2015 The FreeBSD Foundation.
+ * All rights reserved.
+ *
+ * Portions of this software were developed by Konstantin Belousov
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice(s), this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified other than the possible
+ *    addition of one or more copyright notices.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice(s), this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include "libc_private.h"
+
+__weak_reference(__sys_wait6, __wait6);
+
+#pragma weak wait6
+pid_t
+wait6(idtype_t idtype, id_t id, int *status, int options, struct __wrusage *ru,
+    siginfo_t *infop)
+{
+
+	return (((pid_t (*)(idtype_t, id_t, int *, int, struct __wrusage *,
+	    siginfo_t *))__libc_interposing[INTERPOS_wait6])(idtype, id,
+	    status, options, ru, infop));
+}

Modified: projects/em_mq/lib/libpmc/libpmc.c
==============================================================================
--- projects/em_mq/lib/libpmc/libpmc.c	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libpmc/libpmc.c	Sun Apr 19 22:33:24 2015	(r281753)
@@ -164,6 +164,7 @@ PMC_CLASSDEP_TABLE(octeon, OCTEON);
 PMC_CLASSDEP_TABLE(ucf, UCF);
 PMC_CLASSDEP_TABLE(ppc7450, PPC7450);
 PMC_CLASSDEP_TABLE(ppc970, PPC970);
+PMC_CLASSDEP_TABLE(e500, E500);
 
 static struct pmc_event_descr soft_event_table[PMC_EV_DYN_COUNT];
 
@@ -296,8 +297,9 @@ PMC_MDEP_TABLE(armv7, ARMV7, PMC_CLASS_S
 PMC_MDEP_TABLE(mips24k, MIPS24K, PMC_CLASS_SOFT, PMC_CLASS_MIPS24K);
 PMC_MDEP_TABLE(mips74k, MIPS74K, PMC_CLASS_SOFT, PMC_CLASS_MIPS74K);
 PMC_MDEP_TABLE(octeon, OCTEON, PMC_CLASS_SOFT, PMC_CLASS_OCTEON);
-PMC_MDEP_TABLE(ppc7450, PPC7450, PMC_CLASS_SOFT, PMC_CLASS_PPC7450);
-PMC_MDEP_TABLE(ppc970, PPC970, PMC_CLASS_SOFT, PMC_CLASS_PPC970);
+PMC_MDEP_TABLE(ppc7450, PPC7450, PMC_CLASS_SOFT, PMC_CLASS_PPC7450, PMC_CLASS_TSC);
+PMC_MDEP_TABLE(ppc970, PPC970, PMC_CLASS_SOFT, PMC_CLASS_PPC970, PMC_CLASS_TSC);
+PMC_MDEP_TABLE(e500, E500, PMC_CLASS_SOFT, PMC_CLASS_E500, PMC_CLASS_TSC);
 PMC_MDEP_TABLE(generic, SOFT, PMC_CLASS_SOFT);
 
 static const struct pmc_event_descr tsc_event_table[] =
@@ -368,6 +370,7 @@ PMC_CLASS_TABLE_DESC(octeon, OCTEON, oct
 #if defined(__powerpc__)
 PMC_CLASS_TABLE_DESC(ppc7450, PPC7450, ppc7450, powerpc);
 PMC_CLASS_TABLE_DESC(ppc970, PPC970, ppc970, powerpc);
+PMC_CLASS_TABLE_DESC(e500, E500, e500, powerpc);
 #endif
 
 static struct pmc_class_descr soft_class_table_descr =
@@ -2494,6 +2497,12 @@ static struct pmc_event_alias ppc970_ali
 	EV_ALIAS(NULL, NULL)
 };
 
+static struct pmc_event_alias e500_aliases[] = {
+	EV_ALIAS("instructions", "INSTR_COMPLETED"),
+	EV_ALIAS("cycles",       "CYCLES"),
+	EV_ALIAS(NULL, NULL)
+};
+
 #define	POWERPC_KW_OS		"os"
 #define	POWERPC_KW_USR		"usr"
 #define	POWERPC_KW_ANYTHREAD	"anythread"
@@ -2949,6 +2958,10 @@ pmc_event_names_of_class(enum pmc_class 
 		ev = ppc970_event_table;
 		count = PMC_EVENT_TABLE_SIZE(ppc970);
 		break;
+	case PMC_CLASS_E500:
+		ev = e500_event_table;
+		count = PMC_EVENT_TABLE_SIZE(e500);
+		break;
 	case PMC_CLASS_SOFT:
 		ev = soft_event_table;
 		count = soft_event_info.pm_nevent;
@@ -3245,6 +3258,10 @@ pmc_init(void)
 		PMC_MDEP_INIT(ppc970);
 		pmc_class_table[n] = &ppc970_class_table_descr;
 		break;
+	case PMC_CPU_PPC_E500:
+		PMC_MDEP_INIT(e500);
+		pmc_class_table[n] = &e500_class_table_descr;
+		break;
 #endif
 	default:
 		/*
@@ -3444,6 +3461,9 @@ _pmc_name_of_event(enum pmc_event pe, en
 	} else if (pe >= PMC_EV_PPC970_FIRST && pe <= PMC_EV_PPC970_LAST) {
 		ev = ppc970_event_table;
 		evfence = ppc970_event_table + PMC_EVENT_TABLE_SIZE(ppc970);
+	} else if (pe >= PMC_EV_E500_FIRST && pe <= PMC_EV_E500_LAST) {
+		ev = e500_event_table;
+		evfence = e500_event_table + PMC_EVENT_TABLE_SIZE(e500);
 	} else if (pe == PMC_EV_TSC_TSC) {
 		ev = tsc_event_table;
 		evfence = tsc_event_table + PMC_EVENT_TABLE_SIZE(tsc);

Modified: projects/em_mq/lib/libthr/Makefile
==============================================================================
--- projects/em_mq/lib/libthr/Makefile	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libthr/Makefile	Sun Apr 19 22:33:24 2015	(r281753)
@@ -61,10 +61,6 @@ SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthr
 SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
 .endif
 
-.if ${MK_SYSCALL_COMPAT} != "no"
-CFLAGS+=-DSYSCALL_COMPAT
-.endif
-
 .include <bsd.arch.inc.mk>
 
 .include <bsd.lib.mk>

Modified: projects/em_mq/lib/libthr/thread/thr_syscalls.c
==============================================================================
--- projects/em_mq/lib/libthr/thread/thr_syscalls.c	Sun Apr 19 20:20:52 2015	(r281752)
+++ projects/em_mq/lib/libthr/thread/thr_syscalls.c	Sun Apr 19 22:33:24 2015	(r281753)
@@ -95,10 +95,6 @@ __FBSDID("$FreeBSD$");
 #include "libc_private.h"
 #include "thr_private.h"
 
-#ifdef SYSCALL_COMPAT
-extern int __fcntl_compat(int, int, ...);
-#endif
-
 static int
 __thr_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
 {
@@ -203,18 +199,10 @@ __thr_fcntl(int fd, int cmd, ...)
 	va_start(ap, cmd);
 	if (cmd == F_OSETLKW || cmd == F_SETLKW) {
 		_thr_cancel_enter(curthread);
-#ifdef SYSCALL_COMPAT
-		ret = __fcntl_compat(fd, cmd, va_arg(ap, void *));
-#else
 		ret = __sys_fcntl(fd, cmd, va_arg(ap, void *));
-#endif
 		_thr_cancel_leave(curthread, ret == -1);
 	} else {
-#ifdef SYSCALL_COMPAT
-		ret = __fcntl_compat(fd, cmd, va_arg(ap, void *));
-#else
 		ret = __sys_fcntl(fd, cmd, va_arg(ap, void *));
-#endif
 	}
 	va_end(ap);
 
@@ -327,6 +315,26 @@ __thr_poll(struct pollfd *fds, unsigned 
  *   the thread is not canceled.
  */
 static int
+__thr_ppoll(struct pollfd pfd[], nfds_t nfds, const struct timespec *
+    timeout, const sigset_t *newsigmask)
+{
+	struct pthread *curthread;
+	int ret;
+
+	curthread = _get_curthread();
+	_thr_cancel_enter(curthread);
+	ret = __sys_ppoll(pfd, nfds, timeout, newsigmask);
+	_thr_cancel_leave(curthread, ret == -1);
+
+	return (ret);
+}
+
+/*
+ * Cancellation behavior:
+ *   Thread may be canceled at start, but if the system call returns something,
+ *   the thread is not canceled.
+ */
+static int
 __thr_pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, 
 	const struct timespec *timo, const sigset_t *mask)
 {
@@ -545,6 +553,25 @@ __thr_wait4(pid_t pid, int *status, int 
 
 /*

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504192233.t3JMXQ68026453>