svn commit: r278235 - in user/dchagin/lemul: . cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid cddl/contrib/opensolaris/cmd/dtrace/t...

Dmitry Chagin dchagin at FreeBSD.org
Thu Feb 5 07:24:31 UTC 2015 

Author: dchagin
Date: Thu Feb  5 07:24:17 2015
New Revision: 278235
URL: https://svnweb.freebsd.org/changeset/base/278235

Log:
  Merge from head.

Added:
  user/dchagin/lemul/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff
     - copied unchanged from r278234, head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff
  user/dchagin/lemul/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff
     - copied unchanged from r278234, head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff
  user/dchagin/lemul/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff
     - copied unchanged from r278234, head/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff
  user/dchagin/lemul/sys/amd64/include/pvclock.h
     - copied unchanged from r278234, head/sys/amd64/include/pvclock.h
  user/dchagin/lemul/sys/i386/include/pvclock.h
     - copied unchanged from r278234, head/sys/i386/include/pvclock.h
  user/dchagin/lemul/sys/x86/include/pvclock.h
     - copied unchanged from r278234, head/sys/x86/include/pvclock.h
  user/dchagin/lemul/sys/x86/x86/pvclock.c
     - copied unchanged from r278234, head/sys/x86/x86/pvclock.c
  user/dchagin/lemul/tools/build/options/WITHOUT_BOOTPARAMD
     - copied unchanged from r278234, head/tools/build/options/WITHOUT_BOOTPARAMD
  user/dchagin/lemul/tools/build/options/WITHOUT_BOOTPD
     - copied unchanged from r278234, head/tools/build/options/WITHOUT_BOOTPD
  user/dchagin/lemul/tools/build/options/WITHOUT_FILE
     - copied unchanged from r278234, head/tools/build/options/WITHOUT_FILE
  user/dchagin/lemul/tools/build/options/WITHOUT_FINGER
     - copied unchanged from r278234, head/tools/build/options/WITHOUT_FINGER
  user/dchagin/lemul/tools/build/options/WITHOUT_FTP
     - copied unchanged from r278234, head/tools/build/options/WITHOUT_FTP
  user/dchagin/lemul/tools/build/options/WITHOUT_INETD
     - copied unchanged from r278234, head/tools/build/options/WITHOUT_INETD
  user/dchagin/lemul/tools/build/options/WITHOUT_RADIUS_SUPPORT
     - copied unchanged from r278234, head/tools/build/options/WITHOUT_RADIUS_SUPPORT
  user/dchagin/lemul/tools/build/options/WITHOUT_RBOOTD
     - copied unchanged from r278234, head/tools/build/options/WITHOUT_RBOOTD
  user/dchagin/lemul/tools/build/options/WITHOUT_TCP_WRAPPERS
     - copied unchanged from r278234, head/tools/build/options/WITHOUT_TCP_WRAPPERS
  user/dchagin/lemul/tools/build/options/WITHOUT_TFTP
     - copied unchanged from r278234, head/tools/build/options/WITHOUT_TFTP
  user/dchagin/lemul/tools/build/options/WITHOUT_TIMED
     - copied unchanged from r278234, head/tools/build/options/WITHOUT_TIMED
Deleted:
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile
  user/dchagin/lemul/contrib/llvm/patches/patch-29-llvm-r226664-aarch64-x18.diff
  user/dchagin/lemul/contrib/llvm/patches/patch-30-clang-r227062-fixes-x18.diff
