svn commit: r278050 - in projects/building-blocks: . bin/ps bin/sh cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline cddl/contrib/opens...

Garrett Cooper ngie at FreeBSD.org
Mon Feb 2 03:45:18 UTC 2015 

Author: ngie
Date: Mon Feb  2 03:45:02 2015
New Revision: 278050
URL: https://svnweb.freebsd.org/changeset/base/278050

Log:
  MFhead @ r278049

Added:
  projects/building-blocks/sys/dev/iscsi/icl_conn_if.m
     - copied unchanged from r278049, head/sys/dev/iscsi/icl_conn_if.m
  projects/building-blocks/sys/dev/iscsi/icl_soft.c
     - copied unchanged from r278049, head/sys/dev/iscsi/icl_soft.c
  projects/building-blocks/sys/dev/iscsi/icl_wrappers.h
     - copied unchanged from r278049, head/sys/dev/iscsi/icl_wrappers.h
Replaced:
  projects/building-blocks/sys/dev/iscsi/icl.c
     - copied unchanged from r278049, head/sys/dev/iscsi/icl.c
Deleted:
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile
Modified:
  projects/building-blocks/UPDATING
  projects/building-blocks/bin/ps/ps.c
  projects/building-blocks/bin/sh/jobs.c
  projects/building-blocks/bin/sh/trap.c
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
  projects/building-blocks/contrib/amd/amd/amfs_program.c
  projects/building-blocks/contrib/amd/amd/readdir.c
  projects/building-blocks/contrib/amd/hlfsd/homedir.c
  projects/building-blocks/contrib/amd/hlfsd/stubs.c
  projects/building-blocks/contrib/gcc/config/arm/unwind-arm.c
  projects/building-blocks/contrib/gcc/config/arm/unwind-arm.h
  projects/building-blocks/contrib/libcxxrt/exception.cc
  projects/building-blocks/contrib/libcxxrt/stdexcept.cc
  projects/building-blocks/contrib/libcxxrt/typeinfo.cc
  projects/building-blocks/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c
  projects/building-blocks/contrib/tcpdump/print-atm.c
  projects/building-blocks/contrib/tcpdump/print-llc.c
  projects/building-blocks/games/fortune/fortune/fortune.6
  projects/building-blocks/include/semaphore.h
  projects/building-blocks/lib/libc/gen/ttyname.c
  projects/building-blocks/lib/libc/mips/gen/sigsetjmp.S
  projects/building-blocks/lib/libc/rpc/crypt_client.c
  projects/building-blocks/lib/libc/rpc/svc_vc.c
  projects/building-blocks/lib/libnv/Makefile
  projects/building-blocks/lib/libnv/nv.3
  projects/building-blocks/lib/libnv/nv.h
  projects/building-blocks/lib/libnv/nvlist.c
  projects/building-blocks/lib/libnv/nvpair.c
  projects/building-blocks/lib/libproc/proc_sym.c
  projects/building-blocks/lib/msun/src/s_scalbln.c
  projects/building-blocks/libexec/rtld-elf/rtld.c
  projects/building-blocks/share/man/man4/sfxge.4
  projects/building-blocks/share/man/man9/contigmalloc.9
  projects/building-blocks/share/misc/committers-src.dot
  projects/building-blocks/sys/amd64/amd64/machdep.c
  projects/building-blocks/sys/amd64/ia32/ia32_signal.c
  projects/building-blocks/sys/arm/allwinner/a10_gpio.c
  projects/building-blocks/sys/arm/altera/socfpga/socfpga_gpio.c
  projects/building-blocks/sys/arm/arm/busdma_machdep-v6.c
  projects/building-blocks/sys/arm/arm/machdep.c
  projects/building-blocks/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
  projects/building-blocks/sys/arm/freescale/imx/imx_gpio.c
  projects/building-blocks/sys/arm/freescale/vybrid/vf_gpio.c
  projects/building-blocks/sys/arm/include/profile.h
  projects/building-blocks/sys/arm/lpc/lpc_gpio.c
  projects/building-blocks/sys/arm/rockchip/rk30xx_gpio.c
  projects/building-blocks/sys/arm/samsung/exynos/exynos5_pad.c
  projects/building-blocks/sys/arm/ti/ti_gpio.c
  projects/building-blocks/sys/arm/ti/ti_gpio.h
  projects/building-blocks/sys/arm/ti/ti_pruss.c
  projects/building-blocks/sys/arm/xilinx/zy7_gpio.c
  projects/building-blocks/sys/arm/xscale/ixp425/avila_gpio.c
  projects/building-blocks/sys/arm/xscale/ixp425/cambria_gpio.c
  projects/building-blocks/sys/boot/common/load_elf.c
  projects/building-blocks/sys/boot/efi/libefi/efinet.c
  projects/building-blocks/sys/boot/fdt/fdt_loader_cmd.c
  projects/building-blocks/sys/boot/i386/libi386/libi386.h
  projects/building-blocks/sys/boot/i386/libi386/smbios.c
  projects/building-blocks/sys/boot/powerpc/kboot/conf.c
  projects/building-blocks/sys/boot/powerpc/kboot/host_syscall.S
  projects/building-blocks/sys/boot/powerpc/kboot/host_syscall.h
  projects/building-blocks/sys/boot/powerpc/kboot/hostdisk.c
  projects/building-blocks/sys/boot/powerpc/kboot/kbootfdt.c
  projects/building-blocks/sys/boot/powerpc/kboot/kerneltramp.S
  projects/building-blocks/sys/boot/powerpc/kboot/main.c
  projects/building-blocks/sys/boot/powerpc/kboot/ppc64_elf_freebsd.c
  projects/building-blocks/sys/cam/ctl/ctl.c
  projects/building-blocks/sys/cam/ctl/ctl_frontend.c
  projects/building-blocks/sys/cam/ctl/ctl_frontend.h
  projects/building-blocks/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/building-blocks/sys/cam/ctl/ctl_frontend_iscsi.h
  projects/building-blocks/sys/cam/ctl/ctl_ioctl.h
  projects/building-blocks/sys/cam/ctl/ctl_private.h
  projects/building-blocks/sys/cam/ctl/ctl_tpc_local.c
  projects/building-blocks/sys/cam/scsi/scsi_all.h
  projects/building-blocks/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  projects/building-blocks/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/building-blocks/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  projects/building-blocks/sys/conf/Makefile.powerpc
  projects/building-blocks/sys/conf/files
  projects/building-blocks/sys/conf/files.amd64
  projects/building-blocks/sys/conf/kern.mk
  projects/building-blocks/sys/dev/ahci/ahci.h
  projects/building-blocks/sys/dev/ahci/ahci_pci.c
  projects/building-blocks/sys/dev/alc/if_alc.c
  projects/building-blocks/sys/dev/drm2/i915/intel_display.c
  projects/building-blocks/sys/dev/drm2/radeon/ni.c
  projects/building-blocks/sys/dev/drm2/radeon/si.c
  projects/building-blocks/sys/dev/fdt/fdt_clock.c
  projects/building-blocks/sys/dev/gpio/gpio_if.m
  projects/building-blocks/sys/dev/gpio/gpiobus.c
  projects/building-blocks/sys/dev/gpio/gpiobusvar.h
  projects/building-blocks/sys/dev/iscsi/icl.h
  projects/building-blocks/sys/dev/iscsi/iscsi.c
  projects/building-blocks/sys/dev/ofw/openfirm.c
  projects/building-blocks/sys/dev/sfxge/common/efsys.h
  projects/building-blocks/sys/dev/sfxge/common/efx_ev.c
  projects/building-blocks/sys/dev/sfxge/common/efx_tx.c
  projects/building-blocks/sys/dev/sfxge/sfxge.c
  projects/building-blocks/sys/dev/sfxge/sfxge.h
  projects/building-blocks/sys/dev/sfxge/sfxge_dma.c
  projects/building-blocks/sys/dev/sfxge/sfxge_ev.c
  projects/building-blocks/sys/dev/sfxge/sfxge_intr.c
  projects/building-blocks/sys/dev/sfxge/sfxge_port.c
  projects/building-blocks/sys/dev/sfxge/sfxge_tx.c
  projects/building-blocks/sys/dev/sfxge/sfxge_tx.h
  projects/building-blocks/sys/dev/usb/input/uhid.c
  projects/building-blocks/sys/fs/cd9660/cd9660_util.c
  projects/building-blocks/sys/fs/msdosfs/msdosfs_conv.c
  projects/building-blocks/sys/fs/smbfs/smbfs_subr.c
  projects/building-blocks/sys/fs/tmpfs/tmpfs_subr.c
  projects/building-blocks/sys/fs/tmpfs/tmpfs_vnops.c
  projects/building-blocks/sys/fs/udf/udf_vnops.c
  projects/building-blocks/sys/i386/i386/machdep.c
  projects/building-blocks/sys/kern/kern_umtx.c
  projects/building-blocks/sys/libkern/strtol.c
  projects/building-blocks/sys/libkern/strtoq.c
  projects/building-blocks/sys/libkern/strtoul.c
  projects/building-blocks/sys/libkern/strtouq.c
  projects/building-blocks/sys/mips/atheros/ar71xx_gpio.c
  projects/building-blocks/sys/mips/atheros/ar71xx_gpiovar.h
  projects/building-blocks/sys/mips/cavium/octeon_gpio.c
  projects/building-blocks/sys/mips/cavium/octeon_gpiovar.h
  projects/building-blocks/sys/mips/mips/freebsd32_machdep.c
  projects/building-blocks/sys/mips/mips/pm_machdep.c
  projects/building-blocks/sys/mips/rt305x/rt305x_gpio.c
  projects/building-blocks/sys/mips/rt305x/rt305x_gpiovar.h
  projects/building-blocks/sys/modules/aesni/Makefile
  projects/building-blocks/sys/modules/ctl/Makefile
  projects/building-blocks/sys/modules/iscsi/Makefile
  projects/building-blocks/sys/netgraph/ng_parse.c
  projects/building-blocks/sys/netinet/tcp_syncache.c
  projects/building-blocks/sys/powerpc/ofw/ofw_machdep.c
  projects/building-blocks/sys/powerpc/powerpc/exec_machdep.c
  projects/building-blocks/sys/sparc64/sparc64/machdep.c
  projects/building-blocks/sys/sys/cdefs.h
  projects/building-blocks/sys/sys/conf.h
  projects/building-blocks/sys/sys/param.h
  projects/building-blocks/sys/sys/proc.h
  projects/building-blocks/sys/sys/ucontext.h
  projects/building-blocks/sys/ufs/ffs/ffs_softdep.c
  projects/building-blocks/sys/ufs/ffs/softdep.h
  projects/building-blocks/sys/x86/x86/tsc.c
  projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
  projects/building-blocks/tools/tools/nanobsd/rescue/build.sh
  projects/building-blocks/tools/tools/nanobsd/rescue/common
  projects/building-blocks/usr.bin/grep/Makefile
  projects/building-blocks/usr.sbin/bsdinstall/partedit/partedit_x86.c
  projects/building-blocks/usr.sbin/config/config.8
  projects/building-blocks/usr.sbin/config/main.c
  projects/building-blocks/usr.sbin/ctladm/ctladm.8
  projects/building-blocks/usr.sbin/ctladm/ctladm.c
  projects/building-blocks/usr.sbin/ctld/ctl.conf.5
  projects/building-blocks/usr.sbin/ctld/ctld.c
  projects/building-blocks/usr.sbin/ctld/ctld.h
  projects/building-blocks/usr.sbin/ctld/kernel.c
  projects/building-blocks/usr.sbin/ctld/parse.y
