PERFORCE change 134263 for review
John Birrell
jb at FreeBSD.org
Sun Jan 27 16:22:04 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=134263
Change 134263 by jb at jb_freebsd1 on 2008/01/28 00:21:44
IFdtrace
Affected files ...
.. //depot/projects/dtrace7/src/Makefile.inc1#4 integrate
.. //depot/projects/dtrace7/src/cddl/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/Makefile.inc#4 integrate
.. //depot/projects/dtrace7/src/cddl/lib/Makefile#3 integrate
.. //depot/projects/dtrace7/src/cddl/lib/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/cddl/lib/drti/Makefile#1 branch
.. //depot/projects/dtrace7/src/cddl/lib/libavl/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/lib/libctf/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/lib/libdtrace/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/lib/libdtrace/errno.d#2 integrate
.. //depot/projects/dtrace7/src/cddl/lib/libdtrace/net.d#1 branch
.. //depot/projects/dtrace7/src/cddl/lib/libdtrace/nfs.d#1 branch
.. //depot/projects/dtrace7/src/cddl/lib/libdtrace/psinfo.d#2 integrate
.. //depot/projects/dtrace7/src/cddl/lib/libdtrace/sched.d#1 branch
.. //depot/projects/dtrace7/src/cddl/lib/libdtrace/signal.d#1 branch
.. //depot/projects/dtrace7/src/cddl/lib/libdtrace/unistd.d#1 branch
.. //depot/projects/dtrace7/src/cddl/lib/libnvpair/Makefile#3 integrate
.. //depot/projects/dtrace7/src/cddl/lib/libproc/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/lib/libproc/Pcontrol.c#2 delete
.. //depot/projects/dtrace7/src/cddl/lib/libproc/Pcontrol.h#2 delete
.. //depot/projects/dtrace7/src/cddl/lib/libproc/Psymtab.c#2 delete
.. //depot/projects/dtrace7/src/cddl/lib/libproc/Putil.c#2 delete
.. //depot/projects/dtrace7/src/cddl/lib/libproc/Putil.h#2 delete
.. //depot/projects/dtrace7/src/cddl/lib/libproc/libproc.h#2 delete
.. //depot/projects/dtrace7/src/cddl/lib/libumem/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/lib/libuutil/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/lib/libzfs/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/lib/libzpool/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/sbin/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/sbin/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/cddl/sbin/zfs/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/sbin/zpool/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/test/dtrace/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/usr.bin/Makefile#3 integrate
.. //depot/projects/dtrace7/src/cddl/usr.bin/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/cddl/usr.bin/ctfconvert/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/usr.bin/ctfdump/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/usr.bin/ctfmerge/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/usr.bin/sgsmsg/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/usr.bin/ztest/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/usr.sbin/Makefile#3 integrate
.. //depot/projects/dtrace7/src/cddl/usr.sbin/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/cddl/usr.sbin/dtrace/Makefile#2 integrate
.. //depot/projects/dtrace7/src/cddl/usr.sbin/zdb/Makefile#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/include/alloca.h#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/include/devid.h#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/include/dtrace.h#1 branch
.. //depot/projects/dtrace7/src/compat/opensolaris/include/fcntl.h#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/include/fsshare.h#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/include/libintl.h#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/include/libproc.h#1 branch
.. //depot/projects/dtrace7/src/compat/opensolaris/include/mnttab.h#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/include/priv.h#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/include/solaris.h#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/include/stdio.h#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/include/stdlib.h#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/include/strings.h#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/include/unistd.h#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/include/zone.h#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/lib/libumem/umem.c#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/lib/libumem/umem.h#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/deviceid.c#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/fsshare.c#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/mkdirp.c#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/mnttab.c#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/zmount.c#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/zone.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/OPENSOLARIS.LICENSE#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/dtrace.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/Makefile#2 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#2 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#2 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#2 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#2 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/32/Makefile#2 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/64/Makefile#2 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#2 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#2 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#2 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#2 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#2 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#2 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#1 branch
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#1 branch
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.misc.d#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.rootvp.d#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/i386/Makefile#2 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/sparc/Makefile#2 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/sgs/include/_string_table.h#1 branch
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/sgs/include/debug.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/sgs/include/string_table.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zdb/zdb.8#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zdb/zdb.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zdb/zdb_il.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs.8#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs_main.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool.8#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_main.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_util.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_util.h#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/head/stdio_ext.h#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/head/synch.h#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/head/thread.h#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/drti.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_buf.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_decl.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/kernel.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/taskq.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/util.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/opensolaris/tools/ctf/dump/dump.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libdwarf/_libdwarf.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_attrval.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_die.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_finish.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_init.c#2 integrate
.. //depot/projects/dtrace7/src/share/mk/Makefile#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.README#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.compat.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.cpu.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.dep.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.doc.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.endian.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.files.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.incs.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.info.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.init.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.kmod.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.lib.mk#3 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.libnames.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.links.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.man.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.nls.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.obj.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.own.mk#3 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.pkg.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.port.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.port.options.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.port.post.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.port.pre.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.port.subdir.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.prog.mk#3 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.snmpmod.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.subdir.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.symver.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.sys.mk#2 integrate
.. //depot/projects/dtrace7/src/share/mk/sys.mk#5 integrate
.. //depot/projects/dtrace7/src/share/mk/version_gen.awk#2 integrate
.. //depot/projects/dtrace7/src/sys/cddl/cyclic/amd64/cyclic_machdep.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/cyclic/cyclic.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/cyclic/cyclic_test.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/cyclic/i386/cyclic_machdep.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/amd64/dis_tables.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/amd64/dis_tables.h#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/amd64/instr_size.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_anon.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_cddl.h#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_clone.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_debug.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_hacks.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_load.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_modevent.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_test.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_unload.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_vtime.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/i386/dis_tables.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/i386/dis_tables.h#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/i386/dtrace_asm.S#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/i386/instr_size.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/fasttrap/fasttrap.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/fbt/fbt.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/profile/profile.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/prototype.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/sdt/sdt.c#1 branch
.. //depot/projects/dtrace7/src/sys/cddl/dev/systrace/systrace.c#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris.c#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_cmn_err.c#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_misc.c#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_policy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_string.c#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_zone.c#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/machine/endian.h#2 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/rpc/xdr.h#3 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/acl.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/atomic.h#3 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/bitmap.h#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/byteorder.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/callb.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cmn_err.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cpupart.h#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cpuvar.h#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cpuvar_defs.h#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cred.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cyclic.h#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cyclic_impl.h#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/debug.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/dirent.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/dkio.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/dnlc.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/elf.h#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/feature_tests.h#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kcondvar.h#3 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kmem.h#3 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kobj.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kstat.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/lock.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/misc.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mman.h#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mntent.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mnttab.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/modctl.h#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mount.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mutex.h#3 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/objfs.h#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/param.h#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/pcpu.h#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/proc.h#3 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/random.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/rwlock.h#3 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/sdt.h#2 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/sema.h#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/stat.h#1 branch
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/string.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/sunddi.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/sysmacros.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/systm.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/taskq.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/taskq_impl.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/time.h#3 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/types.h#3 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/uio.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/varargs.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/vfs.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/zone.h#2 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/avl.h#3 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#3 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#3 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#2 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/cyclic_impl.h#2 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/debug.h#3 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#2 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/fasttrap_impl.h#1 branch
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/note.h#3 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#3 integrate
.. //depot/projects/dtrace7/src/sys/modules/cyclic/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/cyclic_test/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/dtrace/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/dtrace/Makefile.inc#1 branch
.. //depot/projects/dtrace7/src/sys/modules/dtrace/dtrace/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/dtrace/dtrace_test/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/dtrace/dtraceall/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/dtrace/dtraceall/dtraceall.c#1 branch
.. //depot/projects/dtrace7/src/sys/modules/dtrace/fasttrap/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/dtrace/fbt/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/dtrace/profile/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/dtrace/prototype/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/dtrace/sdt/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/dtrace/systrace/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/opensolaris/Makefile#1 branch
Differences ...
==== //depot/projects/dtrace7/src/Makefile.inc1#4 (text+ko) ====
@@ -1,5 +1,4 @@
-#
-# $FreeBSD: src/Makefile.inc1,v 1.588.2.3 2008/01/21 18:49:04 brueffer Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.596 2008/01/23 22:21:36 ru Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -167,7 +166,14 @@
STRICTTMPPATH= ${BPATH}:${XPATH}
TMPPATH= ${STRICTTMPPATH}:${PATH}
+#
+# Avoid running mktemp(1) unless actually needed.
+# It may not be functional, e.g., due to new ABI
+# when in the middle of installing over this system.
+#
+.if make(distributeworld) || make(installworld)
INSTALLTMP!= /usr/bin/mktemp -d -u -t install
+.endif
#
# Building a world goes through the following stages
@@ -209,6 +215,7 @@
BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${BPATH}:${PATH} \
WORLDTMP=${WORLDTMP} \
+ VERSION="${VERSION}" \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
${BMAKEENV} ${MAKE} -f Makefile.inc1 \
@@ -234,6 +241,7 @@
# world stage
WMAKEENV= ${CROSSENV} \
_SHLIBDIRPREFIX=${WORLDTMP} \
+ VERSION="${VERSION}" \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH}
.if ${MK_CDDL} == "no" || defined(NO_CTF)
@@ -258,6 +266,7 @@
# Yes, the flags are redundant.
LIB32WMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
_SHLIBDIRPREFIX=${LIB32TMP} \
+ VERSION="${VERSION}" \
MACHINE=i386 \
MACHINE_ARCH=i386 \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -277,14 +286,16 @@
.endif
# install stage
+IMAKEENV= ${CROSSENV}
+IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1
.if empty(.MAKEFLAGS:M-n)
-IMAKEENV= ${CROSSENV} \
- PATH=${STRICTTMPPATH}:${INSTALLTMP}
+IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \
+ LD_LIBRARY_PATH=${INSTALLTMP} \
+ PATH_LOCALE=${INSTALLTMP}/locale
+IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh
.else
-IMAKEENV= ${CROSSENV} \
- PATH=${TMPPATH}:${INSTALLTMP}
+IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP}
.endif
-IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1
# kernel stage
KMAKEENV= ${WMAKEENV}
@@ -470,10 +481,15 @@
distribute32 install32:
.if make(distribute32)
mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32 # XXX add to mtree
+ mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32/dtrace # XXX add to mtree
.else
mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree
+ mkdir -p ${DESTDIR}/usr/lib32/dtrace # XXX add to mtree
.endif
cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
+.if ${MK_CDDL} != "no"
+ cd ${.CURDIR}/cddl/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
+.endif
cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
.if ${MK_CRYPT} != "no"
cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
@@ -576,6 +592,14 @@
.endfor
#
+# Required install tools to be saved in a scratch dir for safety.
+#
+ITOOLS= [ awk cap_mkdb cat chflags chmod chown \
+ date echo egrep find grep install-info \
+ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
+ test true uname wc zic
+
+#
# distributeworld
#
# Distributes everything compiled by a `buildworld'.
@@ -586,14 +610,28 @@
#
distributeworld installworld: installcheck
mkdir -p ${INSTALLTMP}
- for prog in [ awk cap_mkdb cat chflags chmod chown \
- date echo egrep find grep install-info \
- ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
- test true uname wc zic; do \
- cp `which $$prog` ${INSTALLTMP}; \
- done
- ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}
- rm -rf ${INSTALLTMP}
+ progs=$$(for prog in ${ITOOLS}; do \
+ if progpath=`which $$prog`; then \
+ echo $$progpath; \
+ else \
+ echo "Required tool $$prog not found in PATH." >&2; \
+ exit 1; \
+ fi; \
+ done); \
+ libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
+ while read line; do \
+ set -- $$line; \
+ if [ "$$2 $$3" != "not found" ]; then \
+ echo $$2; \
+ else \
+ echo "Required library $$1 not found." >&2; \
+ exit 1; \
+ fi; \
+ done); \
+ cp $$libs $$progs ${INSTALLTMP}
+ cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
+ ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
+ ${IMAKEENV} rm -rf ${INSTALLTMP}
#
# reinstall
@@ -822,8 +860,8 @@
# legacy: Build compatibility shims for the next three targets
#
legacy:
-.if ${BOOTSTRAPPING} < 503000
- @echo "ERROR: Source upgrades from versions prior to 5.3 not supported."; \
+.if ${BOOTSTRAPPING} < 600034 && ${BOOTSTRAPPING} != 0
+ @echo "ERROR: Source upgrades from versions prior to 6.0 not supported."; \
false
.endif
.for _tool in tools/build
@@ -852,26 +890,6 @@
.endif
.endif
-.if ${BOOTSTRAPPING} < 600029
-_texinfo= gnu/usr.bin/texinfo
-.endif
-
-.if ${BOOTSTRAPPING} < 600015
-_cap_mkdb= usr.bin/cap_mkdb
-.endif
-
-.if ${BOOTSTRAPPING} < 600018
-_colldef= usr.bin/colldef
-.endif
-
-.if ${BOOTSTRAPPING} < 600017
-_gencat= usr.bin/gencat
-.endif
-
-.if ${BOOTSTRAPPING} < 600016
-_mklocale= usr.bin/mklocale
-.endif
-
.if ${BOOTSTRAPPING} < 700018
_gensnmptree= usr.sbin/bsnmpd/gensnmptree
.endif
@@ -881,8 +899,8 @@
_crunchgen= usr.sbin/crunch/crunchgen
.endif
-.if ${BOOTSTRAPPING} < 600020
-_pwd_mkdb= usr.sbin/pwd_mkdb
+.if ${BOOTSTRAPPING} < 800013
+_mklocale= usr.bin/mklocale
.endif
.if ${MK_CDDL} != "no"
@@ -892,23 +910,18 @@
bootstrap-tools:
.for _tool in \
+ ${_mklocale} \
${_dtrace_tools} \
${_strfile} \
${_gperf} \
${_groff} \
- ${_texinfo} \
- ${_cap_mkdb} \
- ${_colldef} \
- ${_gencat} \
usr.bin/lorder \
usr.bin/makewhatis \
- ${_mklocale} \
usr.bin/rpcgen \
usr.bin/xinstall \
${_gensnmptree} \
usr.sbin/config \
- ${_crunchgen} \
- ${_pwd_mkdb}
+ ${_crunchgen}
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
@@ -1038,15 +1051,16 @@
_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
${_kerberos5_lib_libroken} \
- lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \
- ${_lib_libgssapi} ${_lib_libipx} \
+ lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \
+ lib/libexpat \
+ ${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_default_thread_lib} \
lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
- ${_secure_lib_libssl}
+ ${_secure_lib_libssl} lib/libdwarf lib/libproc
.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no"
_default_thread_lib= lib/${DEFAULT_THREAD_LIB}
==== //depot/projects/dtrace7/src/cddl/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/Makefile.inc#4 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/lib/Makefile#3 (text+ko) ====
@@ -2,11 +2,11 @@
.include <bsd.own.mk>
-SUBDIR= libavl \
+SUBDIR= drti \
+ libavl \
libctf \
libdtrace \
libnvpair \
- libproc \
libumem \
libuutil \
${_libzfs} \
==== //depot/projects/dtrace7/src/cddl/lib/Makefile.inc#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/lib/libavl/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/lib/libctf/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/lib/libdtrace/Makefile#2 (text+ko) ====
@@ -46,22 +46,21 @@
dt_xlator.c \
gmatch.c
-DSRCS= errno.d \
- psinfo.d
+DSRCS= errno.d \
+ psinfo.d \
+ signal.d \
+ unistd.d
.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common
.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libgen/common
CFLAGS+= -I${.OBJDIR} \
- -I${.CURDIR}/../libproc \
-I${.CURDIR}/../../../sys/compat/opensolaris \
-I${.CURDIR}/../../../compat/opensolaris/include \
-I${OPENSOLARIS_USR_DISTDIR}/head \
-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
- -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \
- -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
- -I${OPENSOLARIS_SYS_DISTDIR}/compat
+ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common
#CFLAGS+= -DYYDEBUG
@@ -69,6 +68,9 @@
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
.elif ${MACHINE_ARCH} == "sparc64"
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
+.else
+# temporary hack
+CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
.endif
LFLAGS+=-l
==== //depot/projects/dtrace7/src/cddl/lib/libdtrace/errno.d#2 (text+ko) ====
@@ -19,7 +19,7 @@
*
* CDDL HEADER END
*
- * Portions Copyright 2006 John Birrell jb at freebsd.org
+ * Portions Copyright 2006-2008 John Birrell jb at freebsd.org
*
* $FreeBSD$
*/
@@ -28,5 +28,201 @@
* Use is subject to license terms.
*/
-inline int errno = curthread->td_errno;
-#pragma D binding "1.0" errno
+inline int EPERM = 1;
+#pragma D binding "1.0" EPERM
+inline int ENOENT = 2;
+#pragma D binding "1.0" ENOENT
+inline int ESRCH = 3;
+#pragma D binding "1.0" ESRCH
+inline int EINTR = 4;
+#pragma D binding "1.0" EINTR
+inline int EIO = 5;
+#pragma D binding "1.0" EIO
+inline int ENXIO = 6;
+#pragma D binding "1.0" ENXIO
+inline int E2BIG = 7;
+#pragma D binding "1.0" E2BIG
+inline int ENOEXEC = 8;
+#pragma D binding "1.0" ENOEXEC
+inline int EBADF = 9;
+#pragma D binding "1.0" EBADF
+inline int ECHILD = 10;
+#pragma D binding "1.0" ECHILD
+inline int EDEADLK = 11;
+#pragma D binding "1.0" EDEADLK
+inline int ENOMEM = 12;
+#pragma D binding "1.0" ENOMEM
+inline int EACCES = 13;
+#pragma D binding "1.0" EACCES
+inline int EFAULT = 14;
+#pragma D binding "1.0" EFAULT
+inline int ENOTBLK = 15;
+#pragma D binding "1.0" ENOTBLK
+inline int EBUSY = 16;
+#pragma D binding "1.0" EBUSY
+inline int EEXIST = 17;
+#pragma D binding "1.0" EEXIST
+inline int EXDEV = 18;
+#pragma D binding "1.0" EXDEV
+inline int ENODEV = 19;
+#pragma D binding "1.0" ENODEV
+inline int ENOTDIR = 20;
+#pragma D binding "1.0" ENOTDIR
+inline int EISDIR = 21;
+#pragma D binding "1.0" EISDIR
+inline int EINVAL = 22;
+#pragma D binding "1.0" EINVAL
+inline int ENFILE = 23;
+#pragma D binding "1.0" ENFILE
+inline int EMFILE = 24;
+#pragma D binding "1.0" EMFILE
+inline int ENOTTY = 25;
+#pragma D binding "1.0" ENOTTY
+inline int ETXTBSY = 26;
+#pragma D binding "1.0" ETXTBSY
+inline int EFBIG = 27;
+#pragma D binding "1.0" EFBIG
+inline int ENOSPC = 28;
+#pragma D binding "1.0" ENOSPC
+inline int ESPIPE = 29;
+#pragma D binding "1.0" ESPIPE
+inline int EROFS = 30;
+#pragma D binding "1.0" EROFS
+inline int EMLINK = 31;
+#pragma D binding "1.0" EMLINK
+inline int EPIPE = 32;
+#pragma D binding "1.0" EPIPE
+inline int EDOM = 33;
+#pragma D binding "1.0" EDOM
+inline int ERANGE = 34;
+#pragma D binding "1.0" ERANGE
+inline int EAGAIN = 35;
+#pragma D binding "1.0" EAGAIN
+inline int EWOULDBLOCK = EAGAIN;
+#pragma D binding "1.0" EWOULDBLOCK
+inline int EINPROGRESS = 36;
+#pragma D binding "1.0" EINPROGRESS
+inline int EALREADY = 37;
+#pragma D binding "1.0" EALREADY
+inline int ENOTSOCK = 38;
+#pragma D binding "1.0" ENOTSOCK
+inline int EDESTADDRREQ = 39;
+#pragma D binding "1.0" EDESTADDRREQ
+inline int EMSGSIZE = 40;
+#pragma D binding "1.0" EMSGSIZE
+inline int EPROTOTYPE = 41;
+#pragma D binding "1.0" EPROTOTYPE
+inline int ENOPROTOOPT = 42;
+#pragma D binding "1.0" ENOPROTOOPT
+inline int EPROTONOSUPPORT = 43;
+#pragma D binding "1.0" EPROTONOSUPPORT
+inline int ESOCKTNOSUPPORT = 44;
+#pragma D binding "1.0" ESOCKTNOSUPPORT
+inline int EOPNOTSUPP = 45;
+#pragma D binding "1.0" EOPNOTSUPP
+inline int ENOTSUP = EOPNOTSUPP;
+#pragma D binding "1.0" ENOTSUP
+inline int EPFNOSUPPORT = 46;
+#pragma D binding "1.0" EPFNOSUPPORT
+inline int EAFNOSUPPORT = 47;
+#pragma D binding "1.0" EAFNOSUPPORT
+inline int EADDRINUSE = 48;
+#pragma D binding "1.0" EADDRINUSE
+inline int EADDRNOTAVAIL = 49;
+#pragma D binding "1.0" EADDRNOTAVAIL
+inline int ENETDOWN = 50;
+#pragma D binding "1.0" ENETDOWN
+inline int ENETUNREACH = 51;
+#pragma D binding "1.0" ENETUNREACH
+inline int ENETRESET = 52;
+#pragma D binding "1.0" ENETRESET
+inline int ECONNABORTED = 53;
+#pragma D binding "1.0" ECONNABORTED
+inline int ECONNRESET = 54;
+#pragma D binding "1.0" ECONNRESET
+inline int ENOBUFS = 55;
+#pragma D binding "1.0" ENOBUFS
+inline int EISCONN = 56;
+#pragma D binding "1.0" EISCONN
+inline int ENOTCONN = 57;
+#pragma D binding "1.0" ENOTCONN
+inline int ESHUTDOWN = 58;
+#pragma D binding "1.0" ESHUTDOWN
+inline int ETOOMANYREFS = 59;
+#pragma D binding "1.0" ETOOMANYREFS
+inline int ETIMEDOUT = 60;
+#pragma D binding "1.0" ETIMEDOUT
+inline int ECONNREFUSED = 61;
+#pragma D binding "1.0" ECONNREFUSED
+inline int ELOOP = 62;
+#pragma D binding "1.0" ELOOP
+inline int ENAMETOOLONG = 63;
+#pragma D binding "1.0" ENAMETOOLONG
+inline int EHOSTDOWN = 64;
+#pragma D binding "1.0" EHOSTDOWN
+inline int EHOSTUNREACH = 65;
+#pragma D binding "1.0" EHOSTUNREACH
+inline int ENOTEMPTY = 66;
+#pragma D binding "1.0" ENOTEMPTY
+inline int EPROCLIM = 67;
+#pragma D binding "1.0" EPROCLIM
+inline int EUSERS = 68;
+#pragma D binding "1.0" EUSERS
+inline int EDQUOT = 69;
+#pragma D binding "1.0" EDQUOT
+inline int ESTALE = 70;
+#pragma D binding "1.0" ESTALE
+inline int EREMOTE = 71;
+#pragma D binding "1.0" EREMOTE
+inline int EBADRPC = 72;
+#pragma D binding "1.0" EBADRPC
+inline int ERPCMISMATCH = 73;
+#pragma D binding "1.0" ERPCMISMATCH
+inline int EPROGUNAVAIL = 74;
+#pragma D binding "1.0" EPROGUNAVAIL
+inline int EPROGMISMATCH = 75;
+#pragma D binding "1.0" EPROGMISMATCH
+inline int EPROCUNAVAIL = 76;
+#pragma D binding "1.0" EPROCUNAVAIL
+inline int ENOLCK = 77;
+#pragma D binding "1.0" ENOLCK
+inline int ENOSYS = 78;
+#pragma D binding "1.0" ENOSYS
+inline int EFTYPE = 79;
+#pragma D binding "1.0" EFTYPE
+inline int EAUTH = 80;
+#pragma D binding "1.0" EAUTH
+inline int ENEEDAUTH = 81;
+#pragma D binding "1.0" ENEEDAUTH
+inline int EIDRM = 82;
+#pragma D binding "1.0" EIDRM
+inline int ENOMSG = 83;
+#pragma D binding "1.0" ENOMSG
+inline int EOVERFLOW = 84;
+#pragma D binding "1.0" EOVERFLOW
+inline int ECANCELED = 85;
+#pragma D binding "1.0" ECANCELED
+inline int EILSEQ = 86;
+#pragma D binding "1.0" EILSEQ
+inline int ENOATTR = 87;
+#pragma D binding "1.0" ENOATTR
+inline int EDOOFUS = 88;
+#pragma D binding "1.0" EDOOFUS
+inline int EBADMSG = 89;
+#pragma D binding "1.0" EBADMSG
+inline int EMULTIHOP = 90;
+#pragma D binding "1.0" EMULTIHOP
+inline int ENOLINK = 91;
+#pragma D binding "1.0" ENOLINK
+inline int EPROTO = 92;
+#pragma D binding "1.0" EPROTO
+inline int ELAST = 92;
+#pragma D binding "1.0" ELAST
+inline int ERESTART = -1;
+#pragma D binding "1.0" ERESTART
+inline int EJUSTRETURN = -2;
+#pragma D binding "1.0" EJUSTRETURN
+inline int ENOIOCTL = -3;
+#pragma D binding "1.0" ENOIOCTL
+inline int EDIRIOCTL = -4;
+#pragma D binding "1.0" EDIRIOCTL
==== //depot/projects/dtrace7/src/cddl/lib/libdtrace/psinfo.d#2 (text+ko) ====
@@ -40,6 +40,8 @@
gid_t pr_egid; /* effective group id */
uintptr_t
pr_addr; /* address of process */
+ string pr_psargs; /* process arguments */
+ u_int pr_arglen; /* process argument length */
} psinfo_t;
#pragma D binding "1.0" translator
@@ -54,6 +56,8 @@
pr_gid = T->p_ucred->cr_rgid;
pr_egid = T->p_ucred->cr_groups[0];
pr_addr = 0;
+ pr_psargs = stringof(T->p_args->ar_args);
+ pr_arglen = T->p_args->ar_length;
};
typedef struct lwpsinfo {
@@ -89,17 +93,3 @@
#pragma D attributes Stable/Stable/Common curlwpsinfo
#pragma D binding "1.0" curlwpsinfo
-/*
- * ppid, uid and gid are used frequently enough to merit their own inlines...
- */
-inline uid_t ppid = curpsinfo->pr_ppid;
-#pragma D attributes Stable/Stable/Common ppid
-#pragma D binding "1.0" ppid
-
-inline uid_t uid = curpsinfo->pr_uid;
-#pragma D attributes Stable/Stable/Common uid
-#pragma D binding "1.0" uid
-
-inline gid_t gid = curpsinfo->pr_gid;
-#pragma D attributes Stable/Stable/Common gid
-#pragma D binding "1.0" gid
==== //depot/projects/dtrace7/src/cddl/lib/libnvpair/Makefile#3 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/lib/libumem/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/lib/libuutil/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/lib/libzfs/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/lib/libzpool/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/sbin/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/sbin/Makefile.inc#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/sbin/zfs/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/sbin/zpool/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/usr.bin/Makefile#3 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/usr.bin/Makefile.inc#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/usr.bin/ctfconvert/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/usr.bin/ctfdump/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/usr.bin/ctfmerge/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/usr.bin/sgsmsg/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/usr.bin/ztest/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/usr.sbin/Makefile#3 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/usr.sbin/Makefile.inc#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/usr.sbin/dtrace/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/cddl/usr.sbin/zdb/Makefile#2 (text+ko) ====
==== //depot/projects/dtrace7/src/compat/opensolaris/include/alloca.h#2 (text+ko) ====
==== //depot/projects/dtrace7/src/compat/opensolaris/include/devid.h#2 (text+ko) ====
==== //depot/projects/dtrace7/src/compat/opensolaris/include/fcntl.h#2 (text+ko) ====
==== //depot/projects/dtrace7/src/compat/opensolaris/include/fsshare.h#2 (text+ko) ====
==== //depot/projects/dtrace7/src/compat/opensolaris/include/libintl.h#2 (text+ko) ====
==== //depot/projects/dtrace7/src/compat/opensolaris/include/mnttab.h#2 (text+ko) ====
==== //depot/projects/dtrace7/src/compat/opensolaris/include/priv.h#2 (text+ko) ====
==== //depot/projects/dtrace7/src/compat/opensolaris/include/solaris.h#2 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list