Modified:
  user/dchagin/lemul/Makefile.inc1
  user/dchagin/lemul/UPDATING
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe   (contents, props changed)
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe   (contents, props changed)
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
  user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
  user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.c
  user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.h
  user/dchagin/lemul/contrib/libcxxrt/exception.cc
  user/dchagin/lemul/contrib/libcxxrt/typeinfo.cc
  user/dchagin/lemul/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c
  user/dchagin/lemul/etc/Makefile
  user/dchagin/lemul/etc/rc.d/Makefile
  user/dchagin/lemul/include/Makefile
  user/dchagin/lemul/lib/Makefile
  user/dchagin/lemul/lib/clang/clang.build.mk
  user/dchagin/lemul/lib/csu/powerpc64/Makefile
  user/dchagin/lemul/lib/libc/gen/ttyname.c
  user/dchagin/lemul/lib/libc/rpc/crypt_client.c
  user/dchagin/lemul/lib/libc/rpc/svc_vc.c
  user/dchagin/lemul/lib/libpam/modules/modules.inc
  user/dchagin/lemul/lib/msun/src/s_scalbln.c
  user/dchagin/lemul/libexec/Makefile
  user/dchagin/lemul/release/doc/en_US.ISO8859-1/relnotes/article.xml
  user/dchagin/lemul/release/doc/share/mk/doc.relnotes.mk
  user/dchagin/lemul/release/release.sh
  user/dchagin/lemul/release/tools/gce.conf
  user/dchagin/lemul/sbin/Makefile
  user/dchagin/lemul/sbin/ifconfig/af_inet6.c
  user/dchagin/lemul/sbin/ifconfig/ifconfig.c
  user/dchagin/lemul/share/examples/Makefile
  user/dchagin/lemul/share/man/man4/Makefile
  user/dchagin/lemul/share/man/man5/src.conf.5
  user/dchagin/lemul/share/man/man9/Makefile
  user/dchagin/lemul/share/misc/Makefile
  user/dchagin/lemul/share/mk/src.opts.mk
  user/dchagin/lemul/sys/amd64/amd64/machdep.c
  user/dchagin/lemul/sys/amd64/ia32/ia32_signal.c
  user/dchagin/lemul/sys/arm/allwinner/a10_gpio.c
  user/dchagin/lemul/sys/arm/altera/socfpga/socfpga_gpio.c
  user/dchagin/lemul/sys/arm/arm/busdma_machdep-v6.c
  user/dchagin/lemul/sys/arm/arm/machdep.c
  user/dchagin/lemul/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
  user/dchagin/lemul/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  user/dchagin/lemul/sys/arm/freescale/imx/imx_gpio.c
  user/dchagin/lemul/sys/arm/freescale/vybrid/vf_gpio.c
  user/dchagin/lemul/sys/arm/include/profile.h
  user/dchagin/lemul/sys/arm/lpc/lpc_gpio.c
  user/dchagin/lemul/sys/arm/rockchip/rk30xx_gpio.c
  user/dchagin/lemul/sys/arm/samsung/exynos/exynos5_pad.c
  user/dchagin/lemul/sys/arm/ti/am335x/am335x_prcm.c
  user/dchagin/lemul/sys/arm/ti/ti_gpio.c
  user/dchagin/lemul/sys/arm/ti/ti_gpio.h
  user/dchagin/lemul/sys/arm/xilinx/zy7_gpio.c
  user/dchagin/lemul/sys/arm/xscale/ixp425/avila_gpio.c
  user/dchagin/lemul/sys/arm/xscale/ixp425/cambria_gpio.c
  user/dchagin/lemul/sys/boot/amd64/efi/main.c
  user/dchagin/lemul/sys/boot/common/load_elf.c
  user/dchagin/lemul/sys/boot/efi/include/efiapi.h
  user/dchagin/lemul/sys/boot/fdt/fdt_loader_cmd.c
  user/dchagin/lemul/sys/boot/powerpc/kboot/conf.c
  user/dchagin/lemul/sys/boot/powerpc/kboot/host_syscall.S
  user/dchagin/lemul/sys/boot/powerpc/kboot/host_syscall.h
  user/dchagin/lemul/sys/boot/powerpc/kboot/hostdisk.c
  user/dchagin/lemul/sys/boot/powerpc/kboot/kbootfdt.c
  user/dchagin/lemul/sys/boot/powerpc/kboot/kerneltramp.S
  user/dchagin/lemul/sys/boot/powerpc/kboot/main.c
  user/dchagin/lemul/sys/boot/powerpc/kboot/ppc64_elf_freebsd.c
  user/dchagin/lemul/sys/cam/cam.h
  user/dchagin/lemul/sys/cam/cam_ccb.h
  user/dchagin/lemul/sys/cam/cam_periph.c
  user/dchagin/lemul/sys/cam/cam_xpt.c
  user/dchagin/lemul/sys/cam/cam_xpt_internal.h
  user/dchagin/lemul/sys/cam/ctl/ctl.c
  user/dchagin/lemul/sys/cam/ctl/ctl_frontend.c
  user/dchagin/lemul/sys/cam/ctl/ctl_frontend.h
  user/dchagin/lemul/sys/cam/ctl/ctl_frontend_iscsi.c
  user/dchagin/lemul/sys/cam/ctl/ctl_frontend_iscsi.h
  user/dchagin/lemul/sys/cam/ctl/ctl_ioctl.h
  user/dchagin/lemul/sys/cam/ctl/ctl_private.h
  user/dchagin/lemul/sys/cam/ctl/ctl_tpc_local.c
  user/dchagin/lemul/sys/cam/scsi/scsi_cd.c
  user/dchagin/lemul/sys/cam/scsi/scsi_da.c
  user/dchagin/lemul/sys/cam/scsi/scsi_xpt.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  user/dchagin/lemul/sys/cddl/dev/dtrace/dtrace_load.c
  user/dchagin/lemul/sys/cddl/dev/dtrace/dtrace_unload.c
  user/dchagin/lemul/sys/conf/Makefile.powerpc
  user/dchagin/lemul/sys/conf/files.amd64
  user/dchagin/lemul/sys/conf/files.i386
  user/dchagin/lemul/sys/conf/kern.mk
  user/dchagin/lemul/sys/conf/options
  user/dchagin/lemul/sys/dev/ahci/ahci.h
  user/dchagin/lemul/sys/dev/ahci/ahci_pci.c
  user/dchagin/lemul/sys/dev/drm2/i915/i915_drv.c
  user/dchagin/lemul/sys/dev/drm2/i915/i915_drv.h
  user/dchagin/lemul/sys/dev/drm2/i915/intel_dp.c
  user/dchagin/lemul/sys/dev/drm2/i915/intel_iic.c
  user/dchagin/lemul/sys/dev/drm2/radeon/ni.c
  user/dchagin/lemul/sys/dev/drm2/radeon/si.c
  user/dchagin/lemul/sys/dev/drm2/ttm/ttm_bo.c
  user/dchagin/lemul/sys/dev/drm2/ttm/ttm_page_alloc.c
  user/dchagin/lemul/sys/dev/ed/if_ed.c
  user/dchagin/lemul/sys/dev/fdt/fdt_clock.c
  user/dchagin/lemul/sys/dev/fe/if_fe_isa.c
  user/dchagin/lemul/sys/dev/gpio/gpiobus.c
  user/dchagin/lemul/sys/dev/gpio/gpiobusvar.h
  user/dchagin/lemul/sys/dev/gpio/ofw_gpiobus.c
  user/dchagin/lemul/sys/dev/iscsi/icl.h
  user/dchagin/lemul/sys/dev/iscsi/icl_soft.c
  user/dchagin/lemul/sys/dev/iscsi/iscsi.c
  user/dchagin/lemul/sys/dev/iscsi/iscsi_ioctl.h
  user/dchagin/lemul/sys/dev/iscsi/iscsi_proto.h
  user/dchagin/lemul/sys/dev/sfxge/common/efsys.h
  user/dchagin/lemul/sys/dev/sfxge/sfxge.c
  user/dchagin/lemul/sys/dev/sfxge/sfxge.h
  user/dchagin/lemul/sys/dev/sfxge/sfxge_ev.c
  user/dchagin/lemul/sys/dev/sfxge/sfxge_mcdi.c
  user/dchagin/lemul/sys/dev/sfxge/sfxge_port.c
  user/dchagin/lemul/sys/dev/sfxge/sfxge_rx.c
  user/dchagin/lemul/sys/dev/sfxge/sfxge_tx.c
  user/dchagin/lemul/sys/dev/sfxge/sfxge_tx.h
  user/dchagin/lemul/sys/dev/usb/controller/xhci.c
  user/dchagin/lemul/sys/dev/usb/usb_core.h
  user/dchagin/lemul/sys/dev/usb/usb_msctest.c
  user/dchagin/lemul/sys/dev/usb/usb_transfer.c
  user/dchagin/lemul/sys/dev/xen/timer/timer.c
  user/dchagin/lemul/sys/fs/tmpfs/tmpfs_subr.c
  user/dchagin/lemul/sys/i386/i386/machdep.c
  user/dchagin/lemul/sys/i386/xen/clock.c
  user/dchagin/lemul/sys/kern/kern_clock.c
  user/dchagin/lemul/sys/kern/kern_clocksource.c
  user/dchagin/lemul/sys/kern/sys_pipe.c
  user/dchagin/lemul/sys/mips/atheros/ar71xx_gpio.c
  user/dchagin/lemul/sys/mips/atheros/ar71xx_gpiovar.h
  user/dchagin/lemul/sys/mips/atheros/if_argevar.h
  user/dchagin/lemul/sys/mips/cavium/octeon_gpio.c
  user/dchagin/lemul/sys/mips/cavium/octeon_gpiovar.h
  user/dchagin/lemul/sys/mips/mips/freebsd32_machdep.c
  user/dchagin/lemul/sys/mips/mips/pm_machdep.c
  user/dchagin/lemul/sys/mips/rt305x/rt305x_gpio.c
  user/dchagin/lemul/sys/mips/rt305x/rt305x_gpiovar.h
  user/dchagin/lemul/sys/netinet/ip_output.c
  user/dchagin/lemul/sys/ofed/include/linux/linux_idr.c
  user/dchagin/lemul/sys/powerpc/ofw/ofw_machdep.c
  user/dchagin/lemul/sys/powerpc/powerpc/exec_machdep.c
  user/dchagin/lemul/sys/rpc/svc_vc.c
  user/dchagin/lemul/sys/sparc64/sparc64/machdep.c
  user/dchagin/lemul/sys/sys/cdefs.h
  user/dchagin/lemul/sys/sys/param.h
  user/dchagin/lemul/sys/sys/ucontext.h
  user/dchagin/lemul/tools/build/mk/OptionalObsoleteFiles.inc
  user/dchagin/lemul/usr.bin/Makefile
  user/dchagin/lemul/usr.bin/iscsictl/iscsi.conf.5
  user/dchagin/lemul/usr.bin/iscsictl/iscsictl.c
  user/dchagin/lemul/usr.bin/iscsictl/iscsictl.h
  user/dchagin/lemul/usr.bin/iscsictl/parse.y
  user/dchagin/lemul/usr.bin/iscsictl/token.l
  user/dchagin/lemul/usr.sbin/Makefile
  user/dchagin/lemul/usr.sbin/ctladm/ctladm.8
  user/dchagin/lemul/usr.sbin/ctladm/ctladm.c
  user/dchagin/lemul/usr.sbin/ctld/ctl.conf.5
  user/dchagin/lemul/usr.sbin/ctld/ctld.c
  user/dchagin/lemul/usr.sbin/ctld/ctld.h
  user/dchagin/lemul/usr.sbin/ctld/kernel.c
  user/dchagin/lemul/usr.sbin/ctld/parse.y
  user/dchagin/lemul/usr.sbin/iscsid/iscsid.c
  user/dchagin/lemul/usr.sbin/iscsid/iscsid.h
  user/dchagin/lemul/usr.sbin/iscsid/login.c
  user/dchagin/lemul/usr.sbin/pkg/pkg.c
  user/dchagin/lemul/usr.sbin/ppp/Makefile
