Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 May 2002 08:14:00 -0700 (PDT)
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 11318 for review
Message-ID:  <200205141514.g4EFE0i81943@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11318

Change 11318 by rwatson@rwatson_curry on 2002/05/14 08:12:41

	Integ TrustedBSD MAC branch to base@10755, which is from May 2
	and pre-new-gcc.  There may be some potential mismerges to fix
	in kern_exec and kern_fork due to restructuring of that code
	in the main tree.

Affected files ...

... //depot/projects/trustedbsd/mac/Makefile#7 integrate
... //depot/projects/trustedbsd/mac/Makefile.inc1#13 integrate
... //depot/projects/trustedbsd/mac/bin/ps/fmt.c#4 integrate
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/freebsd.h#5 integrate
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/abi64.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/bsd-4.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/bsd-5.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/cross64.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/dec-bsd.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/dec-osf1.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/ecoff.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/ecoffl.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/elf.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/elf64.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/elfl.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/elfl64.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/elflorion.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/elforion.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/gnu.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/iris3.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/iris4.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/iris4loser.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/iris5.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/iris5gas.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/iris6.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/linux.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/mips-5.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/mips.c#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/mips.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/mips.md#3 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/mips16.S#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/netbsd.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/news4.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/news5.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/nws3250v4.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/osfrose.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/r3900.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/rtems64.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/sni-gas.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/sni-svr4.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/svr3-4.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/svr3-5.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/svr4-4.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/svr4-5.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/svr4-t.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-bsd#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-bsd-gas#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-cross64#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-ecoff#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-elf#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-iris6#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-mips#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-mips-gas#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-osfrose#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-r3900#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-svr3#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-svr3-gas#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-svr4#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-svr4-gas#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/vxworks.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-dec-osf1#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-iris#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-iris3#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-iris6#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-mips#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-netbsd#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-nws3250v4#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-osfrose#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-sni-svr4#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-sony#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-sysv#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-iris3.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-iris4.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-iris5.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-iris6.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-mips.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-news.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-nws3250v4.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-sysv.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-sysv4.h#2 delete
... //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/g++spec.c#2 integrate
... //depot/projects/trustedbsd/mac/contrib/gcc.295/integrate.c#2 integrate
... //depot/projects/trustedbsd/mac/contrib/gcc.295/stmt.c#2 integrate
... //depot/projects/trustedbsd/mac/contrib/gcc/config/freebsd.h#3 integrate
... //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#6 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/HISTORY#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/MANIFEST#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/RELNOTES#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_free_data.3#2 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_get_option.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_log.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_set_option.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_ttyconv.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_acct_mgmt.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_authenticate.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_chauthtok.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_close_session.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_end.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_error.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_authtok.3#6 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_data.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_item.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_user.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenv.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenvlist.3#6 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_info.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_open_session.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_prompt.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_putenv.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_data.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_item.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setcred.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setenv.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_authenticate.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_chauthtok.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_close_session.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_open_session.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_setcred.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_start.3#6 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_strerror.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_verror.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vinfo.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vprompt.3#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam.h#6 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/lib/Makefile#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_configure.c#2 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dynamic.c#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_impl.h#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_load.c#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_nullconv.c#1 branch
... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_end.c#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_authtok.c#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_start.c#5 integrate
... //depot/projects/trustedbsd/mac/contrib/openpam/misc/gendoc.pl#5 integrate
... //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#4 integrate
... //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#5 integrate
... //depot/projects/trustedbsd/mac/etc/pam.d/Makefile#4 integrate
... //depot/projects/trustedbsd/mac/etc/pam.d/gdm#3 integrate
... //depot/projects/trustedbsd/mac/etc/pam.d/rexecd#1 branch
... //depot/projects/trustedbsd/mac/etc/pam.d/xdm#3 integrate
... //depot/projects/trustedbsd/mac/etc/periodic/daily/460.status-mail-rejects#2 integrate
... //depot/projects/trustedbsd/mac/etc/periodic/monthly/200.accounting#3 integrate
... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#12 integrate
... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes-o.real#4 integrate
... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2#6 integrate
... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_tools/freebsd-native.h#4 integrate
... //depot/projects/trustedbsd/mac/lib/libc/stdtime/localtime.c#4 integrate
... //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_cancel.c#4 integrate
... //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_poll.c#2 integrate
... //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_readv.c#2 integrate
... //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_select.c#3 integrate
... //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_wait4.c#2 integrate
... //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_writev.c#2 integrate
... //depot/projects/trustedbsd/mac/lib/libpam/libpam/Makefile#10 integrate
... //depot/projects/trustedbsd/mac/libexec/rexecd/Makefile#3 integrate
... //depot/projects/trustedbsd/mac/libexec/rexecd/rexecd.c#4 integrate
... //depot/projects/trustedbsd/mac/release/Makefile#16 integrate
... //depot/projects/trustedbsd/mac/release/alpha/drivers.conf#2 integrate
... //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 integrate
... //depot/projects/trustedbsd/mac/release/i386/drivers.conf#2 integrate
... //depot/projects/trustedbsd/mac/release/pc98/drivers.conf#4 integrate
... //depot/projects/trustedbsd/mac/release/scripts/base-install.sh#2 integrate
... //depot/projects/trustedbsd/mac/release/scripts/bin-install.sh#3 delete
... //depot/projects/trustedbsd/mac/release/scripts/doFS.sh#5 integrate
... //depot/projects/trustedbsd/mac/release/scripts/driver-remove.pl#3 integrate
... //depot/projects/trustedbsd/mac/sbin/fdisk/fdisk.c#7 integrate
... //depot/projects/trustedbsd/mac/sbin/fsck_ffs/fsutil.c#4 integrate
... //depot/projects/trustedbsd/mac/sbin/fsck_ffs/pass5.c#4 integrate
... //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#6 integrate
... //depot/projects/trustedbsd/mac/sbin/mount_std/mount_std.c#4 integrate
... //depot/projects/trustedbsd/mac/sbin/nfsd/nfsd.c#3 integrate
... //depot/projects/trustedbsd/mac/sbin/restore/tape.c#5 integrate
... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile#5 integrate
... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile.asm#1 branch
... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile.inc#4 integrate
... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/bf-586.s#1 branch
... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/bf-686.s#1 branch
... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/bn-586.s#1 branch
... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/cast-586.s#1 branch
... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/co-586.s#1 branch
... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/crypt586.s#1 branch
... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/des-586.s#1 branch
... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/md5-586.s#1 branch
... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/rc4-586.s#1 branch
... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/rc5-586.s#1 branch
... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/rmd-586.s#1 branch
... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/sha1-586.s#1 branch
... //depot/projects/trustedbsd/mac/share/man/man4/em.4#6 integrate
... //depot/projects/trustedbsd/mac/share/man/man4/wi.4#2 integrate
... //depot/projects/trustedbsd/mac/share/man/man4/wi.4tbl#1 branch
... //depot/projects/trustedbsd/mac/share/man/man4/wi.4tl#1 branch
... //depot/projects/trustedbsd/mac/share/man/man5/drivers.conf.5#2 integrate
... //depot/projects/trustedbsd/mac/share/man/man7/release.7#3 integrate
... //depot/projects/trustedbsd/mac/share/man/man9/Makefile#16 integrate
... //depot/projects/trustedbsd/mac/share/man/man9/zone.9#5 integrate
... //depot/projects/trustedbsd/mac/sys/alpha/alpha/clock.c#3 integrate
... //depot/projects/trustedbsd/mac/sys/alpha/alpha/mem.c#3 integrate
... //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#9 integrate
... //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#10 integrate
... //depot/projects/trustedbsd/mac/sys/conf/NOTES#6 integrate
... //depot/projects/trustedbsd/mac/sys/conf/files#30 integrate
... //depot/projects/trustedbsd/mac/sys/conf/files.powerpc#4 integrate
... //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#7 integrate
... //depot/projects/trustedbsd/mac/sys/conf/kern.pre.mk#7 integrate
... //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#7 integrate
... //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#7 integrate
... //depot/projects/trustedbsd/mac/sys/dev/aac/aac_cam.c#2 integrate
... //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_timer.c#7 integrate
... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/Makefile#4 integrate
... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_fops.h#2 integrate
... //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#7 integrate
... //depot/projects/trustedbsd/mac/sys/dev/isp/isp.c#10 integrate
... //depot/projects/trustedbsd/mac/sys/dev/md/md.c#7 integrate
... //depot/projects/trustedbsd/mac/sys/dev/mii/acphy.c#6 integrate
... //depot/projects/trustedbsd/mac/sys/dev/mii/qsphy.c#6 integrate
... //depot/projects/trustedbsd/mac/sys/dev/my/if_my.c#4 integrate
... //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/ac97_if.m#2 integrate
... //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/feeder_if.m#2 integrate
... //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/mixer_if.m#2 integrate
... //depot/projects/trustedbsd/mac/sys/dev/tx/if_tx.c#3 integrate
... //depot/projects/trustedbsd/mac/sys/dev/usb/usbdi.c#5 integrate
... //depot/projects/trustedbsd/mac/sys/dev/wi/wi_hostap.c#4 integrate
... //depot/projects/trustedbsd/mac/sys/fs/deadfs/dead_vnops.c#5 integrate
... //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#6 integrate
... //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate
... //depot/projects/trustedbsd/mac/sys/fs/fifofs/fifo_vnops.c#9 integrate
... //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vnops.c#7 integrate
... //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.c#5 integrate
... //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.h#7 integrate
... //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#11 integrate
... //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#4 integrate
... //depot/projects/trustedbsd/mac/sys/i386/acpica/Makefile#2 integrate
... //depot/projects/trustedbsd/mac/sys/i386/acpica/genwakecode.pl#2 delete
... //depot/projects/trustedbsd/mac/sys/i386/acpica/genwakecode.sh#1 branch
... //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#11 integrate
... //depot/projects/trustedbsd/mac/sys/i386/conf/Makefile#3 integrate
... //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#17 integrate
... //depot/projects/trustedbsd/mac/sys/i386/conf/makeLINT.pl#2 delete
... //depot/projects/trustedbsd/mac/sys/i386/conf/makeLINT.sed#1 branch
... //depot/projects/trustedbsd/mac/sys/i386/conf/makeLINT.sh#1 branch
... //depot/projects/trustedbsd/mac/sys/i386/i386/mp_clock.c#3 integrate
... //depot/projects/trustedbsd/mac/sys/i386/isa/clock.c#8 integrate
... //depot/projects/trustedbsd/mac/sys/i386/isa/loran.c#2 integrate
... //depot/projects/trustedbsd/mac/sys/ia64/ia64/clock.c#3 integrate
... //depot/projects/trustedbsd/mac/sys/ia64/ia64/exception.s#7 integrate
... //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#15 integrate
... //depot/projects/trustedbsd/mac/sys/ia64/ia64/mca.c#2 integrate
... //depot/projects/trustedbsd/mac/sys/ia64/ia64/mp_machdep.c#9 integrate
... //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#11 integrate
... //depot/projects/trustedbsd/mac/sys/ia64/include/ansi.h#5 integrate
... //depot/projects/trustedbsd/mac/sys/ia64/include/frame.h#2 integrate
... //depot/projects/trustedbsd/mac/sys/kern/init_main.c#20 integrate
... //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#15 integrate
... //depot/projects/trustedbsd/mac/sys/kern/kern_environment.c#4 integrate
... //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#18 integrate
... //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#13 integrate
... //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#10 integrate
... //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#9 integrate
... //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#10 integrate
... //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#18 integrate
... //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#12 integrate
... //depot/projects/trustedbsd/mac/sys/kern/kern_tc.c#9 integrate
... //depot/projects/trustedbsd/mac/sys/kern/makeobjops.pl#3 delete
... //depot/projects/trustedbsd/mac/sys/kern/subr_hints.c#4 integrate
... //depot/projects/trustedbsd/mac/sys/kern/subr_log.c#2 integrate
... //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#15 integrate
... //depot/projects/trustedbsd/mac/sys/kern/sys_generic.c#8 integrate
... //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#9 integrate
... //depot/projects/trustedbsd/mac/sys/kern/tty.c#9 integrate
... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#23 integrate
... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#17 integrate
... //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#13 integrate
... //depot/projects/trustedbsd/mac/sys/kern/vfs_init.c#5 integrate
... //depot/projects/trustedbsd/mac/sys/kern/vnode_if.pl#3 delete
... //depot/projects/trustedbsd/mac/sys/modules/drm/mga/Makefile#2 integrate
... //depot/projects/trustedbsd/mac/sys/modules/drm/r128/Makefile#2 integrate
... //depot/projects/trustedbsd/mac/sys/modules/drm/radeon/Makefile#2 integrate
... //depot/projects/trustedbsd/mac/sys/net/bpf.c#12 integrate
... //depot/projects/trustedbsd/mac/sys/net/if_spppsubr.c#9 integrate
... //depot/projects/trustedbsd/mac/sys/net/if_tap.c#7 integrate
... //depot/projects/trustedbsd/mac/sys/net/if_tun.c#8 integrate
... //depot/projects/trustedbsd/mac/sys/net/rtsock.c#9 integrate
... //depot/projects/trustedbsd/mac/sys/netatm/atm_cm.c#5 integrate
... //depot/projects/trustedbsd/mac/sys/netatm/atm_cm.h#3 integrate
... //depot/projects/trustedbsd/mac/sys/netatm/atm_subr.c#8 integrate
... //depot/projects/trustedbsd/mac/sys/netatm/atm_var.h#6 integrate
... //depot/projects/trustedbsd/mac/sys/netinet/accf_data.c#3 integrate
... //depot/projects/trustedbsd/mac/sys/netinet/accf_http.c#4 integrate
... //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.c#8 integrate
... //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#14 integrate
... //depot/projects/trustedbsd/mac/sys/netkey/keysock.c#5 integrate
... //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC#10 integrate
... //depot/projects/trustedbsd/mac/sys/pc98/pc98/clock.c#7 integrate
... //depot/projects/trustedbsd/mac/sys/pci/if_dc.c#11 integrate
... //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/clock.c#5 integrate
... //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#7 integrate
... //depot/projects/trustedbsd/mac/sys/sys/malloc.h#5 integrate
... //depot/projects/trustedbsd/mac/sys/sys/param.h#9 integrate
... //depot/projects/trustedbsd/mac/sys/sys/proc.h#14 integrate
... //depot/projects/trustedbsd/mac/sys/sys/signalvar.h#6 integrate
... //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#14 integrate
... //depot/projects/trustedbsd/mac/sys/sys/time.h#6 integrate
... //depot/projects/trustedbsd/mac/sys/sys/timepps.h#4 integrate
... //depot/projects/trustedbsd/mac/sys/sys/timetc.h#7 integrate
... //depot/projects/trustedbsd/mac/sys/sys/user.h#6 integrate
... //depot/projects/trustedbsd/mac/sys/tools/makeobjops.awk#1 branch
... //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#3 integrate
... //depot/projects/trustedbsd/mac/sys/ufs/ufs/extattr.h#3 integrate
... //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extattr.c#14 integrate
... //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#33 integrate
... //depot/projects/trustedbsd/mac/sys/vm/uma.h#4 integrate
... //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#5 integrate
... //depot/projects/trustedbsd/mac/sys/vm/uma_dbg.c#1 branch
... //depot/projects/trustedbsd/mac/sys/vm/uma_dbg.h#1 branch
... //depot/projects/trustedbsd/mac/sys/vm/vm_fault.c#7 integrate
... //depot/projects/trustedbsd/mac/sys/vm/vm_map.c#9 integrate
... //depot/projects/trustedbsd/mac/sys/vm/vm_map.h#7 integrate
... //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#8 integrate
... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.I.out#2 integrate
... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.R.out#1 branch
... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.sh#3 integrate
... //depot/projects/trustedbsd/mac/tools/tools/vop_table/vop_table.tcl#2 integrate
... //depot/projects/trustedbsd/mac/usr.bin/Makefile#9 integrate
... //depot/projects/trustedbsd/mac/usr.bin/csplit/Makefile#1 branch
... //depot/projects/trustedbsd/mac/usr.bin/csplit/csplit.1#1 branch
... //depot/projects/trustedbsd/mac/usr.bin/csplit/csplit.c#1 branch
... //depot/projects/trustedbsd/mac/usr.bin/m4/Makefile#3 integrate
... //depot/projects/trustedbsd/mac/usr.bin/m4/eval.c#3 integrate
... //depot/projects/trustedbsd/mac/usr.bin/m4/expr.c#4 integrate
... //depot/projects/trustedbsd/mac/usr.bin/m4/gnum4.c#2 integrate
... //depot/projects/trustedbsd/mac/usr.bin/m4/look.c#3 integrate
... //depot/projects/trustedbsd/mac/usr.bin/m4/main.c#3 integrate
... //depot/projects/trustedbsd/mac/usr.bin/m4/misc.c#3 integrate
... //depot/projects/trustedbsd/mac/usr.bin/m4/pathnames.h#3 integrate
... //depot/projects/trustedbsd/mac/usr.bin/m4/trace.c#2 integrate
... //depot/projects/trustedbsd/mac/usr.bin/truss/alpha-fbsd.c#2 integrate
... //depot/projects/trustedbsd/mac/usr.bin/xargs/strnsubst.c#2 integrate
... //depot/projects/trustedbsd/mac/usr.bin/xargs/xargs.1#3 integrate
... //depot/projects/trustedbsd/mac/usr.bin/xargs/xargs.c#7 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchide/Makefile#2 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchide/crunchide.c#3 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchide/exec_aout.c#2 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchide/exec_elf32.c#2 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchide/extern.h#2 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/create/perform.c#6 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/main.c#3 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/show.c#3 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/ppp/command.c#6 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/ppp/fsm.c#4 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/ppp/lcp.c#4 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/Makefile#6 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/dist.c#7 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/media.c#4 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/package.c#4 integrate
... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/sysinstall.h#6 integrate

