PERFORCE change 61167 for review
Peter Wemm
peter at FreeBSD.org
Tue Sep 7 16:01:01 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=61167
Change 61167 by peter at peter_daintree on 2004/09/07 23:00:53
IFC @61166
Affected files ...
.. //depot/projects/hammer/Makefile.inc1#59 integrate
.. //depot/projects/hammer/UPDATING#53 integrate
.. //depot/projects/hammer/contrib/gdb/gdb/ia64-tdep.c#5 integrate
.. //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.c#5 integrate
.. //depot/projects/hammer/etc/devd.conf#13 integrate
.. //depot/projects/hammer/etc/mtree/BSD.include.dist#24 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/main.c#2 integrate
.. //depot/projects/hammer/include/Makefile#29 integrate
.. //depot/projects/hammer/include/tgmath.h#2 integrate
.. //depot/projects/hammer/lib/Makefile#41 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#16 integrate
.. //depot/projects/hammer/lib/libautofs/Makefile#2 integrate
.. //depot/projects/hammer/lib/libautofs/libautofs.c#2 integrate
.. //depot/projects/hammer/lib/libc/ia64/string/memcpy.S#3 integrate
.. //depot/projects/hammer/lib/libc/ia64/string/memmove.S#3 integrate
.. //depot/projects/hammer/lib/libc/regex/regcomp.c#6 integrate
.. //depot/projects/hammer/lib/libc/sys/msync.2#6 integrate
.. //depot/projects/hammer/lib/libkvm/kvm_proc.c#22 integrate
.. //depot/projects/hammer/lib/libstand/ufs.c#4 integrate
.. //depot/projects/hammer/release/Makefile#56 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#20 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#4 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#58 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml#4 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#3 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#4 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#10 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#6 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#8 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml#5 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml#3 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/readme/article.sgml#11 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#75 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#7 integrate
.. //depot/projects/hammer/release/doc/share/misc/man2hwnotes.pl#4 integrate
.. //depot/projects/hammer/release/doc/share/sgml/release.dsl#3 integrate
.. //depot/projects/hammer/release/doc/share/sgml/release.ent#13 integrate
.. //depot/projects/hammer/sbin/gbde/gbde.c#11 integrate
.. //depot/projects/hammer/share/examples/etc/make.conf#23 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#47 integrate
.. //depot/projects/hammer/share/man/man4/bge.4#11 integrate
.. //depot/projects/hammer/share/man/man4/dc.4#13 integrate
.. //depot/projects/hammer/share/man/man4/gx.4#5 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ctau.4#4 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/el.4#3 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ep.4#6 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ex.4#4 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ie.4#2 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/snc.4#3 integrate
.. //depot/projects/hammer/share/man/man4/nge.4#4 integrate
.. //depot/projects/hammer/share/man/man4/ohci.4#4 integrate
.. //depot/projects/hammer/share/man/man4/polling.4#9 integrate
.. //depot/projects/hammer/share/man/man4/re.4#8 integrate
.. //depot/projects/hammer/share/man/man4/sis.4#6 integrate
.. //depot/projects/hammer/share/man/man4/sn.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ste.4#5 integrate
.. //depot/projects/hammer/share/man/man4/ti.4#7 integrate
.. //depot/projects/hammer/share/man/man4/tl.4#5 integrate
.. //depot/projects/hammer/share/man/man4/uaudio.4#4 integrate
.. //depot/projects/hammer/share/man/man4/ubsa.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ucom.4#4 integrate
.. //depot/projects/hammer/share/man/man4/ucycom.4#1 branch
.. //depot/projects/hammer/share/man/man4/uftdi.4#4 integrate
.. //depot/projects/hammer/share/man/man4/uhci.4#3 integrate
.. //depot/projects/hammer/share/man/man4/umodem.4#4 integrate
.. //depot/projects/hammer/share/man/man4/uplcom.4#6 integrate
.. //depot/projects/hammer/share/man/man4/uscanner.4#12 integrate
.. //depot/projects/hammer/share/man/man4/uvscom.4#3 integrate
.. //depot/projects/hammer/share/man/man4/vr.4#7 integrate
.. //depot/projects/hammer/share/man/man4/wb.4#3 integrate
.. //depot/projects/hammer/share/man/man4/witness.4#3 integrate
.. //depot/projects/hammer/share/man/man5/procfs.5#7 integrate
.. //depot/projects/hammer/share/man/man7/release.7#22 integrate
.. //depot/projects/hammer/share/mk/bsd.subdir.mk#3 integrate
.. //depot/projects/hammer/share/msgdef/Makefile#15 integrate
.. //depot/projects/hammer/sys/alpha/alpha/clock.c#7 integrate
.. //depot/projects/hammer/sys/alpha/alpha/machdep.c#25 integrate
.. //depot/projects/hammer/sys/alpha/conf/GENERIC#22 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#101 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#54 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/assabet_machdep.c#3 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#17 integrate
.. //depot/projects/hammer/sys/conf/NOTES#65 integrate
.. //depot/projects/hammer/sys/conf/files#81 integrate
.. //depot/projects/hammer/sys/conf/options#58 integrate
.. //depot/projects/hammer/sys/ddb/db_ps.c#14 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_powerres.c#13 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#19 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#34 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#20 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#43 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#20 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#23 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed.c#20 integrate
.. //depot/projects/hammer/sys/dev/firewire/sbp.c#32 integrate
.. //depot/projects/hammer/sys/dev/iir/iir.c#9 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_pci.c#11 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#37 integrate
.. //depot/projects/hammer/sys/dev/re/if_re.c#18 integrate
.. //depot/projects/hammer/sys/dev/usb/ucycom.c#1 branch
.. //depot/projects/hammer/sys/dev/usb/umass.c#25 integrate
.. //depot/projects/hammer/sys/dev/usb/uplcom.c#11 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#8 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#47 integrate
.. //depot/projects/hammer/sys/dev/usb/uscanner.c#17 integrate
.. //depot/projects/hammer/sys/fs/autofs/autofs.h#2 integrate
.. //depot/projects/hammer/sys/fs/autofs/autofs_util.c#2 integrate
.. //depot/projects/hammer/sys/fs/autofs/autofs_vfsops.c#2 integrate
.. //depot/projects/hammer/sys/fs/autofs/autofs_vnops.c#2 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#12 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs.h#2 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs_io.c#9 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#6 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs.h#4 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_io.c#11 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#15 integrate
.. //depot/projects/hammer/sys/geom/geom_subr.c#29 integrate
.. //depot/projects/hammer/sys/geom/notes#3 integrate
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#12 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#28 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#40 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_machdep.c#14 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_proto.h#12 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#12 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#13 integrate
.. //depot/projects/hammer/sys/i386/linux/syscalls.master#12 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#40 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vnops.c#12 integrate
.. //depot/projects/hammer/sys/kern/init_main.c#27 integrate
.. //depot/projects/hammer/sys/kern/kern_event.c#22 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#31 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#34 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#40 integrate
.. //depot/projects/hammer/sys/kern/kern_intr.c#30 integrate
.. //depot/projects/hammer/sys/kern/kern_kse.c#11 integrate
.. //depot/projects/hammer/sys/kern/kern_proc.c#35 integrate
.. //depot/projects/hammer/sys/kern/kern_switch.c#25 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#39 integrate
.. //depot/projects/hammer/sys/kern/kern_thr.c#22 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#63 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#27 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#47 integrate
.. //depot/projects/hammer/sys/kern/subr_smp.c#23 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#32 integrate
.. //depot/projects/hammer/sys/kern/sysv_shm.c#16 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#38 integrate
.. //depot/projects/hammer/sys/kern/vfs_aio.c#21 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#33 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#51 integrate
.. //depot/projects/hammer/sys/modules/Makefile#53 integrate
.. //depot/projects/hammer/sys/modules/cs/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/fdc/Makefile#8 integrate
.. //depot/projects/hammer/sys/modules/linprocfs/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/msdosfs/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/nfs4client/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/nfsclient/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/owi/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/smbfs/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/ucycom/Makefile#1 branch
.. //depot/projects/hammer/sys/net/if.c#29 integrate
.. //depot/projects/hammer/sys/net/netisr.c#9 integrate
.. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#13 integrate
.. //depot/projects/hammer/sys/netgraph/ng_pptpgre.c#8 integrate
.. //depot/projects/hammer/sys/netinet/ip_divert.c#21 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#39 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#38 integrate
.. //depot/projects/hammer/sys/netinet/raw_ip.c#28 integrate
.. //depot/projects/hammer/sys/netinet/tcp_output.c#21 integrate
.. //depot/projects/hammer/sys/netinet/tcp_subr.c#28 integrate
.. //depot/projects/hammer/sys/netinet/udp_usrreq.c#24 integrate
.. //depot/projects/hammer/sys/netinet6/nd6.c#14 integrate
.. //depot/projects/hammer/sys/netinet6/raw_ip6.c#14 integrate
.. //depot/projects/hammer/sys/netkey/key.c#17 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#6 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs.h#12 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#19 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_nfsiod.c#7 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#21 integrate
.. //depot/projects/hammer/sys/pc98/conf/GENERIC#25 integrate
.. //depot/projects/hammer/sys/pc98/i386/machdep.c#34 integrate
.. //depot/projects/hammer/sys/pci/if_pcn.c#22 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#28 integrate
.. //depot/projects/hammer/sys/sparc64/conf/GENERIC#28 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#31 integrate
.. //depot/projects/hammer/sys/sys/proc.h#63 integrate
.. //depot/projects/hammer/sys/sys/sched.h#13 integrate
.. //depot/projects/hammer/sys/sys/smp.h#10 integrate
.. //depot/projects/hammer/sys/sys/vnode.h#30 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#19 integrate
.. //depot/projects/hammer/sys/vm/vm_fault.c#24 integrate
.. //depot/projects/hammer/sys/vm/vm_glue.c#32 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#44 integrate
.. //depot/projects/hammer/sys/vm/vm_meter.c#10 integrate
.. //depot/projects/hammer/sys/vm/vnode_pager.c#21 integrate
.. //depot/projects/hammer/tools/regression/include/tgmath/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/include/tgmath/tgmath.c#1 branch
.. //depot/projects/hammer/tools/regression/sockets/kqueue/Makefile#2 integrate
.. //depot/projects/hammer/tools/regression/sockets/kqueue/kqueue.c#2 integrate
.. //depot/projects/hammer/tools/tools/crypto/Makefile#6 integrate
.. //depot/projects/hammer/tools/tools/crypto/cryptotest.c#4 branch
.. //depot/projects/hammer/usr.bin/make/Makefile#8 integrate
.. //depot/projects/hammer/usr.bin/truss/syscalls.c#15 integrate
.. //depot/projects/hammer/usr.bin/truss/truss.1#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/Makefile#8 integrate
.. //depot/projects/hammer/usr.sbin/ppp/acf.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/arp.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/arp.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/async.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/atm.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/atm.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/auth.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/auth.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/bundle.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/bundle.h#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/cbcp.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ccp.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/chap.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/chap_ms.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/chap_ms.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/chat.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/command.c#9 integrate
.. //depot/projects/hammer/usr.sbin/ppp/datalink.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/datalink.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/deflate.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/defs.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/defs.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ether.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ether.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/exec.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/filter.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/filter.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/fsm.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/fsm.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/hdlc.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/hdlc.h#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/i4b.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/i4b.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/id.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/iface.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/iface.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ip.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ipcp.c#7 integrate
.. //depot/projects/hammer/usr.sbin/ppp/iplist.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ipv6cp.c#5 integrate
.. //depot/projects/hammer/usr.sbin/ppp/lcp.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/link.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/lqr.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/main.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/main.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/mbuf.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/mbuf.h#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/mp.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/mp.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/mppe.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/nat_cmd.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ncp.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ncp.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ncpaddr.c#8 integrate
.. //depot/projects/hammer/usr.sbin/ppp/netgraph.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/netgraph.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/pap.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/physical.c#6 integrate
.. //depot/projects/hammer/usr.sbin/ppp/physical.h#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/pred.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/prompt.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/proto.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/radius.c#10 integrate
.. //depot/projects/hammer/usr.sbin/ppp/route.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/server.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/slcompress.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/sync.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/systems.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/tcp.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/tcpmss.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/tty.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/tty.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/udp.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/udp.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/vjcomp.c#2 integrate
Differences ...
==== //depot/projects/hammer/Makefile.inc1#59 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.443 2004/08/26 10:24:25 paul Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.445 2004/09/07 15:27:10 imp Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -675,7 +675,7 @@
#
legacy:
.for _tool in tools/build
- ${_+_}@${ECHODIR} "===> ${_tool}"; \
+ ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \
@@ -750,7 +750,7 @@
${_crunchgen} \
${_gensnmptree} \
${_kbdcontrol}
- ${_+_}@${ECHODIR} "===> ${_tool}"; \
+ ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
${MAKE} DIRPRFX=${_tool}/ depend; \
@@ -788,7 +788,7 @@
usr.bin/awk \
lib/libmagic \
usr.sbin/sysinstall
- ${_+_}@${ECHODIR} "===> ${_tool}"; \
+ ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
${MAKE} DIRPRFX=${_tool}/ build-tools
@@ -796,7 +796,7 @@
.for _tool in \
gnu/usr.bin/cc/cc_tools \
${_kerberos5_tools}
- ${_+_}@${ECHODIR} "===> ${_tool}"; \
+ ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
${MAKE} DIRPRFX=${_tool}/ depend; \
@@ -840,7 +840,7 @@
${_crunchide} \
${_elf2exe} \
${_kgzip}
- ${_+_}@${ECHODIR} "===> ${_tool}"; \
+ ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
${MAKE} DIRPRFX=${_tool}/ depend; \
@@ -933,7 +933,7 @@
.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
${_lib}__L: .PHONY
.if exists(${.CURDIR}/${_lib})
- ${_+_}@${ECHODIR} "===> ${_lib}"; \
+ ${_+_}@${ECHODIR} "===> ${_lib} (depend,all,install)"; \
cd ${.CURDIR}/${_lib}; \
${MAKE} DIRPRFX=${_lib}/ depend; \
${MAKE} DIRPRFX=${_lib}/ all; \
@@ -945,7 +945,7 @@
# static PAM library, and dynamic PAM library before dynamic PAM
# modules.
lib/libpam__L: .PHONY
- ${_+_}@${ECHODIR} "===> lib/libpam"; \
+ ${_+_}@${ECHODIR} "===> lib/libpam (depend,all,install)"; \
cd ${.CURDIR}/lib/libpam; \
${MAKE} DIRPRFX=lib/libpam/ depend; \
${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \
@@ -959,11 +959,11 @@
.for entry in ${SUBDIR}
${entry}.${__target}__D: .PHONY
${_+_}@if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \
- ${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH}"; \
+ ${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH} (${__target})"; \
edir=${entry}.${MACHINE_ARCH}; \
cd ${.CURDIR}/$${edir}; \
else \
- ${ECHODIR} "===> ${DIRPRFX}${entry}"; \
+ ${ECHODIR} "===> ${DIRPRFX}${entry} (${__target})"; \
edir=${entry}; \
cd ${.CURDIR}/$${edir}; \
fi; \
==== //depot/projects/hammer/UPDATING#53 (text+ko) ====
@@ -23,6 +23,11 @@
developers choose to disable these features on build machines
to maximize performance.
+20040906:
+ debug.witness_* has been renamed to debug.witness.*. There are
+ compatibility tunables left in for a few days. Update loader.conf
+ as necessary.
+
20040902:
The ifi_epoch change has been reverted because the ABI breakage
was too extensive. If you are running with a kernel/userland
@@ -1703,7 +1708,7 @@
To upgrade in-place from 4.x-stable to current
----------------------------------------------
# 5.x uses more space than 4.x. Also, the location of kernel
- # modules has changed. If you are installing 5.0 onto a 4.x
+ # modules has changed. If you are installing 5.x onto a 4.x
# system, you'll need about 30MB of free disk space on your /
# partition. If you have less than this, you may encounter difficult
# to back out of problems with this procedure. If /tmp is on
@@ -1714,9 +1719,8 @@
<make sure you have good level 0 dumps>
<maybe fix /etc/fstab> [7]
make buildworld [9]
- make buildkernel KERNCONF=YOUR_KERNEL_HERE [8]
cp sys/${MACHINE}/conf/GENERIC.hints /boot/device.hints [2]
- make installkernel KERNCONF=YOUR_KERNEL_HERE
+ make kernel KERNCONF=YOUR_KERNEL_HERE [8]
cd sys/boot ; make STRIP="" install [6]
[1]
<reboot in single user> [3]
@@ -1782,25 +1786,36 @@
described here.
[7] Before you upgrade, please make sure that you are not using
- compatibility slices. These are device names of the form, on i386
- and other architectures that use MBR slicing, /dev/ad0a without the
- actual slice name. Chances are excellent that these will break.
+ compatibility slices. These are device names of the form /dev/ad0a
+ without the actual slice name. These will break with 5.x and newer.
You generally must update these entries to use the post FreeBSD
- 2.x form of /dev/ad0s1a.
+ 2.x form of /dev/ad0s1a. i386 and pc98 are affected, while alpha
+ is not.
[8] In order to have a kernel that can run the 4.x binaries
needed to do an installworld, you must include the COMPAT_FREEBSD4
option in your kernel. Failure to do so may leave you with a system
that is hard to boot to recover.
+ Make sure that you merge any new devices from GENERIC since the
+ last time you updated your kernel config file.
+
[9] When checking out sources, you must include the -P flag to have
- cvs prune empty directories. Also, if CPUTYPE is defined in your
- /etc/make.conf, make sure to use the "?=" instead of the "=" assignment
- operator, so that buildworld can override the CPUTYPE if it needs to.
+ cvs prune empty directories.
+
+ If CPUTYPE is defined in your /etc/make.conf, make sure to use the
+ "?=" instead of the "=" assignment operator, so that buildworld can
+ override the CPUTYPE if it needs to.
+
+ MAKEOBJDIRPREFIX must be defined in an environment variable, and
+ not on the command line, or in /etc/make.conf. buildworld will
+ warn if it is improperly defined.
+
In case you would like to avoid installing new packages of everything,
you might want to uncomment the "COMPAT4X= YES" entry, so that 4.x
compatibility libraries are built which should allow you to continue
- using your existing software for a while.
+ using your existing software for a while. Alternatively, you can
+ install the misc/compat4x port.
[10] In order to create temporary files, /dev/random must be
initialized by feeding data into it. src/etc/rc.d/preseedrandom
@@ -1814,7 +1829,7 @@
Copyright information:
-Copyright 1998, 2002 M. Warner Losh. All Rights Reserved.
+Copyright 1998-2004 M. Warner Losh. All Rights Reserved.
Redistribution, publication, translation and use, with or without
modification, in full or in part, in any form or format of this
@@ -1838,4 +1853,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.354 2004/09/02 05:07:29 brooks Exp $
+$FreeBSD: src/UPDATING,v 1.356 2004/09/06 23:37:16 jmg Exp $
==== //depot/projects/hammer/contrib/gdb/gdb/ia64-tdep.c#5 (text+ko) ====
@@ -640,6 +640,48 @@
}
static void
+ia64_read_reg (CORE_ADDR addr, void *buf, int len)
+{
+ ULONGEST bspstore;
+ regcache_cooked_read_unsigned (current_regcache, IA64_BSPSTORE_REGNUM,
+ &bspstore);
+ if (addr >= bspstore)
+ {
+ ULONGEST bsp;
+ regcache_cooked_read_unsigned (current_regcache, IA64_BSP_REGNUM,
+ &bsp);
+ if (addr < bsp)
+ {
+ target_read_partial (¤t_target, TARGET_OBJECT_DIRTY,
+ (void*)&bspstore, buf, addr - bspstore, len);
+ return;
+ }
+ }
+ read_memory (addr, buf, len);
+}
+
+static void
+ia64_write_reg (CORE_ADDR addr, void *buf, int len)
+{
+ ULONGEST bspstore;
+ regcache_cooked_read_unsigned (current_regcache, IA64_BSPSTORE_REGNUM,
+ &bspstore);
+ if (addr >= bspstore)
+ {
+ ULONGEST bsp;
+ regcache_cooked_read_unsigned (current_regcache, IA64_BSP_REGNUM,
+ &bsp);
+ if (addr < bsp)
+ {
+ target_write_partial (¤t_target, TARGET_OBJECT_DIRTY,
+ (void*)&bspstore, buf, addr - bspstore, len);
+ return;
+ }
+ }
+ write_memory (addr, buf, len);
+}
+
+static void
ia64_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache,
int regnum, void *buf)
{
@@ -655,20 +697,10 @@
subtract the size of frame from it to get start of register frame. */
bsp = rse_address_add (bsp, -(cfm & 0x7f));
- if ((cfm & 0x7f) > regnum - V32_REGNUM)
+ if ((cfm & 0x7f) > regnum - V32_REGNUM)
{
- ULONGEST bspstore;
- ULONGEST reg_addr = rse_address_add (bsp, (regnum - V32_REGNUM));
- regcache_cooked_read_unsigned (regcache, IA64_BSPSTORE_REGNUM,
- &bspstore);
- if (reg_addr < bspstore) {
- reg = read_memory_integer ((CORE_ADDR)reg_addr, 8);
- store_unsigned_integer (buf, register_size (current_gdbarch,
- regnum), reg);
- } else
- target_read_partial (¤t_target, TARGET_OBJECT_DIRTY,
- (void*)&bspstore, buf, reg_addr - bspstore,
- register_size (current_gdbarch, regnum));
+ ULONGEST addr = rse_address_add (bsp, (regnum - V32_REGNUM));
+ ia64_read_reg (addr, buf, register_size (current_gdbarch, regnum));
}
else
store_unsigned_integer (buf, register_size (current_gdbarch, regnum), 0);
@@ -710,19 +742,9 @@
regcache_cooked_read_unsigned (regcache, IA64_RNAT_REGNUM, &nat_collection);
else
{
- ULONGEST bspstore;
- regcache_cooked_read_unsigned (regcache, IA64_BSPSTORE_REGNUM,
- &bspstore);
- if (nat_addr < bspstore)
- nat_collection = read_memory_integer (nat_addr, 8);
- else {
- char natbuf[8];
- target_read_partial (¤t_target, TARGET_OBJECT_DIRTY,
- (void*)&bspstore, natbuf,
- nat_addr - bspstore,
- register_size (current_gdbarch, regnum));
- nat_collection = *((uint64_t*)natbuf);
- }
+ uint64_t tmp;
+ ia64_read_reg (nat_addr, &tmp, sizeof(tmp));
+ nat_collection = tmp;
}
nat_bit = (gr_addr >> 3) & 0x3f;
natN_val = (nat_collection >> nat_bit) & 1;
@@ -787,16 +809,8 @@
if ((cfm & 0x7f) > regnum - V32_REGNUM)
{
- ULONGEST bspstore;
- ULONGEST reg_addr = rse_address_add (bsp, (regnum - V32_REGNUM));
- regcache_cooked_read_unsigned (regcache, IA64_BSPSTORE_REGNUM,
- &bspstore);
- if (reg_addr < bspstore)
- write_memory (reg_addr, (void *)buf, 8);
- else
- target_write_partial (¤t_target, TARGET_OBJECT_DIRTY,
- (void*)&bspstore, buf, reg_addr - bspstore,
- register_size (current_gdbarch, regnum));
+ ULONGEST addr = rse_address_add (bsp, (regnum - V32_REGNUM));
+ ia64_write_reg (addr, (void *)buf, 8);
}
}
else if (IA64_NAT0_REGNUM <= regnum && regnum <= IA64_NAT31_REGNUM)
@@ -850,34 +864,15 @@
}
else
{
- char nat_buf[8];
- ULONGEST bspstore;
- regcache_cooked_read_unsigned (regcache, IA64_BSPSTORE_REGNUM,
- &bspstore);
- if (nat_addr < bspstore)
- nat_collection = read_memory_integer (nat_addr, 8);
- else {
- char natbuf[8];
- target_read_partial (¤t_target, TARGET_OBJECT_DIRTY,
- (void*)&bspstore, natbuf,
- nat_addr - bspstore,
- register_size (current_gdbarch, regnum));
- nat_collection = *((uint64_t*)natbuf);
- }
+ uint64_t tmp;
+ ia64_read_reg (nat_addr, &tmp, sizeof(tmp));
+ nat_collection = tmp;
if (natN_val)
nat_collection |= natN_mask;
else
nat_collection &= ~natN_mask;
- store_unsigned_integer (nat_buf, register_size (current_gdbarch,
- regnum),
- nat_collection);
- if (nat_addr < bspstore)
- write_memory (nat_addr, nat_buf, 8);
- else
- target_write_partial (¤t_target, TARGET_OBJECT_DIRTY,
- (void*)&bspstore, nat_buf,
- nat_addr - bspstore,
- register_size (current_gdbarch, regnum));
+ tmp = nat_collection;
+ ia64_write_reg (nat_addr, &tmp, sizeof(tmp));
}
}
}
@@ -1451,7 +1446,9 @@
cfm = 0;
if (cache->saved_regs[IA64_CFM_REGNUM] != 0)
{
- cfm = read_memory_integer (cache->saved_regs[IA64_CFM_REGNUM], 8);
+ uint64_t tmp;
+ ia64_read_reg (cache->saved_regs[IA64_CFM_REGNUM], &tmp, sizeof(tmp));
+ cfm = tmp;
}
else if (cfm_reg != 0)
{
@@ -1649,7 +1646,7 @@
{
*lvalp = lval_memory;
*addrp = addr;
- read_memory (addr, valuep, register_size (current_gdbarch, regnum));
+ ia64_read_reg (addr, valuep, register_size (current_gdbarch, regnum));
}
else if (cache->prev_cfm)
store_unsigned_integer (valuep, register_size (current_gdbarch, regnum), cache->prev_cfm);
@@ -1734,7 +1731,11 @@
nat_collection = extract_unsigned_integer (buf, 8);
}
else
- nat_collection = read_memory_integer (nat_addr, 8);
+ {
+ uint64_t tmp;
+ ia64_read_reg (nat_addr, &tmp, sizeof(tmp));
+ nat_collection = tmp;
+ }
nat_bit = (gr_addr >> 3) & 0x3f;
natval = (nat_collection >> nat_bit) & 1;
}
@@ -1750,7 +1751,7 @@
{
*lvalp = lval_memory;
*addrp = addr;
- read_memory (addr, buf, register_size (current_gdbarch, IA64_IP_REGNUM));
+ ia64_read_reg (addr, buf, register_size (current_gdbarch, IA64_IP_REGNUM));
pc = extract_unsigned_integer (buf, 8);
}
else if (cache->frameless)
@@ -1779,7 +1780,7 @@
{
*lvalp = lval_memory;
*addrp = addr;
- read_memory (addr, buf, register_size (current_gdbarch, IA64_IP_REGNUM));
+ ia64_read_reg (addr, buf, register_size (current_gdbarch, IA64_IP_REGNUM));
pc = extract_unsigned_integer (buf, 8);
}
else if (cache->frameless)
@@ -1801,7 +1802,7 @@
{
*lvalp = lval_memory;
*addrp = addr;
- read_memory (addr, buf, register_size (current_gdbarch, IA64_BR0_REGNUM));
+ ia64_read_reg (addr, buf, register_size (current_gdbarch, IA64_BR0_REGNUM));
br0 = extract_unsigned_integer (buf, 8);
}
store_unsigned_integer (valuep, 8, br0);
@@ -1817,7 +1818,7 @@
{
*lvalp = lval_memory;
*addrp = addr;
- read_memory (addr, valuep, register_size (current_gdbarch, regnum));
+ ia64_read_reg (addr, valuep, register_size (current_gdbarch, regnum));
}
else if (cache->frameless)
{
@@ -1828,7 +1829,6 @@
CORE_ADDR r_addr;
CORE_ADDR prev_cfm, prev_bsp, prev_bof;
CORE_ADDR addr = 0;
- ULONGEST bspstore;
if (regnum >= V32_REGNUM)
regnum = IA64_GR32_REGNUM + (regnum - V32_REGNUM);
@@ -1841,24 +1841,9 @@
prev_bof = rse_address_add (prev_bsp, -(prev_cfm & 0x7f));
addr = rse_address_add (prev_bof, (regnum - IA64_GR32_REGNUM));
-
- /* Figure out if the register was already flushed or is dirty.
- If the register was flushed already we can return the address
- on the backingstore for it. */
- regcache_cooked_read_unsigned (current_regcache, IA64_BSPSTORE_REGNUM,
- &bspstore);
- if (addr < bspstore)
- {
- *lvalp = lval_memory;
- *addrp = addr;
- read_memory (addr, valuep, register_size (current_gdbarch, regnum));
- }
- else
- {
- target_read_partial (¤t_target, TARGET_OBJECT_DIRTY,
- (void*)&bspstore, valuep, addr - bspstore,
- register_size (current_gdbarch, regnum));
- }
+ *lvalp = lval_memory;
+ *addrp = addr;
+ ia64_read_reg (addr, valuep, register_size (current_gdbarch, regnum));
}
}
else
@@ -1882,7 +1867,7 @@
{
*lvalp = lval_memory;
*addrp = addr;
- read_memory (addr, valuep, register_size (current_gdbarch, regnum));
+ ia64_read_reg (addr, valuep, register_size (current_gdbarch, regnum));
}
/* Otherwise, punt and get the current value of the register. */
else
@@ -2037,7 +2022,7 @@
{
*lvalp = lval_memory;
*addrp = addr;
- read_memory (addr, buf, register_size (current_gdbarch, IA64_IP_REGNUM));
+ ia64_read_reg (addr, buf, register_size (current_gdbarch, IA64_IP_REGNUM));
pc = extract_unsigned_integer (buf, 8);
}
pc &= ~0xf;
@@ -2054,7 +2039,7 @@
{
*lvalp = lval_memory;
*addrp = addr;
- read_memory (addr, valuep, register_size (current_gdbarch, regnum));
+ ia64_read_reg (addr, valuep, register_size (current_gdbarch, regnum));
}
}
else
@@ -2065,7 +2050,7 @@
{
*lvalp = lval_memory;
*addrp = addr;
- read_memory (addr, valuep, register_size (current_gdbarch, regnum));
+ ia64_read_reg (addr, valuep, register_size (current_gdbarch, regnum));
}
}
==== //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* $Id: mount_smbfs.c,v 1.17 2002/04/10 04:17:51 bp Exp $
- * $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.c,v 1.4 2004/06/20 14:30:33 mux Exp $
+ * $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.c,v 1.5 2004/09/05 06:42:51 tjr Exp $
*/
#include <sys/param.h>
#include <sys/stat.h>
@@ -103,7 +103,7 @@
#else
error = getvfsbyname(SMBFS_VFSNAME, &vfc);
if (error) {
- if (kldload(SMBFS_VFSNAME))
+ if (kldload(SMBFS_VFSNAME) < 0)
err(EX_OSERR, "kldload("SMBFS_VFSNAME")");
error = getvfsbyname(SMBFS_VFSNAME, &vfc);
}
==== //depot/projects/hammer/etc/devd.conf#13 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.15 2004/09/01 00:08:15 brooks Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.16 2004/09/06 20:09:00 glebius Exp $
#
# Refer to devd.conf(5) and devd(8) man pages for the details on how to
# run and configure devd.
@@ -18,9 +18,9 @@
# Setup some shorthand for regex that we use later in the file.
set ethernet-nic-regex
- "(an|ar|ath|aue|awi|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|ep|\
- ex|fe|fxp|gem|gx|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|rue|\
- sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vr|vx|wb|wi|xe|xl)[0-9]+";
+ "(an|ar|ath|aue|awi|axe|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|\
+ ep|ex|fe|fxp|gem|gx|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|\
+ rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vr|vx|wb|wi|xe|xl)[0-9]+";
set scsi-controller-regex
"(adv|advw|aic|aha|ahb|ahc|ahd|bt|ct|iir|isp|mly|mpt|ncv|nsp|\
stg|sym|wds)[0-9]+";
==== //depot/projects/hammer/etc/mtree/BSD.include.dist#24 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.88 2004/08/16 06:36:21 pjd Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.89 2004/09/02 20:44:55 alfred Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -54,6 +54,8 @@
..
..
fs
+ autofs
+ ..
devfs
..
fdescfs
==== //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/main.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.2 2004/08/15 02:39:20 marcel Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.3 2004/09/03 07:11:42 brooks Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -284,7 +284,7 @@
if (!S_ISREG(st.st_mode))
errx(1, "%s: not a regular file", path);
vmcore = strdup(path);
- } else if (remote != NULL) {
+ } else if (remote != NULL && remote[0] != ':' && remote[0] != '|') {
if (stat(remote, &st) != 0) {
snprintf(path, sizeof(path), "/dev/%s", remote);
if (stat(path, &st) != 0) {
==== //depot/projects/hammer/include/Makefile#29 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.222 2004/08/16 06:36:20 pjd Exp $
+# $FreeBSD: src/include/Makefile,v 1.223 2004/09/02 20:44:55 alfred Exp $
#
# Doing a "make install" builds /usr/include.
@@ -43,7 +43,7 @@
isofs/cd9660 netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \
netgraph/atm security/mac_biba security/mac_bsdextended \
security/mac_lomac security/mac_mls security/mac_partition \
- ufs/ffs ufs/ufs
+ ufs/ffs ufs/ufs fs/autofs
.if !defined(NO_BLUETOOTH)
LSUBSUBDIRS= netgraph/bluetooth/include
==== //depot/projects/hammer/include/tgmath.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/tgmath.h,v 1.1 2004/08/08 20:05:47 stefanf Exp $
+ * $FreeBSD: src/include/tgmath.h,v 1.4 2004/09/03 23:44:09 stefanf Exp $
*/
#ifndef _TGMATH_H_
@@ -57,14 +57,15 @@
#define __tg_type3(e1, e2, e3, t) \
(__tg_type(e1, t) || __tg_type(e2, t) || __tg_type(e3, t))
#define __tg_type_corr(e1, e2, e3, t) \
- (__tg_type3(e1, e2, e3, t) || __tg_type3(e1, e2, e3, t complex))
+ (__tg_type3(e1, e2, e3, t) || __tg_type3(e1, e2, e3, t _Complex))
#define __tg_integer(e1, e2, e3) \
(((__typeof__(e1))1.5 == 1) || ((__typeof__(e2))1.5 == 1) || \
((__typeof__(e3))1.5 == 1))
#define __tg_is_complex(e1, e2, e3) \
- (__tg_type3(e1, e2, e3, float complex) || \
- __tg_type3(e1, e2, e3, double complex) || \
- __tg_type3(e1, e2, e3, long double complex))
+ (__tg_type3(e1, e2, e3, float _Complex) || \
+ __tg_type3(e1, e2, e3, double _Complex) || \
+ __tg_type3(e1, e2, e3, long double _Complex)) || \
+ __tg_type3(e1, e2, e3, __typeof__(_Complex_I))
#define __tg_impl_simple(x, y, z, fn, fnf, fnl, ...) \
__builtin_choose_expr(__tg_type_corr(x, y, z, long double), \
@@ -143,7 +144,7 @@
#define logb(x) __tg_simple(x, logb)
#define lrint(x) __tg_simple(x, lrint)
#define lround(x) __tg_simple(x, lround)
-#define nextbyint(x) __tg_simple(x, nextbyint)
+#define nearbyint(x) __tg_simple(x, nearbyint)
#define nextafter(x, y) __tg_simple2(x, y, nextafter)
#define nexttoward(x, y) __tg_simplev(x, nexttoward, x, y)
#define remainder(x, y) __tg_simple2(x, y, remainder)
==== //depot/projects/hammer/lib/Makefile#41 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.191 2004/08/29 18:26:59 obrien Exp $
+# $FreeBSD: src/lib/Makefile,v 1.192 2004/09/03 17:39:00 alfred Exp $
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
@@ -29,7 +29,7 @@
libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \
libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \
libipx libisc libkiconv libmagic libmenu ${_libmilter} ${_libmp} \
- ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \
+ ${_libncp} ${_libngatm} libopie libpam libautofs libpanel libpcap \
${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \
${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \
libugidfw ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz
==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#16 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.26 2004/08/14 03:45:45 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.27 2004/09/04 21:49:42 kientzle Exp $");
#include <sys/stat.h>
#include <errno.h>
@@ -351,12 +351,33 @@
{
struct stat st;
struct tar *tar;
+ const char *p;
+ int r;
+ size_t l;
memset(&st, 0, sizeof(st));
tar = *(a->pformat_data);
tar->entry_offset = 0;
- return (tar_read_header(a, tar, entry, &st));
+ r = tar_read_header(a, tar, entry, &st);
+
+ if (r == ARCHIVE_OK) {
+ /*
+ * "Regular" entry with trailing '/' is really
+ * directory: This is needed for certain old tar
+ * variants and even for some broken newer ones.
+ */
+ p = archive_entry_pathname(entry);
+ l = strlen(p);
+ if (S_ISREG(st.st_mode) && p[l-1] == '/') {
+ st.st_mode &= ~S_IFMT;
+ st.st_mode |= S_IFDIR;
+ }
+
+ /* Copy the final stat data into the entry. */
+ archive_entry_copy_stat(entry, &st);
+ }
+ return (r);
}
static int
@@ -421,8 +442,6 @@
ssize_t bytes;
int err;
const void *h;
- const char *p;
- size_t l;
const struct archive_entry_header_ustar *header;
/* Read 512-byte header record */
@@ -513,16 +532,7 @@
a->archive_format_name = "tar (non-POSIX)";
err = header_old_tar(a, tar, entry, st, h);
}
-
- /* "Regular" entry with trailing '/' is really directory. */
- p = archive_entry_pathname(entry);
- l = strlen(p);
- if (S_ISREG(st->st_mode) && p[l-1] == '/') {
- st->st_mode &= ~S_IFMT;
- st->st_mode |= S_IFDIR;
- }
}
- archive_entry_copy_stat(entry, st);
--tar->header_recursion_depth;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list