Date: Sun, 1 Feb 2015 06:45:32 +0000 (UTC) From: Justin Hibbits <jhibbits@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278022 - in projects/pmac_pmu: . bin/expr bin/ps bin/sh cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline cddl/contrib/ope... Message-ID: <201502010645.t116jWA0072933@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhibbits Date: Sun Feb 1 06:45:31 2015 New Revision: 278022 URL: https://svnweb.freebsd.org/changeset/base/278022 Log: IFC@r278021 Added: projects/pmac_pmu/sys/dev/hwpmc/hwpmc_armv7.c - copied unchanged from r278021, head/sys/dev/hwpmc/hwpmc_armv7.c projects/pmac_pmu/sys/dev/hwpmc/hwpmc_armv7.h - copied unchanged from r278021, head/sys/dev/hwpmc/hwpmc_armv7.h projects/pmac_pmu/sys/dev/iscsi/icl_conn_if.m - copied unchanged from r278021, head/sys/dev/iscsi/icl_conn_if.m projects/pmac_pmu/sys/dev/iscsi/icl_soft.c - copied unchanged from r278021, head/sys/dev/iscsi/icl_soft.c projects/pmac_pmu/sys/dev/iscsi/icl_wrappers.h - copied unchanged from r278021, head/sys/dev/iscsi/icl_wrappers.h Replaced: projects/pmac_pmu/sys/dev/iscsi/icl.c - copied unchanged from r278021, head/sys/dev/iscsi/icl.c Deleted: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile Modified: projects/pmac_pmu/UPDATING projects/pmac_pmu/bin/expr/expr.y projects/pmac_pmu/bin/ps/ps.c projects/pmac_pmu/bin/sh/jobs.c projects/pmac_pmu/bin/sh/trap.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh projects/pmac_pmu/contrib/amd/amd/amfs_generic.c projects/pmac_pmu/contrib/amd/amd/amfs_program.c projects/pmac_pmu/contrib/amd/amd/readdir.c projects/pmac_pmu/contrib/amd/hlfsd/homedir.c projects/pmac_pmu/contrib/amd/hlfsd/stubs.c projects/pmac_pmu/contrib/elftoolchain/elfcopy/main.c projects/pmac_pmu/contrib/libcxxrt/exception.cc projects/pmac_pmu/contrib/libcxxrt/stdexcept.cc projects/pmac_pmu/contrib/libcxxrt/typeinfo.cc projects/pmac_pmu/contrib/netbsd-tests/bin/expr/t_expr.sh projects/pmac_pmu/contrib/sendmail/cf/m4/cfhead.m4 projects/pmac_pmu/contrib/tcpdump/print-atm.c projects/pmac_pmu/contrib/tcpdump/print-llc.c projects/pmac_pmu/etc/rc.d/ipfilter projects/pmac_pmu/etc/sendmail/Makefile projects/pmac_pmu/games/fortune/fortune/fortune.6 projects/pmac_pmu/include/semaphore.h projects/pmac_pmu/lib/libc/gen/sem_new.c projects/pmac_pmu/lib/libc/gen/sem_post.3 projects/pmac_pmu/lib/libc/mips/gen/sigsetjmp.S projects/pmac_pmu/lib/libnv/Makefile projects/pmac_pmu/lib/libnv/nv.3 projects/pmac_pmu/lib/libnv/nv.h projects/pmac_pmu/lib/libnv/nvlist.c projects/pmac_pmu/lib/libnv/nvpair.c projects/pmac_pmu/lib/libpmc/libpmc.c projects/pmac_pmu/lib/libproc/proc_sym.c projects/pmac_pmu/lib/libthread_db/arch/i386/libpthread_md.c projects/pmac_pmu/lib/msun/src/s_scalbln.c projects/pmac_pmu/libexec/rtld-elf/rtld.c projects/pmac_pmu/release/Makefile projects/pmac_pmu/release/scripts/make-manifest.sh projects/pmac_pmu/sbin/geom/class/mountver/gmountver.8 projects/pmac_pmu/share/man/man4/sfxge.4 projects/pmac_pmu/share/man/man7/release.7 projects/pmac_pmu/share/man/man9/contigmalloc.9 projects/pmac_pmu/share/man/man9/pmap_enter.9 projects/pmac_pmu/share/misc/committers-src.dot projects/pmac_pmu/sys/amd64/amd64/machdep.c projects/pmac_pmu/sys/amd64/ia32/ia32_signal.c projects/pmac_pmu/sys/arm/allwinner/a10_gpio.c projects/pmac_pmu/sys/arm/altera/socfpga/socfpga_gpio.c projects/pmac_pmu/sys/arm/arm/intr.c projects/pmac_pmu/sys/arm/arm/machdep.c projects/pmac_pmu/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/pmac_pmu/sys/arm/freescale/imx/imx_gpio.c projects/pmac_pmu/sys/arm/freescale/vybrid/vf_gpio.c projects/pmac_pmu/sys/arm/include/pmc_mdep.h projects/pmac_pmu/sys/arm/include/profile.h projects/pmac_pmu/sys/arm/lpc/lpc_gpio.c projects/pmac_pmu/sys/arm/rockchip/rk30xx_gpio.c projects/pmac_pmu/sys/arm/samsung/exynos/exynos5_pad.c projects/pmac_pmu/sys/arm/ti/am335x/am335x_prcm.c projects/pmac_pmu/sys/arm/ti/files.ti projects/pmac_pmu/sys/arm/ti/ti_gpio.c projects/pmac_pmu/sys/arm/ti/ti_gpio.h projects/pmac_pmu/sys/arm/ti/ti_pruss.c projects/pmac_pmu/sys/arm/xilinx/zy7_gpio.c projects/pmac_pmu/sys/arm/xscale/ixp425/avila_gpio.c projects/pmac_pmu/sys/arm/xscale/ixp425/cambria_gpio.c projects/pmac_pmu/sys/boot/common/load_elf.c projects/pmac_pmu/sys/boot/efi/libefi/efinet.c projects/pmac_pmu/sys/boot/i386/libi386/libi386.h projects/pmac_pmu/sys/boot/i386/libi386/smbios.c projects/pmac_pmu/sys/boot/powerpc/kboot/conf.c projects/pmac_pmu/sys/boot/powerpc/kboot/host_syscall.S projects/pmac_pmu/sys/boot/powerpc/kboot/host_syscall.h projects/pmac_pmu/sys/boot/powerpc/kboot/hostdisk.c projects/pmac_pmu/sys/boot/powerpc/kboot/kbootfdt.c projects/pmac_pmu/sys/boot/powerpc/kboot/kerneltramp.S projects/pmac_pmu/sys/boot/powerpc/kboot/main.c projects/pmac_pmu/sys/boot/powerpc/kboot/ppc64_elf_freebsd.c projects/pmac_pmu/sys/cam/ctl/ctl.c projects/pmac_pmu/sys/cam/ctl/ctl_frontend_iscsi.c projects/pmac_pmu/sys/cam/scsi/scsi_all.h projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/pmac_pmu/sys/conf/Makefile.powerpc projects/pmac_pmu/sys/conf/files projects/pmac_pmu/sys/conf/files.amd64 projects/pmac_pmu/sys/conf/files.arm projects/pmac_pmu/sys/conf/kern.mk projects/pmac_pmu/sys/dev/acpica/acpi.c projects/pmac_pmu/sys/dev/alc/if_alc.c projects/pmac_pmu/sys/dev/ath/ath_hal/ah_internal.h projects/pmac_pmu/sys/dev/ath/ath_rate/sample/sample.c projects/pmac_pmu/sys/dev/ath/ath_rate/sample/sample.h projects/pmac_pmu/sys/dev/drm2/i915/intel_display.c projects/pmac_pmu/sys/dev/drm2/radeon/ni.c projects/pmac_pmu/sys/dev/drm2/radeon/si.c projects/pmac_pmu/sys/dev/fb/fbd.c projects/pmac_pmu/sys/dev/fdt/fdt_clock.c projects/pmac_pmu/sys/dev/gpio/gpio_if.m projects/pmac_pmu/sys/dev/gpio/gpiobus.c projects/pmac_pmu/sys/dev/gpio/gpiobusvar.h projects/pmac_pmu/sys/dev/hwpmc/hwpmc_arm.c projects/pmac_pmu/sys/dev/hwpmc/pmc_events.h projects/pmac_pmu/sys/dev/iscsi/icl.h projects/pmac_pmu/sys/dev/iscsi/iscsi.c projects/pmac_pmu/sys/dev/ofw/openfirm.c projects/pmac_pmu/sys/dev/sfxge/common/efsys.h projects/pmac_pmu/sys/dev/sfxge/common/efx_ev.c projects/pmac_pmu/sys/dev/sfxge/common/efx_tx.c projects/pmac_pmu/sys/dev/sfxge/sfxge.c projects/pmac_pmu/sys/dev/sfxge/sfxge.h projects/pmac_pmu/sys/dev/sfxge/sfxge_dma.c projects/pmac_pmu/sys/dev/sfxge/sfxge_ev.c projects/pmac_pmu/sys/dev/sfxge/sfxge_intr.c projects/pmac_pmu/sys/dev/sfxge/sfxge_port.c projects/pmac_pmu/sys/dev/sfxge/sfxge_tx.c projects/pmac_pmu/sys/dev/sfxge/sfxge_tx.h projects/pmac_pmu/sys/dev/syscons/syscons.c projects/pmac_pmu/sys/dev/usb/input/uhid.c projects/pmac_pmu/sys/dev/virtio/block/virtio_blk.c projects/pmac_pmu/sys/dev/vt/hw/fb/vt_fb.c projects/pmac_pmu/sys/dev/vt/hw/fb/vt_fb.h projects/pmac_pmu/sys/dev/vt/vt.h projects/pmac_pmu/sys/dev/vt/vt_core.c projects/pmac_pmu/sys/fs/cd9660/cd9660_util.c projects/pmac_pmu/sys/fs/fdescfs/fdesc_vfsops.c projects/pmac_pmu/sys/fs/msdosfs/msdosfs_conv.c projects/pmac_pmu/sys/fs/smbfs/smbfs_subr.c projects/pmac_pmu/sys/fs/tmpfs/tmpfs.h projects/pmac_pmu/sys/fs/tmpfs/tmpfs_subr.c projects/pmac_pmu/sys/fs/tmpfs/tmpfs_vfsops.c projects/pmac_pmu/sys/fs/tmpfs/tmpfs_vnops.c projects/pmac_pmu/sys/fs/udf/udf_vnops.c projects/pmac_pmu/sys/i386/i386/machdep.c projects/pmac_pmu/sys/kern/kern_jail.c projects/pmac_pmu/sys/kern/kern_umtx.c projects/pmac_pmu/sys/libkern/strtol.c projects/pmac_pmu/sys/libkern/strtoq.c projects/pmac_pmu/sys/libkern/strtoul.c projects/pmac_pmu/sys/libkern/strtouq.c projects/pmac_pmu/sys/mips/atheros/ar71xx_gpio.c projects/pmac_pmu/sys/mips/atheros/ar71xx_gpiovar.h projects/pmac_pmu/sys/mips/cavium/octeon_gpio.c projects/pmac_pmu/sys/mips/cavium/octeon_gpiovar.h projects/pmac_pmu/sys/mips/mips/freebsd32_machdep.c projects/pmac_pmu/sys/mips/mips/pm_machdep.c projects/pmac_pmu/sys/mips/rt305x/rt305x_gpio.c projects/pmac_pmu/sys/mips/rt305x/rt305x_gpiovar.h projects/pmac_pmu/sys/modules/aesni/Makefile projects/pmac_pmu/sys/modules/ctl/Makefile projects/pmac_pmu/sys/modules/iscsi/Makefile projects/pmac_pmu/sys/netgraph/ng_parse.c projects/pmac_pmu/sys/netinet/sctp_input.c projects/pmac_pmu/sys/netinet/sctp_usrreq.c projects/pmac_pmu/sys/netinet/tcp_syncache.c projects/pmac_pmu/sys/netipsec/key.c projects/pmac_pmu/sys/powerpc/ofw/ofw_machdep.c projects/pmac_pmu/sys/powerpc/powerpc/exec_machdep.c projects/pmac_pmu/sys/powerpc/pseries/plpar_iommu.c projects/pmac_pmu/sys/sparc64/sparc64/machdep.c projects/pmac_pmu/sys/sys/cdefs.h projects/pmac_pmu/sys/sys/conf.h projects/pmac_pmu/sys/sys/eventhandler.h projects/pmac_pmu/sys/sys/jail.h projects/pmac_pmu/sys/sys/param.h projects/pmac_pmu/sys/sys/pmc.h projects/pmac_pmu/sys/sys/proc.h projects/pmac_pmu/sys/sys/ucontext.h projects/pmac_pmu/sys/ufs/ffs/ffs_softdep.c projects/pmac_pmu/sys/ufs/ffs/softdep.h projects/pmac_pmu/sys/ufs/ufs/ufs_quota.c projects/pmac_pmu/sys/ufs/ufs/ufs_vfsops.c projects/pmac_pmu/sys/vm/vm_fault.c projects/pmac_pmu/sys/vm/vm_object.c projects/pmac_pmu/sys/vm/vm_object.h projects/pmac_pmu/sys/x86/x86/tsc.c projects/pmac_pmu/tools/tools/nanobsd/rescue/build.sh projects/pmac_pmu/tools/tools/nanobsd/rescue/common projects/pmac_pmu/usr.bin/grep/Makefile projects/pmac_pmu/usr.bin/sed/main.c projects/pmac_pmu/usr.bin/sed/process.c projects/pmac_pmu/usr.sbin/autofs/autounmountd.c projects/pmac_pmu/usr.sbin/binmiscctl/binmiscctl.c projects/pmac_pmu/usr.sbin/bsdinstall/partedit/partedit_x86.c projects/pmac_pmu/usr.sbin/config/config.8 projects/pmac_pmu/usr.sbin/config/main.c projects/pmac_pmu/usr.sbin/jail/jail.8 projects/pmac_pmu/usr.sbin/pciconf/pciconf.c projects/pmac_pmu/usr.sbin/pmcstudy/pmcstudy.c projects/pmac_pmu/usr.sbin/ppp/command.c projects/pmac_pmu/usr.sbin/ppp/ipcp.c projects/pmac_pmu/usr.sbin/ppp/ipv6cp.c projects/pmac_pmu/usr.sbin/ppp/radius.c projects/pmac_pmu/usr.sbin/ppp/server.c projects/pmac_pmu/usr.sbin/sa/db.c Directory Properties: projects/pmac_pmu/ (props changed) projects/pmac_pmu/cddl/ (props changed) projects/pmac_pmu/cddl/contrib/opensolaris/ (props changed) projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) projects/pmac_pmu/contrib/amd/ (props changed) projects/pmac_pmu/contrib/elftoolchain/ (props changed) projects/pmac_pmu/contrib/libcxxrt/ (props changed) projects/pmac_pmu/contrib/sendmail/ (props changed) projects/pmac_pmu/contrib/tcpdump/ (props changed) projects/pmac_pmu/etc/ (props changed) projects/pmac_pmu/include/ (props changed) projects/pmac_pmu/lib/libc/ (props changed) projects/pmac_pmu/sbin/ (props changed) projects/pmac_pmu/share/ (props changed) projects/pmac_pmu/share/man/man4/ (props changed) projects/pmac_pmu/sys/ (props changed) projects/pmac_pmu/sys/boot/ (props changed) projects/pmac_pmu/sys/boot/powerpc/kboot/ (props changed) projects/pmac_pmu/sys/cddl/contrib/opensolaris/ (props changed) projects/pmac_pmu/sys/conf/ (props changed) projects/pmac_pmu/usr.sbin/jail/ (props changed) Modified: projects/pmac_pmu/UPDATING ============================================================================== --- projects/pmac_pmu/UPDATING Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/UPDATING Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/bin/expr/expr.y ============================================================================== --- projects/pmac_pmu/bin/expr/expr.y Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/bin/expr/expr.y Sun Feb 1 06:45:31 2015 (r278022) @@ -444,14 +444,26 @@ op_minus(struct val *a, struct val *b) return (r); } +/* + * We depend on undefined behaviour giving a result (in r). + * To test this result, pass it as volatile. This prevents + * optimizing away of the test based on the undefined behaviour. + */ void -assert_times(intmax_t a, intmax_t b, intmax_t r) +assert_times(intmax_t a, intmax_t b, volatile intmax_t r) { /* - * if first operand is 0, no overflow is possible, - * else result of division test must match second operand + * If the first operand is 0, no overflow is possible, + * else the result of the division test must match the + * second operand. + * + * Be careful to avoid overflow in the overflow test, as + * in assert_div(). Overflow in division would kill us + * with a SIGFPE before getting the test wrong. In old + * buggy versions, optimization used to give a null test + * instead of a SIGFPE. */ - if (a != 0 && r / a != b) + if ((a == -1 && b == INTMAX_MIN) || (a != 0 && r / a != b)) errx(ERR_EXIT, "overflow"); } Modified: projects/pmac_pmu/bin/ps/ps.c ============================================================================== --- projects/pmac_pmu/bin/ps/ps.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/bin/ps/ps.c Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/bin/sh/jobs.c ============================================================================== --- projects/pmac_pmu/bin/sh/jobs.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/bin/sh/jobs.c Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/bin/sh/trap.c ============================================================================== --- projects/pmac_pmu/bin/sh/trap.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/bin/sh/trap.c Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c Sun Feb 1 06:45:31 2015 (r278022) @@ -14,6 +14,8 @@ */ #include <sys/sdt.h> +#include <stdio.h> +#include <stdlib.h> #include "usdt.h" #define FMT "{" \ Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d Sun Feb 1 06:45:31 2015 (r278022) @@ -40,5 +40,5 @@ BEGIN { - trace(offsetof(vnode_t, v_no_such_member)); + trace(offsetof(struct vnode, v_no_such_member)); } Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c Sun Feb 1 06:45:31 2015 (r278022) @@ -27,6 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <signal.h> +#include <stdlib.h> #include <unistd.h> int Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c Sun Feb 1 06:45:31 2015 (r278022) @@ -27,6 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <signal.h> +#include <stdlib.h> #include <unistd.h> /* Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c Sun Feb 1 06:45:31 2015 (r278022) @@ -27,6 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <signal.h> +#include <stdlib.h> #include <unistd.h> /* Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c Sun Feb 1 06:45:31 2015 (r278022) @@ -27,6 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <signal.h> +#include <stdlib.h> #include <unistd.h> /* Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c Sun Feb 1 06:45:31 2015 (r278022) @@ -27,6 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <signal.h> +#include <stdlib.h> #include <unistd.h> /* Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d Sun Feb 1 06:45:31 2015 (r278022) @@ -25,7 +25,7 @@ BEGIN { - print((void)`p0); + print((void)`proc0); } BEGIN Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d Sun Feb 1 06:45:31 2015 (r278022) @@ -44,7 +44,7 @@ BEGIN i = 0; } -syscall::*lwp*:entry +syscall::*wait*:entry { exit(0); } Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -42,7 +42,7 @@ fi dtrace=$1 -bname=`/usr/bin/basename $0` +bname=`basename $0` dfilename=/var/tmp/$bname.$$ Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c Sun Feb 1 06:45:31 2015 (r278022) @@ -28,6 +28,7 @@ #include <stdio.h> #include <sys/syscall.h> +#include <unistd.h> /*ARGSUSED*/ int Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh ============================================================================== --- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/contrib/amd/amd/amfs_generic.c ============================================================================== --- projects/pmac_pmu/contrib/amd/amd/amfs_generic.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/contrib/amd/amd/amfs_generic.c Sun Feb 1 06:45:31 2015 (r278022) @@ -1113,7 +1113,7 @@ amfs_generic_mount_child(am_node *new_mp new_mp->am_transp = (SVCXPRT *) xmalloc(sizeof(SVCXPRT)); *(new_mp->am_transp) = *current_transp; } - if (error && (new_mp->am_mnt->mf_ops == &amfs_error_ops)) + if (error && new_mp->am_mnt && (new_mp->am_mnt->mf_ops == &amfs_error_ops)) new_mp->am_error = error; if (new_mp->am_error > 0) Modified: projects/pmac_pmu/contrib/amd/amd/amfs_program.c ============================================================================== --- projects/pmac_pmu/contrib/amd/amd/amfs_program.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/contrib/amd/amd/amfs_program.c Sun Feb 1 06:45:31 2015 (r278022) @@ -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/pmac_pmu/contrib/amd/amd/readdir.c ============================================================================== --- projects/pmac_pmu/contrib/amd/amd/readdir.c Sun Feb 1 02:29:58 2015 (r278021) +++ projects/pmac_pmu/contrib/amd/amd/readdir.c Sun Feb 1 06:45:31 2015 (r278022) @@ -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 ".." */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502010645.t116jWA0072933>