Differences ...

==== //depot/projects/trustedbsd/mac/Makefile#7 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.252 2002/04/29 15:22:01 ru Exp $
+# $FreeBSD: src/Makefile,v 1.253 2002/04/30 11:50:01 ru Exp $
 #
 # The user-driven targets are:
 #
@@ -83,13 +83,13 @@
 # order, but that's not important.
 #
 TGTS=	all all-man buildkernel buildworld checkdpadd clean \
-	cleandepend cleandir depend distribute distribworld everything \
+	cleandepend cleandir depend distribute distributeworld everything \
 	hierarchy includes install installcheck installkernel \
 	reinstallkernel installmost installworld libraries lint \
 	mk most obj objlink regress rerelease tags update
 
 .ORDER: buildworld installworld
-.ORDER: buildworld distribworld
+.ORDER: buildworld distributeworld
 .ORDER: buildkernel installkernel
 .ORDER: buildkernel reinstallkernel
 

==== //depot/projects/trustedbsd/mac/Makefile.inc1#13 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.262 2002/04/29 15:22:01 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.266 2002/04/30 23:29:00 bde Exp $
 #
 # Make command line options:
 #	-DMAKE_KERBEROS4 to build KerberosIV
@@ -57,9 +57,6 @@
 .if exists(${.CURDIR}/bin)
 SUBDIR+= bin
 .endif