Directory Properties:
  user/dchagin/lemul/   (props changed)
  user/dchagin/lemul/cddl/   (props changed)
  user/dchagin/lemul/cddl/contrib/opensolaris/   (props changed)
  user/dchagin/lemul/contrib/gcc/   (props changed)
  user/dchagin/lemul/contrib/libcxxrt/   (props changed)
  user/dchagin/lemul/contrib/llvm/   (props changed)
  user/dchagin/lemul/etc/   (props changed)
  user/dchagin/lemul/include/   (props changed)
  user/dchagin/lemul/lib/libc/   (props changed)
  user/dchagin/lemul/sbin/   (props changed)
  user/dchagin/lemul/share/   (props changed)
  user/dchagin/lemul/share/man/man4/   (props changed)
  user/dchagin/lemul/sys/   (props changed)
  user/dchagin/lemul/sys/boot/   (props changed)
  user/dchagin/lemul/sys/boot/powerpc/kboot/   (props changed)
  user/dchagin/lemul/sys/cddl/contrib/opensolaris/   (props changed)
  user/dchagin/lemul/sys/conf/   (props changed)

Modified: user/dchagin/lemul/Makefile.inc1
==============================================================================
--- user/dchagin/lemul/Makefile.inc1	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/Makefile.inc1	Thu Feb  5 07:24:17 2015	(r278235)
@@ -1634,7 +1634,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_lib_libcapsicum} \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
-		lib/libradius lib/libsbuf lib/libtacplus \
+		${_lib_libradius} lib/libsbuf lib/libtacplus \
 		lib/libgeom \
 		${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
 		${_cddl_lib_libuutil} \
@@ -1657,6 +1657,10 @@ lib/libgeom__L: lib/libexpat__L
 _lib_libthr=	lib/libthr
 .endif
 
+.if ${MK_RADIUS_SUPPORT} != "no"
+_lib_libradius=	lib/libradius
+.endif
+
 .if ${MK_OFED} != "no"
 _ofed_lib=	contrib/ofed/usr.lib/
 .endif

Modified: user/dchagin/lemul/UPDATING
==============================================================================
--- user/dchagin/lemul/UPDATING	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/UPDATING	Thu Feb  5 07:24:17 2015	(r278235)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20150131:
+	The powerpc64 kernel has been changed to a position-independent
+	executable. This can only be booted with a new version of loader(8),
+	so make sure to update both world and kernel before rebooting.
+
 20150118:
 	Clang and llvm have been upgraded to 3.5.1 release.  This is a bugfix
 	only release, no new features have been added.  Please see the 20141231

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -31,7 +31,6 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-CC=/usr/bin/gcc
 CFLAGS=
 
 doit()
@@ -47,7 +46,7 @@ void
 main()
 {}
 EOF
-	if $CC $CFLAGS -o $cofile $cfile >/dev/null 2>&1; then
+	if cc $CFLAGS -o $cofile $cfile >/dev/null 2>&1; then
 		$dtrace -xerrtags -C -s /dev/stdin \
 		    >/dev/null 2>$errfile <<EOF
 #include <sys/$file>
@@ -67,11 +66,6 @@ EOF
 	rm -f $cofile $cfile 2>/dev/null
 }
 
