Date: Fri, 7 Jul 2006 05:09:38 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 100840 for review Message-ID: <200607070509.k6759cUY007312@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=100840 Change 100840 by marcel@marcel_nfs on 2006/07/07 05:09:29 IFC @100834 Affected files ... .. //depot/projects/tty/MAINTAINERS#21 integrate .. //depot/projects/tty/Makefile#19 integrate .. //depot/projects/tty/ObsoleteFiles.inc#7 integrate .. //depot/projects/tty/UPDATING#30 integrate .. //depot/projects/tty/bin/cp/cp.c#7 integrate .. //depot/projects/tty/contrib/openbsm/FREEBSD-upgrade#2 integrate .. //depot/projects/tty/contrib/openbsm/HISTORY#3 integrate .. //depot/projects/tty/contrib/openbsm/VERSION#3 integrate .. //depot/projects/tty/contrib/openbsm/bsm/audit_kevents.h#2 integrate .. //depot/projects/tty/contrib/openbsm/bsm/audit_record.h#3 integrate .. //depot/projects/tty/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/tty/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/tty/contrib/openbsm/configure#3 integrate .. //depot/projects/tty/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/tty/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_token.c#3 integrate .. //depot/projects/tty/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/tty/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/tty/include/malloc_np.h#2 integrate .. //depot/projects/tty/lib/libc/posix1e/mac_is_present.3#1 branch .. //depot/projects/tty/lib/libc/stdlib/malloc.c#16 integrate .. //depot/projects/tty/lib/libc/stdlib/tsearch.3#4 integrate .. //depot/projects/tty/lib/libutil/pidfile.c#3 integrate .. //depot/projects/tty/lib/msun/i387/Makefile.inc#3 integrate .. //depot/projects/tty/lib/msun/i387/e_scalb.S#3 delete .. //depot/projects/tty/lib/msun/i387/e_scalbf.S#3 delete .. //depot/projects/tty/lib/msun/src/e_scalbf.c#5 integrate .. //depot/projects/tty/lib/msun/src/s_tanh.c#2 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#38 integrate .. //depot/projects/tty/sbin/dhclient/dhclient.c#7 integrate .. //depot/projects/tty/sbin/gpt/add.c#7 integrate .. //depot/projects/tty/sbin/gpt/gpt.8#9 integrate .. //depot/projects/tty/sbin/gpt/gpt.c#6 integrate .. //depot/projects/tty/sbin/gpt/gpt.h#6 integrate .. //depot/projects/tty/sbin/gpt/label.c#2 integrate .. //depot/projects/tty/sbin/gpt/remove.c#5 integrate .. //depot/projects/tty/sbin/gpt/show.c#6 integrate .. //depot/projects/tty/sbin/ifconfig/ifconfig.8#19 integrate .. //depot/projects/tty/sbin/ifconfig/ifieee80211.c#11 integrate .. //depot/projects/tty/share/man/man4/Makefile#28 integrate .. //depot/projects/tty/share/man/man4/ata.4#12 integrate .. //depot/projects/tty/share/man/man4/enc.4#1 branch .. //depot/projects/tty/share/man/man4/fast_ipsec.4#4 integrate .. //depot/projects/tty/share/man/man4/geom_fox.4#2 integrate .. //depot/projects/tty/share/man/man4/nfe.4#1 branch .. //depot/projects/tty/share/man/man4/ng_netflow.4#8 integrate .. //depot/projects/tty/share/man/man4/ng_tag.4#1 branch .. //depot/projects/tty/share/man/man4/re.4#9 integrate .. //depot/projects/tty/share/man/man4/sched_core.4#2 integrate .. //depot/projects/tty/share/man/man4/uplcom.4#7 integrate .. //depot/projects/tty/share/man/man7/ports.7#10 integrate .. //depot/projects/tty/sys/Makefile#10 integrate .. //depot/projects/tty/sys/amd64/amd64/pmap.c#19 integrate .. //depot/projects/tty/sys/amd64/conf/GENERIC#21 integrate .. //depot/projects/tty/sys/amd64/conf/NOTES#16 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_proto.h#9 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_syscall.h#9 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_sysent.c#9 integrate .. //depot/projects/tty/sys/amd64/linux32/syscalls.master#9 integrate .. //depot/projects/tty/sys/arm/arm/elf_trampoline.c#6 integrate .. //depot/projects/tty/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/tty/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/tty/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/tty/sys/arm/at91/files.at91#2 integrate .. //depot/projects/tty/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/tty/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/tty/sys/bsm/audit_record.h#3 integrate .. //depot/projects/tty/sys/cam/cam_xpt.c#17 integrate .. //depot/projects/tty/sys/compat/freebsd32/freebsd32_proto.h#12 integrate .. //depot/projects/tty/sys/compat/freebsd32/freebsd32_syscall.h#12 integrate .. //depot/projects/tty/sys/compat/freebsd32/freebsd32_syscalls.c#12 integrate .. //depot/projects/tty/sys/compat/freebsd32/freebsd32_sysent.c#12 integrate .. //depot/projects/tty/sys/compat/freebsd32/syscalls.master#12 integrate .. //depot/projects/tty/sys/compat/linprocfs/linprocfs.c#17 integrate .. //depot/projects/tty/sys/compat/linux/linux_ioctl.c#16 integrate .. //depot/projects/tty/sys/compat/linux/linux_ipc.c#12 integrate .. //depot/projects/tty/sys/compat/linux/linux_misc.c#20 integrate .. //depot/projects/tty/sys/compat/linux/linux_util.h#7 integrate .. //depot/projects/tty/sys/compat/ndis/kern_ndis.c#12 integrate .. //depot/projects/tty/sys/compat/svr4/Makefile#2 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_ipc.c#7 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_misc.c#16 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_proto.h#6 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_syscall.h#6 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_syscallnames.c#6 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_sysent.c#6 integrate .. //depot/projects/tty/sys/compat/svr4/syscalls.master#6 integrate .. //depot/projects/tty/sys/conf/NOTES#36 integrate .. //depot/projects/tty/sys/conf/files#47 integrate .. //depot/projects/tty/sys/conf/files.amd64#28 integrate .. //depot/projects/tty/sys/conf/files.i386#33 integrate .. //depot/projects/tty/sys/conf/files.ia64#25 integrate .. //depot/projects/tty/sys/conf/kern.mk#11 integrate .. //depot/projects/tty/sys/conf/kern.pre.mk#12 integrate .. //depot/projects/tty/sys/conf/kmod.mk#18 integrate .. //depot/projects/tty/sys/conf/options#34 integrate .. //depot/projects/tty/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/tty/sys/dev/ata/ata-all.h#23 integrate .. //depot/projects/tty/sys/dev/ata/ata-chipset.c#30 integrate .. //depot/projects/tty/sys/dev/ata/ata-lowlevel.c#18 integrate .. //depot/projects/tty/sys/dev/ata/ata-pci.h#22 integrate .. //depot/projects/tty/sys/dev/ata/atapi-cd.c#20 integrate .. //depot/projects/tty/sys/dev/ath/if_ath.c#19 integrate .. //depot/projects/tty/sys/dev/ath/if_athioctl.h#9 integrate .. //depot/projects/tty/sys/dev/ath/if_athvar.h#15 integrate .. //depot/projects/tty/sys/dev/atkbdc/atkbdc_isa.c#4 integrate .. //depot/projects/tty/sys/dev/bge/if_bge.c#29 integrate .. //depot/projects/tty/sys/dev/bge/if_bgereg.h#21 integrate .. //depot/projects/tty/sys/dev/bktr/CHANGELOG.TXT#3 integrate .. //depot/projects/tty/sys/dev/fdc/fdc.c#7 integrate .. //depot/projects/tty/sys/dev/ic/nec765.h#3 integrate .. //depot/projects/tty/sys/dev/isp/isp.c#10 integrate .. //depot/projects/tty/sys/dev/isp/isp_pci.c#13 integrate .. //depot/projects/tty/sys/dev/isp/ispmbox.h#8 integrate .. //depot/projects/tty/sys/dev/isp/ispreg.h#5 integrate .. //depot/projects/tty/sys/dev/isp/ispvar.h#10 integrate .. //depot/projects/tty/sys/dev/ispfw/asm_2322.h#1 branch .. //depot/projects/tty/sys/dev/ispfw/ispfw.c#7 integrate .. //depot/projects/tty/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/tty/sys/dev/mii/acphy.c#7 integrate .. //depot/projects/tty/sys/dev/mii/amphy.c#7 integrate .. //depot/projects/tty/sys/dev/mii/bmtphy.c#6 integrate .. //depot/projects/tty/sys/dev/mii/brgphy.c#14 integrate .. //depot/projects/tty/sys/dev/mii/ciphy.c#5 integrate .. //depot/projects/tty/sys/dev/mii/e1000phy.c#7 integrate .. //depot/projects/tty/sys/dev/mii/exphy.c#7 integrate .. //depot/projects/tty/sys/dev/mii/inphy.c#5 integrate .. //depot/projects/tty/sys/dev/mii/lxtphy.c#8 integrate .. //depot/projects/tty/sys/dev/mii/mii_physubr.c#9 integrate .. //depot/projects/tty/sys/dev/mii/mlphy.c#6 integrate .. //depot/projects/tty/sys/dev/mii/nsgphy.c#9 integrate .. //depot/projects/tty/sys/dev/mii/nsphy.c#7 integrate .. //depot/projects/tty/sys/dev/mii/pnaphy.c#7 integrate .. //depot/projects/tty/sys/dev/mii/qsphy.c#7 integrate .. //depot/projects/tty/sys/dev/mii/rgephy.c#6 integrate .. //depot/projects/tty/sys/dev/mii/rlphy.c#7 integrate .. //depot/projects/tty/sys/dev/mii/ruephy.c#4 integrate .. //depot/projects/tty/sys/dev/mii/tdkphy.c#8 integrate .. //depot/projects/tty/sys/dev/mii/tlphy.c#7 integrate .. //depot/projects/tty/sys/dev/mii/ukphy.c#7 integrate .. //depot/projects/tty/sys/dev/mii/xmphy.c#7 integrate .. //depot/projects/tty/sys/dev/mpt/mpt.c#10 integrate .. //depot/projects/tty/sys/dev/mpt/mpt.h#12 integrate .. //depot/projects/tty/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/tty/sys/dev/mpt/mpt_pci.c#14 integrate .. //depot/projects/tty/sys/dev/nfe/if_nfe.c#1 branch .. //depot/projects/tty/sys/dev/nfe/if_nfereg.h#1 branch .. //depot/projects/tty/sys/dev/nfe/if_nfevar.h#1 branch .. //depot/projects/tty/sys/dev/puc/puc.c#13 integrate .. //depot/projects/tty/sys/dev/puc/puc_cfg.c#2 integrate .. //depot/projects/tty/sys/dev/puc/puc_pccard.c#6 integrate .. //depot/projects/tty/sys/dev/puc/puc_pci.c#9 integrate .. //depot/projects/tty/sys/dev/puc/pucdata.c#14 integrate .. //depot/projects/tty/sys/dev/re/if_re.c#19 integrate .. //depot/projects/tty/sys/dev/sio/sio.c#21 integrate .. //depot/projects/tty/sys/dev/sk/if_sk.c#4 integrate .. //depot/projects/tty/sys/dev/sound/pci/solo.c#9 integrate .. //depot/projects/tty/sys/dev/usb/if_aue.c#16 integrate .. //depot/projects/tty/sys/dev/usb/if_ural.c#11 integrate .. //depot/projects/tty/sys/dev/usb/uplcom.c#13 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/tty/sys/fs/devfs/devfs_vfsops.c#12 integrate .. //depot/projects/tty/sys/fs/devfs/devfs_vnops.c#16 integrate .. //depot/projects/tty/sys/fs/pseudofs/pseudofs_vnops.c#13 integrate .. //depot/projects/tty/sys/fs/udf/udf_vfsops.c#15 integrate .. //depot/projects/tty/sys/fs/unionfs/union_vnops.c#11 integrate .. //depot/projects/tty/sys/geom/geom_gpt.c#14 integrate .. //depot/projects/tty/sys/geom/mirror/g_mirror.c#12 integrate .. //depot/projects/tty/sys/geom/raid3/g_raid3.c#11 integrate .. //depot/projects/tty/sys/i386/conf/GENERIC#26 integrate .. //depot/projects/tty/sys/i386/conf/NOTES#30 integrate .. //depot/projects/tty/sys/i386/conf/XBOX#5 integrate .. //depot/projects/tty/sys/i386/i386/pmap.c#24 integrate .. //depot/projects/tty/sys/i386/ibcs2/ibcs2_misc.c#11 integrate .. //depot/projects/tty/sys/i386/ibcs2/ibcs2_msg.c#5 integrate .. //depot/projects/tty/sys/i386/ibcs2/ibcs2_poll.h#3 delete .. //depot/projects/tty/sys/i386/ibcs2/ibcs2_proto.h#7 integrate .. //depot/projects/tty/sys/i386/ibcs2/ibcs2_syscall.h#7 integrate .. //depot/projects/tty/sys/i386/ibcs2/ibcs2_sysent.c#8 integrate .. //depot/projects/tty/sys/i386/ibcs2/ibcs2_xenix.h#5 integrate .. //depot/projects/tty/sys/i386/ibcs2/ibcs2_xenix_syscall.h#5 integrate .. //depot/projects/tty/sys/i386/ibcs2/ibcs2_xenix_sysent.c#6 integrate .. //depot/projects/tty/sys/i386/ibcs2/syscalls.master#7 integrate .. //depot/projects/tty/sys/i386/ibcs2/syscalls.xenix#5 integrate .. //depot/projects/tty/sys/i386/linux/linux_proto.h#14 integrate .. //depot/projects/tty/sys/i386/linux/linux_syscall.h#14 integrate .. //depot/projects/tty/sys/i386/linux/linux_sysent.c#15 integrate .. //depot/projects/tty/sys/i386/linux/syscalls.master#14 integrate .. //depot/projects/tty/sys/ia64/conf/GENERIC#16 integrate .. //depot/projects/tty/sys/ia64/disasm/disasm.h#3 integrate .. //depot/projects/tty/sys/ia64/disasm/disasm_decode.c#4 integrate .. //depot/projects/tty/sys/ia64/disasm/disasm_extract.c#3 integrate .. //depot/projects/tty/sys/ia64/disasm/disasm_format.c#3 integrate .. //depot/projects/tty/sys/ia64/disasm/disasm_int.h#3 integrate .. //depot/projects/tty/sys/ia64/ia64/emulate.c#1 branch .. //depot/projects/tty/sys/ia64/ia64/machdep.c#19 integrate .. //depot/projects/tty/sys/ia64/ia64/pmap.c#20 integrate .. //depot/projects/tty/sys/ia64/ia64/trap.c#18 integrate .. //depot/projects/tty/sys/ia64/include/ieeefp.h#3 integrate .. //depot/projects/tty/sys/ia64/include/md_var.h#10 integrate .. //depot/projects/tty/sys/kern/init_sysent.c#18 integrate .. //depot/projects/tty/sys/kern/kern_acl.c#6 integrate .. //depot/projects/tty/sys/kern/kern_descrip.c#19 integrate .. //depot/projects/tty/sys/kern/kern_fork.c#16 integrate .. //depot/projects/tty/sys/kern/kern_ktrace.c#17 integrate .. //depot/projects/tty/sys/kern/kern_linker.c#14 integrate .. //depot/projects/tty/sys/kern/kern_module.c#9 integrate .. //depot/projects/tty/sys/kern/kern_prot.c#14 integrate .. //depot/projects/tty/sys/kern/kern_thread.c#19 integrate .. //depot/projects/tty/sys/kern/sched_4bsd.c#15 integrate .. //depot/projects/tty/sys/kern/sched_core.c#2 integrate .. //depot/projects/tty/sys/kern/subr_acl_posix1e.c#1 branch .. //depot/projects/tty/sys/kern/subr_firmware.c#3 integrate .. //depot/projects/tty/sys/kern/syscalls.c#18 integrate .. //depot/projects/tty/sys/kern/syscalls.master#19 integrate .. //depot/projects/tty/sys/kern/sysv_sem.c#14 integrate .. //depot/projects/tty/sys/kern/uipc_socket2.c#19 integrate .. //depot/projects/tty/sys/kern/uipc_usrreq.c#17 integrate .. //depot/projects/tty/sys/kern/vfs_init.c#10 integrate .. //depot/projects/tty/sys/kern/vfs_mount.c#24 integrate .. //depot/projects/tty/sys/kern/vfs_subr.c#29 integrate .. //depot/projects/tty/sys/kern/vfs_syscalls.c#24 integrate .. //depot/projects/tty/sys/kern/vfs_vnops.c#17 integrate .. //depot/projects/tty/sys/modules/Makefile#31 integrate .. //depot/projects/tty/sys/modules/bktr/bktr_mem/Makefile#2 integrate .. //depot/projects/tty/sys/modules/netgraph/Makefile#11 integrate .. //depot/projects/tty/sys/modules/netgraph/tag/Makefile#1 branch .. //depot/projects/tty/sys/modules/nfe/Makefile#1 branch .. //depot/projects/tty/sys/modules/streams/Makefile#3 integrate .. //depot/projects/tty/sys/modules/svr4/Makefile#4 integrate .. //depot/projects/tty/sys/net/bpf.c#21 integrate .. //depot/projects/tty/sys/net/if.c#25 integrate .. //depot/projects/tty/sys/net/if_atmsubr.c#13 integrate .. //depot/projects/tty/sys/net/if_enc.c#1 branch .. //depot/projects/tty/sys/net/if_gif.c#14 integrate .. //depot/projects/tty/sys/net/if_stf.c#15 integrate .. //depot/projects/tty/sys/net/if_tun.c#15 integrate .. //depot/projects/tty/sys/net/if_types.h#9 integrate .. //depot/projects/tty/sys/net/if_vlan.c#16 integrate .. //depot/projects/tty/sys/net/rtsock.c#15 integrate .. //depot/projects/tty/sys/net80211/ieee80211_freebsd.c#7 integrate .. //depot/projects/tty/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#9 integrate .. //depot/projects/tty/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#4 integrate .. //depot/projects/tty/sys/netgraph/ng_tag.c#1 branch .. //depot/projects/tty/sys/netgraph/ng_tag.h#1 branch .. //depot/projects/tty/sys/netinet/if_ether.c#17 integrate .. //depot/projects/tty/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/tty/sys/netinet/in_rmx.c#8 integrate .. //depot/projects/tty/sys/netinet/ip_divert.c#15 integrate .. //depot/projects/tty/sys/netinet/ip_fw2.c#30 integrate .. //depot/projects/tty/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/tty/sys/netinet/ip_output.c#22 integrate .. //depot/projects/tty/sys/netinet/libalias/libalias.3#3 integrate .. //depot/projects/tty/sys/netinet/tcp_input.c#26 integrate .. //depot/projects/tty/sys/netinet/tcp_syncache.c#18 integrate .. //depot/projects/tty/sys/netinet/tcp_usrreq.c#18 integrate .. //depot/projects/tty/sys/netinet/tcp_var.h#20 integrate .. //depot/projects/tty/sys/netinet6/in6.c#14 integrate .. //depot/projects/tty/sys/netinet6/in6_cksum.c#8 integrate .. //depot/projects/tty/sys/netinet6/in6_pcb.c#13 integrate .. //depot/projects/tty/sys/netinet6/in6_rmx.c#7 integrate .. //depot/projects/tty/sys/netinet6/in6_var.h#10 integrate .. //depot/projects/tty/sys/netinet6/ipsec.c#12 integrate .. //depot/projects/tty/sys/netinet6/raw_ip6.c#13 integrate .. //depot/projects/tty/sys/netipsec/ipsec.h#7 integrate .. //depot/projects/tty/sys/netipsec/ipsec_input.c#9 integrate .. //depot/projects/tty/sys/netipsec/ipsec_osdep.h#3 integrate .. //depot/projects/tty/sys/netipsec/ipsec_output.c#8 integrate .. //depot/projects/tty/sys/netipsec/xform_ipip.c#9 integrate .. //depot/projects/tty/sys/nfsclient/bootp_subr.c#12 integrate .. //depot/projects/tty/sys/nfsclient/nfs_diskless.c#12 integrate .. //depot/projects/tty/sys/nfsserver/nfs_srvcache.c#7 integrate .. //depot/projects/tty/sys/nfsserver/nfsrvcache.h#5 integrate .. //depot/projects/tty/sys/pc98/conf/GENERIC#19 integrate .. //depot/projects/tty/sys/pci/agp_i810.c#13 integrate .. //depot/projects/tty/sys/pci/if_rlreg.h#16 integrate .. //depot/projects/tty/sys/powerpc/conf/GENERIC#16 integrate .. //depot/projects/tty/sys/powerpc/powerpc/mmu_oea.c#3 integrate .. //depot/projects/tty/sys/security/audit/audit.h#2 integrate .. //depot/projects/tty/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/tty/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/tty/sys/sparc64/conf/GENERIC#21 integrate .. //depot/projects/tty/sys/sys/gpt.h#5 integrate .. //depot/projects/tty/sys/sys/rwlock.h#3 integrate .. //depot/projects/tty/sys/sys/syscall.h#18 integrate .. //depot/projects/tty/sys/sys/syscall.mk#18 integrate .. //depot/projects/tty/sys/sys/syscallsubr.h#16 integrate .. //depot/projects/tty/sys/sys/sysproto.h#19 integrate .. //depot/projects/tty/sys/vm/vm_page.c#17 integrate .. //depot/projects/tty/sys/vm/vm_pageq.c#12 integrate .. //depot/projects/tty/tools/kerneldoc/Doxyfile#1 branch .. //depot/projects/tty/tools/kerneldoc/Makefile#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Dependencies#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-cam#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-crypto#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-dev_pci#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-dev_sound#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-dev_usb#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-geom#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-i4b#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-kern#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-libkern#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-linux#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-net80211#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-netgraph#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-netinet#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-netinet6#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-netipsec#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-opencrypto#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Doxyfile-vm#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/Makefile#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/README#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/common-Doxyfile#1 branch .. //depot/projects/tty/tools/kerneldoc/subsys/notreviewed.dox#1 branch .. //depot/projects/tty/tools/tools/ath/athstats/athstats.c#2 integrate .. //depot/projects/tty/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate .. //depot/projects/tty/usr.bin/calendar/calendars/calendar.freebsd#19 integrate .. //depot/projects/tty/usr.bin/netstat/route.c#9 integrate .. //depot/projects/tty/usr.bin/tail/extern.h#3 integrate .. //depot/projects/tty/usr.bin/tail/forward.c#6 integrate .. //depot/projects/tty/usr.bin/tail/tail.1#4 integrate .. //depot/projects/tty/usr.bin/tail/tail.c#5 integrate .. //depot/projects/tty/usr.sbin/kgmon/kgmon.c#3 integrate .. //depot/projects/tty/usr.sbin/lpr/lpd/printjob.c#4 integrate .. //depot/projects/tty/usr.sbin/mtree/misc.c#6 integrate .. //depot/projects/tty/usr.sbin/mtree/mtree.8#10 integrate .. //depot/projects/tty/usr.sbin/mtree/mtree.h#4 integrate .. //depot/projects/tty/usr.sbin/mtree/spec.c#7 integrate .. //depot/projects/tty/usr.sbin/mtree/test/test05.sh#1 branch .. //depot/projects/tty/usr.sbin/mtree/verify.c#8 integrate .. //depot/projects/tty/usr.sbin/newsyslog/newsyslog.c#13 integrate .. //depot/projects/tty/usr.sbin/ngctl/config.c#4 integrate .. //depot/projects/tty/usr.sbin/ngctl/connect.c#4 integrate .. //depot/projects/tty/usr.sbin/ngctl/debug.c#4 integrate .. //depot/projects/tty/usr.sbin/ngctl/list.c#6 integrate .. //depot/projects/tty/usr.sbin/ngctl/main.c#7 integrate .. //depot/projects/tty/usr.sbin/ngctl/mkpeer.c#4 integrate .. //depot/projects/tty/usr.sbin/ngctl/msg.c#5 integrate .. //depot/projects/tty/usr.sbin/ngctl/name.c#4 integrate .. //depot/projects/tty/usr.sbin/ngctl/rmhook.c#4 integrate .. //depot/projects/tty/usr.sbin/ngctl/show.c#4 integrate .. //depot/projects/tty/usr.sbin/ngctl/shutdown.c#3 integrate .. //depot/projects/tty/usr.sbin/ngctl/status.c#4 integrate .. //depot/projects/tty/usr.sbin/ngctl/types.c#4 integrate .. //depot/projects/tty/usr.sbin/ngctl/write.c#3 integrate .. //depot/projects/tty/usr.sbin/sade/Makefile#1 branch .. //depot/projects/tty/usr.sbin/sade/command.c#1 branch .. //depot/projects/tty/usr.sbin/sade/config.c#1 branch .. //depot/projects/tty/usr.sbin/sade/devices.c#1 branch .. //depot/projects/tty/usr.sbin/sade/disks.c#1 branch .. //depot/projects/tty/usr.sbin/sade/dispatch.c#1 branch .. //depot/projects/tty/usr.sbin/sade/dmenu.c#1 branch .. //depot/projects/tty/usr.sbin/sade/globals.c#1 branch .. //depot/projects/tty/usr.sbin/sade/help/partition.hlp#1 branch .. //depot/projects/tty/usr.sbin/sade/help/slice.hlp#1 branch .. //depot/projects/tty/usr.sbin/sade/install.c#1 branch .. //depot/projects/tty/usr.sbin/sade/keymap.c#1 branch .. //depot/projects/tty/usr.sbin/sade/label.c#1 branch .. //depot/projects/tty/usr.sbin/sade/list.h#1 branch .. //depot/projects/tty/usr.sbin/sade/main.c#1 branch .. //depot/projects/tty/usr.sbin/sade/menus.c#1 branch .. //depot/projects/tty/usr.sbin/sade/misc.c#1 branch .. //depot/projects/tty/usr.sbin/sade/msg.c#1 branch .. //depot/projects/tty/usr.sbin/sade/rtermcap.c#1 branch .. //depot/projects/tty/usr.sbin/sade/sade.8#1 branch .. //depot/projects/tty/usr.sbin/sade/sade.h#1 branch .. //depot/projects/tty/usr.sbin/sade/system.c#1 branch .. //depot/projects/tty/usr.sbin/sade/termcap.c#1 branch .. //depot/projects/tty/usr.sbin/sade/usb.c#1 branch .. //depot/projects/tty/usr.sbin/sade/variable.c#1 branch .. //depot/projects/tty/usr.sbin/sade/wizard.c#1 branch Differences ... ==== //depot/projects/tty/MAINTAINERS#21 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.135 2006/06/03 01:52:11 scottl Exp $ +$FreeBSD: src/MAINTAINERS,v 1.137 2006/07/04 02:01:48 brooks Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -35,10 +35,6 @@ NEWCARD imp Pre-commit review requested. OLDCARD imp Pre-commit review requested. pci bus imp,jhb Pre-commit review requested. -telnet markm Heads-up appreciated. Try not to break it. -secure/* markm Heads-up appreciated. Try not to break it. -kerberos5 nectar Pre-commit review requested. -heimdal nectar Pre-commit review requested. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. @@ -63,8 +59,6 @@ Keep in sync with -STABLE. etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. -dhcp mbr Needs to pre-approve commits to contrib/isc-dhcp, so - changes can be made to the isc.org CVS repository. libfetch des Advance notification requested. fetch des Advance notification requested. libpam des Pre-commit review requested. @@ -91,8 +85,6 @@ libufs jmallett Willing to handle problems, help with work. fdc(4) joerg Just keep me informed of changes, try not to break it. sppp(4) joerg Just keep me informed of changes, try not to break it. -libc nectar Opportuntity for pre-commit review appreciated for - nsdispatch(3) and its consumers. unifdef(1) fanf Pre-commit review requested. ntp roberto Pre-commit review requested. inetd dwmalone Recommends pre-commit review. @@ -146,13 +138,7 @@ bin/dd/Makefile:MAINTAINER= green@FreeBSD.org games/fortune/datfiles/Makefile:MAINTAINER= jkh gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch -sbin/dhclient/Makefile.inc:MAINTAINER= mbr -sys/compat/svr4/Makefile:MAINTAINER= newton@freebsd.org -sys/dev/bktr/CHANGELOG.TXT: * MAINTAINER = Roger Hardiman <roger@freebsd.org> sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org -sys/modules/bktr/bktr_mem/Makefile:MAINTAINER= roger@freebsd.org -sys/modules/streams/Makefile:MAINTAINER= newton@atdot.dotat.org -sys/modules/svr4/Makefile:MAINTAINER= newton@FreeBSD.org sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi <kzmi@ca2.so-net.ne.jp> tools/tools/sysdoc/Makefile:MAINTAINER= trhodes@FreeBSD.org usr.bin/locate/Makefile:MAINTAINER= wosch ==== //depot/projects/tty/Makefile#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.333 2006/06/21 09:53:42 obrien Exp $ +# $FreeBSD: src/Makefile,v 1.334 2006/06/22 16:52:53 imp Exp $ # # The user-driven targets are: # @@ -206,9 +206,6 @@ @echo "'Rebuilding world', for how to upgrade your system." @echo "Define DESTDIR to where you want to install FreeBSD," @echo "including /, to override this warning and proceed as usual." - @echo "You may get the historical 'make world' behavior by defining" - @echo "HISTORICAL_MAKE_WORLD. You should understand the implications" - @echo "before doing this." @echo "" @echo "Bailing out now..." @false ==== //depot/projects/tty/ObsoleteFiles.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.37 2006/05/20 00:30:06 marcel Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.39 2006/07/06 11:43:53 delphij Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -2717,6 +2717,11 @@ OLD_FILES+=usr/games/worms OLD_FILES+=usr/games/wump +# 20060521: gethostbyaddr(3) ABI change +OLD_LIBS+=usr/lib/libroken.so.8 +OLD_LIBS+=lib/libatm.so.3 +OLD_LIBS+=lib/libc.so.6 +OLD_LIBS+=lib/libutil.so.5 # 20060413: shared library moved to /usr/lib OLD_LIBS+=lib/libgpib.so.1 # 20060127: revert libdisk to static-only ==== //depot/projects/tty/UPDATING#30 (text+ko) ==== @@ -21,6 +21,11 @@ developers choose to disable these features on build machines to maximize performance. +20060627: + The XBOX kernel now defaults to the nfe(4) driver instead of + the nve(4) driver. Please update your configuration + accordingly. + 20060511: The machdep.* sysctls and the adjkerntz utility have been modified a bit. The new adjkerntz utility uses the new @@ -580,4 +585,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.449 2006/05/15 15:47:45 keramida Exp $ +$FreeBSD: src/UPDATING,v 1.450 2006/06/27 20:22:32 rink Exp $ ==== //depot/projects/tty/bin/cp/cp.c#7 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.52 2005/09/05 04:36:08 csjp Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.53 2006/07/04 20:52:36 maxim Exp $"); /* * Cp copies source files to target files. @@ -476,6 +476,7 @@ } if (errno) err(1, "fts_read"); + fts_close(ftsp); return (rval); } ==== //depot/projects/tty/contrib/openbsm/FREEBSD-upgrade#2 (text) ==== @@ -30,15 +30,15 @@ Normally, the CVS vendor import goes along the following lines: cd ~/p4/projects/trustedbsd/openbsm - cvs -d rwatson@repoman.FreeBSD.org:/home/ncvs -q import src/contrib/openbsm \ - TrustedBSD OPENBSM_1_0_ALPHA_1 + cvs -n -d rwatson@repoman.FreeBSD.org:/home/ncvs -q import \ + src/contrib/openbsm TrustedBSD OPENBSM_1_0_ALPHA_1 -Replacing the version string as required. Use the "-n" argument to CVS to -do a test run. +Replacing the version string as required. Remove the "-n" argument once +the import is tested in order to perform the actual import. Propagation of changes to src/sys/{bsm,security/audit} is something that requires careful coordination and attention to detail. These files are not on CVS vendor branches, but do have the same local vs. vendor merge issues. -$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.4 2006/03/05 13:30:37 rwatson Exp $ +$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.5 2006/06/27 17:55:38 rwatson Exp $ ==== //depot/projects/tty/contrib/openbsm/HISTORY#3 (text) ==== @@ -1,3 +1,13 @@ +OpenBSM 1.0 alpha 7 + +- Adopted Solaris-compatible format for subject32_ex and subject64_ex + tokens, which previously did not correctly implement variable length + address storage. +- Prefer inttypes.h to stdint.h; enhance queue.h detection to test for + TAILQ_FOREACH_SAFE(), which is present in recent BSD queue.h's, but not + older ones. OpenBSM now builds on some FreeBSD 4.x version. +- New event types for extended attributes, ACLs, and scheduling. + OpenBSM 1.0 alpha 6 - Use AU_TO_WRITE and AU_NO_TO_WRITE for the 'keep' argument to au_close(); @@ -165,4 +175,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#12 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#15 $ ==== //depot/projects/tty/contrib/openbsm/VERSION#3 (text) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_6 +OPENBSM_1_0_ALPHA_7 ==== //depot/projects/tty/contrib/openbsm/bsm/audit_kevents.h#2 (text) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#37 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#38 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -383,7 +383,24 @@ #define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ -#define AUE_SYSARCH 406 /* FreeBSD. */ +#define AUE_ACL_GET_LINK 406 /* FreeBSD. */ +#define AUE_ACL_SET_LINK 407 /* FreeBSD. */ +#define AUE_ACL_DELETE_LINK 408 /* FreeBSD. */ +#define AUE_ACL_CHECK_LINK 409 /* FreeBSD. */ +#define AUE_SYSARCH 410 /* FreeBSD. */ +#define AUE_EXTATTRCTL 411 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FILE 412 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FILE 413 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FILE 414 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FILE 415 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FD 416 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FD 417 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FD 418 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FD 419 /* FreeBSD. */ +#define AUE_EXTATTR_GET_LINK 420 /* FreeBSD. */ +#define AUE_EXTATTR_SET_LINK 421 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_LINK 422 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 423 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/tty/contrib/openbsm/bsm/audit_record.h#3 (text) ==== @@ -30,12 +30,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#17 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#19 $ */ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ +#include <sys/time.h> /* struct timeval */ + /* * Token type identifiers. */ ==== //depot/projects/tty/contrib/openbsm/bsm/libbsm.h#3 (text) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#20 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#21 $ */ #ifndef _LIBBSM_H_ @@ -43,7 +43,7 @@ #include <sys/types.h> #include <sys/cdefs.h> -#include <stdint.h> /* Required for audit.h. */ +#include <inttypes.h> /* Required for audit.h. */ #include <time.h> /* Required for clock_t on Linux. */ #include <bsm/audit.h> ==== //depot/projects/tty/contrib/openbsm/config/ltmain.sh#2 (text) ==== @@ -43,8 +43,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.20 -TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)" +VERSION=1.5.22 +TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" # See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes. @@ -132,6 +132,8 @@ show="$echo" show_help= execute_dlfiles= +duplicate_deps=no +preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" @@ -139,6 +141,43 @@ # Shell function definitions: # This seems to be the best place for them +# func_mktempdir [string] +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, STRING is the basename for that directory. +func_mktempdir () +{ + my_template="${TMPDIR-/tmp}/${1-$progname}" + + if test "$run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else + + # If mktemp works, use that first and foremost + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" + + save_mktempdir_umask=`umask` + umask 0077 + $mkdir "$my_tmpdir" + umask $save_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$my_tmpdir" || { + $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 + exit $EXIT_FAILURE + } + fi + + $echo "X$my_tmpdir" | $Xsed +} + + # func_win32_libid arg # return the library type of file 'arg' # @@ -157,12 +196,11 @@ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` - if test "X$win32_nmres" = "Ximport" ; then - win32_libid_type="x86 archive import" - else - win32_libid_type="x86 archive static" - fi + $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac fi ;; *DLL*) @@ -188,6 +226,20 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { + # FreeBSD-specific: where we install compilers with non-standard names + tag_compilers_CC="*cc cc* *gcc gcc*" + tag_compilers_CXX="*c++ c++* *g++ g++*" + base_compiler=`set -- "$@"; echo $1` + + # If $tagname isn't set, then try to infer if the default "CC" tag applies + if test -z "$tagname"; then + for zp in $tag_compilers_CC; do + case $base_compiler in + $zp) tagname="CC"; break;; + esac + done + fi + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -228,7 +280,22 @@ break ;; esac - fi + + # FreeBSD-specific: try compilers based on inferred tag + if test -z "$tagname"; then + eval "tag_compilers=\$tag_compilers_${z}" + if test -n "$tag_compilers"; then + for zp in $tag_compilers; do + case $base_compiler in + $zp) tagname=$z; break;; + esac + done + if test -n "$tagname"; then + break + fi + fi + fi + fi done # If $tagname still isn't set, then no tagged configuration # was found and let the user know that the "--tag" command @@ -295,9 +362,9 @@ $run ${rm}r "$my_xdir" $show "$mkdir $my_xdir" $run $mkdir "$my_xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$my_xdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then + exit $exit_status fi case $host in *-darwin*) @@ -352,6 +419,8 @@ # Darwin sucks eval std_shrext=\"$shrext_cmds\" +disable_libs=no + # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -468,7 +537,11 @@ preserve_args="$preserve_args $arg" ;; - --tag) prevopt="--tag" prev=tag ;; + --tag) + prevopt="--tag" + prev=tag + preserve_args="$preserve_args --tag" + ;; --tag=*) set tag "$optarg" ${1+"$@"} shift @@ -500,6 +573,18 @@ exit $EXIT_FAILURE fi +case $disable_libs in +no) + ;; +shared) + build_libtool_libs=no + build_old_libs=yes + ;; +static) + build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` + ;; +esac + # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. @@ -856,9 +941,9 @@ if test ! -d "${xdir}$objdir"; then $show "$mkdir ${xdir}$objdir" $run $mkdir ${xdir}$objdir - status=$? - if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then + exit $exit_status fi fi @@ -1061,6 +1146,7 @@ no_install=no objs= non_pic_objects= + notinst_path= # paths that contain not-installed libtool libraries precious_files_regex= prefer_static_libs=no preload=no @@ -1089,14 +1175,15 @@ if test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=yes else if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=built fi build_libtool_libs=no build_old_libs=yes - prefer_static_libs=yes break ;; esac @@ -1271,6 +1358,11 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1354,8 +1446,8 @@ prev= continue ;; - darwin_framework) - compiler_flags="$compiler_flags $arg" + darwin_framework|darwin_framework_skip) + test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" prev= @@ -1419,13 +1511,17 @@ continue ;; - -framework|-arch) - prev=darwin_framework - compiler_flags="$compiler_flags $arg" + -framework|-arch|-isysroot) + case " $CC " in + *" ${arg} ${1} "* | *" ${arg} ${1} "*) + prev=darwin_framework_skip ;; + *) compiler_flags="$compiler_flags $arg" + prev=darwin_framework ;; + esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - continue - ;; + continue + ;; -inst-prefix-dir) prev=inst_prefix @@ -1453,7 +1549,8 @@ absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit $EXIT_FAILURE + absdir="$dir" + notinst_path="$notinst_path $dir" fi dir="$absdir" ;; @@ -1467,10 +1564,15 @@ esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; *) dllsearchpath="$dllsearchpath:$dir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac continue @@ -1479,11 +1581,11 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-pw32* | *-*-beos*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) # These systems don't actually have a C or math library (as such) continue ;; - *-*-mingw* | *-*-os2*) + *-*-os2*) # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; @@ -1495,6 +1597,15 @@ # Rhapsody C and math libraries are in the System framework deplibs="$deplibs -framework System" continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test "X$arg" = "X-lc" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; esac elif test "X$arg" = "X-lc_r"; then case $host in @@ -1522,6 +1633,7 @@ compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" + deplibs="$deplibs $arg" continue ;; @@ -1536,7 +1648,12 @@ # +DA*, +DD* enable 64-bit mode on the HP compiler # -q* pass through compiler args for the IBM compiler # -m* pass through architecture-specific compiler args for GCC - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*) + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ + -t[45]*|-txscale*|@*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. @@ -1548,9 +1665,7 @@ esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" - fi + compiler_flags="$compiler_flags $arg" >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607070509.k6759cUY007312>