Directory Properties:
  projects/building-blocks/   (props changed)
  projects/building-blocks/cddl/   (props changed)
  projects/building-blocks/cddl/contrib/opensolaris/   (props changed)
  projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/   (props changed)
  projects/building-blocks/contrib/amd/   (props changed)
  projects/building-blocks/contrib/gcc/   (props changed)
  projects/building-blocks/contrib/libcxxrt/   (props changed)
  projects/building-blocks/contrib/tcpdump/   (props changed)
  projects/building-blocks/include/   (props changed)
  projects/building-blocks/lib/libc/   (props changed)
  projects/building-blocks/share/   (props changed)
  projects/building-blocks/share/man/man4/   (props changed)
  projects/building-blocks/sys/   (props changed)
  projects/building-blocks/sys/boot/   (props changed)
  projects/building-blocks/sys/boot/powerpc/kboot/   (props changed)
  projects/building-blocks/sys/cddl/contrib/opensolaris/   (props changed)
  projects/building-blocks/sys/conf/   (props changed)

Modified: projects/building-blocks/UPDATING
==============================================================================
--- projects/building-blocks/UPDATING	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/UPDATING	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/bin/ps/ps.c
==============================================================================
--- projects/building-blocks/bin/ps/ps.c	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/bin/ps/ps.c	Mon Feb  2 03:45:02 2015	(r278050)
@@ -178,7 +178,7 @@ main(int argc, char *argv[])
 	KINFO *kinfo = NULL, *next_KINFO;
 	KINFO_STR *ks;
 	struct varent *vent;