-.if exists(${.CURDIR}/etc)
-SUBDIR+= etc
-.endif
 .if exists(${.CURDIR}/games) && !defined(NOGAMES)
 SUBDIR+= games
 .endif
@@ -96,6 +93,11 @@
 SUBDIR+= usr.sbin
 .endif
 
+# etc must be last for "distribute" to work
+.if exists(${.CURDIR}/etc)
+SUBDIR+= etc
+.endif
+
 # These are last, since it is nice to at least get the base system
 # rebuilt before you do them.
 .if defined(LOCAL_DIRS)
@@ -353,14 +355,14 @@
 #
 # Installs everything compiled by a 'buildworld'.
 #
-installworld: installcheck
+distributeworld installworld: installcheck
 	mkdir -p ${INSTALLTMP}
 	for prog in [ awk cat chflags chmod chown date echo egrep find grep \
-	    ln make makewhatis mkdir mtree mv perl rm sed sh sysctl \
+	    ln make makewhatis mkdir mtree mv perl pwd_mkdb rm sed sh sysctl \
 	    test true uname wc zic; do \
 		cp `which $$prog` ${INSTALLTMP}; \
 	done
-	cd ${.CURDIR}; ${IMAKE} reinstall
+	cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}
 	rm -rf ${INSTALLTMP}
 
 #