-if [ ! -x $CC ]; then
-	echo "$0: bad compiler: $CC" >& 2
-	exit 1
-fi
-
 concurrency=`psrinfo | wc -l`
 let concurrency=concurrency*4
 let i=0

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe	Thu Feb  5 07:24:17 2015	(r278235)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
 #
 # CDDL HEADER START
 #

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe	Thu Feb  5 07:24:17 2015	(r278235)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
 #
 # CDDL HEADER START
 #

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe	Thu Feb  5 07:24:17 2015	(r278235)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
 #
 # CDDL HEADER START
 #

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe	Thu Feb  5 07:24:17 2015	(r278235)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
 #
 # CDDL HEADER START
 #

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe	Thu Feb  5 07:24:17 2015	(r278235)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
 #
 # CDDL HEADER START
 #

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe	Thu Feb  5 07:24:17 2015	(r278235)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
 #
 # CDDL HEADER START
 #

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe	Thu Feb  5 07:24:17 2015	(r278235)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
 #
 # CDDL HEADER START
 #

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe	Thu Feb  5 07:24:17 2015	(r278235)
@@ -1,4 +1,4 @@
-#!/usr/bin/ksh
+#!/usr/bin/env ksh
 #
 # CDDL HEADER START
 #

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe	Thu Feb  5 07:24:17 2015	(r278235)
@@ -1,4 +1,4 @@
-#!/usr/bin/ksh
+#!/usr/bin/env ksh
 #
 # CDDL HEADER START
 #

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d	Thu Feb  5 07:24:17 2015	(r278235)
@@ -54,7 +54,7 @@ pid$1:a.out:go:
 	exit(1);
 }
 