-	struct winsize ws;
+	struct winsize ws = { .ws_row = 0 };
 	const char *nlistf, *memf, *fmtstr, *str;
 	char *cols;
 	int all, ch, elem, flag, _fmt, i, lineno, linelen, left;

Modified: projects/building-blocks/bin/sh/jobs.c
==============================================================================
--- projects/building-blocks/bin/sh/jobs.c	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/bin/sh/jobs.c	Mon Feb  2 03:45:02 2015	(r278050)
@@ -87,8 +87,8 @@ static int ttyfd = -1;
 
 /* mode flags for dowait */
 #define DOWAIT_BLOCK	0x1 /* wait until a child exits */
-#define DOWAIT_SIG	0x2 /* if DOWAIT_BLOCK, abort on SIGINT/SIGQUIT */
-#define DOWAIT_SIG_ANY	0x4 /* if DOWAIT_SIG, abort on any signal */
+#define DOWAIT_SIG	0x2 /* if DOWAIT_BLOCK, abort on signal */
+#define DOWAIT_SIG_TRAP	0x4 /* if DOWAIT_SIG, abort on trapped signal only */
 
 #if JOBS
 static void restartjob(struct job *);
@@ -1028,7 +1028,7 @@ waitforjob(struct job *jp, int *origstat
 	TRACE(("waitforjob(%%%td) called\n", jp - jobtab + 1));
 	while (jp->state == 0)
 		if (dowait(DOWAIT_BLOCK | (Tflag ? DOWAIT_SIG |
-		    DOWAIT_SIG_ANY : 0), jp) == -1)
+		    DOWAIT_SIG_TRAP : 0), jp) == -1)
 			dotrap();
 #if JOBS
 	if (jp->jobctl) {
@@ -1120,7 +1120,7 @@ dowait(int mode, struct job *job)
 		TRACE(("wait returns %d, status=%d\n", (int)pid, status));
 		if (pid == 0 && (mode & DOWAIT_SIG) != 0) {
 			pid = -1;
-			if (((mode & DOWAIT_SIG_ANY) != 0 ?
+			if (((mode & DOWAIT_SIG_TRAP) != 0 ?
 			    pendingsig : pendingsig_waitcmd) != 0) {
 				errno = EINTR;
 				break;

Modified: projects/building-blocks/bin/sh/trap.c
==============================================================================
--- projects/building-blocks/bin/sh/trap.c	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/bin/sh/trap.c	Mon Feb  2 03:45:02 2015	(r278050)
@@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$");
 
 static char sigmode[NSIG];	/* current value of signal */
 volatile sig_atomic_t pendingsig;	/* indicates some signal received */
-volatile sig_atomic_t pendingsig_waitcmd;	/* indicates SIGINT/SIGQUIT received */
+volatile sig_atomic_t pendingsig_waitcmd;	/* indicates wait builtin should be interrupted */
 static int in_dotrap;			/* do we execute in a trap handler? */
 static char *volatile trap[NSIG];	/* trap handler commands */
 static volatile sig_atomic_t gotsig[NSIG];
@@ -400,6 +400,7 @@ onsig(int signo)
 	    (signo != SIGCHLD || !ignore_sigchld)) {
 		gotsig[signo] = 1;
 		pendingsig = signo;
+		pendingsig_waitcmd = signo;
 	}
 }
 

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl	Mon Feb  2 03:45:02 2015	(r278050)
@@ -273,7 +273,7 @@ sub run_tests {
 		}
 
 		$fullname = "$dir/$name";
-		$exe = "./$base.exe";
+		$exe = "$dir/$base.exe";
 		$exe_pid = -1;
 
 		if ($opt_a && ($status != 0 || $tag != 0 || $droptag != 0 ||

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d	Mon Feb  2 03:45:02 2015	(r278050)
@@ -38,4 +38,4 @@
  *
  */
 
-inline cyc_func_t i = "i am a cyclic function";
+inline dtrace_trap_func_t i = "i am a dtrace trap function";

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d	Mon Feb  2 03:45:02 2015	(r278050)
@@ -38,4 +38,4 @@
  *
  */
 
-inline vfs_t *invalid = xlate<psinfo_t>(curthread->t_procp);
+inline struct vnode *invalid = xlate<psinfo_t>(curthread->td_proc);

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c	Mon Feb  2 03:45:02 2015	(r278050)
@@ -14,6 +14,8 @@
  */
 
 #include <sys/sdt.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "usdt.h"
 
 #define	FMT	"{" \

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d	Mon Feb  2 03:45:02 2015	(r278050)
@@ -36,8 +36,10 @@
 
 BEGIN
 {
-
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Winvalid-pp-token"
 	h = '
 		';
+#pragma clang diagnostic pop
 	exit(0);
 }

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d	Mon Feb  2 03:45:02 2015	(r278050)
@@ -36,7 +36,9 @@
 
 BEGIN
 {
-
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Winvalid-pp-token"
 	h = '';
 	exit(0);
+#pragma clang diagnostic pop
 }

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d	Mon Feb  2 03:45:02 2015	(r278050)
@@ -36,9 +36,11 @@
 
 BEGIN
 {
-
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Winvalid-pp-token"
 	h = "hello
 
 		there";
 	exit(0);
+#pragma clang diagnostic pop
 }

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d	Mon Feb  2 03:45:02 2015	(r278050)
@@ -74,13 +74,13 @@ fbt:::return
 	    (long long)curthread, pid, tid, (int)arg1, (int)arg0);
 }
 
-mutex_enter:adaptive-acquire
+mtx_lock:adaptive-acquire
 {
 	printf(" %u 0x%llX %d %d lock:0x%llX", timestamp,
 	    (long long)curthread, pid, tid, arg0);
 }
 
-mutex_exit:adaptive-release
+mtx_unlock:adaptive-release
 {
 	printf(" %u 0x%llX %d %d lock:0x%llX", timestamp,
 	    (long long) curthread, pid, tid, arg0);

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c	Mon Feb  2 03:45:02 2015	(r278050)
@@ -28,6 +28,7 @@
 
 #include <strings.h>
 #include <rpc/rpc.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <sys/param.h>
 #include <rpcsvc/mount.h>

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d	Mon Feb  2 03:45:02 2015	(r278050)
@@ -40,5 +40,5 @@
 
 BEGIN
 {
-	trace(offsetof(vnode_t, v_no_such_member));
+	trace(offsetof(struct vnode, v_no_such_member));
 }

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c	Mon Feb  2 03:45:02 2015	(r278050)
@@ -27,6 +27,7 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <signal.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 int

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d	Mon Feb  2 03:45:02 2015	(r278050)
@@ -44,7 +44,7 @@ pid$1:a.out:waiting:entry
 proc:::create
 /pid == $1/
 {
-	child = args[0]->pr_pid;
+	child = args[0]->p_pid;
 	trace(pid);
 }
 

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c	Mon Feb  2 03:45:02 2015	(r278050)
@@ -26,6 +26,8 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <spawn.h>
 #include <signal.h>
 #include <stdio.h>

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c	Mon Feb  2 03:45:02 2015	(r278050)
@@ -27,6 +27,7 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <signal.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 /*

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c	Mon Feb  2 03:45:02 2015	(r278050)
@@ -27,6 +27,7 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <signal.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 /*

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d	Mon Feb  2 03:45:02 2015	(r278050)
@@ -44,7 +44,7 @@ pid$1:a.out:waiting:entry
 proc:::create
 /pid == $1/
 {
-	child = args[0]->pr_pid;
+	child = args[0]->p_pid;
 }
 
 pid$1:a.out:go:
@@ -54,7 +54,7 @@ pid$1:a.out:go:
 	exit(1);
 }
 
-syscall::rexit:entry
+syscall::exit:entry
 /pid == $1/
 {
 	exit(0);

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c	Mon Feb  2 03:45:02 2015	(r278050)
@@ -27,6 +27,7 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <signal.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 /*

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c	Mon Feb  2 03:45:02 2015	(r278050)
@@ -27,6 +27,7 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <signal.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 /*

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d	Mon Feb  2 03:45:02 2015	(r278050)
@@ -25,7 +25,7 @@
 
 BEGIN
 {
-	print((void)`p0);
+	print((void)`proc0);
 }
 
 BEGIN

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d	Mon Feb  2 03:45:02 2015	(r278050)
@@ -22,13 +22,13 @@
 typedef struct pancakes {
 	int i;
 	string s;
-	timespec_t t;
+	struct timespec t;
 } pancakes_t;
 
 translator pancakes_t < void *V > {
 	i = 2 * 10;
 	s = strjoin("I like ", "pancakes");
-	t = *(timespec_t *)`dtrace_zero;
+	t = *(struct timespec *)`dtrace_zero;
 };
 
 BEGIN

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out	Mon Feb  2 03:45:02 2015	(r278050)
@@ -1,7 +1,7 @@
 pancakes_t {
     int i = 0x14
     string s = [ "I like pancakes" ]
-    timespec_t t = {
+    struct timespec t = {
         time_t tv_sec = 0
         long tv_nsec = 0
     }

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d	Mon Feb  2 03:45:02 2015	(r278050)
@@ -44,7 +44,7 @@ BEGIN
 	i = 0;
 }
 
-syscall::*lwp*:entry
+syscall::*wait*:entry
 {
 	exit(0);
 }

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -36,8 +36,9 @@ script()
 {
 	$dtrace -s /dev/stdin <<EOF
 	proc:::signal-discard
-	/args[1]->pr_pid == $child &&
-	    args[1]->pr_psargs == "$longsleep" && args[2] == SIGHUP/
+	/args[1]->p_pid == $child &&
+	    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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -37,12 +37,13 @@ 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.
 		 */
-		target = args[1]->pr_pid;
+		target = args[1]->p_pid;
 	}
 
 	proc:::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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -60,14 +60,14 @@ spinny &
 child=$!
 
 #
-# This is gutsy -- we're assuming that mutex_enter(9F) will show up in the
+# This is gutsy -- we're assuming that mtx_lock(9) will show up in the
 # output.  This is most likely _not_ to show up in the output if the 
 # platform does not support arbitrary resolution interval timers -- but
 # the above script was stress-tested down to 100 hertz and still ran
 # successfully on all platforms, so one is hopeful that this test will pass
 # even in that case.
 #
-script | tee /dev/fd/2 | grep mutex_enter > /dev/null
+script | tee /dev/fd/2 | grep mtx_lock > /dev/null
 status=$?
 
 kill $child

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -63,7 +63,7 @@ child=$!
 # The only thing we can be sure of is that some module named "unix" (or
 # "genunix") did some work -- so that's all we'll check.
 #
-script | tee /dev/fd/2 | grep unix > /dev/null
+script | tee /dev/fd/2 | grep kernel > /dev/null
 status=$? 
 
 kill $child

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -63,7 +63,7 @@ child=$!
 # This is the same gutsy test as that found in the func() test; see that
 # test for the rationale.
 #
-script | tee /dev/fd/2 | grep mutex_enter > /dev/null
+script | tee /dev/fd/2 | grep mtx_lock > /dev/null
 status=$?
 
 kill $child

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d	Mon Feb  2 03:45:02 2015	(r278050)
@@ -31,8 +31,8 @@
 #pragma D option dynvarsize=1m
 
 struct bar {
-	int pid;
-	kthread_t *curthread;
+	pid_t pid;
+	struct thread *curthread;
 };
 
 self struct bar foo[int];

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -42,7 +42,7 @@ fi
 
 dtrace=$1
 
-bname=`/usr/bin/basename $0`
+bname=`basename $0`
 
 dfilename=/var/tmp/$bname.$$
 

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c	Mon Feb  2 03:45:02 2015	(r278050)
@@ -28,6 +28,7 @@
 
 #include <stdio.h>
 #include <sys/syscall.h>
+#include <unistd.h>
 
 /*ARGSUSED*/
 int

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -106,11 +106,13 @@ cat > main.c <<EOF
 #include <dlfcn.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <signal.h>
 
 int
 main(int argc, char **argv)
 {
 	void *live;
+	sigset_t mask;
 
 	if ((live = dlopen("./livelib.so", RTLD_LAZY | RTLD_LOCAL)) == NULL) {
 		printf("dlopen of livelib.so failed: %s\n", dlerror());
@@ -119,7 +121,8 @@ main(int argc, char **argv)
 
 	(void) dlclose(live);
 
-	pause();
+	(void) sigemptyset(&mask);
+	(void) sigsuspend(&mask);
 
 	return (0);
 }
@@ -133,7 +136,7 @@ fi
 
 script() {
 	$dtrace -w -x bufsize=1k -c ./main -qs /dev/stdin <<EOF
-	syscall::pause:entry
+	syscall::sigsuspend:entry
 	/pid == \$target/
 	{
 		system("$dtrace -l -P test_prov*");

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c	Mon Feb  2 03:45:02 2015	(r278050)
@@ -26,6 +26,10 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <stdlib.h>
 #include <unistd.h>
 
 #include "forker.h"

Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh	Mon Feb  2 03:45:02 2015	(r278050)
@@ -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: projects/building-blocks/contrib/amd/amd/amfs_program.c
==============================================================================
--- projects/building-blocks/contrib/amd/amd/amfs_program.c	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/contrib/amd/amd/amfs_program.c	Mon Feb  2 03:45:02 2015	(r278050)
@@ -147,10 +147,12 @@ amfs_program_exec(char *info)
   (void) fclose(stdout);
   if (!logfp)
     logfp = stderr;		/* initialize before possible first use */
-  (void) dup(fileno(logfp));
+    if (dup(fileno(logfp)) == -1)
+      return errno;
   if (fileno(logfp) != fileno(stderr)) {
     (void) fclose(stderr);
-    (void) dup(fileno(logfp));
+    if (dup(fileno(logfp)) == -1)
+      return errno;
   }
 
   /*

Modified: projects/building-blocks/contrib/amd/amd/readdir.c
==============================================================================
--- projects/building-blocks/contrib/amd/amd/readdir.c	Mon Feb  2 02:56:29 2015	(r278049)
+++ projects/building-blocks/contrib/amd/amd/readdir.c	Mon Feb  2 03:45:02 2015	(r278050)
@@ -63,6 +63,7 @@ static int key_already_in_chain(char *ke
 static nfsentry *make_entry_chain(am_node *mp, const nfsentry *current_chain, int fully_browsable);
 static int amfs_readdir_browsable(am_node *mp, nfscookie cookie, nfsdirlist *dp, nfsentry *ep, u_int count, int fully_browsable);
 
+static const u_int dotdotcookie = DOT_DOT_COOKIE;
 
 /****************************************************************************
  *** FUNCTIONS                                                             ***
@@ -178,8 +179,9 @@ make_entry_chain(am_node *mp, const nfse
 
       /* we have space.  put entry in next cell */
       ++last_cookie;
-      chain[num_entries].ne_fileid = (u_int) last_cookie;
-      *(u_int *) chain[num_entries].ne_cookie = (u_int) last_cookie;
+      chain[num_entries].ne_fileid = last_cookie;
+      (void)memcpy(chain[num_entries].ne_cookie, &last_cookie,
+	sizeof(last_cookie));
       chain[num_entries].ne_name = key;
       if (num_entries < max_entries - 1) {	/* link to next one */
 	chain[num_entries].ne_nextentry = &chain[num_entries + 1];
@@ -253,7 +255,7 @@ amfs_readdir_browsable(am_node *mp, nfsc
     ep[0].ne_fileid = mp->am_gen;
     ep[0].ne_name = ".";
     ep[0].ne_nextentry = &ep[1];
-    *(u_int *) ep[0].ne_cookie = 0;
+    (void)memset(ep[0].ne_cookie, 0, sizeof(u_int));
 
     /* construct ".." */
     if (mp->am_parent)
@@ -300,9 +302,12 @@ amfs_readdir_browsable(am_node *mp, nfsc
       nfsentry *ne;
       for (j = 0, ne = te; ne; ne = ne->ne_nextentry)
 	plog(XLOG_DEBUG, "gen2 key %4d \"%s\"", j++, ne->ne_name);
-      for (j = 0, ne = ep; ne; ne = ne->ne_nextentry)
+      for (j = 0, ne = ep; ne; ne = ne->ne_nextentry) {
+	u_int cookie;
+	(void)memcpy(&cookie, ne->ne_cookie, sizeof(cookie));
 	plog(XLOG_DEBUG, "gen2+ key %4d \"%s\" fi=%d ck=%d",
-	     j++, ne->ne_name, ne->ne_fileid, *(u_int *)ne->ne_cookie);
+	     j++, ne->ne_name, ne->ne_fileid, cookie);
+      }
       plog(XLOG_DEBUG, "EOF is %d", dp->dl_eof);
     }
     return 0;
@@ -412,7 +417,7 @@ amfs_generic_readdir(am_node *mp, nfscoo
     ep[0].ne_fileid = mp->am_gen;
     ep[0].ne_name = ".";
     ep[0].ne_nextentry = &ep[1];
-    *(u_int *) ep[0].ne_cookie = 0;
+    (void)memset(ep[0].ne_cookie, 0, sizeof(u_int));
 
     /* construct ".." */
     if (mp->am_parent)
@@ -429,9 +434,12 @@ amfs_generic_readdir(am_node *mp, nfscoo
     if (amuDebug(D_READDIR)) {
       nfsentry *ne;
       int j;
-      for (j = 0, ne = ep; ne; ne = ne->ne_nextentry)
+      for (j = 0, ne = ep; ne; ne = ne->ne_nextentry) {
+	u_int cookie;
+	(void)memcpy(&cookie, ne->ne_cookie, sizeof(cookie));
 	plog(XLOG_DEBUG, "gen1 key %4d \"%s\" fi=%d ck=%d",
-	     j++, ne->ne_name, ne->ne_fileid, *(u_int *)ne->ne_cookie);
+	     j++, ne->ne_name, ne->ne_fileid, cookie);
+      }
     }
     return 0;
   }
@@ -460,9 +468,9 @@ amfs_generic_readdir(am_node *mp, nfscoo
       am_node *xp_next = next_nonerror_node(xp->am_osib);
 
       if (xp_next) {

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

More information about the svn-src-projects mailing list