@@ -388,14 +390,11 @@
 	cd ${.CURDIR}/share/man; ${MAKE} makedb
 .endif
 
-#
-# distribworld
-#
-# Front-end to distribute to make sure the search path contains
-# the object directory. Needed for miniperl.
-#
-distribworld:
-	cd ${.CURDIR}; PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 distribute
+redistribute:
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Distributing everything.."
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
 
 #
 # buildkernel and installkernel
@@ -646,7 +645,8 @@
 
 cross-tools:
 .for _tool in ${_btxld} ${_elf2exe} \
-    gnu/usr.bin/binutils usr.bin/objformat gnu/usr.bin/cc ${_xlint}
+    gnu/usr.bin/binutils usr.bin/objformat usr.sbin/crunch/crunchide \
+    gnu/usr.bin/cc ${_xlint}
 	cd ${.CURDIR}/${_tool}; \
 		${MAKE} obj; \
 		${MAKE} depend; \
@@ -666,19 +666,22 @@
 includes:
 	cd ${.CURDIR}/include;			${MAKE} -B all install
 	cd ${.CURDIR}/gnu/include;		${MAKE} install
+	cd ${.CURDIR}/gnu/lib/csu;		${MAKE} beforeinstall
+	cd ${.CURDIR}/gnu/lib/libdialog;	${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libobjc;		${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libreadline/readline;	${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libregex;		${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libstdc++;	${MAKE} beforeinstall
-	cd ${.CURDIR}/gnu/lib/libdialog;	${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/usr.bin/cc/cc1plus;	${MAKE} beforeinstall
-.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE)
-.if exists(${.CURDIR}/secure/lib/libcrypto)
-	cd ${.CURDIR}/secure/lib/libcrypto;	${MAKE} beforeinstall
-.endif
-.if exists(${.CURDIR}/secure/lib/libssl)
-	cd ${.CURDIR}/secure/lib/libssl;	${MAKE} beforeinstall
-.endif
+.if exists(${.CURDIR}/kerberos5) && !defined(NOCRYPT) && \
+    defined(MAKE_KERBEROS5)
+	cd ${.CURDIR}/kerberos5/lib/libasn1;		${MAKE} beforeinstall
+	cd ${.CURDIR}/kerberos5/lib/libhdb;		${MAKE} beforeinstall
+	cd ${.CURDIR}/kerberos5/lib/libkadm5clnt;	${MAKE} beforeinstall
+	cd ${.CURDIR}/kerberos5/lib/libkadm5srv;	${MAKE} beforeinstall
+	cd ${.CURDIR}/kerberos5/lib/libkafs5;		${MAKE} beforeinstall
+	cd ${.CURDIR}/kerberos5/lib/libkrb5;		${MAKE} beforeinstall
+	cd ${.CURDIR}/kerberos5/lib/libsl;		${MAKE} beforeinstall
 .endif
 .if exists(${.CURDIR}/kerberosIV) && !defined(NOCRYPT) && \
     defined(MAKE_KERBEROS4)
@@ -693,26 +696,16 @@
 .else
 	cd ${.CURDIR}/lib/libtelnet;		${MAKE} beforeinstall
 .endif
-.if exists(${.CURDIR}/kerberos5) && !defined(NOCRYPT) && \
-    defined(MAKE_KERBEROS5)
-	cd ${.CURDIR}/kerberos5/lib/libasn1;		${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberos5/lib/libhdb;		${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberos5/lib/libkadm5clnt;	${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberos5/lib/libkadm5srv;	${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberos5/lib/libkafs5;		${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberos5/lib/libkrb5;		${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberos5/lib/libsl;		${MAKE} beforeinstall
-.endif
 .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH})
 	cd ${.CURDIR}/lib/csu/${MACHINE_ARCH};	${MAKE} beforeinstall
 .endif
-	cd ${.CURDIR}/gnu/lib/csu;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libalias;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libatm;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libdevstat;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libc;			${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libcalendar;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libcam;		${MAKE} beforeinstall
+	cd ${.CURDIR}/lib/libcom_err;		${MAKE} beforeinstall
+	cd ${.CURDIR}/lib/libdevstat;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libdisk;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libedit;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libfetch;		${MAKE} beforeinstall
@@ -720,25 +713,32 @@
 	cd ${.CURDIR}/lib/libkvm;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libmd;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libmp;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/msun;			${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libncp;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libncurses;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libnetgraph;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libopie;		${MAKE} beforeinstall
+	cd ${.CURDIR}/lib/libpam/libpam;	${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libpcap;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libradius;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/librpcsvc;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libpam/libpam;	${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libsbuf;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libstand;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libtacplus;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libcom_err;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libusbhid;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libutil;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libvgl;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libwrap;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libypclnt;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libz;			${MAKE} beforeinstall
+	cd ${.CURDIR}/lib/msun;			${MAKE} beforeinstall
+.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE)
+.if exists(${.CURDIR}/secure/lib/libcrypto)
+	cd ${.CURDIR}/secure/lib/libcrypto;	${MAKE} beforeinstall
+.endif
+.if exists(${.CURDIR}/secure/lib/libssl)
+	cd ${.CURDIR}/secure/lib/libssl;	${MAKE} beforeinstall
+.endif
+.endif
 	cd ${.CURDIR}/usr.bin/lex;		${MAKE} beforeinstall
 
 #

==== //depot/projects/trustedbsd/mac/bin/ps/fmt.c#4 (text+ko) ====

@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.17 2002/02/03 14:43:04 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.18 2002/05/02 05:46:37 jmallett Exp $");
 
 #if 0
 #ifndef lint
@@ -72,8 +72,8 @@
 	if (buf == NULL) {
 		if ((arg_max = sysconf(_SC_ARG_MAX)) == -1)
 			errx(1, "sysconf _SC_ARG_MAX failed");
-		if ((buf = malloc((u_int)(4 * arg_max)  +  1)) == NULL)
-			errx(1, "malloc failed");
+		if ((buf = malloc((size_t)(4 * arg_max) + 1)) == NULL)
+			err(1, "malloc");
 	}
 
 	if (*argv == 0) {

==== //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/freebsd.h#5 (text+ko) ====

@@ -1,5 +1,5 @@
 /* Definitions for Intel 386 running FreeBSD with either a.out or ELF format
-   Copyright (C) 1996-2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2000, 2002 Free Software Foundation, Inc.
    Contributed by Eric Youngdale.
    Modified for stabs-in-ELF by H.J. Lu.
    Adapted from GNU/Linux version by John Polstra.
@@ -23,7 +23,7 @@
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.43 2002/04/24 04:21:41 obrien Exp $ */
+/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.44 2002/05/01 19:20:37 obrien Exp $ */
 
 #undef  CPP_PREDEFINES
 #define CPP_PREDEFINES 							\
@@ -38,7 +38,7 @@
 #undef  ASM_SPEC
 #define ASM_SPEC	"%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}"
 
-#undef  ASM_FINAL_SPEC 
+#undef  ASM_FINAL_SPEC
 #define ASM_FINAL_SPEC	"%|"
 
 /* Provide a LINK_SPEC appropriate for FreeBSD.  Here we provide support
@@ -49,9 +49,6 @@
    have the time to search for those flags. I am sure how to add
    support for -soname shared_object_name. H.J.
 
-   I took out %{v:%{!V:-V}}. It is too much :-(. They can use
-   -Wl,-V.
-
    When the -shared link option is used a final link is not being
    done.  */
 
@@ -64,14 +61,19 @@
     %{assert*} %{R*}} \
   %{!maout: \
     %{Wl,*:%*} \
+    %{v:-V} \
     %{assert*} %{R*} %{rpath*} %{defsym*} \
     %{shared:-Bshareable %{h*} %{soname*}} \
-    %{symbolic:-Bsymbolic} \
     %{!shared: \
       %{!static: \
 	%{rdynamic: -export-dynamic} \
 	%{!dynamic-linker: -dynamic-linker /usr/libexec/ld-elf.so.1}} \
-      %{static:-Bstatic}}}"
+      %{static:-Bstatic}} \
+    %{symbolic:-Bsymbolic}}"
+
+/* Provide a STARTFILE_SPEC appropriate for FreeBSD.  Here we add the magical
+   crtbegin.o file (see crtstuff.c) which provides part of the support for
+   getting C++ file-scope static object constructed before entering `main'.  */
 
 #undef STARTFILE_SPEC
 #define STARTFILE_SPEC "\
@@ -86,10 +88,12 @@
       %{!pg: \
 	%{p:gcrt1.o%s} \
 	%{!p:crt1.o%s}}} \
-    crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}"
+    crti.o%s \
+    %{!shared:crtbegin.o%s} \
+    %{shared:crtbeginS.o%s}}"
 
 /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386.  Here we tack on our
-   own magical crtend.o file (compare w/crtstuff.c) which provides part of the
+   own magical crtend.o file (see crtstuff.c) which provides part of the
    support for getting C++ file-scope static object constructed before
    entering `main', followed by the normal "finalizer" file, `crtn.o'.  */
 
@@ -102,20 +106,23 @@
 
 /************************[  Target stuff  ]***********************************/
 
-/* Define the actual types of some ANSI-mandated types.  
+/* Define the actual types of some ANSI-mandated types.
    Needs to agree with <machine/ansi.h>.  GCC defaults come from c-decl.c,
    c-common.c, and config/<arch>/<arch>.h.  */
 
-#undef SIZE_TYPE
+#undef  SIZE_TYPE
 #define SIZE_TYPE	"unsigned int"
- 
-#undef PTRDIFF_TYPE
+
+#undef  PTRDIFF_TYPE
 #define PTRDIFF_TYPE	"int"
 
+#undef  WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE	BITS_PER_WORD
+
 /* This is the pseudo-op used to generate a 32-bit word of data with a
    specific value in some section.  */
 
-#undef INT_ASM_OP
+#undef  INT_ASM_OP
 #define INT_ASM_OP	".long"
 
 /* Biggest alignment supported by the object file format of this
@@ -151,27 +158,23 @@
 #define TARGET_DEFAULT \
   (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387)
 
-/* Prefix for internally generated assembler labels.  If we aren't using 
-   underscores, we are using prefix `.'s to identify labels that should  
-   be ignored, as in `i386/gas.h' --karl@cs.umb.edu  */                 
-#undef  LPREFIX
-#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L")
+/* Don't default to pcc-struct-return, we want to retain compatibility with
+   older gcc versions AND pcc-struct-return is nonreentrant.
+   (even though the SVR4 ABI for the i386 says that records and unions are
+   returned in memory).  */
+
+#undef  DEFAULT_PCC_STRUCT_RETURN
+#define DEFAULT_PCC_STRUCT_RETURN 0
 
 /* The a.out tools do not support "linkonce" sections. */
 #undef  SUPPORTS_ONE_ONLY
 #define SUPPORTS_ONE_ONLY	TARGET_ELF
 
-/* Enable alias attribute support.  */
-#undef  SET_ASM_OP
-#define SET_ASM_OP		".set"
-
-/* The a.out tools do not support "Lscope" .stabs symbols. */
-#undef  NO_DBX_FUNCTION_END
-#define NO_DBX_FUNCTION_END	TARGET_AOUT
-
-/* In ELF, the function stabs come first, before the relative offsets.  */
-#undef  DBX_FUNCTION_FIRST
-#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF
+/* Prefix for internally generated assembler labels.  If we aren't using
+   underscores, we are using prefix `.'s to identify labels that should
+   be ignored, as in `i386/gas.h' --karl@cs.umb.edu  */
+#undef  LPREFIX
+#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L")
 
 /* supply our own hook for calling __main() from main() */
 #undef  INVOKE__main
@@ -255,11 +258,19 @@
 
 /************************[  Assembler stuff  ]********************************/
 
+/* Override the default comment-starter of "/" from unix.h.  */
+#undef  ASM_COMMENT_START
+#define ASM_COMMENT_START "#"
+
 #undef  ASM_APP_ON
 #define ASM_APP_ON	"#APP\n"
 
 #undef  ASM_APP_OFF
-#define ASM_APP_OFF	"#NO_APP\n" 
+#define ASM_APP_OFF	"#NO_APP\n"
+
+/* Enable alias attribute support.  */
+#undef  SET_ASM_OP
+#define SET_ASM_OP	".set"
 
 /* This is how to begin an assembly language file.
    The .file command should always begin the output.
@@ -274,8 +285,8 @@
   } while (0)
 
 /* This is how to store into the string BUF
-   the symbol_ref name of an internal numbered label where      
-   PREFIX is the class of label and NUM is the number within the class.  
+   the symbol_ref name of an internal numbered label where
+   PREFIX is the class of label and NUM is the number within the class.
    This is suitable for output with `assemble_name'.  */
 #undef	ASM_GENERATE_INTERNAL_LABEL
 #define ASM_GENERATE_INTERNAL_LABEL(BUF, PREFIX, NUMBER)		\
@@ -405,7 +416,6 @@
       }									\
   } while (0)
 
-
 #undef  ASM_OUTPUT_SOURCE_LINE
 #define ASM_OUTPUT_SOURCE_LINE(FILE, LINE)				\
   do {									\
@@ -503,10 +513,10 @@
   } while (0)
 
 /* Switch into a generic section.
- 
+
    We make the section read-only and executable for a function decl,
    read-only for a const data decl, and writable for a non-const data decl.
- 
+
    If the section has already been defined, we must not
    emit the attributes here. The SVR4 assembler does not
    recognize section redefinitions.
@@ -666,13 +676,21 @@
    some don't.
 
    *OLD* GAS requires the %cl argument, so override i386/unix.h. */
-      
+
 #undef  AS3_SHIFT_DOUBLE
 #define AS3_SHIFT_DOUBLE(a,b,c,d)	AS3 (a,b,c,d)
 
 
 /************************[  Debugger stuff  ]*********************************/
 
+/* The a.out tools do not support "Lscope" .stabs symbols. */
+#undef  NO_DBX_FUNCTION_END
+#define NO_DBX_FUNCTION_END	TARGET_AOUT
+
+/* In ELF, the function stabs come first, before the relative offsets.  */
+#undef  DBX_FUNCTION_FIRST
+#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF
+
 /* Copy this from the svr4 specifications... */
 /* Define the register numbers to be used in Dwarf debugging information.
    The SVR4 reference port C compiler uses the following register numbers

==== //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/g++spec.c#2 (text+ko) ====

@@ -18,6 +18,8 @@
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+/* $FreeBSD: src/contrib/gcc.295/cp/g++spec.c,v 1.3 2002/05/01 20:04:18 obrien Exp $ */
+
 #include "config.h"
 #include "system.h"
 
@@ -31,10 +33,16 @@
 #ifndef MATH_LIBRARY
 #define MATH_LIBRARY "-lm"
 #endif
+#ifndef MATH_LIBRARY_PROFILE
+#define MATH_LIBRARY_PROFILE "-lm"
+#endif
 
 #ifndef LIBSTDCXX
 #define LIBSTDCXX "-lstdc++"
 #endif
+#ifndef LIBSTDCXX_PROFILE
+#define LIBSTDCXX_PROFILE "-lstdc++"
+#endif
 
 void
 lang_specific_driver (fn, in_argc, in_argv, in_added_libraries)
@@ -45,6 +53,9 @@
 {
   int i, j;
 
+  /* If non-zero, the user gave us the `-p' or `-pg' flag.  */ 
+  int saw_profile_flag = 0;
+
   /* If non-zero, the user gave us the `-v' flag.  */ 
   int saw_verbose_flag = 0;
 
@@ -135,6 +146,8 @@
 	    }
 	  else if (strcmp (argv[i], "-lc") == 0)
 	    args[i] |= WITHLIBC;
+	  else if (strcmp (argv[i], "-pg") == 0 || strcmp (argv[i], "-p") == 0)
+	    saw_profile_flag++;
 	  else if (strcmp (argv[i], "-v") == 0)
 	    {
 	      saw_verbose_flag = 1;
@@ -236,14 +249,14 @@
   /* Add `-lstdc++' if we haven't already done so.  */
   if (library)
     {
-      arglist[j++] = LIBSTDCXX;
+      arglist[j++] = saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX;
       added_libraries++;
     }
   if (saw_math)
     arglist[j++] = saw_math;
   else if (library && need_math)
     {
-      arglist[j++] = MATH_LIBRARY;
+      arglist[j++] = saw_profile_flag ? MATH_LIBRARY_PROFILE : MATH_LIBRARY;
       added_libraries++;
     }
   if (saw_libc)

==== //depot/projects/trustedbsd/mac/contrib/gcc.295/integrate.c#2 (text+ko) ====

@@ -19,6 +19,8 @@
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+/* $FreeBSD: src/contrib/gcc.295/integrate.c,v 1.2 2002/05/01 19:40:55 obrien Exp $ */
+
 
 #include "config.h"
 #include "system.h"
@@ -1608,6 +1610,20 @@
   if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_NEEDS_CONTEXT)
     static_chain_value = lookup_static_chain (fndecl);
 
+  /* If the inline function has these flags sets, that means that 
+     coresponding global flags should be set for this function. */
+  if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_CALLS_SETJMP)
+    current_function_calls_setjmp = 1;
+
+  if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_CALLS_LONGJMP)
+    current_function_calls_longjmp = 1;
+
+  if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_HAS_NONLOCAL_LABEL)
+    current_function_has_nonlocal_label = 1;
+
+  if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_USES_CONST_POOL)
+    current_function_uses_const_pool = 1;
+
   if (GET_CODE (parm_insns) == NOTE
       && NOTE_LINE_NUMBER (parm_insns) > 0)
     {

==== //depot/projects/trustedbsd/mac/contrib/gcc.295/stmt.c#2 (text+ko) ====

@@ -19,6 +19,8 @@
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+/* $FreeBSD: src/contrib/gcc.295/stmt.c,v 1.2 2002/05/01 19:40:55 obrien Exp $ */
+
 
 /* This file handles the generation of rtl code from tree structure
    above the level of expressions, using subroutines in exp*.c and emit-rtl.c.
@@ -4027,6 +4029,10 @@
 		    cleanup = protect_with_terminate (cleanup);
 		    expand_eh_region_end (cleanup);
 		  }
+		else 
+		  {
+		    do_pending_stack_adjust();
+		  }
 	      }
 
 	    if (reachable)

==== //depot/projects/trustedbsd/mac/contrib/gcc/config/freebsd.h#3 (text+ko) ====

@@ -1,5 +1,5 @@
 /* Base configuration file for all FreeBSD targets.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -21,116 +21,72 @@
 /* Common FreeBSD configuration. 
    All FreeBSD architectures should include this file, which will specify
    their commonalities.
-   Adapted from /usr/src/contrib/gcc/config/i386/freebsd.h,
-   /usr/src/contrib/gcc/config/svr4.h & 
-   egcs/gcc/config/i386/freebsd-elf.h by
-   David O'Brien <obrien@FreeBSD.org>.  */
+   Adapted from gcc/config/i386/freebsd-elf.h by 
+   David O'Brien <obrien@FreeBSD.org>.  
+   Further work by David O'Brien <obrien@FreeBSD.org> and
+   Loren J. Rittle <ljrittle@acm.org>.  */
 
-/* $FreeBSD: src/contrib/gcc/config/freebsd.h,v 1.36 2001/05/14 22:45:26 obrien Exp $ */
+/* $FreeBSD: src/contrib/gcc/config/freebsd.h,v 1.37 2002/04/30 17:22:42 obrien Exp $ */
 
-
-/* Cpp, assembler, linker, library, and startfile spec's.  */
+/* In case we need to know.  */
+#define USING_CONFIG_FREEBSD 1
 
 /* This defines which switch letters take arguments.  On FreeBSD, most of
    the normal cases (defined in gcc.c) apply, and we also have -h* and
    -z* options (for the linker) (coming from SVR4).
    We also have -R (alias --rpath), no -z, --soname (-h), --assert etc.  */
 
-#define FBSD_SWITCH_TAKES_ARG(CHAR)					\
-  (DEFAULT_SWITCH_TAKES_ARG (CHAR)					\
-    || (CHAR) == 'h'							\
-    || (CHAR) == 'z' /* ignored by ld */				\
-    || (CHAR) == 'R')
-
 #undef  SWITCH_TAKES_ARG
 #define SWITCH_TAKES_ARG(CHAR) (FBSD_SWITCH_TAKES_ARG(CHAR))
 
-/* This defines which multi-letter switches take arguments.  */
-
-#define FBSD_WORD_SWITCH_TAKES_ARG(STR)					\
-  (DEFAULT_WORD_SWITCH_TAKES_ARG (STR)					\
-   || !strcmp ((STR), "rpath") || !strcmp ((STR), "rpath-link")		\
-   || !strcmp ((STR), "soname") || !strcmp ((STR), "defsym") 		\
-   || !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker"))
-
 #undef  WORD_SWITCH_TAKES_ARG
 #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR))
 
-/* Place spaces around this string.  We depend on string splicing to produce
-   the final CPP_PREDEFINES value.  */
-
-#define FBSD_CPP_PREDEFINES \
-  " -D__FreeBSD__=5 -D__FreeBSD_cc_version=500002 -Dunix -Asystem(unix) -Asystem(FreeBSD) "
-
-#define FBSD_CPP_SPEC "							\
-  %(cpp_cpu)								\

>>> TRUNCATED FOR MAIL (1000 lines) <<<

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




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