-syscall::rexit:entry
+syscall::exit:entry
 /pid == $1/
 {
 	exit(0);

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe
==============================================================================
Binary file (source and/or target). No diff available.

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe
==============================================================================
Binary file (source and/or target). No diff available.

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -37,7 +37,8 @@ script()
 	$dtrace -s /dev/stdin <<EOF
 	proc:::signal-discard
 	/args[1]->p_pid == $child &&
-	    args[1]->pr_psargs == "$longsleep" && args[2] == SIGHUP/
+	    xlate<psinfo_t *>(args[1])->pr_psargs == "$longsleep" &&
+	    args[2] == SIGHUP/
 	{
 		exit(0);
 	}
@@ -48,7 +49,7 @@ killer()
 {
 	while true; do
 		sleep 1
-		/usr/bin/kill -HUP $child
+		kill -HUP $child
 	done
 }
 
@@ -58,7 +59,7 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-longsleep="/usr/bin/sleep 10000"
+longsleep="/bin/sleep 10000"
 
 /usr/bin/nohup $longsleep &
 child=$!

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -48,7 +48,7 @@ sleeper()
 {
 	while true; do
 		$longsleep &
-		/usr/bin/sleep 1
+		sleep 1
 		kill -9 $!
 	done
 }
@@ -59,7 +59,7 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-longsleep="/usr/bin/sleep 10000"
+longsleep="/bin/sleep 10000"
 
 sleeper &
 child=$!
@@ -67,9 +67,9 @@ child=$!
 script
 status=$?
 
-pstop $child
+kill -STOP $child
 pkill -P $child
 kill $child
-prun $child
+kill -CONT $child
 
 exit $status

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -37,7 +37,8 @@ script()
 	$dtrace -s /dev/stdin <<EOF
 	proc:::signal-send
 	/execname == "kill" && curpsinfo->pr_ppid == $child &&
-	    args[1]->pr_psargs == "$longsleep" && args[2] == SIGUSR1/
+	    xlate<psinfo_t *>(args[1])->pr_psargs == "$longsleep" &&
+	    args[2] == SIGUSR1/
 	{
 		/*
 		 * This is guaranteed to not race with signal-handle.
@@ -58,7 +59,7 @@ sleeper()
 	while true; do
 		$longsleep &
 		sleep 1
-		/usr/bin/kill -USR1 $!
+		kill -USR1 $!
 	done
 }
 
@@ -68,7 +69,7 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-longsleep="/usr/bin/sleep 10000"
+longsleep="/bin/sleep 10000"
 
 sleeper &
 child=$!
@@ -76,9 +77,9 @@ child=$!
 script
 status=$?
 
-pstop $child
+kill -STOP $child
 pkill -P $child
 kill $child
-prun $child
+kill -CONT $child
 
 exit $status

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-bname=`/bin/basename $0`
+bname=`basename $0`
 dfilename=/var/tmp/$bname.$$.d
 
 ## Create .d file

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -42,7 +42,7 @@ fi
 
 dtrace=$1
 
-bname=`/usr/bin/basename $0`
+bname=`basename $0`
 
 dfilename=/var/tmp/$bname.$$
 

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -43,7 +43,7 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-bname=`/usr/bin/basename $0`
+bname=`basename $0`
 dfilename=/var/tmp/$bname.$$.d
 
 ## Create .d file
@@ -77,7 +77,7 @@ fi
 
 #Get the groupid of the calling process using ps
 
-groupid=`ps -o pid,pgid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+groupid=`ps -x -o pid,egid | grep "$$ " | awk '{print $2}' 2>/dev/null`
 if [ $? -ne 0 ]; then
 	print -u2 "unable to get uid of the current process with pid = $$"
 	exit 1
@@ -93,5 +93,5 @@ fi
 
 #Cleanup leftovers
 
-/bin/rm -f $dfilename
+rm -f $dfilename
 exit 0

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-bname=`/bin/basename $0`
+bname=`basename $0`
 dfilename=/var/tmp/$bname.$$
 
 ## Create .d file
@@ -69,7 +69,7 @@ EOF
 
 chmod 555 $dfilename
 
-userid=`ps -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+userid=`ps -x -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null`
 if [ $? -ne 0 ]; then
 	print -u2 "unable to get uid of the current process with pid = $$"
 	exit 1
@@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-#/bin/rm -f $dfilename
+rm -f $dfilename
 exit 0

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-bname=`/bin/basename $0`
+bname=`basename $0`
 dfilename=/var/tmp/$bname.$$
 
 ## Create .d file
@@ -69,7 +69,7 @@ EOF
 
 chmod 555 $dfilename
 
-groupid=`ps -o pid,gid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+groupid=`ps -x -o pid,gid | grep "$$ " | awk '{print $2}' 2>/dev/null`
 if [ $? -ne 0 ]; then
 	print -u2 "unable to get uid of the current process with pid = $$"
 	exit 1
@@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-#/bin/rm -f $dfilename
+rm -f $dfilename
 exit 0

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-bname=`/bin/basename $0`
+bname=`basename $0`
 dfilename=/var/tmp/$bname.$$.d
 
 ## Create .d file
@@ -75,12 +75,12 @@ fi
 
 #Pass current pid (I mean parent pid for .d script).
 
-$dfilename $$ >/dev/null 2>&1
+$dfilename $$ #>/dev/null 2>&1
 
 if [ $? -ne 0 ]; then
 	print -u2 "Error in executing $dfilename"
 	exit 1
 fi
 
-#/bin/rm -f $dfilename
+rm -f $dfilename
 exit 0

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-bname=`/bin/basename $0`
+bname=`basename $0`
 dfilename=/var/tmp/$bname.$$
 
 ## Create .d file
@@ -69,7 +69,7 @@ EOF
 
 chmod 555 $dfilename
 
-projectid=`ps -o pid,projid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+projectid=`ps -x -o pid,projid | grep "$$ " | awk '{print $2}' 2>/dev/null`
 if [ $? -ne 0 ]; then
 	print -u2 "unable to get uid of the current process with pid = $$"
 	exit 1
@@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-#/bin/rm -f $dfilename
+rm -f $dfilename
 exit 0

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-bname=`/bin/basename $0`
+bname=`basename $0`
 dfilename=/var/tmp/$bname.$$
 
 ## Create .d file
@@ -69,7 +69,7 @@ EOF
 
 chmod 555 $dfilename
 
-sessionid=`ps -o pid,sid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+sessionid=`ps -x -o pid,sid | grep "$$ " | awk '{print $2}' 2>/dev/null`
 if [ $? -ne 0 ]; then
 	print -u2 "unable to get sid of the current process with pid = $$"
 	exit 1
@@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-#/bin/rm -f $dfilename
+rm -f $dfilename
 exit 0

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-bname=`/bin/basename $0`
+bname=`basename $0`
 dfilename=/var/tmp/$bname.$$.d
 
 ## Create .d file

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-bname=`/bin/basename $0`
+bname=`basename $0`
 dfilename=/var/tmp/$bname.$$
 
 ## Create .d file
@@ -69,7 +69,7 @@ EOF
 
 chmod 555 $dfilename
 
-taskidval=`ps -o pid,taskid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+taskidval=`ps -x -o pid,taskid | grep "$$ " | awk '{print $2}' 2>/dev/null`
 if [ $? -ne 0 ]; then
 	print -u2 "unable to get uid of the current process with pid = $$"
 	exit 1
@@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-#/bin/rm -f $dfilename
+rm -f $dfilename
 exit 0

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-bname=`/bin/basename $0`
+bname=`basename $0`
 dfilename=/var/tmp/$bname.$$
 
 ## Create .d file
@@ -69,7 +69,7 @@ EOF
 
 chmod 555 $dfilename
 
-userid=`ps -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+userid=`ps -x -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null`
 if [ $? -ne 0 ]; then
 	print -u2 "unable to get uid of the current process with pid = $$"
 	exit 1
@@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-#/bin/rm -f $dfilename
+rm -f $dfilename
 exit 0

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -48,7 +48,7 @@ fi
 
 dtrace="$1"
 startdir="$PWD"
-dir=$(mktemp -td drtiXXXXXX)
+dir=$(mktemp -d -t drtiXXXXXX)
 if (( $? != 0 )); then
 	print -u2 'Could not create safe temporary directory'
 	exit 2

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -51,7 +51,7 @@ provider test_prov {
 };
 EOF
 
-gcc -c test.c
+cc -c test.c
 if [ $? -ne 0 ]; then
 	print -u2 "failed to compile test.c"
 	exit 1
@@ -61,7 +61,7 @@ if [ $? -ne 0 ]; then
 	print -u2 "failed to create DOF"
 	exit 1
 fi
-gcc -o test test.o prov.o
+cc -o test test.o prov.o
 if [ $? -ne 0 ]; then
 	print -u2 "failed to link final executable"
 	exit 1

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -51,7 +51,7 @@ provider test_prov {
 };
 EOF
 
-gcc -c test.c
+cc -c test.c
 if [ $? -ne 0 ]; then
 	print -u2 "failed to compile test.c"
 	exit 1
@@ -61,7 +61,7 @@ if [ $? -ne 0 ]; then
 	print -u2 "failed to create DOF"
 	exit 1
 fi
-gcc -o test test.o prov.o
+cc -o test test.o prov.o
 if [ $? -ne 0 ]; then
 	print -u2 "failed to link final executable"
 	exit 1

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh	Thu Feb  5 07:24:17 2015	(r278235)
@@ -51,7 +51,7 @@ provider test_prov {
 };
 EOF
 
-gcc -c test.c
+cc -c test.c
 if [ $? -ne 0 ]; then
 	print -u2 "failed to compile test.c"
 	exit 1
@@ -61,7 +61,7 @@ if [ $? -ne 0 ]; then
 	print -u2 "failed to create DOF"
 	exit 1
 fi
-gcc -o test test.o prov.o
+cc -o test test.o prov.o
 if [ $? -ne 0 ]; then
 	print -u2 "failed to link final executable"
 	exit 1

Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
==============================================================================
--- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c	Thu Feb  5 07:24:17 2015	(r278235)
@@ -382,6 +382,9 @@ dt_stddev(uint64_t *data, uint64_t norma
 	int64_t norm_avg;
 	uint64_t diff[2];
 
+	if (data[0] == 0)
+		return (0);
+
 	/*
 	 * The standard approximation for standard deviation is
 	 * sqrt(average(x**2) - average(x)**2), i.e. the square root

Modified: user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.c
==============================================================================
--- user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.c	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.c	Thu Feb  5 07:24:17 2015	(r278235)
@@ -25,6 +25,7 @@
    along with this program; see the file COPYING.  If not, write to
    the Free Software Foundation, 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
+#define __ARM_STATIC_INLINE
 #include "unwind.h"
 
 /* We add a prototype for abort here to avoid creating a dependency on
@@ -1089,4 +1090,11 @@ _Unwind_GetIPInfo (struct _Unwind_Contex
   *ip_before_insn = 0;
   return _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1;
 }
+
+void
+_Unwind_SetIP (struct _Unwind_Context *context, _Unwind_Ptr val)
+{
+  _Unwind_SetGR (context, 15, val | (_Unwind_GetGR (context, 15) & 1));
+}
+
 #endif

Modified: user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.h
==============================================================================
--- user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.h	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/contrib/gcc/config/arm/unwind-arm.h	Thu Feb  5 07:24:17 2015	(r278235)
@@ -34,6 +34,10 @@
 
 #define __ARM_EABI_UNWINDER__ 1
 
+#ifndef __ARM_STATIC_INLINE
+#define __ARM_STATIC_INLINE static inline
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -245,7 +249,7 @@ extern "C" {
       return tmp;
     }
 
-  static inline _Unwind_Word
+  __ARM_STATIC_INLINE _Unwind_Word
   _Unwind_GetGR (_Unwind_Context *context, int regno)
     {
       _uw val;
@@ -253,6 +257,12 @@ extern "C" {
       return val;
     }
 
+  __ARM_STATIC_INLINE void
+  _Unwind_SetGR (_Unwind_Context *context, int regno, _Unwind_Word val)
+    {
+      _Unwind_VRS_Set (context, _UVRSC_CORE, regno, _UVRSD_UINT32, &val);
+    }
+
 #ifndef __FreeBSD__
   /* Return the address of the instruction, not the actual IP value.  */
 #define _Unwind_GetIP(context) \
@@ -260,21 +270,16 @@ extern "C" {
 
 #define _Unwind_GetIPInfo(context, ip_before_insn) \
   (*ip_before_insn = 0, _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1)
-#else
-  _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *);
-  _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *);
-#endif
-
-  static inline void
-  _Unwind_SetGR (_Unwind_Context *context, int regno, _Unwind_Word val)
-    {
-      _Unwind_VRS_Set (context, _UVRSC_CORE, regno, _UVRSD_UINT32, &val);
-    }
 
   /* The dwarf unwinder doesn't understand arm/thumb state.  We assume the
      landing pad uses the same instruction set as the call site.  */
 #define _Unwind_SetIP(context, val) \
   _Unwind_SetGR (context, 15, val | (_Unwind_GetGR (context, 15) & 1))
+#else
+  _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *);
+  _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *);
+  void _Unwind_SetIP (struct _Unwind_Context *, _Unwind_Ptr);
+#endif
 
 #ifdef __cplusplus
 }   /* extern "C" */

Modified: user/dchagin/lemul/contrib/libcxxrt/exception.cc
==============================================================================
--- user/dchagin/lemul/contrib/libcxxrt/exception.cc	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/contrib/libcxxrt/exception.cc	Thu Feb  5 07:24:17 2015	(r278235)
@@ -673,7 +673,7 @@ static _Unwind_Reason_Code trace(struct 
  * If the failure happened by falling off the end of the stack without finding
  * a handler, prints a back trace before aborting.
  */
-#if __GNUC__ > 3 && __GNUC_MINOR__ > 2
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
 extern "C" void *__cxa_begin_catch(void *e) throw();
 #else
 extern "C" void *__cxa_begin_catch(void *e);
@@ -1191,7 +1191,7 @@ BEGIN_PERSONALITY_FUNCTION(__gxx_persona
  * pointer to the caught exception, which is either the adjusted pointer (for
  * C++ exceptions) of the unadjusted pointer (for foreign exceptions).
  */
-#if __GNUC__ > 3 && __GNUC_MINOR__ > 2
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
 extern "C" void *__cxa_begin_catch(void *e) throw()
 #else
 extern "C" void *__cxa_begin_catch(void *e)

Modified: user/dchagin/lemul/contrib/libcxxrt/typeinfo.cc
==============================================================================
--- user/dchagin/lemul/contrib/libcxxrt/typeinfo.cc	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/contrib/libcxxrt/typeinfo.cc	Thu Feb  5 07:24:17 2015	(r278235)
@@ -35,23 +35,15 @@ type_info::~type_info() {}
 
 bool type_info::operator==(const type_info &other) const
 {
-#ifdef LIBCXXRT_MERGED_TYPEINFO
 	return __type_name == other.__type_name;
-#else
-	return __type_name == other.__type_name || strcmp(__type_name, other.__type_name) == 0;
-#endif
 }
 bool type_info::operator!=(const type_info &other) const
 {
-	return !operator==(other);
+	return __type_name != other.__type_name;
 }
 bool type_info::before(const type_info &other) const
 {
-#ifdef LIBCXXRT_MERGED_TYPEINFO
 	return __type_name < other.__type_name;
-#else
-	return strcmp(__type_name, other.__type_name) < 0;
-#endif
 }
 const char* type_info::name() const
 {

Copied: user/dchagin/lemul/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff (from r278234, head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/dchagin/lemul/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff	Thu Feb  5 07:24:17 2015	(r278235, copy of r278234, head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff)
@@ -0,0 +1,33 @@
+Allow clang to be built for mips/mips64 backend types by adding our mips
+triple ids
+
+This only allows testing and does not change the defaults for mips/mips64.
+They still build/use gcc by default.
+
+Differential Revision:	https://reviews.freebsd.org/D1190
+Reviewed by:	dim
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/277423
+
+Index: tools/clang/lib/Driver/Tools.cpp
+===================================================================
+--- tools/clang/lib/Driver/Tools.cpp
++++ tools/clang/lib/Driver/Tools.cpp
+@@ -6592,6 +6592,17 @@ void freebsd::Link::ConstructJob(Compilation &C, c
+     CmdArgs.push_back("elf32ppc_fbsd");
+   }
+ 
++  if (Arg *A = Args.getLastArg(options::OPT_G)) {
++    if (ToolChain.getArch() == llvm::Triple::mips ||
++      ToolChain.getArch() == llvm::Triple::mipsel ||
++      ToolChain.getArch() == llvm::Triple::mips64 ||
++      ToolChain.getArch() == llvm::Triple::mips64el) {
++      StringRef v = A->getValue();
++      CmdArgs.push_back(Args.MakeArgString("-G" + v));
++      A->claim();
++    }
++  }
++
+   if (Output.isFilename()) {
+     CmdArgs.push_back("-o");
+     CmdArgs.push_back(Output.getFilename());

Copied: user/dchagin/lemul/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff (from r278234, head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/dchagin/lemul/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff	Thu Feb  5 07:24:17 2015	(r278235, copy of r278234, head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff)
@@ -0,0 +1,83 @@
+Pull in r226664 from upstream llvm trunk (by Tim Northover):
+
+  AArch64: add backend option to reserve x18 (platform register)
+
+  AAPCS64 says that it's up to the platform to specify whether x18 is
+  reserved, and a first step on that way is to add a flag controlling
+  it.
+
+  From: Andrew Turner <andrew at fubar.geek.nz>
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/277774
+
+Index: lib/Target/AArch64/AArch64RegisterInfo.cpp
+===================================================================
+--- lib/Target/AArch64/AArch64RegisterInfo.cpp
++++ lib/Target/AArch64/AArch64RegisterInfo.cpp
+@@ -33,6 +33,10 @@ using namespace llvm;
+ #define GET_REGINFO_TARGET_DESC
+ #include "AArch64GenRegisterInfo.inc"
+ 
++static cl::opt<bool>
++ReserveX18("aarch64-reserve-x18", cl::Hidden,
++          cl::desc("Reserve X18, making it unavailable as GPR"));
++
+ AArch64RegisterInfo::AArch64RegisterInfo(const AArch64InstrInfo *tii,
+                                          const AArch64Subtarget *sti)
+     : AArch64GenRegisterInfo(AArch64::LR), TII(tii), STI(sti) {}
+@@ -90,7 +94,7 @@ AArch64RegisterInfo::getReservedRegs(const Machine
+     Reserved.set(AArch64::W29);
+   }
+ 
+-  if (STI->isTargetDarwin()) {
++  if (STI->isTargetDarwin() || ReserveX18) {
+     Reserved.set(AArch64::X18); // Platform register
+     Reserved.set(AArch64::W18);
+   }
+@@ -117,7 +121,7 @@ bool AArch64RegisterInfo::isReservedReg(const Mach
+     return true;
+   case AArch64::X18:
+   case AArch64::W18:
+-    return STI->isTargetDarwin();
++    return STI->isTargetDarwin() || ReserveX18;
+   case AArch64::FP:
+   case AArch64::W29:
+     return TFI->hasFP(MF) || STI->isTargetDarwin();
+@@ -379,7 +383,7 @@ unsigned AArch64RegisterInfo::getRegPressureLimit(
+   case AArch64::GPR64commonRegClassID:
+     return 32 - 1                                      // XZR/SP
+            - (TFI->hasFP(MF) || STI->isTargetDarwin()) // FP
+-           - STI->isTargetDarwin() // X18 reserved as platform register
++           - (STI->isTargetDarwin() || ReserveX18) // X18 reserved as platform register
+            - hasBasePointer(MF);   // X19
+   case AArch64::FPR8RegClassID:
+   case AArch64::FPR16RegClassID:
+Index: test/CodeGen/AArch64/arm64-platform-reg.ll
+===================================================================
+--- test/CodeGen/AArch64/arm64-platform-reg.ll
++++ test/CodeGen/AArch64/arm64-platform-reg.ll
+@@ -1,4 +1,5 @@
+-; RUN: llc -mtriple=arm64-apple-ios -o - %s | FileCheck %s --check-prefix=CHECK-DARWIN
++; RUN: llc -mtriple=arm64-apple-ios -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE-X18
++; RUN: llc -mtriple=arm64-freebsd-gnu -aarch64-reserve-x18 -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE-X18
+ ; RUN: llc -mtriple=arm64-linux-gnu -o - %s | FileCheck %s
+ 
+ ; x18 is reserved as a platform register on Darwin but not on other
+@@ -16,11 +17,11 @@ define void @keep_live() {
+ ; CHECK: ldr x18
+ ; CHECK: str x18
+ 
+-; CHECK-DARWIN-NOT: ldr fp
+-; CHECK-DARWIN-NOT: ldr x18
+-; CHECK-DARWIN: Spill
+-; CHECK-DARWIN-NOT: ldr fp
+-; CHECK-DARWIN-NOT: ldr x18
+-; CHECK-DARWIN: ret
++; CHECK-RESERVE-X18-NOT: ldr fp
++; CHECK-RESERVE-X18-NOT: ldr x18
++; CHECK-RESERVE-X18: Spill
++; CHECK-RESERVE-X18-NOT: ldr fp
++; CHECK-RESERVE-X18-NOT: ldr x18
++; CHECK-RESERVE-X18: ret
+   ret void
+ }

Copied: user/dchagin/lemul/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff (from r278234, head/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/dchagin/lemul/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff	Thu Feb  5 07:24:17 2015	(r278235, copy of r278234, head/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff)
@@ -0,0 +1,54 @@
+Pull in r227062 from upstream clang trunk (by Renato Golin):
+
+  Allows Clang to use LLVM's fixes-x18 option
+
+  This patch allows clang to have llvm reserve the x18
+  platform register on AArch64. FreeBSD will use this in the kernel for
+  per-cpu data but has no need to reserve this register in userland so
+  will need this flag to reserve it.
+
+  This uses llvm r226664 to allow this register to be reserved.
+
+  Patch by Andrew Turner.
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/277775
+
+Index: tools/clang/include/clang/Driver/Options.td
+===================================================================
+--- tools/clang/include/clang/Driver/Options.td
++++ tools/clang/include/clang/Driver/Options.td
+@@ -1141,6 +1141,9 @@ def mno_long_calls : Flag<["-"], "mno-long-calls">
+ def mgeneral_regs_only : Flag<["-"], "mgeneral-regs-only">, Group<m_aarch64_Features_Group>,
+   HelpText<"Generate code which only uses the general purpose registers (AArch64 only)">;
+ 
++def ffixed_x18 : Flag<["-"], "ffixed-x18">, Group<m_aarch64_Features_Group>,
++  HelpText<"Reserve the x18 register (AArch64 only)">;
++
+ def mvsx : Flag<["-"], "mvsx">, Group<m_ppc_Features_Group>;
+ def mno_vsx : Flag<["-"], "mno-vsx">, Group<m_ppc_Features_Group>;
+ def mfprnd : Flag<["-"], "mfprnd">, Group<m_ppc_Features_Group>;
+Index: tools/clang/lib/Driver/Tools.cpp
+===================================================================
+--- tools/clang/lib/Driver/Tools.cpp
++++ tools/clang/lib/Driver/Tools.cpp
+@@ -887,6 +887,11 @@ void Clang::AddAArch64TargetArgs(const ArgList &Ar
+     if (A->getOption().matches(options::OPT_mno_global_merge))
+       CmdArgs.push_back("-mno-global-merge");
+   }
++
++  if (Args.hasArg(options::OPT_ffixed_x18)) {
++    CmdArgs.push_back("-backend-option");
++    CmdArgs.push_back("-aarch64-reserve-x18");
++  }
+ }
+ 
+ // Get CPU and ABI names. They are not independent
+Index: tools/clang/test/Driver/aarch64-fixed-x18.c
+===================================================================
+--- tools/clang/test/Driver/aarch64-fixed-x18.c
++++ tools/clang/test/Driver/aarch64-fixed-x18.c
+@@ -0,0 +1,4 @@
++// RUN: %clang -target aarch64-none-gnu -ffixed-x18 -### %s 2> %t
++// RUN: FileCheck --check-prefix=CHECK-FIXED-X18 < %t %s
++
++// CHECK-FIXED-X18: "-backend-option" "-aarch64-reserve-x18"

Modified: user/dchagin/lemul/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c
==============================================================================
--- user/dchagin/lemul/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c	Thu Feb  5 07:24:17 2015	(r278235)
@@ -107,9 +107,6 @@ ATF_TC_BODY(ttyname_r_err, tc)
 		ATF_REQUIRE(rv == ERANGE);
 	}
 
-#ifdef __FreeBSD__
-	atf_tc_expect_fail("FreeBSD returns ENOTTY instead of EBADF; see bin/191936");
-#endif
 	rv = ttyname_r(-1, buf, ttymax);
 	ATF_REQUIRE(rv == EBADF);
 

Modified: user/dchagin/lemul/etc/Makefile
==============================================================================
--- user/dchagin/lemul/etc/Makefile	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/etc/Makefile	Thu Feb  5 07:24:17 2015	(r278235)
@@ -21,13 +21,11 @@ BIN1=	crontab \
 	dhclient.conf \
 	disktab \
 	fbtab \
-	ftpusers \
 	gettytab \
 	group \
 	hosts \
 	hosts.allow \
 	hosts.equiv \
-	inetd.conf \
 	libalias.conf \
 	libmap.conf \
 	login.access \
@@ -101,6 +99,14 @@ BIN1+= snmpd.config
 BIN1+= freebsd-update.conf
 .endif
 
+.if ${MK_FTP} != "no"
+BIN1+= ftpusers
+.endif
+
+.if ${MK_INETD} != "no"
+BIN1+= inetd.conf
+.endif
+
 .if ${MK_LOCATE} != "no"
 BIN1+=	${.CURDIR}/../usr.bin/locate/locate/locate.rc
 .endif

Modified: user/dchagin/lemul/etc/rc.d/Makefile
==============================================================================
--- user/dchagin/lemul/etc/rc.d/Makefile	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/etc/rc.d/Makefile	Thu Feb  5 07:24:17 2015	(r278235)
@@ -43,7 +43,6 @@ FILES=	DAEMON \
 	growfs \
 	gssd \
 	${_hcsecd} \
-	hostapd \
 	hostid \
 	hostid_save \
 	hostname \
@@ -137,7 +136,6 @@ FILES=	DAEMON \
 	var \
 	virecover \
 	watchdogd \
-	wpa_supplicant \
 	ypbind \
 	yppasswdd \
 	ypserv \

Modified: user/dchagin/lemul/include/Makefile
==============================================================================
--- user/dchagin/lemul/include/Makefile	Thu Feb  5 07:19:30 2015	(r278234)
+++ user/dchagin/lemul/include/Makefile	Thu Feb  5 07:24:17 2015	(r278235)
@@ -44,7 +44,7 @@ LSUBDIRS=	cam/ata cam/scsi \
 	dev/hwpmc \
 	dev/ic dev/iicbus dev/io dev/lmc dev/mfi dev/nvme \
 	dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \
-	dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
+	dev/speaker dev/utopia dev/vkbd dev/wi \
 	fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \
 	fs/procfs fs/smbfs fs/udf fs/unionfs \
 	geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
@@ -58,12 +58,12 @@ LSUBDIRS=	cam/ata cam/scsi \
 
 LSUBSUBDIRS=	dev/mpt/mpilib
 
-.if ${MK_CUSE} != "no"
-LSUBDIRS+=	fs/cuse
+.if ${MK_BLUETOOTH} != "no"
+LSUBSUBDIRS+=	netgraph/bluetooth/include
 .endif
 
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
-_dev_powermac_nvram=	dev/powermac_nvram
+.if ${MK_CUSE} != "no"
+LSUBDIRS+=	fs/cuse
 .endif
 
 .if ${MK_GSSAPI} != "no"
@@ -75,15 +75,18 @@ INCS+=		gssapi.h
 INCS+=	hesiod.h
 .endif
 
-.if ${MK_BLUETOOTH} != "no"
-LSUBSUBDIRS+=	netgraph/bluetooth/include
-.endif
-
 # Handle the #define aliases for libiconv
 .if ${MK_ICONV} == "yes"
 INCS+=		iconv.h
 .endif
-	
+
+.if ${MK_USB} != "no"
+LSUBDIRS+=	dev/usb

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

More information about the svn-src-user mailing list